Merge branch 'developer' into 'master'

Developer

See merge request !12

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

@@ -7,6 +7,8 @@ import java.util.Set;
 import java.util.stream.Collectors;
 
 import com.gic.enterprise.dto.wm.WmGoodsConfigDTO;
+import com.gic.enterprise.entity.TabWmStoreSyncLog;
+import com.gic.enterprise.service.*;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,10 +33,6 @@ import com.gic.enterprise.entity.TabWmStoreConfig;
 import com.gic.enterprise.entity.TabWmStoreCouponConfig;
 import com.gic.enterprise.error.ErrorCode;
 import com.gic.enterprise.qo.wm.CouponConfigQO;
-import com.gic.enterprise.service.WmStoreApiService;
-import com.gic.enterprise.service.WmStoreConfigService;
-import com.gic.enterprise.service.WmStoreCouponConfigService;
-import com.gic.enterprise.service.WmStoreService;
 
 @Service("wmStoreApiService")
 public class WmStoreApiServiceImpl implements WmStoreApiService {
@@ -44,6 +42,8 @@ public class WmStoreApiServiceImpl implements WmStoreApiService {
     private WmStoreConfigService wmStoreConfigService;
     @Autowired
     private WmStoreCouponConfigService wmStoreCouponConfigService;
+    @Autowired
+    private WmStoreSyncLogService wmStoreSyncLogService;
 
     @Override
     public ServiceResponse<Integer> saveWmStore(WmStoreDTO wmStoreDTO) {
@@ -187,9 +187,11 @@ public class WmStoreApiServiceImpl implements WmStoreApiService {
                 .collect(Collectors.toSet());
         //积分配置查询会员组接口，默认已配置
         result.add(String.valueOf(WmStoreConfigTypeEnum.INTEGRAL_CONFIG.getCode()));
-        //todo 查询是否有门店导购同步记录
-        result.add(String.valueOf(WmStoreConfigTypeEnum.STORE_CLERK_CONFIG.getCode()));
-
+        //查询是否有门店导购同步记录
+        List<TabWmStoreSyncLog> storeSyncLog = wmStoreSyncLogService.getStoreList(null, wmMallStoreId);
+        if (CollectionUtils.isNotEmpty(storeSyncLog)) {
+            result.add(String.valueOf(WmStoreConfigTypeEnum.STORE_CLERK_CONFIG.getCode()));
+        }
         return ServiceResponse.success(result);
     }
 

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

@@ -5,6 +5,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import com.gic.api.base.commons.Page;
 import com.gic.enterprise.base.UserInfo;
 import com.gic.enterprise.error.ErrorCode;
 import com.gic.goods.pump.api.service.WeiMobGoodsService;
@@ -13,6 +14,8 @@ import com.gic.member.config.api.service.OrderPointCalculationPartyApiService;
 import com.gic.open.api.dto.EnterpriseServeInfoDTO;
 import com.gic.open.api.service.EnterpriseLicenseApiService;
 import com.gic.redis.data.util.RedisUtil;
+import com.gic.weimob.api.dto.GicMemberGradeDTO;
+import com.gic.weimob.api.dto.WeimobCouponTemplateDTO;
 import com.gic.weimob.api.service.*;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
@@ -129,12 +132,12 @@ public class WmMallStoreController {
                 List<WmStoreVO> voList = list.stream()
                         .map(e -> {
                             WmStoreVO vo = EntityUtil.changeEntityNew(WmStoreVO.class, e);
+                            if (hasCouponSet(vo.getWmMallStoreId())) {
+                                vo.setHasBindCoupon(1);
+                            }
                             ServiceResponse<Set<String>> configSet = wmStoreApiService.getWmStoreConfigKey(e.getWmMallStoreId());
                             if (configSet.isSuccess()) {
                                 Set<String> set = configSet.getResult();
-                                if (set.contains(String.valueOf(WmStoreConfigTypeEnum.COUPON_CONFIG.getCode()))) {
-                                    vo.setHasBindCoupon(1);
-                                }
                                 boolean isAllConfig = Stream.of(WmStoreConfigTypeEnum.values())
                                         .allMatch(configType -> set.contains(String.valueOf(configType.getCode())));
                                 if (isAllConfig){
@@ -584,4 +587,16 @@ public class WmMallStoreController {
         }
         return new HashMap<>(2);
     }
+
+    private boolean hasCouponSet(Integer wmMallStoreId) {
+        ServiceResponse<Page<WmStoreCouponConfigDTO>> result = wmStoreApiService
+                .pageCouponConfig(new CouponConfigQO().setWmMallStoreId(wmMallStoreId));
+        if (result.isSuccess()) {
+            Page<WmStoreCouponConfigDTO> page = result.getResult();
+            if (page != null && CollectionUtils.isNotEmpty(page.getResult())) {
+                return true;
+            }
+        }
+        return false;
+    }
 }

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

@@ -672,12 +672,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);
@@ -685,7 +685,7 @@ public class WmStoreSyncController {
                         ServiceResponse<Void> wmResult = this.weimobStoreSiteService
                                 .addWeimobVirtualStore(wmMallStoreId, enterpriseId, wmPhysicalStoreDTO, list);
                         LOGGER.info("微盟同步总店-分店返回结果:{}", JSON.toJSONString(wmResult));
-                        if (wmResult.isSuccess()) {
+                        if (!wmResult.isSuccess()) {
                             rMap.put(regionName + "-" + storeCode, wmResult.getMessage());
                         } else {
                             rMap.put(regionName + "-" + storeCode, "成功");

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

@@ -96,7 +96,7 @@ public class LoginController {
         Config config = ConfigService.getConfig("COMMON.4.0-gic-properties");
         String url = config.getProperty("service_host", "").replace("/gic", "");
         if (StringUtils.isBlank(redirectUrl)) {
-            redirectUrl = url + "/damo-system/overview/index";
+            redirectUrl = url + "/damo-system";
 //            redirectUrl = "https://four.gicdev.com/cost-center/billing-center/overview";
         }
         String token;