Merge remote-tracking branch 'origin/master'

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwpayment/service/impl/HlwPaymentServiceImpl.java

@@ -284,8 +284,7 @@ public class HlwPaymentServiceImpl extends ServiceImpl<HlwPaymentMapper, HlwPaym
              * 查看平台-服务商有效期
              */
             //平台信息
-            QueryWrapper<HlwCpSetting> queryWrapperCp = new QueryWrapper<>();
-            HlwCpSetting hlwCpSetting = hlwCpSettingService.getOne(queryWrapperCp);
+            HlwCpSetting hlwCpSetting = hlwCpSettingService.getById(hlwPayment.getCpId());
             //平台服务商
             QueryWrapper<HlwCpSubcontractor> queryWrapperCpSubcontractor = new QueryWrapper<>();
             queryWrapperCpSubcontractor.eq("cp_id", hlwCpSetting.getId());
@@ -600,8 +599,7 @@ public class HlwPaymentServiceImpl extends ServiceImpl<HlwPaymentMapper, HlwPaym
              * 查看平台-服务商有效期
              */
             //平台信息
-            QueryWrapper<HlwCpSetting> queryWrapperCp = new QueryWrapper<>();
-            HlwCpSetting hlwCpSetting = hlwCpSettingService.getOne(queryWrapperCp);
+            HlwCpSetting hlwCpSetting = hlwCpSettingService.getById(hlwPayment.getCpId());
             //平台服务商
             QueryWrapper<HlwCpSubcontractor> queryWrapperCpSubcontractor = new QueryWrapper<>();
             queryWrapperCpSubcontractor.eq("cp_id", hlwCpSetting.getId());
@@ -875,8 +873,7 @@ public class HlwPaymentServiceImpl extends ServiceImpl<HlwPaymentMapper, HlwPaym
     @Transactional(rollbackFor = Exception.class)
     public void updateAccountA_B(HlwPayment hlwPayment) {
         //平台信息
-        QueryWrapper<HlwCpSetting> queryWrapperCp = new QueryWrapper<>();
-        HlwCpSetting hlwCpSetting = hlwCpSettingService.getOne(queryWrapperCp);
+        HlwCpSetting hlwCpSetting = hlwCpSettingService.getById(hlwPayment.getCpId());
         //平台服务商
         QueryWrapper<HlwCpSubcontractor> queryWrapperCpSubcontractor = new QueryWrapper<>();
         queryWrapperCpSubcontractor.eq("cp_id", hlwCpSetting.getId());