zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/dto/pay/PayCustomRechargeDto.java

@@ -35,5 +35,15 @@ public class PayCustomRechargeDto {
     private BigDecimal remaining;
     @ApiModelProperty("用水余额")
     private BigDecimal balance;
+    /**
+     * 公司id
+     */
+    @ApiModelProperty(value = "公司id")
+    private Integer companyOrgId;
+    /**
+     * 部门id
+     */
+    @ApiModelProperty(value = "部门id")
+    private Integer deptOrgId;
 
 }

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

@@ -12,7 +12,9 @@
             c.office_id as "officeId",
             rech.id as "rechargeId",
             rech.remaining as "remaining",
-            rech.balance as "balance"
+            rech.balance as "balance",
+            c.company_org_id,
+            c.dept_org_id
         from pay_base_customerandmeterrela c
         left join pay_pay_rechargeaccount rech on rech.account_id=c.account_id
         <where>
@@ -65,7 +67,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 debt >0
             <if test="tenantId!=null">

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

@@ -868,8 +868,8 @@ public class PayFeeServiceImp implements PayFeeService {
         payTransactiondetails.setDelFlag("0");
         LoginUser loginUser=UserUtil.getCurrentUser();
         payTransactiondetails.setTenantId(loginUser.getTenantId());
-        payTransactiondetails.setCompanyOrgId(loginUser.getCompanyId());
-        payTransactiondetails.setDeptOrgId(loginUser.getDepartmentId());
+        payTransactiondetails.setCompanyOrgId(payCustomRechargeDto.getCompanyOrgId());
+        payTransactiondetails.setDeptOrgId(payCustomRechargeDto.getDeptOrgId());
         return payTransactiondetails;
     }
 
@@ -915,8 +915,8 @@ public class PayFeeServiceImp implements PayFeeService {
         payReceived.setDelFlag("0");
         LoginUser loginUser = UserUtil.getCurrentUser();
         payReceived.setTenantId(loginUser.getTenantId());
-        payReceived.setCompanyOrgId(loginUser.getCompanyId());
-        payReceived.setDeptOrgId(loginUser.getDepartmentId());
+        payReceived.setCompanyOrgId(payReceivable.getCompanyOrgId());
+        payReceived.setDeptOrgId(payReceivable.getDeptOrgId());
         payReceived.setPayway(payway);
         payReceived.setReceivedamount(receivedamount);
         payReceived.setPayseriesno(payseriesno);