修改支付机构sql

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

@@ -645,7 +645,9 @@
             a.update_date updateDate,
             a.remarks,
             a. calculateway,
-            a.waterproperty_id as waterpropertyId
+            a.waterproperty_id as waterpropertyId,
+            a.community_id,
+            a.dept_org_id
          from pay_base_account a  join
           sc_device d on d.account_id = a.id
         where d.id=#{deviceId}

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

@@ -487,7 +487,9 @@
         a.office_id as "officeId",
         a.watertype as "watertype",
         a.ladderlevel as "ladderlevel",
-        a.debt as "debt"
+        a.debt as "debt",
+        a.company_org_id,
+        a.dept_org_id
         from pay_pay_receivable a
         where a.usedamount_id =#{amountId}
         order by a.ladderlevel,a.feetype

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

@@ -436,8 +436,7 @@ public class MeasurementSettlementServiceImpl implements MeasurementSettlementSe
                             payTransactiondetails.setTranstypeLabel("扣费");
                             payTransactiondetails.setPaywayLabel(paywayName);
                             payTransactiondetails.setTenantId(loginUser.getTenantId());
-                            payTransactiondetails.setCompanyOrgId(loginUser.getCompanyId());
-                            payTransactiondetails.setDeptOrgId(loginUser.getDepartmentId());
+
                             transactiondetailsDtoList.add(payTransactiondetails);
 
 
@@ -490,13 +489,13 @@ public class MeasurementSettlementServiceImpl implements MeasurementSettlementSe
         payReceived.setUpdateBy(BigInteger.valueOf(userId));
         payReceived.setUpdateDate(localDateTime);
         payReceived.setDelFlag("0");
-
+        payReceived.setCompanyOrgId(payReceivable.getCompanyOrgId());
+        payReceived.setDeptOrgId(payReceivable.getDeptOrgId());
         payReceived.setPayway(payway);
         payReceived.setReceivedamount(receivedamount);
         payReceived.setPayseriesno(payseriesno);
         payReceived.setTenantId(loginUser.getTenantId());
-        payReceived.setCompanyOrgId(loginUser.getCompanyId());
-        payReceived.setDeptOrgId(loginUser.getDepartmentId());
+
         //保存实收并返写id
         payPayReceivedMapper.insert(payReceived);
         return payReceived;
@@ -521,7 +520,8 @@ public class MeasurementSettlementServiceImpl implements MeasurementSettlementSe
         payTransactiondetails.setState(1);
         payTransactiondetails.setYear(year);
         payTransactiondetails.setMonth(month);
-
+        payTransactiondetails.setCompanyOrgId(payBaseAccount.getCompanyOrgId());
+        payTransactiondetails.setDeptOrgId(payBaseAccount.getDeptOrgId());
         payTransactiondetails.setUpdateBy(BigInteger.valueOf(userId));
         payTransactiondetails.setUpdateDate(localDateTime);
         payTransactiondetails.setCreateBy(BigInteger.valueOf(userId));
@@ -640,8 +640,8 @@ public class MeasurementSettlementServiceImpl implements MeasurementSettlementSe
                     payReceivable.setCreateDate(LocalDateTime.now());
                     payReceivable.setDelFlag("0");
                     payReceivable.setTenantId(loginUser.getTenantId());
-                    payReceivable.setCompanyOrgId(loginUser.getCompanyId());
-                    payReceivable.setDeptOrgId(loginUser.getDepartmentId());
+                    payReceivable.setCompanyOrgId(payBaseAccount.getCompanyOrgId());
+                    payReceivable.setDeptOrgId(payBaseAccount.getDeptOrgId());
                     payReceivable.setFeetypename(info.getLabel());
                     result = payPayReceivableMapper.add(payReceivable);
 

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

@@ -304,8 +304,8 @@ public class PayBaseAccountServiceImpl implements PayBaseAccountService {
             payRechargeaccountDto.setUpdateBy(new BigInteger(String.valueOf(loginUser.getId())));
             payRechargeaccountDto.setUpdateDate(LocalDateTime.now());
             payRechargeaccountDto.setTenantId(loginUser.getTenantId());
-            payRechargeaccountDto.setCompanyOrgId(loginUser.getCompanyId());
-            payRechargeaccountDto.setDeptOrgId(loginUser.getDepartmentId());
+            payRechargeaccountDto.setCompanyOrgId(payBaseAccount.getCompanyOrgId());
+            payRechargeaccountDto.setDeptOrgId(payBaseAccount.getDeptOrgId());
             rechList.add(payRechargeaccountDto);
 
         }