修改导入付款余额查询+企业绑定平台支付账户id设置修改

happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlgcompany/controller/HlgCompanySubcontractorController.java

@@ -209,7 +209,7 @@ public class HlgCompanySubcontractorController {
         List<HlgCompanySubcontractor> list = hlgCompanySubcontractorService.findAllList(hlgCompanySubcontractor.getCompanyId());
         HlgCompany hlgCompany=hlgCompanyService.getById(hlgCompanySubcontractor.getCompanyId());
         if(hlgCompany.getIsCpOn()==1){
-            HlgCpSetting hlgCpSetting=hlgCpSettingService.findHlgCpSetting();
+            HlgCpSetting hlgCpSetting=hlgCpSettingService.findHlgCpSettingBalance(hlgCompanySubcontractor.getCompanyId());
             if(hlgCpSetting!=null && hlgCpSetting.getIsOn()==1){
                 HlgCompanySubcontractor hlgCompanySubcontractor1=new HlgCompanySubcontractor();
                 hlgCompanySubcontractor1.setSubcontractorId(hlgCpSetting.getSubcontractorId());

happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlgcompany/service/impl/HlgCompanyServiceImpl.java

@@ -303,8 +303,8 @@ public class HlgCompanyServiceImpl extends ServiceImpl<HlgCompanyMapper, HlgComp
             //查询平台支付设置
             HlgCpSetting hlgCpSetting=hlgCpSettingService.findHlgCpSetting();
             HlgCpAccount hlgCpAccount=new HlgCpAccount();
-            hlgCpAccount.setCompanyId(hlgCpSetting.getCompanyId());
-            hlgCpAccount.setCpCompanyId(hlgCompany.getId());
+            hlgCpAccount.setCpCompanyId(hlgCpSetting.getCompanyId());
+            hlgCpAccount.setCompanyId(hlgCompany.getId());
             hlgCpAccount.setTotalDeposit(0.00);
             hlgCpAccount.setTotalDepositServiceFee(0.00);
             hlgCpAccount.setTotalPayment(0.00);

happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlgcpmanager/mapper/HlgCpSettingMapper.java

@@ -15,4 +15,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 public interface HlgCpSettingMapper extends BaseMapper<HlgCpSetting> {
 
     HlgCpSetting findHlgCpSetting();
+
+    HlgCpSetting findHlgCpSettingBalance(Integer companyId);
 }

happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlgcpmanager/mapper/xml/HlgCpSettingMapper.xml

@@ -13,14 +13,12 @@
 		a.update_time AS "updateTime",
 		a.update_by AS "updateBy.id",
 		s.name AS "subcontractorName",
-		hc.company_name as "companyName",
-		ha.balance as "balance"
+		hc.company_name as "companyName"
 	</sql>
 
     <sql id="hlgCpSettingJoins">
         left join hlg_subcontractor s ON s.id = a.subcontractor_id
         left join hlg_company hc ON hc.id = a.company_id
-        left join hlg_cp_account ha on ha.company_id=a.company_id and ha.cp_company_id=a.id
     </sql>
 
 
@@ -41,4 +39,17 @@
     </select>
 
 
+    <select id="findHlgCpSettingBalance" resultType="org.jeecg.modules.hlgcpmanager.entity.HlgCpSetting" >
+        SELECT
+        <include refid="hlgCpSettingColumns"/>
+        ,ha.balance as "balance"
+        FROM hlg_cp_setting a
+        left join hlg_subcontractor s ON s.id = a.subcontractor_id
+        left join hlg_company hc ON hc.id = a.company_id
+        left join hlg_cp_account ha on ha.cp_company_id=a.company_id
+        where ha.company_id=#{0}
+        limit 1
+    </select>
+
+
 </mapper>

happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlgcpmanager/service/IHlgCpSettingService.java

@@ -12,4 +12,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
 public interface IHlgCpSettingService extends IService<HlgCpSetting> {
 
     HlgCpSetting findHlgCpSetting();
+
+    HlgCpSetting findHlgCpSettingBalance(Integer companyId);
 }

happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlgcpmanager/service/impl/HlgCpSettingServiceImpl.java

@@ -19,4 +19,9 @@ public class HlgCpSettingServiceImpl extends ServiceImpl<HlgCpSettingMapper, Hlg
     public HlgCpSetting findHlgCpSetting() {
         return baseMapper.findHlgCpSetting();
     }
+
+    @Override
+    public HlgCpSetting findHlgCpSettingBalance(Integer companyId) {
+        return baseMapper.findHlgCpSettingBalance(companyId);
+    }
 }