修改bug

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

@@ -12,32 +12,18 @@ public class PingAnBankService {
 //		String xml = "";
 //		HttpUtil.postXml(url,xml);
 
-        String res = "A0010101020020108050000801500000000001074001  123450120120620151810201206180000011037  000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000<?xml version=\"1.0\" encoding=\"GBK\"?>" +
-                "<Result>" +
-                "<BatchNo>201603260001</BatchNo>" +
-                "<AcctNo>11014891204004</AcctNo>" +
-                "<BusiType>00000</BusiType>" +
-                "<CorpId>E000070730</CorpId>" +
-                "<TotalNum>2</TotalNum>" +
-                "<TotalAmount>50</TotalAmount>" +
-                "<FileName>req_20160326_0001.txt</FileName>" +
-                "<RandomPwd>mem12Xv0vc+chHRyXHT8HWlcXVQTHZWQ</RandomPwd>" +
-                "<HashData></HashData>" +
-                "<SignData></SignData>" +
-                "<Remark>备注信息</Remark>" +
-                "</Result>";
-
+        String res = "A0010102010010107990000999900000000001084014       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");
 
         postMethod.setRequestEntity(new StringRequestEntity(
-                res, "text/html", "GBK"));
+                res, "text/html", "UTF-8"));
         postMethod.setRequestHeader("Content-Type",
-                "text/xml; charset=GBK");
+                "text/xml; charset=UTF-8");
 
         HttpClient httpClient = new HttpClient();
         int resultint = httpClient.executeMethod(postMethod);
-        res = new String(postMethod.getResponseBody(),"GBK");
+        res = new String(postMethod.getResponseBody(),"UTF-8");
         System.out.println("http response:" + res);
         postMethod.releaseConnection();
         System.out.println(resultint);

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

@@ -568,7 +568,53 @@ public class PayApiService {
         userSubMchId.setUserCode(request.getSubMerchantCode());
         userSubMchId.setPayChannel(ComCode.PAYCHANNEL_HL2);
         userSubMchId = userService.getUserSubmchid(userSubMchId);
+        // 如果没有注册 则先注册
+        if(userSubMchId == null){
+            UserEntity userEntity = userService.getUserInfo(request);
+            UserDetailEntity userDetailEntity = userService.getUserDetailByCode(request.getSubMerchantCode());
+            CardEntity cardEntityDebit = userService.getCardInfoByCode(userEntity);
+            JSONObject dto = new JSONObject();
+
+            String orderId = MakeOrderNum.makeOrderNum();
+
+            dto.put("orderId", MakeOrderNum.makeOrderNum());
+
+            dto.put("serviceType",1);
+            dto.put("subMerchantName",userDetailEntity.getRealName()+orderId);
+            dto.put("subMerchantType","PERSON");
+            dto.put("businessLicense",userDetailEntity.getRealName()+orderId);
+            dto.put("legalPersonName",userDetailEntity.getRealName());
+            dto.put("legalPersonID",userDetailEntity.getIdCard());
+            dto.put("subMerchantPersonName",userDetailEntity.getRealName());
+            dto.put("subMerchantPersonPhone",userEntity.getMobile());
+            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());
+
+            JSONObject jsonObject = null;
+            try {
+                jsonObject = juHeZhongPayJFenService.merchantIn(dto);
+            } catch (Exception e) {
+
+            }
+            if (!"0000".equals(jsonObject.getString("code"))) {
+                new MyException(jsonObject.getString("msg"));
+            }
+            String subMchId = jsonObject.getString("subMchId");
+            userSubMchId = new UserSubMchId();
+            userSubMchId.setUserCode(request.getSubMerchantCode());
+            userSubMchId.setPayChannel(ComCode.PAYCHANNEL_HL2);
+            userSubMchId.setSubmchid(subMchId);
+            userService.addUserSubmchid(userSubMchId);
+        }
         OrderEntity orderEntity = this.getOrder(request.getPayNo());
 
         PayBackDto payBackDto = new PayBackDto();
@@ -691,13 +737,16 @@ public class PayApiService {
          OrderEntity orderEntity = new OrderEntity(code, request.getSubMerchantCode(), payNo, payCode,request.getPayMethod(), "ali", "1",amount , request.getLevel() + ":" + request.getSubject(), "","0", request.getCardCode());
          payDao.saveOrderInfo(orderEntity);
 
-         UpgradeUserEntity upgradeUserEntity = new UpgradeUserEntity();
-         upgradeUserEntity.setUserCode(request.getSubMerchantCode());
-         upgradeUserEntity.setLevel(request.getLevel());
-         upgradeUserEntity.setOrderCode(payCode);
-         upgradeUserEntity.setStatus("0");
-         upgradeUserEntity.setAfterMobile(request.getAfterMobile());
-         userService.addUpgradeUser(upgradeUserEntity);
+         if("A".equals(request.getLevel())){
+             UpgradeUserEntity upgradeUserEntity = new UpgradeUserEntity();
+             upgradeUserEntity.setUserCode(request.getSubMerchantCode());
+             upgradeUserEntity.setLevel(request.getLevel());
+             upgradeUserEntity.setOrderCode(payCode);
+             upgradeUserEntity.setStatus("0");
+             upgradeUserEntity.setAfterMobile(request.getAfterMobile());
+             userService.addUpgradeUser(upgradeUserEntity);
+         }
+
 
          // 支付宝支付返回对应支付信息
          JSONObject dto = new JSONObject();

src/main/java/com/thinkgem/jeesite/modules/user/bean/UserRequest.java

@@ -40,6 +40,8 @@ public class UserRequest extends Request {
 
     private String level;
 
+    private String cardCode;
+
 
 
     public String getMobile() {
@@ -289,4 +291,12 @@ public class UserRequest extends Request {
     public void setPayChannel(String payChannel) {
         this.payChannel = payChannel;
     }
+
+    public String getCardCode() {
+        return cardCode;
+    }
+
+    public void setCardCode(String cardCode) {
+        this.cardCode = cardCode;
+    }
 }

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

@@ -331,7 +331,12 @@ public class UserApiService {
                             throw new MyException(jsonObject.getString("msg"));
                         }
                         String subMchId = jsonObject.getString("subMchId");
+                        userSubMchIdQuery = new UserSubMchId();
+                        userSubMchIdQuery.setUserCode(recommendedUser.getCode());
+                        userSubMchIdQuery.setPayChannel(rateEntity.getPayChannel());
+                        userSubMchIdQuery.setSubmchid(subMchId);
                         rateEntity.setServiceType("0");// 添加费率
+                        this.addUserSubmchid(userSubMchIdQuery);
                         this.merchantFeelJFen(subMchId,rateEntity);
                     }else{
                         // 修改费率

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

@@ -322,7 +322,7 @@
         FROM
         youka_cards yc
         LEFT JOIN youka_bank yb ON yc.belong_bank = yb.bank_code
-        LEFT JOIN youka_card_swpaccid ON ycs.card_code = yc.code
+        LEFT JOIN youka_card_swpaccid ycs ON ycs.card_code = yc.code
         WHERE
         yc.user_code = #{subMerchantCode}
         AND yc.code = #{cardCode}