解决冲突

Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>

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

@@ -522,7 +522,7 @@ public class OrderServiceImpl implements Orderservice {
         //支付回调成功标记
         redisCache.save(RedisKeyConstant.KGD_PAYMENT_CALLBACK_FMID + message.getOut_trade_no(), message.getOut_trade_no(), 10L, TimeUnit.MINUTES);
         if (message.getSource() != null && message.getSource().equals(PaySuccessSource.OUTSIDE.getSource())) {
-            verificationCoupon(message.getTrans_id());
+            verificationCoupon(message.getTrans_id(), message.getThirdPartTradeNo());
         }
         return sendPaySuccessNoticeMessage();
     }

shopping-cart-application-service/src/main/java/cn/freemud/adapter/ActivityAdapter.java

@@ -240,7 +240,7 @@ public class ActivityAdapter {
 
 
 
-    public PremiumExchangeResponseVo convert2PremiumExchangeSharing(ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult) {
+    public PremiumExchangeResponseVo convert2PremiumExchangeSharing(CalculationDiscountResult calculationDiscountResult) {
         return this.convert2PremiumExchange(calculationDiscountResult);
     }
 

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/calculate/SendGoods.java

@@ -52,4 +52,8 @@ public class SendGoods {
 
     private String picture;
 
+    /**
+     * 商品类型：2、是加料商品，9、是虚拟商品，7、是套餐商品，1、是单品
+     */
+    private Integer productType;
 }

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java

@@ -79,6 +79,7 @@ import com.freemud.sdk.api.assortment.shoppingcart.constant.CommonsConstant;
 import com.freemud.sdk.api.assortment.shoppingcart.enums.BusinessTypeEnum;
 import com.freemud.sdk.api.assortment.shoppingcart.service.ShoppingCartBaseService;
 import com.freemud.sdk.api.assortment.shoppingcart.service.impl.ShoppingCartBaseServiceImpl;
+import com.freemud.sdk.api.assortment.shoppingcart.util.ShoppingSdkLogUtil;
 import com.google.common.collect.Lists;
 import javafx.util.Pair;
 import ma.glasnost.orika.MapperFacade;