cup 3 жил өмнө
parent
commit
37b257df42

+ 2 - 2
mp-admin/src/main/java/com/qs/mp/web/controller/api/user/UserDeliverOrderController.java

@@ -219,13 +219,13 @@ public class UserDeliverOrderController extends BaseApiController {
       }
 
       prizeStorageList.add(prizeStorage);
-      orderSettleVO.setResource(DeliverOrderResourceEnum.PAYMENT);
+      orderSettleVO.setResource(DeliverOrderResourceEnum.PAYMENT.getValue());
     }else {
       prizeStorageList = userPrizeStorageService.list(new LambdaQueryWrapper<UserPrizeStorage>()
               .eq(UserPrizeStorage::getUserId, userId).eq(UserPrizeStorage::getStatus, PrizeStorageStatusEnum.NOT_DISTRIBUTED)
               .in(UserPrizeStorage::getStorageId, param.getIds()));
       goodsNum = prizeStorageList.stream().mapToInt(UserPrizeStorage::getGoodsNum).sum();
-      orderSettleVO.setResource(DeliverOrderResourceEnum.DELIVER);
+      orderSettleVO.setResource(DeliverOrderResourceEnum.DELIVER.getValue());
     }
 
 

+ 1 - 1
mp-service/src/main/java/com/qs/mp/user/domain/vo/DeliverOrderSettleVO.java

@@ -20,7 +20,7 @@ import lombok.Data;
 public class DeliverOrderSettleVO {
 
   @ApiModelProperty("订单来源:1提货订单,2现金购买")
-  private DeliverOrderResourceEnum resource;
+  private Integer resource;
 
 
   @ApiModelProperty("用户配送地址")