diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/order/excel/HardOrderExcelVo.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/order/excel/HardOrderExcelVo.java index b63c299b4..18943565a 100644 --- a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/order/excel/HardOrderExcelVo.java +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/order/excel/HardOrderExcelVo.java @@ -27,6 +27,9 @@ public class HardOrderExcelVo { @ExcelProperty("部门") private String userDeptName; + @ExcelProperty("商品") + private String productDesc; + @ExcelProperty("支付方式") private String payType; diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/feign/RemoteWalletService.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/feign/RemoteWalletService.java index e89022406..9fc1196a0 100644 --- a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/feign/RemoteWalletService.java +++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/feign/RemoteWalletService.java @@ -37,8 +37,8 @@ public interface RemoteWalletService { R getWalletById(@RequestParam Long walletId); @NoToken - @GetMapping("/wallet-manage/get-wallet-by-ids") - R> getWalletByIds(@RequestParam List walletIds); + @PostMapping("/wallet-manage/get-wallet-by-ids") + R> getWalletByIds(@RequestBody List walletIds); @NoToken @GetMapping("/wallet-manage/get-wallet-by-phone") diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletManageController.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletManageController.java index 6ca9cc5b5..04ff4878e 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletManageController.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletManageController.java @@ -109,6 +109,16 @@ public class WalletManageController { @Inner @GetMapping("/get-wallet-by-ids") public R> getWalletByIds(@RequestParam List walletIds) { + return listWalletByIds(walletIds); + } + + @Inner + @PostMapping("/get-wallet-by-ids") + public R> getWalletByIdsPost(@RequestBody List walletIds) { + return listWalletByIds(walletIds); + } + + private R> listWalletByIds(List walletIds) { WalletManageDto dto = new WalletManageDto(); dto.setWalletIds(walletIds); List wallet = walletManageService.scopeList(dto, null);