优化代码

java110-utils/src/main/java/com/java110/utils/constant/WechatConstant.java

@@ -62,4 +62,7 @@ public class WechatConstant {
     public static final String PAY_ADAPT = "PAY_ADAPT";
     //支付通知适配器
     public static final String PAY_NOTIFY_ADAPT = "PAY_NOTIFY_ADAPT";
+    public static final String PAY_OWE_FEE_NOTIFY_ADAPT = "PAY_OWE_FEE_NOTIFY_ADAPT";
+
+
 }

service-api/src/main/java/com/java110/api/smo/payment/adapt/chinaums/ChinaUmsPayNotifyAdapt.java

@@ -20,6 +20,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.java110.api.properties.WechatAuthProperties;
 import com.java110.api.smo.DefaultAbstractComponentSMO;
 import com.java110.api.smo.payment.adapt.IOweFeeToNotifyAdapt;
+import com.java110.api.smo.payment.adapt.IPayNotifyAdapt;
 import com.java110.core.factory.WechatFactory;
 import com.java110.dto.smallWeChat.SmallWeChatDto;
 import com.java110.utils.constant.CommonConstant;
@@ -57,7 +58,7 @@ import java.util.*;
  */
 
 @Component(value = "chinaUmsPayNotifyAdapt")
-public class ChinaUmsPayNotifyAdapt extends DefaultAbstractComponentSMO implements IOweFeeToNotifyAdapt {
+public class ChinaUmsPayNotifyAdapt extends DefaultAbstractComponentSMO implements IPayNotifyAdapt {
 
     private static final Logger logger = LoggerFactory.getLogger(ChinaUmsPayNotifyAdapt.class);
 

service-api/src/main/java/com/java110/api/smo/payment/impl/OweFeeToNotifySMOImpl.java

@@ -26,7 +26,7 @@ public class OweFeeToNotifySMOImpl implements IOweFeeToNotifySMO {
     @Override
     public ResponseEntity<String> toNotify(String param, HttpServletRequest request) {
         String wId = request.getParameter("wId");
-        String payNotifyAdapt = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, WechatConstant.PAY_NOTIFY_ADAPT);
+        String payNotifyAdapt = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, WechatConstant.PAY_OWE_FEE_NOTIFY_ADAPT);
         payNotifyAdapt = StringUtil.isEmpty(payNotifyAdapt) ? DEFAULT_OWE_FEE_TO_NOTIFY_ADAPT : payNotifyAdapt;
         //支付适配器
         IOweFeeToNotifyAdapt tPayNotifyAdapt = ApplicationContextFactory.getBean(payNotifyAdapt, IOweFeeToNotifyAdapt.class);

service-api/src/main/java/com/java110/api/smo/payment/impl/ToNotifySMOImpl.java

@@ -30,7 +30,8 @@ public class ToNotifySMOImpl implements IToNotifySMO {
 
         String payNotifyAdapt = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, WechatConstant.PAY_NOTIFY_ADAPT);
         payNotifyAdapt = StringUtil.isEmpty(payNotifyAdapt) ? DEFAULT_PAY_NOTIFY_ADAPT : payNotifyAdapt;
-        //支付适配器
+        //支付适配器IPayNotifyAdapt
+        logger.debug("适配器：" + payNotifyAdapt);
         IPayNotifyAdapt tPayNotifyAdapt = ApplicationContextFactory.getBean(payNotifyAdapt, IPayNotifyAdapt.class);
         String resXml = tPayNotifyAdapt.confirmPayFee(param, wId);
         logger.info("【小程序支付回调响应】 响应内容：\n" + resXml);

service-job/src/main/java/com/java110/job/adapt/Repair/MachineDistributeLeaflets.java

@@ -20,7 +20,9 @@ import com.java110.intf.community.IRepairInnerServiceSMO;
 import com.java110.intf.community.IRepairUserInnerServiceSMO;
 import com.java110.intf.store.ISmallWeChatInnerServiceSMO;
 import com.java110.intf.store.ISmallWechatAttrInnerServiceSMO;
-import com.java110.intf.user.*;
+import com.java110.intf.user.IOwnerAppUserInnerServiceSMO;
+import com.java110.intf.user.IStaffAppAuthInnerServiceSMO;
+import com.java110.intf.user.IUserInnerServiceSMO;
 import com.java110.job.adapt.DatabusAdaptImpl;
 import com.java110.utils.cache.MappingCache;
 import com.java110.utils.util.StringUtil;
@@ -132,7 +134,7 @@ public class MachineDistributeLeaflets extends DatabusAdaptImpl {
                 sendMsg(paramIn, communityDtos.get(0));
                 //派单成功给业主推送信息
                 publishMsg(paramIn, communityDtos.get(0));
-            } else if (repairState.equals("1100") && repairWay.equals("100")) {
+            } else if (repairState.equals("1100") && (repairWay.equals("100") || repairWay.equals("300"))) {
                 String staffId = "";
                 if (repairUserDtos.size() > 1) {
                     staffId = repairUserDtos.get(1).getStaffId();
@@ -156,7 +158,7 @@ public class MachineDistributeLeaflets extends DatabusAdaptImpl {
                 if (repairUserDtos.size() > 1) {
                     //给维修师傅推送信息
                     sendMsg(paramIn, communityDtos.get(0));
-                }else {
+                } else {
                     //抢单成功给维修师傅推送信息
                     publishMessage(paramIn, communityDtos.get(0));
                 }
@@ -389,8 +391,7 @@ public class MachineDistributeLeaflets extends DatabusAdaptImpl {
      * @param paramIn
      * @param communityDto
      */
-    private void
-    publishMessage(JSONObject paramIn, CommunityDto communityDto) {
+    private void publishMessage(JSONObject paramIn, CommunityDto communityDto) {
         //查询公众号配置
         SmallWeChatDto smallWeChatDto = new SmallWeChatDto();
         smallWeChatDto.setWeChatType("1100");