微盟店铺卡券配置接口

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/wm/WmCouponDTO.java

+package com.gic.enterprise.dto.wm;
+
+import java.io.Serializable;
+
+public class WmCouponDTO implements Serializable{
+    private static final long serialVersionUID = -6461391431608411393L;
+    /**
+     * 微盟卡券ID
+     */
+    private Long wmCouponId;
+
+    /**
+     * 店铺主键
+     */
+    private Integer wmMallStoreId;
+
+    public Long getWmCouponId() {
+        return wmCouponId;
+    }
+
+    public WmCouponDTO setWmCouponId(Long wmCouponId) {
+        this.wmCouponId = wmCouponId;
+        return this;
+    }
+
+    public Integer getWmMallStoreId() {
+        return wmMallStoreId;
+    }
+
+    public WmCouponDTO setWmMallStoreId(Integer wmMallStoreId) {
+        this.wmMallStoreId = wmMallStoreId;
+        return this;
+    }
+}

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

@@ -4,6 +4,7 @@ import com.gic.api.base.commons.ServiceResponse;
 import com.gic.enterprise.dto.WmMemberCardConfigDTO;
 import com.gic.enterprise.dto.WmOrderConfigDTO;
 import com.gic.enterprise.dto.WmStoreDTO;
+import com.gic.enterprise.dto.wm.WmCouponDTO;
 import com.gic.enterprise.dto.wm.WmStoreConfigDTO;
 import com.gic.enterprise.dto.wm.WmStoreCouponConfigDTO;
 
@@ -116,13 +117,12 @@ public interface WmStoreApiService {
     ServiceResponse<Void> saveCouponConfig(WmStoreCouponConfigDTO dto);
 
     /**
-     * 根据gic查询微盟绑定的卡券ID，店铺唯一
+     * 根据gic查询微盟绑定的卡券ID
      * @Title: getWmCouponId

      * @Description:
     
* @author guojuxing
      * @param couponId
-     * @param wmMallStoreId
店铺主键
-     * @return  com.gic.api.base.commons.ServiceResponse<java.lang.Long>

+     * @return  com.gic.enterprise.dto.wm.WmCouponDTO
     
*/
-    ServiceResponse<Long> getWmCouponId(Long couponId, Integer wmMallStoreId);
+    ServiceResponse<List<WmCouponDTO>> getWmCouponId(Long couponId);
 }

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

@@ -3,6 +3,8 @@ package com.gic.enterprise.dao.mapper;
 import com.gic.enterprise.entity.TabWmStoreCouponConfig;
 import com.gic.enterprise.qo.wm.CouponConfigQO;
 
+import java.util.List;
+
 public interface TabWmStoreCouponConfigMapper {
     /**
      * 根据主键删除
@@ -52,5 +54,5 @@ public interface TabWmStoreCouponConfigMapper {
      */
     int updateByPrimaryKey(TabWmStoreCouponConfig record);
 
-    TabWmStoreCouponConfig getCouponConfig(CouponConfigQO params);
+    List<TabWmStoreCouponConfig> getCouponConfig(CouponConfigQO params);
 }
\ No newline at end of file

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

@@ -4,6 +4,8 @@ import com.gic.enterprise.dto.wm.WmStoreCouponConfigDTO;
 import com.gic.enterprise.entity.TabWmStoreCouponConfig;
 import com.gic.enterprise.qo.wm.CouponConfigQO;
 
+import java.util.List;
+
 public interface WmStoreCouponConfigService {
 
     /**
@@ -24,5 +26,5 @@ public interface WmStoreCouponConfigService {
      * @param params

      * @return  com.gic.enterprise.entity.TabWmStoreCouponConfig

     
*/
-    TabWmStoreCouponConfig getCouponConfig(CouponConfigQO params);
+    List<TabWmStoreCouponConfig> getCouponConfig(CouponConfigQO params);
 }

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

@@ -10,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
+import java.util.List;
 
 @Service("wmStoreCouponConfigService")
 public class WmStoreCouponConfigServiceImpl implements WmStoreCouponConfigService{
@@ -27,7 +28,7 @@ public class WmStoreCouponConfigServiceImpl implements WmStoreCouponConfigServic
     }
 
     @Override
-    public TabWmStoreCouponConfig getCouponConfig(CouponConfigQO params) {
+    public List<TabWmStoreCouponConfig> getCouponConfig(CouponConfigQO params) {
         return tabWmStoreCouponConfigMapper.getCouponConfig(params);
     }
 }

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

@@ -6,10 +6,12 @@ import java.util.stream.Collectors;
 import com.alibaba.fastjson.JSON;
 import com.gic.commons.util.StringUtil;
 import com.gic.enterprise.dto.WmOrderConfigDTO;
+import com.gic.enterprise.dto.wm.WmCouponDTO;
 import com.gic.enterprise.dto.wm.WmStoreCouponConfigDTO;
 import com.gic.enterprise.entity.TabWmStoreCouponConfig;
 import com.gic.enterprise.qo.wm.CouponConfigQO;
 import com.gic.enterprise.service.WmStoreCouponConfigService;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -188,18 +190,18 @@ public class WmStoreApiServiceImpl implements WmStoreApiService {
         if (StringUtils.isBlank(dto.getWmCouponId())) {
             return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "微盟卡券为空");
         }
-        TabWmStoreCouponConfig gicRecord = wmStoreCouponConfigService
+        List<TabWmStoreCouponConfig> gicRecord = wmStoreCouponConfigService
                 .getCouponConfig(new CouponConfigQO()
                         .setWmMainAccount(dto.getWmMainAccount())
                         .setGicCouponId(dto.getGicCouponId()));
-        if (gicRecord != null) {
+        if (CollectionUtils.isNotEmpty(gicRecord)) {
             return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "gic卡券重复绑定");
         }
-        TabWmStoreCouponConfig wmRecord = wmStoreCouponConfigService
+        List<TabWmStoreCouponConfig> wmRecord = wmStoreCouponConfigService
                 .getCouponConfig(new CouponConfigQO()
                         .setWmMainAccount(dto.getWmMainAccount())
                         .setWmCouponId(dto.getWmCouponId()));
-        if (wmRecord != null) {
+        if (CollectionUtils.isNotEmpty(wmRecord)) {
             return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "微盟卡券重复绑定");
         }
         wmStoreCouponConfigService.saveCouponConfig(dto);
@@ -207,19 +209,20 @@ public class WmStoreApiServiceImpl implements WmStoreApiService {
     }
 
     @Override
-    public ServiceResponse<Long> getWmCouponId(Long couponId, Integer wmMallStoreId) {
-        TabWmStore wmStore = wmStoreService.getByWmMallStoreId(wmMallStoreId);
-        if (wmStore == null) {
-            return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "店铺不存在");
-        }
-        TabWmStoreCouponConfig gicRecord = wmStoreCouponConfigService
+    public ServiceResponse<List<WmCouponDTO>> getWmCouponId(Long couponId) {
+        List<TabWmStoreCouponConfig> gicRecord = wmStoreCouponConfigService
                 .getCouponConfig(new CouponConfigQO()
-                        .setWmMainAccount(wmStore.getWmMainAccount())
                         .setGicCouponId(couponId.toString()));
-        if (gicRecord == null) {
+        if (CollectionUtils.isEmpty(gicRecord)) {
             return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "未绑定");
         }
-        return ServiceResponse.success(Long.valueOf(gicRecord.getWmCouponId()));
+        List<WmCouponDTO> list = gicRecord.stream().map(e -> {
+            WmCouponDTO temp = new WmCouponDTO();
+            temp.setWmCouponId(Long.valueOf(e.getWmCouponId()));
+            temp.setWmMallStoreId(wmStoreService.getByWmMainAccount(e.getWmMainAccount()).getWmMallStoreId());
+            return temp;
+        }).collect(Collectors.toList());
+        return ServiceResponse.success(list);
     }