Merge remote-tracking branch 'origin/dev_1.1' into dev_1.1

happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlgaccount/service/impl/HlgAccountDetailServiceImpl.java

@@ -363,7 +363,7 @@ public class HlgAccountDetailServiceImpl extends ServiceImpl<HlgAccountDetailMap
     }
 
     /**
-     * 修改服务费
+     * 修改服务费(只有中间服务商可以修改)
      *
      * @param hlgAccountDetail
      * @return
@@ -384,7 +384,7 @@ public class HlgAccountDetailServiceImpl extends ServiceImpl<HlgAccountDetailMap
          * 2、拦截条件：type=0&&isDrawback=0
          */
         HlgCpAccountDetail hlgCpAccountDetail = hlgCpAccountDetailService.getByAccountDetailId(hlgAccountDetail.getId());
-        if (hlgCpAccountDetail.getType() != 0 || hlgCpAccountDetail.getIsDrawback() != 0) {
+        if (hlgCpAccountDetail == null || hlgCpAccountDetail.getType() != 0 || hlgCpAccountDetail.getIsDrawback() != 0) {
             result.error500("不满足调整条件");
             return result;
         }
@@ -402,7 +402,7 @@ public class HlgAccountDetailServiceImpl extends ServiceImpl<HlgAccountDetailMap
         /**
          * 4、拦截条件：只有B-C可以修改
          */
-        if (hlgAccountDetail.getCompanyId() != 0) {
+        if (hlgAccountDetail.getCompanyId() == 0) {
             result.error500("不满足调整条件");
             return result;
         }
@@ -455,7 +455,7 @@ public class HlgAccountDetailServiceImpl extends ServiceImpl<HlgAccountDetailMap
          * 1、拦截条件：开心平台是否开启
          */
         HlgCpSetting hlgCpSetting = hlgCpSettingService.findHlgCpSetting();
-        if (hlgCpSetting.getIsOn() != 1) {
+        if (hlgCpSetting == null || hlgCpSetting.getIsOn() != 1) {
             result.error500("充值失败,未开启开心平台");
             return result;
         }