Merge remote-tracking branch 'refs/remotes/origin/dev' into nanguangmall

mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserDTO.java

@@ -235,4 +235,10 @@ public class UserDTO extends BaseVOEntity {
 
     @ApiModelProperty(name = "有效期管理  0-否  1-是")
     private Integer validityPeriodManagement;
+
+    @ApiModelProperty("业务员nc编码")
+    private String salespersonNcCode;
+
+    @ApiModelProperty( "制单员nc编码")
+    private String documentPreparerNcCode;
 }

mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserShipperDTO.java

@@ -191,4 +191,7 @@ public class UserShipperDTO extends UserDTO {
     @ApiModelProperty(name = "备注信息")
     private String remark;
 
+    @ApiModelProperty("客户nc编码")
+    private String customerNcCode;
+
 }

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

@@ -199,4 +199,10 @@ public class UserShipperAPI extends BaseController {
         SettlementInfoQueryVo infoQueryVo = userShipperApplicationService.getSettlementInfoByUserId(userId);
         return R.ok(infoQueryVo);
     }
+
+    @ApiOperation("查询委托方汇总数据")
+    @GetMapping("/getShipperSummaryData/{userId}")
+    public AjaxResult<?> getShipperSummaryData(@PathVariable Long userId) {
+        return AjaxResult.success(userShipperApplicationService.getShipperSummaryData(userId));
+    }
 }