修改支付得bug

src/main/java/com/thinkgem/jeesite/modules/pay/dao/PayApiDao.java

@@ -15,7 +15,7 @@ public interface PayApiDao {
 
     List<UserRateEntity> getCDEUsers(String[] pathIds);
 
-    List<UserRateEntity> getSABUsers(String[] pathIds);
+    List<UserRateEntity> getSABUsers(String[] pathIds,String payChannel);
 
     void saveBenefitInfo(BenefitEntity benefitEntity);
 

src/main/java/com/thinkgem/jeesite/modules/pay/pinganbank/PingAnBankService.java

@@ -11,8 +11,8 @@ public class PingAnBankService {
 //		String url = "http://127.0.0.1:7072/";
 //		String xml = "";
 //		HttpUtil.postXml(url,xml);
-
-        String res = "A0010102010010107990000999900000000001084014       0120100809171028    2010080981026055                                                                                                          00000                       0<?xml version=\"1.0\" encoding=\"GBK\"?><Result><Account>11002873390701</Account><CcyCode>RMB</CcyCode></Result>";
+// 00202043000000326000 企业码
+        String res = "A0010102010020204300000032600000000001084014       0120100809171028    2010080981026055                                                                                                          00000                       0<?xml version=\"1.0\" encoding=\"GBK\"?><Result><Account>11002873390701</Account><CcyCode>RMB</CcyCode></Result>";
         PostMethod postMethod = new PostMethod(
                 "http://127.0.0.1:7072");
 

src/main/java/com/thinkgem/jeesite/modules/pay/service/PayApiService.java

@@ -360,7 +360,7 @@ public class PayApiService {
             }
         }
         // 获取顶级管理员
-        List<UserRateEntity> pathSABUsers = payDao.getSABUsers(pathIds);
+        List<UserRateEntity> pathSABUsers = payDao.getSABUsers(pathIds,request.getPayChannel());
         for (UserRateEntity entity : pathSABUsers) {
             userBenefit.put(entity.getUserCode(), String.valueOf((minRate - Double.parseDouble(entity.getRate())) * Double.parseDouble(request.getAmount())));
             minRate = Double.valueOf(entity.getRate());

src/main/java/com/thinkgem/jeesite/modules/user/service/UserApiService.java

@@ -133,7 +133,7 @@ public class UserApiService {
         // 保存用户信息
         String code = IdGen.randomBase62(64);
         UserEntity recommend = userDao.checkRecommend(request);
-        UserEntity userEntity = new UserEntity(code, "", request.getMobile(), MD5.sign(request.getNewPassword(), ComCode.signCode, "utf-8"), request.getRecommendedMobile(), recommend.getRecommendedPath() + recommend.getId() + ",", recommend.getBelongTo());
+        UserEntity userEntity = new UserEntity(code, "", request.getMobile(), MD5.sign(request.getNewPassword(), ComCode.signCode, "utf-8"), request.getRecommendedMobile(), ","+recommend.getRecommendedPath() + recommend.getId() + ",", recommend.getBelongTo());
         userDao.signUp(userEntity);
         UserEntity user = userDao.getUserInfo(new Request(code));
         // 以下两行代码应Android要求，增加空detail和card

src/main/resources/mappings/modules/pay/PayApiDao.xml

@@ -62,7 +62,7 @@
             yr.rate AS rate
         FROM
             youka_users yu
-        LEFT JOIN youka_rate yr ON yu.level = yr.user_level AND yr.pay_method = 'quick'
+        LEFT JOIN youka_rate yr ON yu.level = yr.user_level AND yr.pay_method = 'quick'  AND yr.pay_channel = #{payChannel}
         WHERE
             yu.id IN
         <foreach collection="array" item="pathIds" index="index"