weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_20260429' into dev_WMS20260401

Browse Source 
# Conflicts:
#	mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java
#	mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/UserServiceFeign.java
#	mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteOmsFeignFallbackFactory.java
#	mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteUserFeignFallbackFactory.java
#	mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/batchDetail/BatchDetailApplicationService.java
#	mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/batchDetail/service/BatchDetailDomainService.java
#	mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/sysTableConfig/SysTableConfigApi.java
This commit is contained in:
王奎兴
2026-05-15 13:55:42 +08:00
parent 226ded3ee9 20e47e8cc4
commit 206c85aaf7
162 changed files with 7447 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd-user-center/src/main/java/com/mhd/user/application/service/UserShipperApplicationService.java
+23 -1
View File
@@ -33,6 +33,7 @@ import com.mhd.common.core.domain.po.RolePO;
import com.mhd.user.domain.userAggregate.entity.UserRoleEntity;
import com.mhd.user.domain.userAggregate.entity.UserShipperEntity;
import com.mhd.user.domain.userAggregate.event.ShipperEventPublisher;
import com.mhd.user.domain.userAggregate.repository.mapper.UserShipperMapper;
import com.mhd.user.domain.userAggregate.repository.po.UserDriverPo;
import com.mhd.user.domain.userAggregate.repository.todo.*;
import com.mhd.user.domain.userAggregate.service.*;
@@ -112,6 +113,9 @@ public class UserShipperApplicationService {
@Resource
private WlhyServiceFeign wlhyServiceFeign;
@Resource
private UserShipperMapper userShipperMapper;
/**
* @Description 查询托运人列表
* @Author Alex
@@ -1209,5 +1213,23 @@ public class UserShipperApplicationService {
}
}
/**
* 推送状态更新
* @param shipperId
* @param pushStatus
* @param pushTime
* @param pushBy
* @return
*/
public int updatePushStatus(Long shipperId, Integer pushStatus, String pushTime, Long pushBy,String pushByName) {
UserShipperEntity userShipper = new UserShipperEntity();
userShipper.setShipperId(shipperId);
userShipper.setPushStatus(pushStatus);
if (pushTime != null && !"".equals(pushTime)) {
userShipper.setPushTime(DateUtil.parse(pushTime));
}
userShipper.setPushBy(pushBy);
userShipper.setPushByName(pushByName);
return userShipperMapper.updatePushStatus(userShipper);
}
}
mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/entity/UserShipperEntity.java
+12
View File
@@ -263,4 +263,16 @@ public class UserShipperEntity extends BaseVOEntity {
@ApiModelProperty(name = "组织名称")
private String organizationName;
@ApiModelProperty(name = "推送状态 1-未推送 2-推送中 3-推送成功 4-推送失败")
private Integer pushStatus;
@ApiModelProperty(name = "推送时间")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date pushTime;
@ApiModelProperty(name = "推送人")
private Long pushBy;
@ApiModelProperty(name = "推送人姓名")
private String pushByName;
}
mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/mapper/UserShipperMapper.java
+8
View File
@@ -7,6 +7,7 @@ import com.mhd.user.domain.userAggregate.repository.todo.UserShipperDO;
import com.mhd.user.domain.userAggregate.repository.po.UserShipperPo;
import org.apache.ibatis.annotations.Param;
import java.util.Date;
import java.util.List;
public interface UserShipperMapper extends BaseMapper<UserShipperEntity> {
@@ -28,4 +29,11 @@ public interface UserShipperMapper extends BaseMapper<UserShipperEntity> {
List<UserShipperEntity> selectBySealId(@Param("userShipperEntity") UserShipperEntity userShipperEntity);
public com.mhd.common.core.domain.po.UserShipperPo getShipperSummaryData(Long userId);
/**
*
* @param userShipper
* @return
*/
int updatePushStatus(UserShipperEntity userShipper);
}
mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/po/UserShipperPo.java
+14
View File
@@ -321,4 +321,18 @@ public class UserShipperPo implements Serializable {
@ApiModelProperty(name = "备注")
private String userRemarkShipper;
@ApiModelProperty(value = "推送状态：1-未推送，2-推送中，3-推送成功，4-推送失败")
private Integer pushStatus;
@ApiModelProperty(value = "推送时间")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date pushTime;
@ApiModelProperty(value = "推送人ID")
private Long pushBy;
@ApiModelProperty(value = "推送人姓名")
private String pushByName;
}
mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/todo/UserShipperDO.java
+21
View File
@@ -288,4 +288,25 @@ public class UserShipperDO extends UserDO {
@ApiModelProperty(name = "备注")
private String userRemark;
@ApiModelProperty("创建时间起")
private Date createTimeFrom;
@ApiModelProperty("创建时间止")
private Date createTimeTo;
@ApiModelProperty("更新时间起")
private String updateTimeFrom;
@ApiModelProperty("更新时间止")
private String updateTimeTo;
@ApiModelProperty("推送状态")
private Integer pushStatus;
@ApiModelProperty("推送时间起")
private String pushTimeFrom;
@ApiModelProperty("推送时间止")
private String pushTimeTo;
}
mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserShipperDTO.java
+15
View File
@@ -235,4 +235,19 @@ public class UserShipperDTO extends UserDTO {
private String taxNumber;
@ApiModelProperty(value = "更新时间起")
private String updateTimeFrom;
@ApiModelProperty(value = "更新时间止")
private String updateTimeTo;
@ApiModelProperty(value = "推送时间起")
private String pushTimeFrom;
@ApiModelProperty(value = "推送时间止")
private String pushTimeTo;
@ApiModelProperty(value = "推送状态")
private Integer pushStatus;
}
mhd-user-center/src/main/java/com/mhd/user/interfaces/facade/UserShipperAPI.java
+19
View File
@@ -20,9 +20,11 @@ import com.mhd.user.interfaces.vo.SettlementInfoQueryVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.Date;
import java.util.List;
@Api(tags = "用户中台管理-托运人管理")
@@ -235,4 +237,21 @@ public class UserShipperAPI extends BaseController {
}
}
@ApiOperation("商业合作伙伴-更新推送状态")
@PostMapping("/updatePushStatus")
public AjaxResult updatePushStatus(@RequestParam("shipperId") Long shipperId,
@RequestParam("pushStatus") Integer pushStatus,
@RequestParam(value = "pushTime", required = false) String pushTime,
@RequestParam(value = "pushBy", required = false) Long pushBy,
@RequestParam(value = "pushByName", required = false) String pushByName){
try{
int result = userShipperApplicationService.updatePushStatus(shipperId,pushStatus,pushTime,pushBy,pushByName);
return result > 0 ? AjaxResult.success() : AjaxResult.error("更新失败");
}catch (Exception e){
log.error("更新推送状态异常： shipperId = {} , error = ", e.getMessage());
return AjaxResult.error("更新推送状态异常：" + e.getMessage());
}
}
}
mhd-user-center/src/main/resources/bootstrap.yml
+8 -8
View File
@@ -20,17 +20,17 @@ spring:
discovery:
# server-addr: 127.0.0.1:8848
# 线上测试环境配置 容器名+端口号
# server-addr: 10.33.0.129:6010
server-addr: 10.102.192.5:6848
username: nacos
password: manhuoda@2023
server-addr: 10.33.0.129:6010
# server-addr: 10.102.192.5:6848
# username: nacos
# password: manhuoda@2023
config:
# server-addr: 127.0.0.1:8848
# 线上测试环境配置 容器名+端口号
# server-addr: 10.33.0.129:6010
server-addr: 10.102.192.5:6848
username: nacos
password: manhuoda@2023
server-addr: 10.33.0.129:6010
# server-addr: 10.102.192.5:6848
# username: nacos
# password: manhuoda@2023
group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置
file-extension: yml #默认properties
# 共享配置
mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml
+36 -1
View File
@@ -161,7 +161,11 @@
b.invoice_title,
b.tax_number,
b.user_email,
b.user_remark as userRemarkShipper
b.user_remark as userRemarkShipper,
b.push_status,
b.push_time,
b.push_by,
b.push_by_name
FROM "USER" a
LEFT JOIN user_shipper b ON a.user_id = b.user_id
left join (select user_id, LISTAGG(DISTINCT r.role_name, '&amp;') WITHIN GROUP(ORDER BY r.role_name) AS roleName
@@ -312,6 +316,24 @@
and DATE_FORMAT(a.create_time,'%Y-%m-%d') <![CDATA[<=]]>
DATE_FORMAT(#{createTimeTo},'%Y-%m-%d')
</if>
/*更新时间*/
<if test="updateTimeFrom != null and updateTimeFrom != ''">
and DATE_FORMAT(a.update_time,'%Y-%m-%d') &gt;= #{updateTimeFrom}
</if>
<if test="updateTimeTo != null and updateTimeTo != ''">
and DATE_FORMAT(a.update_time,'%Y-%m-%d') &lt;= #{updateTimeTo}
</if>
/*推送状态*/
<if test="pushStatus != null">
and b.push_status = #{pushStatus}
</if>
/*推送时间*/
<if test="pushTimeFrom != null and pushTimeFrom != ''">
and DATE_FORMAT(b.push_time,'%Y-%m-%d') &gt;= #{pushTimeFrom}
</if>
<if test="pushTimeTo != null and pushTimeTo != ''">
and DATE_FORMAT(b.push_time,'%Y-%m-%d') &lt;= #{pushTimeTo}
</if>
/*审核时间*/
<if test="userAuthTimeFrom!=null and userAuthTimeTo!=null ">
and DATE_FORMAT(b.shipper_fill_time,'%Y-%m-%d') <![CDATA[>=]]>
@@ -401,4 +423,17 @@
and esign_enterprise_status = #{userShipperEntity.esignEnterpriseStatus}
</select>
<update id="updatePushStatus">
UPDATE user_shipper
<set>
<if test="pushStatus != null">push_status = #{pushStatus},</if>
<if test="pushTime != null">push_time = #{pushTime},</if>
<if test="pushBy != null">push_by = #{pushBy},</if>
<if test="pushByName != null">push_by_name = #{pushByName},</if>
</set>
WHERE shipper_id = #{shipperId}
</update>
</mapper>