feat:创建共富商城订单

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/app/HardAppCreateFarmerOrderDto.java

@@ -19,8 +19,8 @@ public class HardAppCreateFarmerOrderDto {
     @NotNull(message = "购物车id不能为空")
     private Long carParentId;
 
-    @NotNull(message = "钱包类型不能为空")
-    private WalletTypeEnum walletType;
+    @NotNull(message = "钱包类型id")
+    private Long walletTypeId;
 
     @NotNull(message = "自提点id不能为空")
     private Long pickUpId;

pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardOrderController.java

@@ -194,7 +194,6 @@ public class HardOrderController {
     @Idempotent(expireTime = 3, key = "'/app/hard-order/app/create-farmer-order' + #body.getCarParentId() ", info = "正在创建订单中，请勿重复操作")
     public R<Long> appCreateFarmerReserveOrder(@RequestBody HardAppCreateFarmerOrderDto body) {
         PjcloudUser user = SecurityUtils.getUser();
-        body.setWalletType(WalletTypeEnum.EAT);
         body.setHardType(HardTypeEnum.SUPERMARKET);
         body.setUserId(user.getId());
         body.setOrderType(HardOrderTypeEnum.FARMER);

pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderServiceImpl.java

@@ -642,7 +642,7 @@ public class HardOrderServiceImpl extends ServiceImpl<HardOrderMapper, HardOrder
         UserInfo userDetail = userService.getInnerByUserId(dto.getUserId()).getData();
         if (ObjectUtil.isEmpty(userDetail)) throw new RuntimeException("用户不存在不存在");
         // 钱包
-        WalletManageEntity wallet = remoteWalletService.getWallet(dto.getUserId(), dto.getWalletType()).getData();
+        WalletManageEntity wallet = remoteWalletService.getWalletByWalletTypeId(dto.getUserId(), dto.getWalletTypeId()).getData();
         if (ObjectUtil.isEmpty(wallet)) throw new RuntimeException("用户钱包不存在");
         // 查询父订单
         HardParentCarEntity parentCar = hardCarService.getParentCarById(dto.getCarParentId());