微盟配置

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

@@ -13,9 +13,7 @@ import org.apache.commons.collections.CollectionUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import com.alibaba.fastjson.JSON;
 import com.gic.api.base.commons.ServiceResponse;
@@ -171,7 +169,7 @@ public class WmMallStoreController {
     }
 
     /**
-     * 获取会员卡已同步接口
+     * 获取会员卡等级已同步接口
      * @Title: listMemberGrade

      * @Description:
     
* @author guojuxing
@@ -184,6 +182,33 @@ public class WmMallStoreController {
     }
 
     /**
+     * 卡券错误日志列表
+     * @param gicCouponId
+     * @param sendType 非必填，null时取全部，1 为推送卡券,2 核销卡券
+     * @param currentPage
+     * @param pageSize
+     * @param searchStr
+     * @return
+     */
+    @RequestMapping("/list-coupon-log")
+    public RestResponse listCouponLog(String gicCouponId, Integer sendType,
+                                      @RequestParam(defaultValue = "1") int currentPage,
+                                      @RequestParam(defaultValue = "20") int pageSize, String searchStr) {
+        return ResultControllerUtils.commonResult(weimobMerchantService
+                .getCouponLogs(Long.valueOf(gicCouponId), sendType, currentPage, pageSize, searchStr), WeimobCouponErLogVO.class);
+    }
+
+    /**
+     * 删除卡券错误日志
+     * @param couponErLogIds 卡券错误日志ID，英文逗号给开
+     * @return
+     */
+    @RequestMapping("delete-coupon-error-log")
+    public RestResponse deleteCouponErrorLog(@RequestBody List<Long> couponErLogIds) {
+        return ResultControllerUtils.commonResult(weimobMerchantService.deleteCouponErrorlog(couponErLogIds));
+    }
+
+    /**
      * 获取微盟卡券列表
      * @Title: listWmCoupon

      * @Description:
@@ -201,6 +226,12 @@ public class WmMallStoreController {
         return RestResponse.failure(wmStoreResponse.getCode(), wmStoreResponse.getMessage());
     }
 
+    /**
+     * gic卡券列表
+     * @param wmMallStoreId
+     * @param cardName
+     * @return
+     */
     @RequestMapping("/list-gic-coupon")
     public RestResponse listGicCoupon(Integer wmMallStoreId, String cardName) {
         Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();

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

+package com.gic.enterprise.web.vo.wm;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class WeimobCouponErLogVO implements Serializable{
+    private static final long serialVersionUID = 5523945209221656292L;
+
+    /**
+     * 日志主键
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long couponErLogId;
+
+    /**
+     * 1 : 发送卡券  --- 2 ：核销卡券
+     */
+    private Integer sendType;
+
+    /**
+     * 企业id
+     */
+    private Integer enterpriseId;
+
+    /**
+     *
+     */
+    private Integer wmMallStoreId;
+
+    /**
+     *
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long pid;
+
+    /**
+     *
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long mcuAreaId;
+
+    /**
+     *
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long mcuId;
+
+    /**
+     *
+     */
+    private Integer wid;
+
+    /**
+     *
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long gicCouponLogId;
+
+    /**
+     *
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long gicCouponTempId;
+
+    /**
+     *
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long wmCouponTempId;
+
+    /**
+     *
+     */
+    private String couponCode;
+
+    /**
+     *
+     */
+    private String wmParam;
+
+    /**
+     *
+     */
+    private String wmResponse;
+
+    /**
+     *
+     */
+    private Date createTime;
+
+    /**
+     *
+     */
+    private Date updateTime;
+
+    /**
+     *
+     */
+    private Integer status;
+
+    public Long getCouponErLogId() {
+        return couponErLogId;
+    }
+
+    public WeimobCouponErLogVO setCouponErLogId(Long couponErLogId) {
+        this.couponErLogId = couponErLogId;
+        return this;
+    }
+
+    public Integer getSendType() {
+        return sendType;
+    }
+
+    public WeimobCouponErLogVO setSendType(Integer sendType) {
+        this.sendType = sendType;
+        return this;
+    }
+
+    public Integer getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public WeimobCouponErLogVO setEnterpriseId(Integer enterpriseId) {
+        this.enterpriseId = enterpriseId;
+        return this;
+    }
+
+    public Integer getWmMallStoreId() {
+        return wmMallStoreId;
+    }
+
+    public WeimobCouponErLogVO setWmMallStoreId(Integer wmMallStoreId) {
+        this.wmMallStoreId = wmMallStoreId;
+        return this;
+    }
+
+    public Long getPid() {
+        return pid;
+    }
+
+    public WeimobCouponErLogVO setPid(Long pid) {
+        this.pid = pid;
+        return this;
+    }
+
+    public Long getMcuAreaId() {
+        return mcuAreaId;
+    }
+
+    public WeimobCouponErLogVO setMcuAreaId(Long mcuAreaId) {
+        this.mcuAreaId = mcuAreaId;
+        return this;
+    }
+
+    public Long getMcuId() {
+        return mcuId;
+    }
+
+    public WeimobCouponErLogVO setMcuId(Long mcuId) {
+        this.mcuId = mcuId;
+        return this;
+    }
+
+    public Integer getWid() {
+        return wid;
+    }
+
+    public WeimobCouponErLogVO setWid(Integer wid) {
+        this.wid = wid;
+        return this;
+    }
+
+    public Long getGicCouponLogId() {
+        return gicCouponLogId;
+    }
+
+    public WeimobCouponErLogVO setGicCouponLogId(Long gicCouponLogId) {
+        this.gicCouponLogId = gicCouponLogId;
+        return this;
+    }
+
+    public Long getGicCouponTempId() {
+        return gicCouponTempId;
+    }
+
+    public WeimobCouponErLogVO setGicCouponTempId(Long gicCouponTempId) {
+        this.gicCouponTempId = gicCouponTempId;
+        return this;
+    }
+
+    public Long getWmCouponTempId() {
+        return wmCouponTempId;
+    }
+
+    public WeimobCouponErLogVO setWmCouponTempId(Long wmCouponTempId) {
+        this.wmCouponTempId = wmCouponTempId;
+        return this;
+    }
+
+    public String getCouponCode() {
+        return couponCode;
+    }
+
+    public WeimobCouponErLogVO setCouponCode(String couponCode) {
+        this.couponCode = couponCode;
+        return this;
+    }
+
+    public String getWmParam() {
+        return wmParam;
+    }
+
+    public WeimobCouponErLogVO setWmParam(String wmParam) {
+        this.wmParam = wmParam;
+        return this;
+    }
+
+    public String getWmResponse() {
+        return wmResponse;
+    }
+
+    public WeimobCouponErLogVO setWmResponse(String wmResponse) {
+        this.wmResponse = wmResponse;
+        return this;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public WeimobCouponErLogVO setCreateTime(Date createTime) {
+        this.createTime = createTime;
+        return this;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public WeimobCouponErLogVO setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+        return this;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public WeimobCouponErLogVO setStatus(Integer status) {
+        this.status = status;
+        return this;
+    }
+}

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

@@ -11,16 +11,26 @@ public class WeimobStoreClerkLogVO implements Serializable{
     /**
      * 日志主键
      */
-    private String id;
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long id;
     /**
      * 企业id
      */
-    private String enterpriseId;
+    private Integer enterpriseId;
     /**
      * 微盟商户id
      */
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long pid;
+
+    /**
+     *
+     */
+    private Integer storeInfoId;
+    /**
+     *
+     */
+    private Integer clerkId;
     /**
      * 门店编码
      */
@@ -67,20 +77,20 @@ public class WeimobStoreClerkLogVO implements Serializable{
      */
     private Integer status;
 
-    public String getId() {
+    public Long getId() {
         return id;
     }
 
-    public WeimobStoreClerkLogVO setId(String id) {
+    public WeimobStoreClerkLogVO setId(Long id) {
         this.id = id;
         return this;
     }
 
-    public String getEnterpriseId() {
+    public Integer getEnterpriseId() {
         return enterpriseId;
     }
 
-    public WeimobStoreClerkLogVO setEnterpriseId(String enterpriseId) {
+    public WeimobStoreClerkLogVO setEnterpriseId(Integer enterpriseId) {
         this.enterpriseId = enterpriseId;
         return this;
     }
@@ -94,6 +104,24 @@ public class WeimobStoreClerkLogVO implements Serializable{
         return this;
     }
 
+    public Integer getStoreInfoId() {
+        return storeInfoId;
+    }
+
+    public WeimobStoreClerkLogVO setStoreInfoId(Integer storeInfoId) {
+        this.storeInfoId = storeInfoId;
+        return this;
+    }
+
+    public Integer getClerkId() {
+        return clerkId;
+    }
+
+    public WeimobStoreClerkLogVO setClerkId(Integer clerkId) {
+        this.clerkId = clerkId;
+        return this;
+    }
+
     public String getStoreCode() {
         return storeCode;
     }