diff --git a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/po/UserShipperPo.java b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/po/UserShipperPo.java index d25de5e24..d8163e9b5 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/po/UserShipperPo.java +++ b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/po/UserShipperPo.java @@ -257,4 +257,7 @@ public class UserShipperPo implements Serializable { @ApiModelProperty(name = "客户nc编码") private String customerNcCode; + + @ApiModelProperty("结算币种") + private String settlementCurrency; } diff --git a/mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml b/mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml index c03889522..4866e3a3a 100644 --- a/mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml +++ b/mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml @@ -139,7 +139,7 @@ b.monthly_settlement_flag, a.user_auth_status, b.original_receipt_flag, - b.freight_node,b.customer_nc_code + b.freight_node,b.customer_nc_code,b.settlement_currency 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, '&') WITHIN GROUP(ORDER BY r.role_name) AS roleName diff --git a/mhd_product/src/main/java/com/linke/product/interfaces/facade/menu/MenuApi.java b/mhd_product/src/main/java/com/linke/product/interfaces/facade/menu/MenuApi.java index bef559376..ec7ee1470 100644 --- a/mhd_product/src/main/java/com/linke/product/interfaces/facade/menu/MenuApi.java +++ b/mhd_product/src/main/java/com/linke/product/interfaces/facade/menu/MenuApi.java @@ -206,7 +206,7 @@ public class MenuApi extends BaseController { * 文件批量上传到oss * */ - @PostMapping("/batchUpload") + /*@PostMapping("/batchUpload") public AjaxResult batchUpload(@RequestParam("files") List files) { if (files == null || files.size() == 0) { return AjaxResult.error("上传文件不能为空"); @@ -235,6 +235,21 @@ public class MenuApi extends BaseController { fileUrls.add(fileUrl); } + return AjaxResult.success(fileUrls); + }*/ + + + @PostMapping("/batchUpload") + public AjaxResult batchUpload(@RequestParam("files") List files) { + if (files == null || files.size() == 0) { + return AjaxResult.error("上传文件不能为空"); + } + List fileUrls = new ArrayList<>(); + for (MultipartFile multipartFile : files) { + String fileKey = fileStorageService.uploadFile(multipartFile); + fileUrls.add(fileKey); + } + return AjaxResult.success(fileUrls); }