@@ -260,6 +260,10 @@ public class UserDeliverOrderController extends BaseApiController {
orderSettleVO.setPayAmt(orderAmt + freightAmt);
orderSettleVO.setPrizeList(prizeStorageList);
+ AppSourceEnum appSourceEnum = AppSourceEnum.getByValue(param.getAppSource());
+ orderSettleVO.setAppId(appSourceEnum.getAppId());
+
// 缓存订单结算对象
redisCache.setCacheObject(RedisKey.build(RedisKey.USER_DELIVER_ORDER_KEY, userId), orderSettleVO, 10,
TimeUnit.MINUTES);
@@ -28,4 +28,7 @@ public class DeliverOrderParam {
@ApiModelProperty(value = "地址ID",required=false)
private Long addrId;
+ @ApiModelProperty("小程序,1盲票,2码上兑券,3支付宝盲票")
+ private Integer appSource;
}
@@ -56,4 +56,6 @@ public class DeliverOrderSettleVO {
@ApiModelProperty("奖品库列表")
List<UserPrizeStorage> prizeList = new ArrayList<>();
+ @ApiModelProperty("小程序Id")
+ private String appId;
@@ -100,6 +100,7 @@ public class UserDeliverOrderServiceImpl extends ServiceImpl<UserDeliverOrderMap
userDeliverOrder.setOrderNum(orderSettleVO.getPrizeList().stream().mapToInt(UserPrizeStorage::getGoodsNum).sum());
userDeliverOrder.setPayAmt(orderSettleVO.getPayAmt());
userDeliverOrder.setFreightAmt(orderSettleVO.getFreightAmt());
+ userDeliverOrder.setAppId(orderSettleVO.getAppId());
userDeliverOrder.setMemo(memo);
if (orderSettleVO.getPayAmt() > 0) {
userDeliverOrder.setStatus(DeliverOrderStatusEnum.NOT_PAY);