Merge remote-tracking branch 'origin/feature/coco-payGift-刘鹏飞' into feature/coco-payGift-刘鹏飞

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -266,7 +266,7 @@ public class OrderSdkAdapter {
 
         // 买一赠一寄件信息
         if(requestVO.getChooseGoods() != null && !requestVO.getChooseGoods().isEmpty()){
-            request.setChooseGoods(JSONArray.parseArray(JSONObject.toJSONString(requestVO.getChooseGoods()), CreateOrderRequest.ChooseGood.class));
+            request.setOrderSendCouponRespList(JSONArray.parseArray(JSONObject.toJSONString(requestVO.getChooseGoods()), CreateOrderRequest.ChooseGood.class));
         }
 
         return request;

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

@@ -176,7 +176,6 @@ public class OrderServiceImpl implements Orderservice {
     private String cloudPrintQueue;
     @Value("${mq.cloud_print_exchange}")
     private String cloud_print_exchange;
-
     /**
      * coco商户
      */
@@ -1288,12 +1287,14 @@ public class OrderServiceImpl implements Orderservice {
             queryOrderResponseVo.setRedpacketsPicture(getRedpacketsPicture(activityId));
         }
 
+
         // 支付有礼
         // 目前只有coco在订单详情参加支付有礼，且不检查订单的状态
         if(cocoPartnerId.contains(partnerId)){
             joinPayGift(sessionId, queryOrderResponseVo);
         }
 
+
         buildQueryOrderResponseVo(queryOrderResponseVo,response);
 
         return ResponseUtil.success(queryOrderResponseVo);
@@ -3109,18 +3110,6 @@ public class OrderServiceImpl implements Orderservice {
         return ResponseUtil.success(responses.getData());
     }
 
-
-    public String getMealCodeRule(String appId){
-        String mealCodeRule = "";
-        List<AssortmentOpenPlatformPartnerWxappConfig> partnerWxappConfigs = orderAdapter.cacheSelectDefaultPage(appId, "2");
-        Map<String, AssortmentOpenPlatformPartnerWxappConfig> configMap = partnerWxappConfigs.stream().collect(Collectors.toMap(AssortmentOpenPlatformPartnerWxappConfig::getAppKey, Function.identity()));
-        AssortmentOpenPlatformPartnerWxappConfig refundDeliveryFeeConfig = configMap.get("mealCodeRule");
-        if(null != refundDeliveryFeeConfig) {
-            mealCodeRule = refundDeliveryFeeConfig.getAppValue();
-        }
-        return mealCodeRule;
-    }
-
     public void buildQueryOrderResponseVo(QueryOrderResponseVo queryOrderResponseVo,QueryOrderByIdResponse response) {
 
         List<QueryOrderResponseVo.chooseGood> chooseGoods = new ArrayList<>();
@@ -3140,4 +3129,16 @@ public class OrderServiceImpl implements Orderservice {
         queryOrderResponseVo.setChooseGoods(chooseGoods);
 
     }
+
+    public String getMealCodeRule(String appId){
+        String mealCodeRule = "";
+        List<AssortmentOpenPlatformPartnerWxappConfig> partnerWxappConfigs = orderAdapter.cacheSelectDefaultPage(appId, "2");
+        Map<String, AssortmentOpenPlatformPartnerWxappConfig> configMap = partnerWxappConfigs.stream().collect(Collectors.toMap(AssortmentOpenPlatformPartnerWxappConfig::getAppKey, Function.identity()));
+        AssortmentOpenPlatformPartnerWxappConfig refundDeliveryFeeConfig = configMap.get("mealCodeRule");
+        if(null != refundDeliveryFeeConfig) {
+            mealCodeRule = refundDeliveryFeeConfig.getAppValue();
+        }
+        return mealCodeRule;
+    }
+
 }

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/create/CreateOrderRequest.java

@@ -218,7 +218,7 @@ public class CreateOrderRequest extends BaseRequest {
     /**
      * 买一赠一选择的商品
      */
-    private List<ChooseGood> chooseGoods;
+    private List<ChooseGood> orderSendCouponRespList;
 
     @Data
     public static class ChooseGood {

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/promotion/GiftSharingService.java

@@ -214,7 +214,7 @@ public class GiftSharingService {
     public CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount discountInfo(CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods goods) {
         CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount discount = goods.getDiscounts()
                 .stream()
-                .filter(g -> ActivityTypeEnum.TYPE_62.getCode().equals(g.getType()) || ActivityTypeEnum.TYPE_61.getCode().equals(g.getType()))
+                .filter(g -> ActivityTypeEnum.TYPE_63.getCode().equals(g.getType()) || ActivityTypeEnum.TYPE_62.getCode().equals(g.getType()) || ActivityTypeEnum.TYPE_61.getCode().equals(g.getType()))
                 .findFirst()
                 .get();
         return discount;