Merge remote-tracking branch 'remotes/origin/feature/1.9.9-支付有礼增加sku-海波'

order-application-service/src/main/java/cn/freemud/entities/dto/activity/PayGitCheckAndJoinRequestDto.java

@@ -4,6 +4,8 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.List;
+
 @Data
 public class PayGitCheckAndJoinRequestDto {
     //门店编号
@@ -22,4 +24,6 @@ public class PayGitCheckAndJoinRequestDto {
 
     //点餐方式 1-到店取餐 2-外卖
     private Integer orderWay;
+
+    private List<String> skuIds;
 }

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -832,6 +832,9 @@ public class OrderServiceImpl implements Orderservice {
         payGitRequestDto.setOid(queryOrderResponseVo.getOid());
         payGitRequestDto.setPayAmount(queryOrderResponseVo.getAmount());
         payGitRequestDto.setPayType(1);//1-微信,2-储值卡
+        if(CollectionUtils.isNotEmpty(queryOrderResponseVo.getProducts())){
+            payGitRequestDto.setSkuIds(queryOrderResponseVo.getProducts().stream().map(p -> p.getPid()).collect(Collectors.toList()));
+        }
         if (OrderType.COLLECT_GOODS.getCode().intValue() == queryOrderResponseVo.getOrderType() || OrderType.EAT_IN.getCode().intValue() == queryOrderResponseVo.getOrderType()) {
             payGitRequestDto.setOrderWay(1);
         } else {