Browse Source

fix:修复场景投放劵列表规则

release_toaliyun_real
xmzhao71 2 years ago
parent
commit
95e403025c
3 changed files with 54 additions and 25 deletions
  1. +30
    -25
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java
  2. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java
  3. +21
    -0
      mallinkService/src/main/java/com/iformall/enums/EnumCouponType.java

+ 30
- 25
mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java View File

@@ -34,10 +34,7 @@ import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.*;

@RestController
@RequestMapping("wxCoupon")
@@ -75,6 +72,10 @@ public class WxCouponController extends BaseController {
logger.debug("[" + getIpAddr() + "] WxCouponController::list");
if (wxCoupon == null) wxCoupon = new WxCoupon();
wxCoupon.updateTenantInfo(getTenantInfo());
// 处理场景投放发劵显示筛选
if (wxCoupon.getSpecifyShowFlag() != null && Boolean.TRUE.equals(wxCoupon.getSpecifyShowFlag())) {
wxCoupon.setTypes(EnumCouponType.getWxSendCouponType());
}
return couponList(wxCoupon, pageNum, pageSize, isList);
}
@@ -142,27 +143,31 @@ public class WxCouponController extends BaseController {
logger.debug("[" + getIpAddr() + "] WxCouponController::list");
if (wxCoupon == null) wxCoupon = new WxCoupon();
wxCoupon.updateTenantInfo(getTenantInfo());
Integer[] typeArray = {
EnumCouponType.COUPON_MANJIAN.getCode(),
EnumCouponType.COUPON_DAIJIN.getCode(),
// EnumCouponType.COUPON_TUANGOU.getCode(),
EnumCouponType.COUPON_LIPIN.getCode(),
EnumCouponType.COUPON_TINGCHE.getCode(),
EnumCouponType.COUPON_MULTIMCH.getCode(),
EnumCouponType.COUPON_DOUYIN.getCode(),
EnumCouponType.COUPON_PRESS.getCode(),
EnumCouponType.COUPON_PREORDER.getCode(),
EnumCouponType.COUPON_DOUYIN_GO_HOME.getCode(),
EnumCouponType.COUPON_DOUYIN_DAIJIN.getCode()};

wxCoupon.setTypes(Arrays.asList(typeArray));

Integer[] sendTypeArray = {
EnumCouponSendType.ACTIVE.getCode(),
EnumCouponSendType.PASSIVE.getCode(),};

wxCoupon.setSendTypes(Arrays.asList(sendTypeArray));

// Integer[] typeArray = {
// EnumCouponType.COUPON_MANJIAN.getCode(),
// EnumCouponType.COUPON_DAIJIN.getCode(),
//// EnumCouponType.COUPON_TUANGOU.getCode(),
// EnumCouponType.COUPON_LIPIN.getCode(),
// EnumCouponType.COUPON_TINGCHE.getCode(),
// EnumCouponType.COUPON_MULTIMCH.getCode(),
// EnumCouponType.COUPON_DOUYIN.getCode(),
// EnumCouponType.COUPON_PRESS.getCode(),
// EnumCouponType.COUPON_PREORDER.getCode(),
// EnumCouponType.COUPON_DOUYIN_GO_HOME.getCode(),
// EnumCouponType.COUPON_DOUYIN_DAIJIN.getCode()};
//
// wxCoupon.setTypes(Arrays.asList(typeArray));
//
// Integer[] sendTypeArray = {
// EnumCouponSendType.ACTIVE.getCode(),
// EnumCouponSendType.PASSIVE.getCode(),};
//
// wxCoupon.setSendTypes(Arrays.asList(sendTypeArray));

// 处理场景投放发劵显示筛选
if (wxCoupon.getSpecifyShowFlag() != null && Boolean.TRUE.equals(wxCoupon.getSpecifyShowFlag())) {
wxCoupon.setTypes(EnumCouponType.getWxTriggerSendCouponType());
}
if(StringUtils.isNotBlank(wxCoupon.getSortColumn())){
String coryColumn = "c."+wxCoupon.getSortColumns();
wxCoupon.setSortColumns(coryColumn);


+ 3
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java View File

@@ -533,5 +533,8 @@ public class WxCoupon extends TenantEntity {

@io.swagger.annotations.ApiModelProperty(value = "商品版本 EnumCouponVersion", name = "version")
private Integer version;

@io.swagger.annotations.ApiModelProperty(value = "场景投放发劵显示筛选")
private Boolean specifyShowFlag;
}

+ 21
- 0
mallinkService/src/main/java/com/iformall/enums/EnumCouponType.java View File

@@ -134,6 +134,27 @@ public enum EnumCouponType {
return typeList;
}

public static List<Integer> getWxSendCouponType(){
List<Integer> typeList = new ArrayList<>();
typeList.add(COUPON_MANJIAN.getCode());
typeList.add(COUPON_DAIJIN.getCode());
typeList.add(COUPON_LIPIN.getCode());
typeList.add(COUPON_TINGCHE.getCode());
typeList.add(COUPON_MULTIMCH.getCode());
return typeList;
}

public static List<Integer> getWxTriggerSendCouponType(){
List<Integer> typeList = new ArrayList<>();
typeList.add(COUPON_MANJIAN.getCode());
typeList.add(COUPON_DAIJIN.getCode());
typeList.add(COUPON_LIPIN.getCode());
typeList.add(COUPON_MULTIMCH.getCode());
typeList.add(COUPON_PRESS.getCode());
typeList.add(COUPON_GROUP.getCode());
return typeList;
}

public static EnumAppPlat getAppPlat(Integer couponType){
if(getWeiXinType().contains(couponType)){
return EnumAppPlat.WX;


Loading…
Cancel
Save