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/pom.xml

@@ -211,6 +211,11 @@
             <artifactId>gic-data-cloud-api</artifactId>
             <version>${gic-data-cloud-api}</version>
         </dependency>
+        <dependency>
+            <groupId>com.gic</groupId>
+            <artifactId>gic-member-tag-api</artifactId>
+            <version>${gic-member-tag-api}</version>
+        </dependency>
     </dependencies>
 
     <build>

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

@@ -118,15 +118,15 @@ public class BillingPayInfoApiServiceImpl implements BillingPayInfoApiService {
     public ServiceResponse<Void> wxCallBack(String resDataStr) {
         ScanPayResDataDTO resData = JSON.parseObject(resDataStr, ScanPayResDataDTO.class);
         ApprovalCallBackDTO approvalCallBackDTO = new ApprovalCallBackDTO();
-        approvalCallBackDTO.setPaySerialNumber(resData.getOutTradeNo());
+        approvalCallBackDTO.setPaySerialNumber(resData.getOut_trade_no());
         approvalCallBackDTO.setEnterpriseId(Integer.valueOf(resData.getAttach().split(":")[1]));
-        approvalCallBackDTO.setErrorCode(resData.getErrCode());
-        approvalCallBackDTO.setErrorCodeRes(resData.getErrCodeDes());
-        approvalCallBackDTO.setTimeEnd(resData.getTimeEnd());
-        approvalCallBackDTO.setPrepayId(resData.getPrepayId());
-        approvalCallBackDTO.setResultCode(StringUtils.equalsIgnoreCase(resData.getResultCode(), "SUCCESS") ? 1 : 0);
-        approvalCallBackDTO.setTotalFeePaid(new BigDecimal(resData.getTotalFee()).divide(new BigDecimal("100"), 5, RoundingMode.HALF_UP).doubleValue());
-        approvalCallBackDTO.setOnlineSerialNumber(resData.getTransactionId());
+        approvalCallBackDTO.setErrorCode(resData.getErr_code());
+        approvalCallBackDTO.setErrorCodeRes(resData.getErr_code_des());
+        approvalCallBackDTO.setTimeEnd(resData.getTime_end());
+        approvalCallBackDTO.setPrepayId(resData.getPrepay_id());
+        approvalCallBackDTO.setResultCode(StringUtils.equalsIgnoreCase(resData.getResult_code(), "SUCCESS") ? 1 : 0);
+        approvalCallBackDTO.setTotalFeePaid(new BigDecimal(resData.getTotal_fee()).divide(new BigDecimal("100"), 5, RoundingMode.HALF_UP).doubleValue());
+        approvalCallBackDTO.setOnlineSerialNumber(resData.getTransaction_id());
 
         return strategyMap.get(PayTypeEnum.WE_CHAT_PAY.getCode() + "").callBack(approvalCallBackDTO);
     }

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

@@ -10,6 +10,7 @@ import com.gic.enterprise.constant.BillingAuditStatusEnum;
 import com.gic.enterprise.dto.market.ServeLicenseDTO;
 import com.gic.enterprise.utils.LicenseUtils;
 import com.gic.marketing.process.api.service.sms.SmsSendApiService;
+import com.gic.member.tag.api.service.SceneCrowdGroupApiService;
 import com.gic.open.api.service.EnterpriseLicenseApiService;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
@@ -99,6 +100,8 @@ public class EnterpriseApiServiceImpl implements EnterpriseApiService {
     private EnterpriseLicenseApiService enterpriseLicenseApiService;
     @Autowired
     private IndexDescApiService indexDescApiService;
+    @Autowired
+    private SceneCrowdGroupApiService sceneCrowdGroupApiService;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -168,6 +171,7 @@ public class EnterpriseApiServiceImpl implements EnterpriseApiService {
         dataConfigApiService.initPerformanceConfig(enterpriseId);
         //年龄段配置
         dataConfigApiService.initGenerationConfig(enterpriseId);
+        sceneCrowdGroupApiService.initSceneCrowdGroup(enterpriseId);
 
         //观云台字典初始化
         indexDescApiService.init(enterpriseId);

gic-platform-enterprise-service/src/main/resources/dubbo-gic-platform-enterprise-service.xml

@@ -147,4 +147,5 @@
     <dubbo:reference interface="com.gic.open.api.service.EnterpriseLicenseApiService" id="enterpriseLicenseApiService" timeout="6000" />
     <dubbo:reference interface="com.gic.widget.screening.api.service.EsScreeningEnterpriseInitService" id="esScreeningEnterpriseInitService" timeout="6000" />
     <dubbo:reference interface="com.gic.cloud.service.IndexDescApiService" id="indexDescApiService" timeout="6000" />
+    <dubbo:reference interface="com.gic.member.tag.api.service.SceneCrowdGroupApiService" id="sceneCrowdGroupApiService" timeout="6000" />
 </beans>