Merge branch 'feature/20210326_【2.0.24】【商家小助手】汇总_wanghanghang'

# Conflicts:
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java

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

@@ -3797,7 +3797,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;
@@ -3978,6 +3978,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;
@@ -4006,7 +4007,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/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 , "农工商停车"),
     ;