Merge branch 'developer' of…

Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-platform-enterprise into developer

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/BillingOrderServiceImpl.java

@@ -26,7 +26,7 @@ import com.gic.enterprise.service.BillingOrderService;
 import com.gic.enterprise.utils.CreateRandomUtils;
 import com.github.pagehelper.Page;
 
-@Service
+@Service("billingOrderService")
 public class BillingOrderServiceImpl implements BillingOrderService {
 
     private Logger logger = LogManager.getLogger(BillingOrderServiceImpl.class);

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/BillingRechargeRecordServiceImpl.java

@@ -24,7 +24,7 @@ import com.github.pagehelper.PageHelper;
  * @author zhiwj
  * @date 2019/8/15 17:05
  */
-@Service
+@Service("billingRechargeRecordService")
 public class BillingRechargeRecordServiceImpl implements BillingRechargeRecordService {
 
     @Autowired

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/BillingAccountApiServiceImpl.java

@@ -48,9 +48,8 @@ public class BillingAccountApiServiceImpl implements BillingAccountApiService {
     private TodoItemApiService todoItemApiService;
     @Autowired
     private UserApiService userApiService;
-//    @Autowired
-//    private BillingOrderApiService billingOrderApiService;
-
+    @Autowired
+    private BillingOrderApiService billingOrderApiService;
     @Autowired
     private Config config;
 
@@ -186,10 +185,10 @@ public class BillingAccountApiServiceImpl implements BillingAccountApiService {
                             itemDTO.setPackageHours(packageHoursEnum.getMessage());
                         }
                     }
-//                    ServiceResponse<Integer> orderResponse = billingOrderApiService.saveSmsOrderBuyNow(orderDTO, itemDTO);
-//                    //订购短信套餐包
-//                    billingOrderApiService.
-//                            paySmsPackageOrder(enterpriseId, orderResponse.getResult(), PayTypeEnum.BALANCE_PAY.getCode(), null);
+                    ServiceResponse<Integer> orderResponse = billingOrderApiService.saveSmsOrderBuyNow(orderDTO, itemDTO);
+                    //订购短信套餐包
+                    billingOrderApiService.
+                            paySmsPackageOrder(enterpriseId, orderResponse.getResult(), PayTypeEnum.BALANCE_PAY.getCode(), null);
                 }
             }
         } else {

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/BillingOrderApiServcImpl.java

@@ -8,6 +8,7 @@ import java.util.Date;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -39,6 +40,7 @@ public class BillingOrderApiServcImpl implements BillingOrderApiService {
     private DictApiService dictApiService;
     @Autowired
     private BillingCouponCardService billingCouponCardService;
+    @Lazy
     @Autowired
     private BillingPayInfoApiService billingPayInfoApiService;
     @Autowired

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/ConfigRuleEnterpriseApiServiceImpl.java

@@ -202,7 +202,7 @@ public class ConfigRuleEnterpriseApiServiceImpl implements ConfigRuleEnterpriseA
         com.github.pagehelper.Page page = configRuleEnterpriseService.listRule(search, pageNum, pageSize);
         Page<RuleEnterpriseDTO> resultPage = PageHelperUtils.changePageHelperToCurrentPage(page);
         //
-        if (pageNum != null && pageNum == 1) {
+        if (pageNum != null && pageNum == 1 && StringUtils.isBlank(search)) {
             //添加默认平台规则
             TabConfigRuleEnterpriseRel defaultRule = configRuleEnterpriseService.getByEnterpriseId(-1);
             if (defaultRule != null) {

gic-platform-enterprise-service/src/main/resources/mapper/TabConfigRuleEnterpriseMapper.xml

@@ -118,7 +118,9 @@
     from tab_config_rule_enterprise t1
     left join tab_config_rule_enterprise_rel t2 on t1.enterprise_rule_id = t2.enterprise_rule_id
     and t2.status = 1
-    and t2.enterprise_id != -1
+    <if test="search == null or search == '' ">
+      and t2.enterprise_id != -1
+    </if>
     <if test="search != null and search != '' ">
       left join tab_enterprise t3 on t2.enterprise_id = t3.enterprise_id
     </if>