Merge remote-tracking branch 'origin/20210716' into 20210716

zoniot-pay/zoniot-pay-core/src/main/resources/mapper/pay/PayPayReceivedMapper.xml

@@ -281,7 +281,10 @@
             rece.remarks as "remarks",
             rece.del_flag as "delFlag",
             rece.site_id as "siteId",
-            rece.customer_id as "customerId"
+            rece.customer_id as "customerId",
+            rece.tenant_id,
+            rece.company_org_id,
+            rece.dept_org_id
         from pay_pay_received rece
         <where>
             rece.canceledrecord_id is null and rece.state=1

zoniot-pay/zoniot-pay-core/src/main/resources/mapper/pay/PayTransactiondetailsMapper.xml

@@ -192,7 +192,10 @@
         a.year as "year",
         a.month AS "month",
         a.transtypeLabel as "transtypeLabel",
-        a.paywayLabel as "paywayLabel"
+        a.paywayLabel as "paywayLabel",
+        a.tenant_id,
+        a.company_org_id,
+        a.dept_org_id
 
     </sql>
     <select id="findList" resultType="com.zcxk.rmcp.pay.dto.pay.PayTransactiondetails">

zoniot-pay/zoniot-pay-web/src/main/java/com/zcxk/rmcp/pay/service/impl/pay/PayPayReceivedServiceImpl.java

@@ -111,7 +111,7 @@ public class PayPayReceivedServiceImpl implements PayPayReceivedService {
         //获取相同批次号相同的实收信息
         List<PayPayReceived> payReceiveds =  payPayReceivedMapper.findBySeriesno(payseriesno,loginUser.getSiteId(),loginUser.getCustomerId());
         //获取同批次号的交易明细
-        List<PayTransactiondetails> payTransactiondetails = payTransactiondetailsMapper.findBySeriesno(payseriesno,loginUser.getSiteId(),loginUser.getCustomerId(),loginUser.getDataPermissionMap().get(loginUser.getSiteId()));
+        List<PayTransactiondetails> payTransactiondetails = payTransactiondetailsMapper.findBySeriesno(payseriesno,loginUser.getSiteId(),null,null);
         Boolean isCancel=true;
         for(PayPayReceived Received:payReceiveds){
             if(StringUtils.isBlank(newPayseriesno)){
@@ -163,8 +163,7 @@ public class PayPayReceivedServiceImpl implements PayPayReceivedService {
             Received.setUpdateDate(time);
             Received.setRemarks("");
             Received.setDelFlag("0");
-            Received.setSiteId(new BigInteger(String.valueOf(loginUser.getSiteId())));
-            Received.setCustomerId(new BigInteger(String.valueOf(loginUser.getCustomerId())));
+
             payPayReceivedMapper.insert(Received);
         }
 
@@ -193,10 +192,10 @@ public class PayPayReceivedServiceImpl implements PayPayReceivedService {
         LoginUser loginUser = UserUtil.getCurrentUser();
         //通过客户ID获取预存账户
         PayRechargeaccountDto rechDao = new PayRechargeaccountDto();
-        rechDao.setSiteId(new BigInteger(String.valueOf(loginUser.getSiteId())));
-        rechDao.setCustomerId(new BigInteger(String.valueOf(loginUser.getCustomerId())));
+        //rechDao.setSiteId(new BigInteger(String.valueOf(loginUser.getSiteId())));
+        //rechDao.setCustomerId(new BigInteger(String.valueOf(loginUser.getCustomerId())));
         rechDao.setAccountId(payTransactiondetails.getAccountId());
-        rechDao.setProgramItems(loginUser.getDataPermissionMap().get(loginUser.getSiteId()));
+        //rechDao.setProgramItems(loginUser.getDataPermissionMap().get(loginUser.getSiteId()));
         List<PayRechargeaccountDto> payRechargeaccounts = payRechargeaccountMapper.findList(rechDao, loginUser.getUserCondition());
         //回退账户预存
         if(payRechargeaccounts.size()==1){

zoniot-pay/zoniot-pay-web/src/main/resources/application-sit.properties

@@ -1,4 +1,4 @@
-server.port=8337
+server.port=8339
 spring.application.name=zoniot-pay-web
 logging.level.root=info
 logging.path=./logs