add ADApay member api

mec-biz/src/main/java/com/ym/mec/biz/service/NotifyCallback.java

@@ -40,6 +40,10 @@ public class NotifyCallback implements MQTTCallbackHandler {
         notifyCallback = this;
         String baseUrl = notifyCallback.sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL);
         if (!baseUrl.equals("https://mstuonline.dayaedu.com")) {
+            Adapay.debug = true;
+            /**
+             * prodMode 模式，默认为生产模式，false可以使用mock模式
+             */
             Adapay.prodMode = false;
         }
         Adapay.setDeviceID(baseUrl);

mec-biz/src/main/java/com/ym/mec/biz/service/impl/HfMemberSserviceImpl.java

@@ -1,11 +1,8 @@
 package com.ym.mec.biz.service.impl;
 
-import com.huifu.adapay.Adapay;
 import com.ym.mec.biz.dal.dao.HfMemberDao;
-import com.ym.mec.biz.dal.dao.SysConfigDao;
 import com.ym.mec.biz.dal.entity.HfMember;
 import com.ym.mec.biz.service.HfMemberService;
-import com.ym.mec.biz.service.SysConfigService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
@@ -24,8 +21,6 @@ import java.util.Map;
 public class HfMemberSserviceImpl extends BaseServiceImpl<Integer, HfMember> implements HfMemberService {
     @Autowired
     private HfMemberDao hfMemberDao;
-    @Autowired
-    private SysConfigDao sysConfigDao;
 
     @Override
     public BaseDAO<Integer, HfMember> getDAO() {
@@ -50,11 +45,6 @@ public class HfMemberSserviceImpl extends BaseServiceImpl<Integer, HfMember> imp
         member.setStatus("pending");
         insert(member);
 
-        String baseUrl = sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL);
-        if (!baseUrl.equals("https://mstuonline.dayaedu.com")) {
-            Adapay.prodMode = false;
-        }
-
         HashMap<String, Object> memberParams = new HashMap<>();
         memberParams.put("order_no", "corp_mem_" + System.currentTimeMillis());
         memberParams.put("member_id", member.getMemberId());
@@ -92,13 +82,9 @@ public class HfMemberSserviceImpl extends BaseServiceImpl<Integer, HfMember> imp
         Date nowDate = new Date();
         member.setUpdateTime(nowDate);
         member.setStatus("pending");
-        update(member);
-
-        String baseUrl = sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL);
-        if (!baseUrl.equals("https://mstuonline.dayaedu.com")) {
-            Adapay.prodMode = false;
+        if (update(member) <= 0) {
+            throw new BizException("更新商户信息失败,请重试");
         }
-
         HashMap<String, Object> memberParams = new HashMap<>();
         memberParams.put("order_no", "corp_mem_" + System.currentTimeMillis());
         memberParams.put("member_id", member.getMemberId());
@@ -124,10 +110,6 @@ public class HfMemberSserviceImpl extends BaseServiceImpl<Integer, HfMember> imp
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Map<String, Object> createSettleAccount(String memberId, String cardNo, String bankCode) throws Exception {
-        String baseUrl = sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL);
-        if (!baseUrl.equals("https://mstuonline.dayaedu.com")) {
-            Adapay.prodMode = false;
-        }
         HfMember hfMember = hfMemberDao.getByMemberId(memberId);
         if (!hfMember.getStatus().equals("succeeded")) {
             throw new BizException("商户审核通过，才能绑定结算卡");

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/adapay/ConfigInit.java

@@ -32,14 +32,6 @@ public class ConfigInit {
         } else {
             return instance;
         }
-
-        Adapay.debug = true;
-
-        /**
-         * prodMode 模式，默认为生产模式，false可以使用mock模式
-         */
-        Adapay.prodMode = true;
-
         /**
          *添加商户配置，一个商户只需要 添加一次，添加以后在内存中。
          */

mec-web/src/main/java/com/ym/mec/web/WebApplication.java

@@ -2,6 +2,9 @@ package com.ym.mec.web;
 
 import javax.servlet.Filter;
 
+import com.huifu.adapay.model.MerConfig;
+import com.ym.mec.biz.service.NotifyCallback;
+import com.ym.mec.thirdparty.adapay.ConfigInit;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -55,4 +58,10 @@ public class WebApplication {
 		registration.setOrder(1);
 		return registration;
 	}
+
+	@Bean
+	public static void startMqtt() {
+		MerConfig merConfig = ConfigInit.merConfig;
+		new NotifyCallback();
+	}
 }

mec-web/src/main/java/com/ym/mec/web/controller/AdapayController.java

@@ -112,10 +112,6 @@ public class AdapayController extends BaseController {
     @GetMapping(value = "getMemberInfo")
     @PreAuthorize("@pcs.hasPermissions('adapay/getMemberInfo')")
     public HttpResponseResult<Map<String, Object>> getMemberInfo(String memberId) throws Exception {
-        String baseUrl = sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL);
-        if (!baseUrl.equals("https://mstuonline.dayaedu.com")) {
-            Adapay.prodMode = false;
-        }
         return succeed(CorpMember.executeQueryMember(memberId));
     }