商业合作伙伴推送人姓名字段添加

mhd-user-center/src/main/java/com/mhd/user/application/service/UserShipperApplicationService.java

@@ -1221,7 +1221,7 @@ public class UserShipperApplicationService {
      * @param pushBy
      * @return
      */
-    public int updatePushStatus(Long shipperId, Integer pushStatus, String pushTime, Long pushBy) {
+    public int updatePushStatus(Long shipperId, Integer pushStatus, String pushTime, Long pushBy,String pushByName) {
         UserShipperEntity userShipper = new UserShipperEntity();
         userShipper.setShipperId(shipperId);
         userShipper.setPushStatus(pushStatus);
@@ -1229,6 +1229,7 @@ public class UserShipperApplicationService {
             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

@@ -272,6 +272,7 @@ public class UserShipperEntity extends BaseVOEntity {
     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/po/UserShipperPo.java

@@ -332,4 +332,7 @@ public class UserShipperPo implements Serializable {
 
     @ApiModelProperty(value = "推送人ID")
     private Long pushBy;
+
+    @ApiModelProperty(value = "推送人姓名")
+    private String pushByName;
 }

mhd-user-center/src/main/java/com/mhd/user/interfaces/facade/UserShipperAPI.java

@@ -242,10 +242,11 @@ public class UserShipperAPI extends BaseController {
     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 = "pushBy", required = false) Long pushBy,
+                                       @RequestParam(value = "pushByName", required = false) String pushByName){
 
         try{
-            int result = userShipperApplicationService.updatePushStatus(shipperId,pushStatus,pushTime,pushBy);
+            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());

mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml

@@ -429,6 +429,7 @@
             <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>