Merge remote-tracking branch 'remotes/origin/feature/1.9.29_蜜雪中台订单区分支付方式' into qa

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	ordercenter-sdk/pom.xml
#	ordercenter-sdk/readme.md
#	ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderExtInfoDto.java

assortment-ordercenter-sdk/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>assortment-ordercenter-sdk</artifactId>
-    <version>1.9.4-SNAPSHOT</version>
+    <version>1.9.9-SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>ordercenter-sdk</artifactId>
-            <version>1.4.16-SNAPSHOT</version>
+            <version>1.4.20-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

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

@@ -1325,6 +1325,9 @@ public class OrderSdkAdapter {
             case "fmwd":
                 orderClientType = 25;
                 break;
+            case "parking":
+                orderClientType = 99;
+                break;
             default:
                 orderClientType = OrderClientType.SAAS.getIndex();
                 break;
@@ -1374,6 +1377,9 @@ public class OrderSdkAdapter {
             case 25:
                 name = "fmwd";
                 break;
+            case 99:
+                name = "parking";
+                break;
             default:
                 name = orderClientType.toString();
                 break;
@@ -1421,6 +1427,9 @@ public class OrderSdkAdapter {
             case 25:
                 name = "非码微店";
                 break;
+            case 99:
+                name = "农工商停车";
+                break;
             default:
                 break;
         }

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/enums/OrderSourceType.java

@@ -39,6 +39,8 @@ public enum OrderSourceType {
     SAASMALL("saasmall", "微商城"),
 
     APP("app", "APP"),
+
+    PARKING("parking", "农工商停车"),
     ;
 
     private String code;

order-application-service/pom.xml

@@ -88,7 +88,7 @@
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>storecenter-sdk</artifactId>
-            <version>2.10.6-SNAPSHOT</version>
+            <version>2.10.1.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>cn.freemud</groupId>

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

@@ -122,6 +122,9 @@ public class AppOrderServiceImpl implements AppOrderService {
         OrderExtInfoDto extInfo = JSONObject.parseObject(productOrderBean.getExtInfo(), OrderExtInfoDto.class);
         extInfo.setAppid(createPrepayVo.getPayAppId());
         extInfo.setOpenid(createPrepayVo.getOpenId());
+        if (StringUtils.isNotBlank(createPrepayVo.getPayCode())) {
+            extInfo.setPayCode(createPrepayVo.getPayCode());
+        }
         String faceCode = "";
         String cardCode = "";
         String transId = createPrepayVo.getOrderCode() + redisService.increment(RedisUtil.getPaymentTransIdSequenceKey(createPrepayVo.getOrderCode()), 1, TimeUnit.DAYS);

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/enums/OrderClientType.java

@@ -35,6 +35,7 @@ public enum OrderClientType {
     KOUBEI(22, "口碑"),
     SAASMALL(23, "微商城"),
     FMWD(25, "非码微店"),
+    PARKING(99 , "农工商停车"),
     ;
 
 

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

@@ -119,8 +119,26 @@ public class OrderExtInfoDto {
      * 扫呗商户号 新支付服务做中转使用
      */
     private String terminalId;
+
+    /**
+     * 停车场ID
+     */
+    private String parkingAreaId;
+    /**
+     * 车牌号
+     */
+    private String carNumber;
+    /**
+     * 入场时间
+     */
+    private String inTime;
+    /**
+     * 出场时间
+     */
+    private String outTime;
+
     /**
-     * 打开小程序的场景值。
+     * 支付渠道编号(参考支付组payment_platform)
      */
-    private String scene;
+    private String payCode;
 }

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

@@ -351,7 +351,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         checkUpdateStock(updateShoppingCartGoodsQtyRequestVo, cartGoods);
 
         // 更新购物车中数量
-        List<CartGoods> cartGoodsList = assortmentSdkService.updateGoodsQtyBySdk(partnerId, userId, storeId, cartGoodsUid, qty, "", shoppingCartBaseService);
+        List<CartGoods> cartGoodsList = assortmentSdkService.updateGoodsQtyBySdk(partnerId, userId, storeId, cartGoodsUid, qty<0?0:qty, "", shoppingCartBaseService);
 
         // check购物车中所有商品
         CheckCartRequest checkCartRequest = assortmentSdkService.checkShoppingCartSdk(cartGoodsList, partnerId, storeId, shoppingCartGoodsResponseVo, updateShoppingCartGoodsQtyRequestVo.getOrderType(), "", updateShoppingCartGoodsQtyRequestVo.getMenuType(), shoppingCartBaseService);