Merge branch 'developer' of…

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

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

@@ -5,11 +5,15 @@ import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import com.gic.enterprise.base.UserInfo;
 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 com.gic.member.config.api.enums.OrderPointCalculationPartyEnum;
+import com.gic.member.config.api.service.OrderPointCalculationPartyApiService;
+import com.gic.redis.data.util.RedisUtil;
+import com.gic.weimob.api.service.*;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,8 +39,6 @@ import com.gic.enterprise.web.vo.wm.*;
 import com.gic.marketing.api.dto.coupon.CouponDTO;
 import com.gic.marketing.api.service.coupon.MemberCouponApiService;
 import com.gic.member.config.api.service.MemberCardApiService;
-import com.gic.weimob.api.service.WeimobMerchantService;
-import com.gic.weimob.api.service.WeimobStoreSiteService;
 
 @RestController
 @RequestMapping("/wm-mall-store")
@@ -57,10 +59,16 @@ public class WmMallStoreController {
     private WeimobBaseService weimobBaseService;
     @Autowired
     private WeiMobGoodsService weiMobGoodsService;
+    @Autowired
+    private OrderPointCalculationPartyApiService orderPointCalculationPartyApiService;
+    @Autowired
+    private WeimobOrderService weimobOrderService;
 
     @RequestMapping("/save-wm-store")
     public RestResponse save(WmStoreDTO dto) {
-        dto.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
+        UserInfo userInfo = UserDetailUtils.getUserDetail().getUserInfo();
+        Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
+        dto.setEnterpriseId(enterpriseId);
         ServiceResponse<Integer> result = wmStoreApiService.saveWmStore(dto);
         if (result.isSuccess()) {
             //创建微盟gic关联
@@ -69,6 +77,10 @@ public class WmMallStoreController {
                             dto.getWmMainAccount(), Long.valueOf(dto.getWmPid()), Long.valueOf(dto.getWmStoreId()),
                             MallModeEnum.mapToWm(dto.getMallMode()));
             LOGGER.info("微盟商城店铺-微盟结果:{}", JSON.toJSONString(saveStoreInfo));
+            ServiceResponse<Void> response = orderPointCalculationPartyApiService
+                    .saveOrderPointCalculationParty(enterpriseId, Long.valueOf(result.getResult()),
+                            dto.getWmPidName(), userInfo.getUserId(), userInfo.getUserName(), OrderPointCalculationPartyEnum.WEIMO.getCode());
+            LOGGER.info("微盟商城店铺-会员组初始化结果:{}", JSON.toJSONString(response));
         }
         return OperationResultUtils.operationResult(result,
                 OperationResultUtils.LOG_NEW + "微盟商城店铺", dto.getWmPidName());
@@ -145,7 +157,10 @@ public class WmMallStoreController {
         ServiceResponse<String> response = weimobMerchantService.getAuthUrl();
         if (response.isSuccess()) {
             String authUrl = response.getResult();
-            String mainHost = DomainUtils.getCurrentDomain() + "/wm-mall-store/auth-callback?wmMallStoreId=" + wmMallStoreId;
+            String mainHost = DomainUtils.getCurrentDomain() + "/gic-enterprise-web/wm-mall-store/auth-callback";
+
+            //为了授权回调取用的店铺主键ID
+            RedisUtil.setCache("enterprise:wm:auth:" + UserDetailUtils.getUserDetail().getEnterpriseId(), wmMallStoreId);
             return RestResponse.success(authUrl + "&redirect_uri=" + mainHost);
         } else {
             return RestResponse.failure(response.getCode(), response.getMessage());
@@ -232,6 +247,50 @@ public class WmMallStoreController {
                 Long.valueOf(couponId), Long.valueOf(couponLogId), couponCode));
     }
 
+
+    /**
+     * 获取错误订单日志
+     * @Title: getWmOrderErrorLog

+     * @Description: 
+    
* @author guojuxing 
+     * @param wmMallStoreId
+     * @param currentPage
+     * @param pageSize
+     * @param searchStr

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

+    
*/
+    @RequestMapping("get-wm-order-error-log")
+    public RestResponse getWmOrderErrorLog(Integer wmMallStoreId, 
+                                           @RequestParam(defaultValue = "1") int currentPage,
+                                           @RequestParam(defaultValue = "20") int pageSize,
+                                           String searchStr) {
+        return ResultControllerUtils.commonPageResult(weimobOrderService
+                .getErrWmOrderLog(wmMallStoreId, currentPage, pageSize, searchStr), WeimobOrderErLogVO.class);
+    }
+
+    /**
+     * 批量处理订单错误日志
+     * @param errLogIds
+     * @param type (0--"不处理";1--"重新同步 ")
+     * @return
+     */
+    @RequestMapping("delete-wm-order-error-log")
+    public RestResponse deleteWmOrderErrorLog(String errLogIds, Integer type) {
+        if (StringUtils.isBlank(errLogIds)) {
+            return RestResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "参数为空");
+        }
+        String[] errLogArr = errLogIds.split(",");
+        List<Long> errLogList = new ArrayList<>(errLogArr.length);
+        for (String errLog : errLogArr) {
+            if (StringUtils.isBlank(errLog)) {
+                continue;
+            }
+            errLogList.add(Long.valueOf(errLog));
+        }
+        return ResultControllerUtils.commonResult(weimobOrderService
+                .dealErrOrderBatch(errLogList, type));
+    }
+
     /**
      * 核销卡券
      * @param mcuId
@@ -315,20 +374,26 @@ public class WmMallStoreController {
      * @param code
      */
     @RequestMapping("auth-callback")
-    @ResponseBody
-    public void authCallBack(String code, Integer wmMallStoreId) throws IOException {
+    public void authCallBack(String code) throws IOException {
         try {
-            ServiceResponse<Void> authWmResponse = weimobMerchantService.weimobStoreAuth(wmMallStoreId, code);
+            Object obj = RedisUtil.getCache("enterprise:wm:auth:" + UserDetailUtils.getUserDetail().getEnterpriseId());
+            if (obj == null) {
+                LOGGER.warn("微盟授权-店铺ID缓存不存在");
+            }
+            ServiceResponse<Void> authWmResponse = weimobMerchantService.weimobStoreAuth((Integer) obj, code);
             LOGGER.info("微盟中间件返回结果：{}", JSON.toJSONString(authWmResponse));
             if (authWmResponse.isSuccess()) {
                 //更新gic侧店铺授权状态
-                ServiceResponse<String> wmMallStoreResponse = wmStoreApiService.authWmStore(wmMallStoreId);
+                ServiceResponse<String> wmMallStoreResponse = wmStoreApiService.authWmStore((Integer) obj);
                 if (!wmMallStoreResponse.isSuccess()) {
                     LOGGER.warn("企业侧微盟店铺授权结果:{}", JSON.toJSONString(wmMallStoreResponse));
                 }
             }
         } catch (Exception e) {
             LOGGER.warn("微盟授权返回结果:{}", e.getMessage(), e);
+        } finally {
+            //清空缓存
+            RedisUtil.delCache("enterprise:wm:auth:" + UserDetailUtils.getUserDetail().getEnterpriseId());
         }
     }
 

gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/vo/wm/WeimobOrderErLogVO.java

+package com.gic.enterprise.web.vo.wm;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class WeimobOrderErLogVO implements Serializable{
+    private static final long serialVersionUID = -5110534109536620583L;
+
+    /**
+     *
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long orderErLogId;
+
+    /**
+     *
+     */
+    private Integer wmMallStoreId;
+
+    /**
+     *
+     */
+    private Integer enterpriseId;
+
+    /**
+     *
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long pid;
+
+    /**
+     *
+     */
+    private Integer wmOrderType;
+
+    /**
+     *
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long wmOrderId;
+
+    /**
+     *
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long wmRightsId;
+
+    /**
+     *
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long wid;
+
+    /**
+     *
+     */
+    private String wmOrderMsg;
+
+    /**
+     *
+     */
+    private String errInfo;
+
+    /**
+     *
+     */
+    private Date createTime;
+
+    /**
+     *
+     */
+    private Date updateTime;
+
+    /**
+     *
+     */
+    private Integer status;
+
+    public Long getOrderErLogId() {
+        return orderErLogId;
+    }
+
+    public WeimobOrderErLogVO setOrderErLogId(Long orderErLogId) {
+        this.orderErLogId = orderErLogId;
+        return this;
+    }
+
+    public Integer getWmMallStoreId() {
+        return wmMallStoreId;
+    }
+
+    public WeimobOrderErLogVO setWmMallStoreId(Integer wmMallStoreId) {
+        this.wmMallStoreId = wmMallStoreId;
+        return this;
+    }
+
+    public Integer getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public WeimobOrderErLogVO setEnterpriseId(Integer enterpriseId) {
+        this.enterpriseId = enterpriseId;
+        return this;
+    }
+
+    public Long getPid() {
+        return pid;
+    }
+
+    public WeimobOrderErLogVO setPid(Long pid) {
+        this.pid = pid;
+        return this;
+    }
+
+    public Integer getWmOrderType() {
+        return wmOrderType;
+    }
+
+    public WeimobOrderErLogVO setWmOrderType(Integer wmOrderType) {
+        this.wmOrderType = wmOrderType;
+        return this;
+    }
+
+    public Long getWmOrderId() {
+        return wmOrderId;
+    }
+
+    public WeimobOrderErLogVO setWmOrderId(Long wmOrderId) {
+        this.wmOrderId = wmOrderId;
+        return this;
+    }
+
+    public Long getWmRightsId() {
+        return wmRightsId;
+    }
+
+    public WeimobOrderErLogVO setWmRightsId(Long wmRightsId) {
+        this.wmRightsId = wmRightsId;
+        return this;
+    }
+
+    public Long getWid() {
+        return wid;
+    }
+
+    public WeimobOrderErLogVO setWid(Long wid) {
+        this.wid = wid;
+        return this;
+    }
+
+    public String getWmOrderMsg() {
+        return wmOrderMsg;
+    }
+
+    public WeimobOrderErLogVO setWmOrderMsg(String wmOrderMsg) {
+        this.wmOrderMsg = wmOrderMsg;
+        return this;
+    }
+
+    public String getErrInfo() {
+        return errInfo;
+    }
+
+    public WeimobOrderErLogVO setErrInfo(String errInfo) {
+        this.errInfo = errInfo;
+        return this;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public WeimobOrderErLogVO setCreateTime(Date createTime) {
+        this.createTime = createTime;
+        return this;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public WeimobOrderErLogVO setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+        return this;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public WeimobOrderErLogVO setStatus(Integer status) {
+        this.status = status;
+        return this;
+    }
+}

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

@@ -128,6 +128,7 @@
 
     <dubbo:reference interface="com.gic.weimob.api.service.WeimobStoreSiteService" id="weimobStoreSiteService" timeout="6000"/>
     <dubbo:reference interface="com.gic.weimob.api.service.WeimobMerchantService" id="weimobMerchantService" timeout="6000"/>
+    <dubbo:reference interface="com.gic.weimob.api.service.WeimobOrderService" id="weimobOrderService" timeout="6000"/>
     <dubbo:reference interface="com.gic.weimob.api.service.WeimobMemberService" id="weimobMemberService" timeout="6000"/>
     <dubbo:reference interface="com.gic.weimob.api.service.WeimobBaseService" id="weimobBaseService" timeout="6000"/>
     <dubbo:reference interface="com.gic.marketing.api.service.coupon.MemberCouponApiService" id="memberCouponApiService" timeout="6000"/>
@@ -135,4 +136,5 @@
     <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" />
+    <dubbo:reference interface="com.gic.member.config.api.service.OrderPointCalculationPartyApiService" id="orderPointCalculationPartyApiService" timeout="60000" />
 </beans>