Merge branch 'developer' into 'master'

Developer

See merge request !9

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/service/WmStoreSyncLogApiService.java

@@ -58,4 +58,15 @@ public interface WmStoreSyncLogApiService {
      * @return  com.gic.api.base.commons.ServiceResponse<java.lang.Void>

     
*/
     ServiceResponse<Void> deleteLogic(Integer storeId, Integer wmMallStoreId);
+
+    /**
+     * 查询所有店铺
+     * @Title: listByStoreId

+     * @Description:
+    
* @author guojuxing
+     * @param storeId
+     * @param enterpriseId

+     * @return  com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.enterprise.dto.wm.WmStoreSyncLogDTO>>

+    
*/
+    ServiceResponse<List<WmStoreSyncLogDTO>> listByStoreId(Integer storeId, Integer enterpriseId);
 }

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/dao/mapper/TabWmStoreSyncLogMapper.java

@@ -60,4 +60,6 @@ public interface TabWmStoreSyncLogMapper {
     List<TabWmStoreSyncLog> getStoreList(@Param("typeList") List<Integer> type, @Param("wmMallStoreId") Integer wmMallStoreId);
 
     int deleteLogic(@Param("storeId") Integer storeId, @Param("wmMallStoreId") Integer wmMallStoreId);
+
+    List<TabWmStoreSyncLog> listByStoreId(@Param("storeId") Integer storeId, @Param("enterpriseId") Integer enterpriseId);
 }
\ No newline at end of file

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/WmStoreSyncLogService.java

@@ -17,4 +17,6 @@ public interface WmStoreSyncLogService {
     List<TabWmStoreSyncLog> getStoreList(List<Integer> type, Integer wmMallStoreId);
 
     int deleteLogic(Integer storeId, Integer wmMallStoreId);
+
+    List<TabWmStoreSyncLog> listByStoreId(Integer storeId, Integer enterpriseId);
 }

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

@@ -51,4 +51,9 @@ public class WmStoreSyncLogServiceImpl implements WmStoreSyncLogService {
     public int deleteLogic(Integer storeId, Integer wmMallStoreId) {
         return tabWmStoreSyncLogMapper.deleteLogic(storeId, wmMallStoreId);
     }
+
+    @Override
+    public List<TabWmStoreSyncLog> listByStoreId(Integer storeId, Integer enterpriseId) {
+        return tabWmStoreSyncLogMapper.listByStoreId(storeId, enterpriseId);
+    }
 }

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

@@ -42,7 +42,7 @@ public class AppletQrcodeApiServiceImpl implements AppletQrcodeApiService {
             qrcodePathDTO.setUrl(uploadResult.getUrl());
             qrcodePathDTO.setDownloadUrl(uploadResult.getDownloadUrl());
             qrcodePathDTO.setPath(path+"?pageId="+i);
-            ServiceResponse.success(qrcodePathDTO);
+            return ServiceResponse.success(qrcodePathDTO);
         }
         return ServiceResponse.failure(ErrorCode.SYSTEM_ERROR.getCode(), "生成小程序二维码异常");
     }

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

@@ -71,4 +71,13 @@ public class WmStoreSyncLogApiServiceImpl implements WmStoreSyncLogApiService {
         wmStoreSyncLogService.deleteLogic(storeId, wmMallStoreId);
         return ServiceResponse.success();
     }
+
+    @Override
+    public ServiceResponse<List<WmStoreSyncLogDTO>> listByStoreId(Integer storeId, Integer enterpriseId) {
+        List<TabWmStoreSyncLog> list = wmStoreSyncLogService.listByStoreId(storeId, enterpriseId);
+        if (CollectionUtils.isEmpty(list)) {
+            return ServiceResponse.success(Collections.emptyList());
+        }
+        return ServiceResponse.success(EntityUtil.changeEntityListNew(WmStoreSyncLogDTO.class, list));
+    }
 }

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/utils/SmsUtils.java

@@ -51,7 +51,7 @@ public class SmsUtils {
         if (StringUtils.isBlank(noticeCode)) {
             return SmsTypeEnum.MARKETING.getCode();
         }
-        if (NoticeConstant.PARAMS_VERIFY_CODE.equals(noticeCode)) {
+        if (NoticeConstant.NOTICE_WXA_VERIFY_CODE.equals(noticeCode)) {
             return SmsTypeEnum.AUTH_CODE.getCode();
         } else {
             return SmsTypeEnum.NOTICE.getCode();

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

@@ -184,4 +184,13 @@
     and wm_mall_store_id = #{wmMallStoreId}
     and store_id = #{storeId}
   </update>
+
+  <select id="listByStoreId" resultMap="BaseResultMap">
+    select <include refid="Base_Column_List"></include>
+    from tab_wm_store_sync_log
+    where status = 1
+    and store_id = #{storeId}
+    and enterprise_id = #{enterpriseId}
+    group by wm_mall_store_id
+  </select>
 </mapper>
\ No newline at end of file

gic-platform-enterprise-web/pom.xml

@@ -204,6 +204,11 @@
             <artifactId>gic-weimob-api</artifactId>
             <version>${gic-weimob-api}</version>
         </dependency>
+        <dependency>
+            <groupId>com.gic</groupId>
+            <artifactId>gic-goods-api</artifactId>
+            <version>${gic-goods-api}</version>
+        </dependency>
     </dependencies>
 
     <build>

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

@@ -6,6 +6,7 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import com.gic.enterprise.error.ErrorCode;
+import com.gic.goods.pump.api.service.WeiMobGoodsService;
 import com.gic.weimob.api.service.WeimobBaseService;
 import com.gic.weimob.api.service.WeimobMemberService;
 import org.apache.commons.collections.CollectionUtils;
@@ -54,6 +55,8 @@ public class WmMallStoreController {
     private WeimobMemberService weimobMemberService;
     @Autowired
     private WeimobBaseService weimobBaseService;
+    @Autowired
+    private WeiMobGoodsService weiMobGoodsService;
 
     @RequestMapping("/save-wm-store")
     public RestResponse save(WmStoreDTO dto) {
@@ -272,6 +275,23 @@ public class WmMallStoreController {
     }
 
     /**
+     * 同步商品信息
+     * @param wmMallStoreId
+     * @return
+     */
+    @RequestMapping("/sync-goods")
+    public RestResponse syncGoods(Integer wmMallStoreId) {
+        ServiceResponse<WmStoreDTO> response = wmStoreApiService.getWmStoreByWmMallStoreId(wmMallStoreId);
+        if (response.isSuccess()) {
+            WmStoreDTO wmStoreDTO = response.getResult();
+            ServiceResponse<Void> goodsResponse = weiMobGoodsService
+                    .saveEnterpriseIdAndPid(UserDetailUtils.getUserDetail().getEnterpriseId(), Long.valueOf(wmStoreDTO.getWmPid()));
+            return ResultControllerUtils.commonResult(goodsResponse);
+        }
+        return RestResponse.failure(response.getCode(), response.getMessage());
+    }
+
+    /**
      * gic卡券列表
      * @param wmMallStoreId
      * @param cardName

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

@@ -13,6 +13,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import com.gic.commons.util.EntityUtil;
 import com.gic.enterprise.web.vo.wm.WmBranchVO;
+import com.gic.weimob.api.dto.WeimobGuiderSynDTO;
 import com.gic.weimob.api.dto.WeimobStoreGicInfoDTO;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.MapUtils;
@@ -95,6 +96,7 @@ public class WmStoreSyncController {
     @RequestMapping("list-store")
     public RestResponse listStore(StoreSearchDTO storeSearchDTO) {
         //todo 过滤已同步过的门店
+        storeSearchDTO.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
         return ResultControllerUtils.commonResult(storeApiService.listStore(storeSearchDTO, 0, 1000));
     }
 
@@ -275,17 +277,32 @@ public class WmStoreSyncController {
     }
 
     /**
+     * 导购重新同步
+     * @param clerkIds 英文逗号隔开
+     * @param wmMallStoreId
+     * @return
+     */
+    @RequestMapping("/sync-clerk-to-wm-again")
+    public RestResponse syncClerkToWmAgain(String clerkIds, Integer wmMallStoreId) {
+        return ResultControllerUtils.commonResult(clerkApiService
+                .syncClerkToWeimob(wmMallStoreId, clerkIds, UserDetailUtils.getUserDetail().getEnterpriseId()));
+    }
+
+    /**
      * 门店错误日志-不处理
      * @Title: deleteStoreClerkErrorLog

      * @Description:
     
* @author guojuxing
-     * @param id

+     * @param ids
      * @return  com.gic.commons.webapi.reponse.RestResponse

     
*/
     @RequestMapping("delete-store-clerk-error-log")
     @ResponseBody
-    public RestResponse deleteStoreClerkErrorLog(String id) {
-        return ResultControllerUtils.commonResult(weimobStoreSiteService.deleteStoreClerkErrorlog(Long.valueOf(id)));
+    public RestResponse deleteStoreClerkErrorLog(String ids) {
+        if (StringUtils.isNotBlank(ids)) {
+            Arrays.stream(ids.split(",")).forEach( e -> weimobStoreSiteService.deleteStoreClerkErrorlog(Long.valueOf(e)));
+        }
+        return RestResponse.success();
     }
 
     /**

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

@@ -133,4 +133,6 @@
     <dubbo:reference interface="com.gic.marketing.api.service.coupon.MemberCouponApiService" id="memberCouponApiService" timeout="6000"/>
 
     <dubbo:reference interface="com.gic.store.service.ClerkApiService" id="clerkApiService" timeout="60000" />
+
+    <dubbo:reference interface="com.gic.goods.pump.api.service.WeiMobGoodsService" id="weiMobGoodsService" timeout="60000" />
 </beans>