分账功能

xpgx-service/src/main/java/com/miaxis/wx/service/impl/WxOrderServiceImpl.java

@@ -163,9 +163,9 @@ public class WxOrderServiceImpl extends ServiceImpl<WxOrderMapper, WxOrder> impl
         sortMap.put("out_order_no", orderCode);
 
         //扣除手续费后
-        double commission = orderInfo.getTotal() * 0.01;
-        double total = orderInfo.getTotal() - commission;
-        int amount = (int) Math.floor(total * 0.3);
+        //  double commission = orderInfo.getTotal() * 0.01;
+        //  double total = orderInfo.getTotal() - commission;
+        int amount = (int) Math.floor(orderInfo.getTotal() * 0.3);
         Map<String, Object> receiverMap = new TreeMap<String, Object>();
         receiverMap.put("type", "PERSONAL_OPENID");
 
@@ -207,7 +207,7 @@ public class WxOrderServiceImpl extends ServiceImpl<WxOrderMapper, WxOrder> impl
         orderSplit.setOutTradeNo(orderInfo.getOutTradeNo());
         orderSplit.setAmount(amount);
         orderSplit.setOpenId(account);
-        if(account!=null) {
+        if (account != null) {
             orderSplit.setOpenIdType(orderInfo.getForeType());
         } else {
             orderSplit.setOpenIdType(2);
@@ -233,14 +233,14 @@ public class WxOrderServiceImpl extends ServiceImpl<WxOrderMapper, WxOrder> impl
 //        }
 
         Map<String, String> sortMap = new TreeMap<String, String>();
-        sortMap.put("mch_appid",xcxAppid);
-        sortMap.put("mchid",wxpayConfig.getMerchantId());
+        sortMap.put("mch_appid", xcxAppid);
+        sortMap.put("mchid", wxpayConfig.getMerchantId());
         sortMap.put("nonce_str", RandomStringUtils.randomAlphanumeric(32));
-        sortMap.put("partner_trade_no",getOrderCode(null));
+        sortMap.put("partner_trade_no", getOrderCode(null));
         //sortMap.put("openid",student.getGzhOpenid());
-        sortMap.put("check_name","NO_CHECK");
-        sortMap.put("amount",String.valueOf(amount));
-        sortMap.put("desc","用户提现");
+        sortMap.put("check_name", "NO_CHECK");
+        sortMap.put("amount", String.valueOf(amount));
+        sortMap.put("desc", "用户提现");
 
         WXPayConfig config = new WxPayConfigImpl();
         String sign = WXPayUtil.generateSignature(sortMap, config.getKey(), WXPayConstants.SignType.MD5);
@@ -251,7 +251,7 @@ public class WxOrderServiceImpl extends ServiceImpl<WxOrderMapper, WxOrder> impl
         Map<String, String> resMap;
         String xmlStr = pay.requestWithCert(url, sortMap, config.getHttpConnectTimeoutMs(), config.getHttpReadTimeoutMs());
         resMap = XmlUtil.xmlToMap(xmlStr);
-        if (!"SUCCESS".equals(resMap.get("return_code"))||!"SUCCESS".equals(resMap.get("result_code"))){
+        if (!"SUCCESS".equals(resMap.get("return_code")) || !"SUCCESS".equals(resMap.get("result_code"))) {
             throw new CustomException(resMap.get("return_msg"));
         }
         //新增提现记录
@@ -279,20 +279,18 @@ public class WxOrderServiceImpl extends ServiceImpl<WxOrderMapper, WxOrder> impl
 //        }
 
         Map<String, String> sortMap = new TreeMap<String, String>();
-        sortMap.put("mch_id",wxpayConfig.getMerchantId());
+        sortMap.put("mch_id", wxpayConfig.getMerchantId());
         sortMap.put("nonce_str", RandomStringUtils.randomAlphanumeric(32));
-        sortMap.put("partner_trade_no",getOrderCode(null));
-        sortMap.put("amount",String.valueOf(dto.getAmount()));
-        sortMap.put("desc","用户银行卡提现");
-
-
+        sortMap.put("partner_trade_no", getOrderCode(null));
+        sortMap.put("amount", String.valueOf(dto.getAmount()));
+        sortMap.put("desc", "用户银行卡提现");
 
 
         // 进行签名服务
 
-        sortMap.put("enc_true_name",rsaUtils.encryptData(dto.getEncTrueName()) );
-        sortMap.put("enc_bank_no",rsaUtils.encryptData(dto.getEncBankNo()));
-        sortMap.put("bank_code",dto.getBankCode().toString());
+        sortMap.put("enc_true_name", rsaUtils.encryptData(dto.getEncTrueName()));
+        sortMap.put("enc_bank_no", rsaUtils.encryptData(dto.getEncBankNo()));
+        sortMap.put("bank_code", dto.getBankCode().toString());
 
 
         WXPayConfig config = new WxPayConfigImpl();
@@ -304,7 +302,7 @@ public class WxOrderServiceImpl extends ServiceImpl<WxOrderMapper, WxOrder> impl
         Map<String, String> resMap;
         String xmlStr = pay.requestWithCert(url, sortMap, config.getHttpConnectTimeoutMs(), config.getHttpReadTimeoutMs());
         resMap = XmlUtil.xmlToMap(xmlStr);
-        if (!"SUCCESS".equals(resMap.get("return_code"))||!"SUCCESS".equals(resMap.get("result_code"))){
+        if (!"SUCCESS".equals(resMap.get("return_code")) || !"SUCCESS".equals(resMap.get("result_code"))) {
             throw new CustomException(resMap.get("return_msg"));
         }
         //新增提现记录
@@ -317,7 +315,7 @@ public class WxOrderServiceImpl extends ServiceImpl<WxOrderMapper, WxOrder> impl
 
         //如果此卡之前未存储，则加入到银行卡列表
         List<WxExtractBank> bankList = wxExtractBankService.list(new QueryWrapper<WxExtractBank>().eq("enc_bank_no", dto.getEncBankNo()));
-        if (CollectionUtils.isEmpty(bankList)){
+        if (CollectionUtils.isEmpty(bankList)) {
             WxExtractBank wxExtractBank = new WxExtractBank();
             wxExtractBank.setBankCode(dto.getBankCode());
             wxExtractBank.setEncBankNo(dto.getEncBankNo());