From d94f23e76aed12b3353f1b5e8413a0303b0ae92e Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 19 Apr 2021 17:10:30 +0800
Subject: [PATCH] modify

---
 zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxCommonAction.java |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxCommonAction.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxCommonAction.java
index d36a21e..dde86bb 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxCommonAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxCommonAction.java
@@ -10,6 +10,7 @@
 import com.matrix.system.common.bean.BusParameterSettings;
 import com.matrix.system.common.constance.AppConstance;
 import com.matrix.system.common.dao.BusParameterSettingsDao;
+import com.matrix.system.common.interceptor.HostInterceptor;
 import com.matrix.system.hive.bean.MoneyCardUse;
 import com.matrix.system.hive.bean.MoneyCardUseFlow;
 import com.matrix.system.hive.bean.SysVipInfo;
@@ -187,7 +188,7 @@
                                 }
                                 shopActivitiesGroupJoinDao.updateByModel(groupJoin);
 
-                                SysVipInfo sysVipInfo = sysVipInfoDao.selectByPhone(order.getUserTel());
+                                SysVipInfo sysVipInfo = sysVipInfoDao.selectByPhone(order.getUserTel(), order.getCompanyId());
                                 if(sysVipInfo!=null){
                                     sysVipInfo.setIsDeal(SysVipInfo.DEAL_VIP);
                                     sysVipInfoDao.update(sysVipInfo);
@@ -204,7 +205,7 @@
                             resXml = AppConstance.RESULT_XML_SUCCESS;
 
                             //支付记录
-                            recordPayLog(Integer.valueOf(orderId), 1, order.getOrderNo(), payMoney,  payLog, "支付成功", ShopOrder.ORDER_PAY_STATUS_SUCCESS);
+                            recordPayLog(Integer.valueOf(orderId), 1, order.getOrderNo(), payMoney,  "支付成功", ShopOrder.ORDER_PAY_STATUS_SUCCESS);
 
 
                         } else {
@@ -306,7 +307,7 @@
                                 BigDecimal.ROUND_HALF_DOWN).doubleValue();
 
                         if (moneyCardUseFlow.getCarUseId()==null) {
-                            ShopPayLog payLog = new ShopPayLog();
+
                             if(payMoney.equals(moneyCardUseFlow.getTotal())){
                                 threadResult.putInMap("status", "success");
                                 resXml = AppConstance.RESULT_XML_SUCCESS;
@@ -321,7 +322,7 @@
                                 moneyCardUseDao.update(moneyCardUse);
 
                                 //充值记录
-                                recordPayLog(Integer.valueOf(moneyCardUseFlowId),2,moneyCardUseFlow.getPayNo(),new BigDecimal(payMoney),  payLog, "充值成功", ShopOrder.ORDER_PAY_STATUS_SUCCESS);
+                                recordPayLog(Integer.valueOf(moneyCardUseFlowId),2,moneyCardUseFlow.getPayNo(),new BigDecimal(payMoney), "充值成功", ShopOrder.ORDER_PAY_STATUS_SUCCESS);
                             }else{
                                 LogUtil.debug("支付金额不一致,检查支付金额payMoney={},order.getPayMoney()={}", payMoney, moneyCardUseFlow.getTotal());
                                 threadResult.putInMap("status", "err");
@@ -367,8 +368,9 @@
 
 
 
-    private void recordPayLog(Integer orderId, Integer type,String orderNo, BigDecimal payMoney, ShopPayLog payLog, String payRemark, int payStatus) {
+    private void recordPayLog(Integer orderId, Integer type,String orderNo, BigDecimal payMoney, String payRemark, int payStatus) {
         //设置支付类型为收款
+        ShopPayLog payLog=new ShopPayLog();
         payLog.setPayType(type);
         payLog.setJoinId(orderId);
         payLog.setPayMoney(payMoney);

--
Gitblit v1.9.1