Merge remote-tracking branch 'origin/master'

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

@@ -9,6 +9,7 @@ import com.ym.mec.biz.service.PayService;
 import com.ym.mec.biz.service.StudentPaymentOrderService;
 import com.ym.mec.biz.service.SysAccountService;
 import com.ym.mec.biz.service.SysPaymentConfigService;
+import com.ym.mec.common.exception.BizException;
 import com.ym.mec.thirdparty.adapay.Payment;
 import com.ym.mec.thirdparty.union.UnionPay;
 import com.ym.mec.thirdparty.union.UnionPayFeignService;
@@ -238,40 +239,28 @@ public class PayServiceImpl implements PayService {
      * @return
      */
     private List<SysAccount> getRoutingAccount(Map<String, BigDecimal> routingFee, String company, Integer organId) {
-        String channel = "";
         String type = "";
-
         if (routingFee.get("COM").compareTo(BigDecimal.ZERO) > 0 && routingFee.get("PER").compareTo(BigDecimal.ZERO) > 0) {
-            channel = "YQPAY";
             type = "COM,PER";
         } else if (routingFee.get("COM").compareTo(BigDecimal.ZERO) > 0 && routingFee.get("PER").compareTo(BigDecimal.ZERO) == 0) {
-            channel = sysConfigDao.findConfigValue("com_account_channel");
             type = "COM";
         } else if (routingFee.get("COM").compareTo(BigDecimal.ZERO) == 0 && routingFee.get("PER").compareTo(BigDecimal.ZERO) > 0) {
-            channel = sysConfigDao.findConfigValue("per_account_channel");
             type = "PER";
         }
-        List<SysAccount> accounts = sysAccountService.getAccount(company, channel, type, null);
-
+        List<SysAccount> accounts = new ArrayList<>();
         if (sysConfigDao.findConfigValue("payment_channel").equals("ADAPAY")) {
             BigDecimal amount = routingFee.get("COM").add(routingFee.get("PER"));
             routingFee.put("COM", amount);
             routingFee.put("PER", BigDecimal.ZERO);
             accounts = sysAccountService.getAdaAccount(organId, "ADAPAY", amount);
+        } else {
+            accounts = sysAccountService.getAccount(company, "YQPAY", type, null);
         }
 
         for (SysAccount account : accounts) {
             if (account.getType().equals("COM")) {
                 account.setRoutingFee(routingFee.get("COM"));
             } else {
-                //私有账户根据金额切换账户
-//                SysAccount perAccount = sysAccountService.getPerAccount(channel, account);
-//                if (perAccount != null) {
-//                    account.setRoutingMerNo(perAccount.getRoutingMerNo());
-//                    if (!account.getCompany().equals("daya")) {
-//                        account.setMerNo(perAccount.getRoutingMerNo());
-//                    }
-//                }
                 account.setRoutingFee(routingFee.get("PER"));
             }
         }

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

@@ -8,6 +8,7 @@ import com.ym.mec.biz.service.SysAccountService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
+import com.ym.mec.thirdparty.adapay.ConfigInit;
 import com.ym.mec.util.date.DateUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.annotations.Param;
@@ -74,7 +75,9 @@ public class SysAccountServiceImpl extends BaseServiceImpl<Integer, SysAccount>
         SysAccount account = sysAccountDao.getAdaAccount(organId, channel);
 
         if (account == null && originalAccount == null) {
-            throw new BizException("分部账户未设置请设置");
+            account = sysAccountDao.getAdaAccount(ConfigInit.organId, channel);
+            accounts.add(account);
+            return accounts;
         } else if (account == null) {
             accounts.add(originalAccount);
             return accounts;
@@ -102,7 +105,7 @@ public class SysAccountServiceImpl extends BaseServiceImpl<Integer, SysAccount>
                 accounts.add(originalAccount);
             }else {
                 String routingMerNo = account.getRoutingMerNo();
-                getAdaAccount(Integer.parseInt(routingMerNo), channel, amount);
+                return getAdaAccount(Integer.parseInt(routingMerNo), channel, amount);
             }
         }
         return accounts;

mec-student/src/main/java/com/ym/mec/student/controller/StudentOrderController.java

@@ -204,13 +204,15 @@ public class StudentOrderController extends BaseController {
         paymentParams.put("goods_desc", orderBody);
         paymentParams.put("time_expire", timeExpire);
 
-        List<Map<String, Object>> divMembers = new ArrayList<>();
-        Map<String, Object> divMember = new HashMap<>();
-        divMember.put("member_id", merNos);//分佣账户
-        divMember.put("amount", amount);//分佣金额
-        divMember.put("fee_flag", "Y"); //承担手续费
-        divMembers.add(divMember);
-        //paymentParams.put("div_members", JSON.toJSONString(divMembers));
+        if(!merNos.equals(ConfigInit.merNo)) {
+            List<Map<String, Object>> divMembers = new ArrayList<>();
+            Map<String, Object> divMember = new HashMap<>();
+            divMember.put("member_id", merNos);//分佣账户
+            divMember.put("amount", amount);//分佣金额
+            divMember.put("fee_flag", "Y"); //承担手续费
+            divMembers.add(divMember);
+            paymentParams.put("div_members", JSON.toJSONString(divMembers));
+        }
 
         Map<String, Object> expendParams = new HashMap<>(5);
 

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

@@ -3,13 +3,13 @@ package com.ym.mec.thirdparty.adapay;
 import com.huifu.adapay.Adapay;
 import com.huifu.adapay.model.MerConfig;
 
-/**
- * @author jane.zhao
- */
+
 public class ConfigInit {
 
 
     private static ConfigInit instance;
+    public final static Integer organId = 46; //商户对应的分部
+    public final static String merNo = "B09767221"; //商户对应的分部
     public final static String appId = "app_f0ebdd29-046f-4b60-bd50-92e2c1285c02";
 
     public final static String wxAppId = "wx751141096e75a4ee";

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

@@ -2,9 +2,7 @@ package com.ym.mec.thirdparty.adapay;
 
 import java.util.Map;
 
-/**
- * @author jane.zhao
- */
+
 public class MainDemo {
 
 
@@ -43,7 +41,7 @@ public class MainDemo {
 //        memberParams.put("card_name", "武汉大雅");
 //        new CorpMember().executeCreateMember(memberParams);
 
-        new CorpMember().executeQueryMember("W004201");
+//        new CorpMember().executeQueryMember("W004201");
 
 
         //Payment.closePayment("002112020062916385810123596334923411456");

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

@@ -8,9 +8,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.huifu.adapay.core.exception.BaseAdaPayException;
 import org.springframework.util.DigestUtils;
 
-/**
- * @author jane.zhao
- */
 public class Payment extends ConfigInit {
 
 

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

@@ -5,9 +5,6 @@ import java.util.Map;
 
 import com.alibaba.fastjson.JSON;
 
-/**
- * @author jane.zhao
- */
 public class Refund extends ConfigInit {
 
     /**