合并冲突

assortment-ordercenter-sdk/pom.xml

@@ -61,7 +61,7 @@
         <dependency>
             <artifactId>promotioncenter-sdk</artifactId>
             <groupId>com.freemud.application.service.sdk</groupId>
-            <version>2.3.RELEASE</version>
+            <version>2.7.RELEASE</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

order-application-service/pom.xml

@@ -40,7 +40,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>2.0.2-SNAPSHOT</version>
+            <version>2.1.8-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
@@ -60,7 +60,7 @@
         <dependency>
             <artifactId>promotioncenter-sdk</artifactId>
             <groupId>com.freemud.application.service.sdk</groupId>
-            <version>2.3.RELEASE</version>
+            <version>2.7.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.sdk.api.assortment</groupId>

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -53,6 +53,7 @@ import com.freemud.api.assortment.datamanager.manager.cache.CacheOpenPlatformPar
 import com.freemud.application.sdk.api.log.LogThreadLocal;
 import com.freemud.application.sdk.api.ordercenter.entities.PayItem;
 import com.freemud.application.sdk.api.ordercenter.enums.*;
+import com.freemud.application.sdk.api.ordercenter.enums.PayChannelType;
 import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto;
 import com.freemud.application.sdk.api.ordercenter.request.OrderExtendedReq;
 import com.freemud.application.sdk.api.ordercenter.request.create.OrderPayItemCreateReq;

order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java

@@ -13,6 +13,7 @@
 package cn.freemud.entities.vo;
 
 import cn.freemud.entities.dto.UserDeliveryInfoDto;
+import com.freemud.application.sdk.api.ordercenter.request.create.OrderPayItemCreateReq;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import cn.freemud.entities.dto.delivery.WeixinDeliveryAddressDto;
@@ -23,6 +24,8 @@ import org.hibernate.validator.constraints.NotEmpty;
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Pattern;
+import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
 
 
@@ -250,6 +253,14 @@ public class CreateOrderVo {
     private UnionPayCard unionPayCard;
 
     /**
+     * svc支付金额
+     */
+    private BigDecimal svcAmount;
+    /**
+     * 现金支付金额
+     */
+    private BigDecimal cashAmount;
+    /**
      * 电子风味卡
      */
     @Data

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

@@ -2446,7 +2446,6 @@ public class OrderServiceImpl implements Orderservice {
     }
 
     public OrderPayResponse getPreOrderPay(QueryOrdersResponse.DataBean.OrderBean orderBean, PaymentRequest paymentRequest, String trackingNo, Integer cardAmount, String transId, String partnerPayOvertime, OrderExtInfoDto orderExtInfoDto) {
-        OrderPayResponse orderPayResponse;
         try {
             UnifiedOrderRequest request = orderAdapter.convent2UnifiedOrderRequest(orderBean, paymentRequest, orderBean.getAmount(), cardAmount, transId, partnerPayOvertime);
             if (orderExtInfoDto != null && StringUtils.isNotBlank(orderExtInfoDto.getStationId())) {

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

@@ -152,7 +152,6 @@ public class CouponClientServiceImpl implements CouponClientService {
                         || OldOrderAccountType.DISCOUNT_COUPON.equals(OldOrderAccountType.getByCode(account.getType()))
                         || OldOrderAccountType.FREIGHT_COUPON.equals(OldOrderAccountType.getByCode(account.getType()))
                         )).collect(Collectors.toList());
-                        ) && account.getPrice() != 0l).collect(Collectors.toList());
         if (CollectionUtils.isEmpty(accountList)) {
             return null;
         }

order-management/pom.xml

@@ -65,7 +65,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>2.1.2-RELEASE</version>
+            <version>2.1.8-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

shopping-cart-application-service/pom.xml

@@ -45,7 +45,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-shoppingcart-sdk</artifactId>
-            <version>1.9.-S12NAPSHOT</version>
+            <version>1.9.12-SNAPSHOT</version>
         </dependency>
         <!--   再来一单查询订单信息  -->
         <dependency>