修改bug

src/main/java/com/thinkgem/jeesite/modules/pay/juhezhong/service/JuHeZhongPayJFenService.java

@@ -104,10 +104,10 @@ public class JuHeZhongPayJFenService {
         JuHeZhongPayJFenService juHeZhongPayJFenService = new JuHeZhongPayJFenService();
 
         JSONObject dto = new JSONObject();
-//        dto.put("orderId", MakeOrderNum.makeOrderNum());
-          // subMchId = B105244442
-
-        // 聂换换 B105247024
+        dto.put("orderId", MakeOrderNum.makeOrderNum());
+//           subMchId = B105244442
+//
+//         聂换换 B105247024
 //        dto.put("serviceType",1);
 //        dto.put("subMerchantName","kklsubMerchantName32");
 //        dto.put("subMerchantType","PERSON");
@@ -217,19 +217,19 @@ public class JuHeZhongPayJFenService {
 
          */
 
-        dto.put("orderId",MakeOrderNum.makeOrderNum());
-        dto.put("merchantId",ComCode.JFEN_MERCHANT_ID);
-        dto.put("serviceType","5");
-        dto.put("subMchId","B105244442");
-        dto.put("merchantKey",ComCode.JFEN_MERCHANT_KEY);
-        dto.put("timestamp",System.currentTimeMillis());
-        dto.put("passwd","249286");
-        dto.put("productName","productName");
-        dto.put("tradeNo","20180413135359746143");
-
-        dto.put("swpaccid","3296555230614091180");
-
-        juHeZhongPayJFenService.openCard(dto);
+//        dto.put("orderId",MakeOrderNum.makeOrderNum());
+//        dto.put("merchantId",ComCode.JFEN_MERCHANT_ID);
+//        dto.put("serviceType","5");
+//        dto.put("subMchId","B105244442");
+//        dto.put("merchantKey",ComCode.JFEN_MERCHANT_KEY);
+//        dto.put("timestamp",System.currentTimeMillis());
+//        dto.put("passwd","249286");
+//        dto.put("productName","productName");
+//        dto.put("tradeNo","20180413135359746143");
+//
+//        dto.put("swpaccid","3296555230614091180");
+//
+//        juHeZhongPayJFenService.openCard(dto);
 
     }
 }

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

@@ -393,26 +393,57 @@ public class PayApiService {
             String orderId = MakeOrderNum.makeOrderNum();
 
             dto.put("orderId", MakeOrderNum.makeOrderNum());
-
+//
             dto.put("serviceType",1);
-            dto.put("subMerchantName",userDetailEntity.getRealName()+orderId);
+            dto.put("subMerchantName",userDetailEntity.getRealName()+System.currentTimeMillis());
             dto.put("subMerchantType","PERSON");
-            dto.put("businessLicense",userDetailEntity.getRealName()+orderId);
+            dto.put("businessLicense",userDetailEntity.getRealName()+System.currentTimeMillis());
             dto.put("legalPersonName",userDetailEntity.getRealName());
+
             dto.put("legalPersonID",userDetailEntity.getIdCard());
             dto.put("subMerchantPersonName",userDetailEntity.getRealName());
-            dto.put("subMerchantPersonPhone",userEntity.getMobile());
+            dto.put("subMerchantPersonPhone",cardEntityDebit.getCardMobile());
             dto.put("bankType","TOPRIVATE");
 
             dto.put("accountName",userDetailEntity.getRealName());
             dto.put("accountNo",cardEntityDebit.getCardNo());
             dto.put("bankName",cardEntityDebit.getBankName());
-            dto.put("bankProv",cardEntityDebit.getProvince());
+            dto.put("bankProv",cardEntityDebit.getCity());
             dto.put("bankCity",cardEntityDebit.getCity());
             dto.put("bankBranch",cardEntityDebit.getCardPlace());
             dto.put("bankCode",cardEntityDebit.getBelongBank());
 
             dto.put("timestamp",System.currentTimeMillis());
+//            dto.put("legalPersonID",userDetailEntity.getIdCard());
+//            dto.put("subMerchantPersonName",userDetailEntity.getRealName());
+//            dto.put("subMerchantPersonPhone",cardEntityDebit.getCardMobile());
+//            dto.put("bankType","TOPRIVATE");
+//
+//            dto.put("accountName",userDetailEntity.getRealName());
+//            dto.put("accountNo",cardEntityDebit.getCardNo());
+//            dto.put("bankName",cardEntityDebit.getBankName());
+//            dto.put("bankProv",cardEntityDebit.getProvince());
+//            dto.put("bankCity",cardEntityDebit.getCity());
+//            dto.put("bankBranch",cardEntityDebit.getCardPlace());
+//            dto.put("bankCode",cardEntityDebit.getBelongBank());
+//
+//            dto.put("timestamp",System.currentTimeMillis());
+
+
+//            dto.put("legalPersonID","130434199212214429");
+//            dto.put("subMerchantPersonName","聂换换");
+//            dto.put("subMerchantPersonPhone","13722537737");
+//            dto.put("bankType","TOPRIVATE");
+//
+//            dto.put("accountName","聂换换");
+//            dto.put("accountNo","6217000060031684713");
+//            dto.put("bankName","中国建设银行");
+//            dto.put("bankProv","天津");
+//            dto.put("bankCity","天津市");
+//            dto.put("bankBranch","开户地址new");
+//            dto.put("bankCode","105100000017");
+//
+//            dto.put("timestamp",System.currentTimeMillis());
 
             JSONObject jsonObject = null;
             try {

src/main/resources/mappings/modules/user/UserDao.xml

@@ -191,6 +191,8 @@
             yc.card_no AS cardNo,
             yc.card_mobile AS cardMobile,
             yc.belong_bank AS belongBank,
+            yb.bank_name AS bankName,
+            yb.bank_short AS bankShort,
             yc.card_bank AS cardBank,
             yc.card_place AS cardPlace,
             yc.is_debit AS isDebit,
@@ -207,6 +209,7 @@
             yc.del_flag AS delFlag
         FROM
             youka_cards yc
+        LEFT JOIN  youka_bank yb ON yc.belong_bank = yb.bank_code
         WHERE
             yc.user_code = #{code}
             AND yc.is_debit = 'Y'