Merge remote-tracking branch 'origin/master'

assortment-ordercenter-sdk/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>assortment-ordercenter-sdk</artifactId>
-    <version>2.1.40-RELEASE</version>
+    <version>2.1.41-RELEASE</version>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>ordercenter-sdk</artifactId>
-            <version>1.3.42.RELEASE</version>
+            <version>1.3.43.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

assortment-ordercenter-sdk/readme.md

@@ -117,3 +117,4 @@
 | 2.1.38-RELEASE | 外卖配送自动流转 | 张志恒 | 2021-03-11 |
 | 2.1.39-RELEASE | 美业 | 刘鹏飞 | 2021-03-12 |
 | 2.1.40-RELEASE |  三方展示活动信息   | 张志恒 | 2021-03-22 |
+| 2.1.41-RELEASE |  小助手刷卡支付下单   | 王航航 | 2021-03-31 |
\ No newline at end of file

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

@@ -43,6 +43,7 @@ public enum OrderSourceType {
     Y_POS("ypos", "非码云POS", 26),
     TIKTOKPAY("tiktokpay","抖音支付", 27),
     BEAUTIFUL("beautiful","美业", 28),
+    ASSISTANT("assistant","非码小助手", 29),
     parkingmanual("parkingmanual", "农工商停车手工录单", 98),
     PARKING("parking", "农工商停车", 99),
     SDG("sdg", "闪电购", 1000);

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

@@ -3799,7 +3799,7 @@ public class OrderServiceImpl implements Orderservice {
 
         String ebCode = this.getPayCodeByChanel(paymentRequest.getWxAppId(), channel, storeId);
         OrderPayResponse orderPayResponse = new OrderPayResponse();
-        ;
+
         if (StringUtils.isBlank(ebCode)) {
             orderPayResponse.setMsg("请先联系相关人员配置商户对应的支付渠道");
             return orderPayResponse;
@@ -3980,6 +3980,7 @@ public class OrderServiceImpl implements Orderservice {
         log.info("payment timeout callback for refund orderDto={}", JSON.toJSONString(orderBean));
         Integer abState = 4;
         String noPay = "8200404";
+        //4 表示订单已经退款了
         if (abState.equals(orderBean.getAbnormalState())) {
             log.info("payment timeout callback for refund is exist");
             return;
@@ -4008,7 +4009,7 @@ public class OrderServiceImpl implements Orderservice {
             sdkUpdateAbnormalState.setAbnormalDesc(desc + ",退款失败");
         }
         sdkUpdateAbnormalState.setPartnerId(orderBean.getCompanyId());
-        sdkUpdateAbnormalState.setAbnormalState(4);
+        sdkUpdateAbnormalState.setAbnormalState(4);//
         sdkUpdateAbnormalState.setOrderCode(orderBean.getOid());
         orderSdkService.updateAbnormalState(sdkUpdateAbnormalState);
     }

ordercenter-sdk/pom.xml

@@ -8,7 +8,7 @@
         <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <version>1.3.42.RELEASE</version>
+    <version>1.3.43.RELEASE</version>
     <artifactId>ordercenter-sdk</artifactId>
 
     <dependencies>

ordercenter-sdk/readme.md

@@ -74,3 +74,4 @@
 | 1.3.40.RELEASE |  外卖配送自动流转   | 李小二 | 2021-03-11 |
 | 1.3.41.RELEASE |  美业   | 刘鹏飞 | 2021-03-12 |
 | 1.3.42.RELEASE |  三方展示活动信息   | 张志恒 | 2021-03-22 |
+| 1.3.43.RELEASE |  小助手刷卡支付   | 王航航 | 2021-03-31 |
\ No newline at end of file

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

@@ -38,6 +38,7 @@ public enum OrderClientType {
     FMWD(25, "非码微店"),
     TIKTOKPAY(27, "抖音小程序"),
     BEAUTIFUL(28, "美业"),
+    ASSISTANT(29, "非码小助手"),
     PARKING(99 , "农工商停车"),
     ;