优化房屋费用报表

java110-bean/src/main/java/com/java110/po/wechat/OnlinePayPo.java

@@ -40,6 +40,8 @@ public class OnlinePayPo implements Serializable {
     private String payName;
     private String transactionId;
 
+    private String paymentPoolId;
+
     public String getRefundFee() {
         return refundFee;
     }
@@ -136,5 +138,11 @@ public class OnlinePayPo implements Serializable {
         this.transactionId = transactionId;
     }
 
+    public String getPaymentPoolId() {
+        return paymentPoolId;
+    }
 
+    public void setPaymentPoolId(String paymentPoolId) {
+        this.paymentPoolId = paymentPoolId;
+    }
 }

java110-db/src/main/resources/mapper/acct/OnlinePayV1ServiceDaoImplMapper.xml

@@ -8,9 +8,9 @@
     <!-- 保存线上支付信息 add by wuxw 2018-07-03 -->
     <insert id="saveOnlinePayInfo" parameterType="Map">
         insert into online_pay(
-        refund_fee,mch_id,order_id,total_fee,open_id,app_id,pay_id,state,message,pay_name,transaction_id
+        refund_fee,mch_id,order_id,total_fee,open_id,app_id,pay_id,state,message,pay_name,transaction_id,payment_pool_id
         ) values (
-        #{refundFee},#{mchId},#{orderId},#{totalFee},#{openId},#{appId},#{payId},#{state},#{message},#{payName},#{transactionId}
+        #{refundFee},#{mchId},#{orderId},#{totalFee},#{openId},#{appId},#{payId},#{state},#{message},#{payName},#{transactionId},#{paymentPoolId}
         )
     </insert>
 
@@ -20,7 +20,7 @@
         select t.refund_fee,t.refund_fee refundFee,t.mch_id,t.mch_id mchId,t.order_id,t.order_id
         orderId,t.total_fee,t.total_fee totalFee,t.open_id,t.open_id openId,t.app_id,t.app_id
         appId,t.status_cd,t.status_cd statusCd,t.pay_id,t.pay_id payId,t.state,t.message,t.pay_name,t.pay_name
-        payName,t.transaction_id,t.transaction_id transactionId
+        payName,t.transaction_id,t.transaction_id transactionId,t.payment_pool_id paymentPoolId
         from online_pay t
         where 1 =1
         <if test="refundFee !=null and refundFee != ''">

service-acct/src/main/java/com/java110/acct/payment/adapt/bbgpay/BbgNativeQrcodePaymentFactoryAdapt.java

@@ -176,7 +176,7 @@ public class BbgNativeQrcodePaymentFactoryAdapt implements IPaymentFactoryAdapt
         resultMap.put("codeUrl", paramOut.getString("qr_link"));
         resultMap.put("code", "0");
         resultMap.put("msg", "下单成功");
-        doSaveOnlinePay(smallWeChatDto, "无", orderNum, feeName, payAmount, OnlinePayDto.STATE_WAIT, "待支付");
+        doSaveOnlinePay(smallWeChatDto, "无", orderNum, feeName, payAmount, OnlinePayDto.STATE_WAIT, "待支付",paymentPoolValueDtos.get(0).getPpId());
 
         return resultMap;
     }
@@ -263,7 +263,9 @@ public class BbgNativeQrcodePaymentFactoryAdapt implements IPaymentFactoryAdapt
         onlinePayV1InnerServiceSMOImpl.updateOnlinePay(onlinePayPo);
     }
 
-    private void doSaveOnlinePay(SmallWeChatDto smallWeChatDto, String openId, String orderId, String feeName, double money, String state, String message) {
+    private void doSaveOnlinePay(SmallWeChatDto smallWeChatDto, String openId, String orderId, String feeName,
+                                 double money, String state, String message,
+                                 String ppId) {
         OnlinePayPo onlinePayPo = new OnlinePayPo();
         onlinePayPo.setAppId(smallWeChatDto.getAppId());
         onlinePayPo.setMchId(smallWeChatDto.getMchId());
@@ -276,6 +278,7 @@ public class BbgNativeQrcodePaymentFactoryAdapt implements IPaymentFactoryAdapt
         onlinePayPo.setState(state);
         onlinePayPo.setTotalFee(money + "");
         onlinePayPo.setTransactionId(orderId);
+        onlinePayPo.setPaymentPoolId(ppId);
         onlinePayV1InnerServiceSMOImpl.saveOnlinePay(onlinePayPo);
     }
 

service-acct/src/main/java/com/java110/acct/payment/adapt/bbgpay/BbgPaymentFactoryAdapt.java

@@ -223,7 +223,7 @@ public class BbgPaymentFactoryAdapt implements IPaymentFactoryAdapt {
         resultMap.put("sign", paramOut.getString("paySign"));
         resultMap.put("code", "0");
         resultMap.put("msg", "下单成功");
-        doSaveOnlinePay(smallWeChatDto, openid, orderNum, feeName, payAmount, OnlinePayDto.STATE_WAIT, "待支付");
+        doSaveOnlinePay(smallWeChatDto, openid, orderNum, feeName, payAmount, OnlinePayDto.STATE_WAIT, "待支付",paymentPoolValueDtos.get(0).getPpId());
 
         return resultMap;
     }
@@ -309,7 +309,9 @@ public class BbgPaymentFactoryAdapt implements IPaymentFactoryAdapt {
         onlinePayV1InnerServiceSMOImpl.updateOnlinePay(onlinePayPo);
     }
 
-    private void doSaveOnlinePay(SmallWeChatDto smallWeChatDto, String openId, String orderId, String feeName, double money, String state, String message) {
+    private void doSaveOnlinePay(SmallWeChatDto smallWeChatDto, String openId, String orderId, String feeName,
+                                 double money, String state, String message,
+                                 String ppId) {
         OnlinePayPo onlinePayPo = new OnlinePayPo();
         onlinePayPo.setAppId(smallWeChatDto.getAppId());
         onlinePayPo.setMchId(smallWeChatDto.getMchId());
@@ -322,6 +324,7 @@ public class BbgPaymentFactoryAdapt implements IPaymentFactoryAdapt {
         onlinePayPo.setState(state);
         onlinePayPo.setTotalFee(money + "");
         onlinePayPo.setTransactionId(orderId);
+        onlinePayPo.setPaymentPoolId(ppId);
         onlinePayV1InnerServiceSMOImpl.saveOnlinePay(onlinePayPo);
     }
 

service-acct/src/main/java/com/java110/acct/payment/adapt/bbgpay/QrCodeBbgPaymentAdapt.java

@@ -110,7 +110,7 @@ public class QrCodeBbgPaymentAdapt implements IQrCodePaymentSMO {
         params.put("ware_name", feeName);// 商品名称
         params.put("device_ip", "172.0.0.1");// 商户数据包
         params.put("recog_no", "123123");// 交易终端编号
-        doSaveOnlinePay(shopSmallWeChatDto, "-1", orderNum, feeName, payAmount, OnlinePayDto.STATE_WAIT, "待支付");
+        doSaveOnlinePay(shopSmallWeChatDto, "-1", orderNum, feeName, payAmount, OnlinePayDto.STATE_WAIT, "待支付",paymentPoolValueDtos.get(0).getPpId());
 
         String decryParams = EncryptDecryptFactory.execute(paymentPoolValueDtos, gzhPayUrl, params);
 
@@ -188,7 +188,9 @@ public class QrCodeBbgPaymentAdapt implements IQrCodePaymentSMO {
         }
     }
 
-    private void doSaveOnlinePay(SmallWeChatDto smallWeChatDto, String openId, String orderId, String feeName, double money, String state, String message) {
+    private void doSaveOnlinePay(SmallWeChatDto smallWeChatDto, String openId, String orderId, String feeName,
+                                 double money, String state, String message,
+                                 String ppId) {
         OnlinePayPo onlinePayPo = new OnlinePayPo();
         onlinePayPo.setAppId(smallWeChatDto.getAppId());
         onlinePayPo.setMchId(smallWeChatDto.getMchId());
@@ -201,6 +203,7 @@ public class QrCodeBbgPaymentAdapt implements IQrCodePaymentSMO {
         onlinePayPo.setState(state);
         onlinePayPo.setTotalFee(money + "");
         onlinePayPo.setTransactionId(orderId);
+        onlinePayPo.setPaymentPoolId(ppId);
         onlinePayV1InnerServiceSMOImpl.saveOnlinePay(onlinePayPo);
     }
 

service-acct/src/main/java/com/java110/acct/payment/adapt/plutus/QrCodePlutusPaymentAdapt.java

@@ -113,7 +113,8 @@ public class QrCodePlutusPaymentAdapt implements IQrCodePaymentSMO {
 
         String param = PlutusFactory.Encryption(paramMap.toJSONString(), privateKey,key,devId);
         System.out.println(param);
-        doSaveOnlinePay(shopSmallWeChatDto, "-1", orderNum, feeName, payAmount, OnlinePayDto.STATE_WAIT, "待支付");
+        doSaveOnlinePay(shopSmallWeChatDto, "-1", orderNum, feeName, payAmount, OnlinePayDto.STATE_WAIT,
+                "待支付",paymentPoolValueDtos.get(0).getPpId());
 
         String str = PlutusFactory.post(PAY_UNIFIED_ORDER_URL, param);
         System.out.println(str);
@@ -215,7 +216,9 @@ public class QrCodePlutusPaymentAdapt implements IQrCodePaymentSMO {
         }
     }
 
-    private void doSaveOnlinePay(SmallWeChatDto smallWeChatDto, String openId, String orderId, String feeName, double money, String state, String message) {
+    private void doSaveOnlinePay(SmallWeChatDto smallWeChatDto, String openId, String orderId, String feeName, double money,
+                                 String state, String message,
+                                 String ppId) {
         OnlinePayPo onlinePayPo = new OnlinePayPo();
         onlinePayPo.setAppId(smallWeChatDto.getAppId());
         onlinePayPo.setMchId(smallWeChatDto.getMchId());
@@ -228,6 +231,7 @@ public class QrCodePlutusPaymentAdapt implements IQrCodePaymentSMO {
         onlinePayPo.setState(state);
         onlinePayPo.setTotalFee(money + "");
         onlinePayPo.setTransactionId(orderId);
+        onlinePayPo.setPaymentPoolId(ppId);
         onlinePayV1InnerServiceSMOImpl.saveOnlinePay(onlinePayPo);
     }
 

service-acct/src/main/java/com/java110/acct/payment/adapt/wechat/QrCodeWechatPaymentAdapt.java

@@ -123,7 +123,8 @@ public class QrCodeWechatPaymentAdapt implements IQrCodePaymentSMO {
 
         logger.debug("调用支付统一下单接口" + xmlData);
 
-        doSaveOnlinePay(shopSmallWeChatDto, "-1", orderNum, feeName, payAmount, OnlinePayDto.STATE_WAIT, "待支付");
+        doSaveOnlinePay(shopSmallWeChatDto, "-1", orderNum, feeName, payAmount,
+                OnlinePayDto.STATE_WAIT, "待支付",paymentPoolValueDtos.get(0).getPpId());
 
 
         ResponseEntity<String> responseEntity = outRestTemplate.postForEntity(
@@ -217,7 +218,8 @@ public class QrCodeWechatPaymentAdapt implements IQrCodePaymentSMO {
     }
 
 
-    private void doSaveOnlinePay(SmallWeChatDto smallWeChatDto, String openId, String orderId, String feeName, double money, String state, String message) {
+    private void doSaveOnlinePay(SmallWeChatDto smallWeChatDto, String openId, String orderId, String feeName,
+                                 double money, String state, String message,String ppId) {
         OnlinePayPo onlinePayPo = new OnlinePayPo();
         onlinePayPo.setAppId(smallWeChatDto.getAppId());
         onlinePayPo.setMchId(smallWeChatDto.getMchId());
@@ -230,6 +232,7 @@ public class QrCodeWechatPaymentAdapt implements IQrCodePaymentSMO {
         onlinePayPo.setState(state);
         onlinePayPo.setTotalFee(money + "");
         onlinePayPo.setTransactionId(orderId);
+        onlinePayPo.setPaymentPoolId(ppId);
         onlinePayV1InnerServiceSMOImpl.saveOnlinePay(onlinePayPo);
     }
 

service-acct/src/main/java/com/java110/acct/payment/adapt/wechat/WechatNativeQrcodePaymentFactoryAdapt.java

@@ -157,7 +157,7 @@ public class WechatNativeQrcodePaymentFactoryAdapt implements IPaymentFactoryAda
             paramMap.put("appid", MappingCache.getValue(DOMAIN_WECHAT_PAY, WECHAT_SERVICE_APP_ID));  //服务商appid，是服务商注册时公众号的id
             paramMap.put("mch_id", MappingCache.getValue(DOMAIN_WECHAT_PAY, WECHAT_SERVICE_MCH_ID));  //服务商商户号
             paramMap.put("sub_appid", smallWeChatDto.getAppId());//起调小程序appid
-            paramMap.put("sub_mch_id", smallWeChatDto.getMchId());//起调小程序的商户号
+            paramMap.put("sub_mch_id", mchId);//起调小程序的商户号
         }
         paramMap.put("sign", PayUtil.createSign(paramMap, key));
 //转换为xml
@@ -173,7 +173,7 @@ public class WechatNativeQrcodePaymentFactoryAdapt implements IPaymentFactoryAda
         if (responseEntity.getStatusCode() != HttpStatus.OK) {
             throw new IllegalArgumentException("支付失败" + responseEntity.getBody());
         }
-        doSaveOnlinePay(smallWeChatDto, "无", orderNum, feeName, payAmount, OnlinePayDto.STATE_WAIT, "待支付");
+        doSaveOnlinePay(smallWeChatDto, "无", orderNum, feeName, payAmount, OnlinePayDto.STATE_WAIT, "待支付",paymentPoolValueDtos.get(0).getPpId());
         return PayUtil.xmlStrToMap(responseEntity.getBody());
     }
 
@@ -292,7 +292,9 @@ public class WechatNativeQrcodePaymentFactoryAdapt implements IPaymentFactoryAda
     }
 
 
-    private void doSaveOnlinePay(SmallWeChatDto smallWeChatDto, String openId, String orderId, String feeName, double money, String state, String message) {
+    private void doSaveOnlinePay(SmallWeChatDto smallWeChatDto, String openId, String orderId,
+                                 String feeName, double money, String state, String message,
+                                 String ppId) {
         OnlinePayPo onlinePayPo = new OnlinePayPo();
         onlinePayPo.setAppId(smallWeChatDto.getAppId());
         onlinePayPo.setMchId(smallWeChatDto.getMchId());
@@ -305,6 +307,7 @@ public class WechatNativeQrcodePaymentFactoryAdapt implements IPaymentFactoryAda
         onlinePayPo.setState(state);
         onlinePayPo.setTotalFee(money + "");
         onlinePayPo.setTransactionId(orderId);
+        onlinePayPo.setPaymentPoolId(ppId);
         onlinePayV1InnerServiceSMOImpl.saveOnlinePay(onlinePayPo);
     }
 

service-acct/src/main/java/com/java110/acct/payment/adapt/wechat/WechatPaymentFactoryAdapt.java

@@ -237,7 +237,7 @@ public class WechatPaymentFactoryAdapt implements IPaymentFactoryAdapt {
         if (responseEntity.getStatusCode() != HttpStatus.OK) {
             throw new IllegalArgumentException("支付失败" + responseEntity.getBody());
         }
-        doSaveOnlinePay(smallWeChatDto, openid, orderNum, feeName, payAmount, OnlinePayDto.STATE_WAIT, "待支付");
+        doSaveOnlinePay(smallWeChatDto, openid, orderNum, feeName, payAmount, OnlinePayDto.STATE_WAIT, "待支付",paymentPoolValueDtos.get(0).getPpId());
         return PayUtil.xmlStrToMap(responseEntity.getBody());
     }
 
@@ -358,7 +358,8 @@ public class WechatPaymentFactoryAdapt implements IPaymentFactoryAdapt {
         onlinePayV1InnerServiceSMOImpl.updateOnlinePay(onlinePayPo);
     }
 
-    private void doSaveOnlinePay(SmallWeChatDto smallWeChatDto, String openId, String orderId, String feeName, double money, String state, String message) {
+    private void doSaveOnlinePay(SmallWeChatDto smallWeChatDto, String openId, String orderId, String feeName,
+                                 double money, String state, String message,String ppId) {
         OnlinePayPo onlinePayPo = new OnlinePayPo();
         onlinePayPo.setAppId(smallWeChatDto.getAppId());
         onlinePayPo.setMchId(smallWeChatDto.getMchId());
@@ -371,6 +372,7 @@ public class WechatPaymentFactoryAdapt implements IPaymentFactoryAdapt {
         onlinePayPo.setState(state);
         onlinePayPo.setTotalFee(money + "");
         onlinePayPo.setTransactionId(orderId);
+        onlinePayPo.setPaymentPoolId(ppId);
         onlinePayV1InnerServiceSMOImpl.saveOnlinePay(onlinePayPo);
     }