Merge branch 'developer' into 'master'

Developer

See merge request !13

gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/IndexModuleController.java

@@ -44,10 +44,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  *
@@ -164,14 +161,24 @@ public class IndexModuleController {
                 map.put("key", provinceDTO.getProvinceName());
                 map.put("mainStoreMemberCount", 0);
                 map.put("openStoreMemberCount", 0);
-                for(StoreProvinceData storeProvinceData : dataResponse.getResult()){
-                    if(provinceDTO.getProvinceName().equals(storeProvinceData.getProvince())){
-                        map.put("mainStoreMemberCount", storeProvinceData.getMemberCount());
+                if (dataResponse != null) {
+                    List<StoreProvinceData> storeProvinceDataList = dataResponse.getResult();
+                    if (CollectionUtils.isNotEmpty(storeProvinceDataList)) {
+                        storeProvinceDataList.forEach(e -> {
+                            if (provinceDTO.getProvinceName().equals(e.getProvince())) {
+                                map.put("mainStoreMemberCount", e.getMemberCount());
+                            }
+                        });
                     }
                 }
-                for(StoreProvinceData storeProvinceData : dataOpenStore.getResult()){
-                    if(provinceDTO.getProvinceName().equals(storeProvinceData.getProvince())){
-                        map.put("openStoreMemberCount", storeProvinceData.getMemberCount());
+                if (dataOpenStore != null) {
+                    List<StoreProvinceData> dataOpenStoreList = dataOpenStore.getResult();
+                    if (CollectionUtils.isNotEmpty(dataOpenStoreList)) {
+                        for (StoreProvinceData storeProvinceData : dataOpenStoreList) {
+                            if (provinceDTO.getProvinceName().equals(storeProvinceData.getProvince())) {
+                                map.put("openStoreMemberCount", storeProvinceData.getMemberCount());
+                            }
+                        }
                     }
                 }
                 //查询门店数量

gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/wm/WmMallStoreController.java

@@ -470,12 +470,14 @@ public class WmMallStoreController {
     @RequestMapping("/get-integral-config")
     public RestResponse getIntegralConfig(Integer wmMallStoreId) {
         //获取已配置的卡券ID
-        ServiceResponse<Long> mcuIdResponse = weimobMerchantService.getMcuAreaId(wmMallStoreId);
-        if (!mcuIdResponse.isSuccess()) {
-            return RestResponse.failure(mcuIdResponse.getCode(), mcuIdResponse.getMessage());
-        }
-        return ResultControllerUtils.commonResult(memberCardApiService
-                .isGicCalculateIntegral(mcuIdResponse.getResult(), UserDetailUtils.getUserDetail().getEnterpriseId()));
+//        ServiceResponse<Long> mcuIdResponse = weimobMerchantService.getMcuAreaId(wmMallStoreId);
+//        if (!mcuIdResponse.isSuccess()) {
+//            return RestResponse.failure(mcuIdResponse.getCode(), mcuIdResponse.getMessage());
+//        }
+        return ResultControllerUtils.commonResult(orderPointCalculationPartyApiService
+                .isGicCalculateIntegral(UserDetailUtils.getUserDetail().getEnterpriseId(),
+                        OrderPointCalculationPartyEnum.WEIMO.getCode(),
+                        Long.valueOf(wmMallStoreId)));
     }
 
     /**
@@ -489,13 +491,21 @@ public class WmMallStoreController {
     
*/
     @RequestMapping("/edit-integral-config")
     public RestResponse editIntegralConfig(Integer wmMallStoreId, String integralRule) {
-        //获取已配置的卡券ID
-        ServiceResponse<Long> mcuIdResponse = weimobMerchantService.getMcuAreaId(wmMallStoreId);
-        if (!mcuIdResponse.isSuccess()) {
-            return RestResponse.failure(mcuIdResponse.getCode(), mcuIdResponse.getMessage());
+        //1：gic计算 0:erp计算
+        int state = 1;
+        if ("erp".equals(integralRule)) {
+            state = 0;
         }
-        return ResultControllerUtils.commonResult(memberCardApiService
-                .updateIntegralRule(mcuIdResponse.getResult(), UserDetailUtils.getUserDetail().getEnterpriseId(), integralRule));
+        //获取已配置的卡券ID
+//        ServiceResponse<Long> mcuIdResponse = weimobMerchantService.getMcuAreaId(wmMallStoreId);
+//        if (!mcuIdResponse.isSuccess()) {
+//            return RestResponse.failure(mcuIdResponse.getCode(), mcuIdResponse.getMessage());
+//        }
+        return ResultControllerUtils.commonResult(orderPointCalculationPartyApiService
+                .updateIntegralRule(UserDetailUtils.getUserDetail().getEnterpriseId(),
+                        OrderPointCalculationPartyEnum.WEIMO.getCode(),
+                        Long.valueOf(wmMallStoreId),
+                        state));
     }
 
     @RequestMapping("/list-wm-store-config")

gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/wm/WmStoreSyncController.java

@@ -600,12 +600,12 @@ public class WmStoreSyncController {
                         String storeCode = row.get(1);
                         StoreRegionDTO storeRegion = getStoreRegion(enterpriseId, regionName);
                         if (storeRegion == null) {
-                            rMap.put(storeCode, "门店域不存在");
+                            rMap.put(regionName + "-" + storeCode, "门店域不存在");
                             continue;
                         }
                         StoreDTO storeDTO = getStoreByRegionAndCode(enterpriseId, storeRegion.getRegionId(), storeCode);
                         if (storeDTO == null) {
-                            rMap.put(storeCode, "门店code不存在");
+                            rMap.put(regionName + "-" + storeCode, "门店code不存在");
                             continue;
                         }
                         List<WeimobPhysicalStoreDTO> list = new ArrayList<>(1);

gic-platform-operation-web/pom.xml

@@ -188,6 +188,11 @@
             <artifactId>rule-manage-api</artifactId>
             <version>${rule-manage-api}</version>
         </dependency>
+        <dependency>
+            <groupId>com.gic.authcenter</groupId>
+            <artifactId>gic-authcenter-api</artifactId>
+            <version>${gic-authcenter-api}</version>
+        </dependency>
     </dependencies>
 
     <dependencyManagement>

gic-platform-operation-web/src/main/java/com/gic/operation/web/controller/MenuController.java

@@ -3,6 +3,7 @@ package com.gic.operation.web.controller;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import com.gic.authcenter.api.service.GicDepartmentService;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.logging.log4j.LogManager;
@@ -43,12 +44,23 @@ public class MenuController {
     private MenuItemApiService menuItemApiService;
     @Autowired
     private ServeApiService serveApiService;
+    @Autowired
+    private GicDepartmentService gicDepartmentService;
 
     @RequestMapping("/sync-product-menu")
     public RestResponse syncProductMenu(String menuCode) {
         return RestResponse.success();
     }
 
+    /**
+     * 运维用户部门职位数据
+     * @return
+     */
+    @RequestMapping("/list-depart")
+    public RestResponse listDepart() {
+        return RestResponse.success(gicDepartmentService.listAllGicDepartment());
+    }
+
 
     /**
      * 新增GIC页面
@@ -105,6 +117,7 @@ public class MenuController {
     
 */
     @RequestMapping("/update-app-page")
     public RestResponse updateAppPage(MenuDTO menuDTO, String authDepartJson) {
+        LOGGER.info("编辑应用第一级参数：{}", JSON.toJSONString(menuDTO));
         setAuthType(menuDTO, authDepartJson);
         return ResultControllerUtils.commonResult(menuApiService.updateAppPage(menuDTO));
     }

gic-platform-operation-web/src/main/resources/dubbo-gic-platform-operation-web.xml

@@ -89,4 +89,6 @@
     <dubbo:reference interface="com.gic.mq.sdk.service.MQConfigService" id="mQConfigService" timeout="6000"/>
     <dubbo:reference interface="com.gic.mq.sdk.service.MQStatusService" id="mQStatusService" timeout="6000"/>
     <dubbo:reference interface="com.gic.mall.share.api.service.PayConfigApiService" id="payConfigApiService" timeout="6000"/>
+
+    <dubbo:reference interface="com.gic.authcenter.api.service.GicDepartmentService" id="gicDepartmentService" timeout="6000" />
 </beans>
\ No newline at end of file