Просмотр исходного кода

商户注券->新建商户发券

release_toaliyun_real
Burce 6 лет назад
Родитель
Сommit
ef96158a41
3 измененных файлов: 31 добавлений и 0 удалений
  1. +19
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendController.java
  2. +1
    -0
      mallinkService/src/main/java/com/iformall/common/ErrorCode.java
  3. +11
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java

+ 19
- 0
mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendController.java Просмотреть файл

@@ -1,5 +1,6 @@
package com.iformall.controller.market; package com.iformall.controller.market;


import com.alibaba.fastjson.JSONObject;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog; import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.ErrorCode; import com.iformall.common.ErrorCode;
@@ -105,6 +106,24 @@ public class WxCouponSendController extends BaseController {
if (!EnumCouponSendType.PASSIVE.getCode().equals(wxCoupon.getSendType())) { if (!EnumCouponSendType.PASSIVE.getCode().equals(wxCoupon.getSendType())) {
return new ResultData(ErrorCode.COUPON_TYPE_IS_NOT_PASSIVE); return new ResultData(ErrorCode.COUPON_TYPE_IS_NOT_PASSIVE);
} }

//商户卡库存校验
if(Objects.equals(wxCouponSend.getSendType(),EnumCouponSendSendType.MERCHANT.getCode())) {
JSONObject jo = JSONObject.parseObject(wxCouponSend.getConditions()) ;
if(Objects.isNull(jo)||!jo.containsKey(WxCouponSend.KEY_LIMIT)) {
return new ResultData(ErrorCode.COUPON_SEND_LIMIT_VERIFY);
}
WxCoupon queryById = new WxCoupon() ;
queryById.setId(wxCouponSend.getId());
WxCoupon wxCouponOfDb = wxCouponService.findById(queryById);
if(Objects.isNull(wxCouponOfDb)) {
return new ResultData(ErrorCode.COUPON_IS_EMPTY);
}
if(jo.getInteger(WxCouponSend.KEY_LIMIT) >wxCouponOfDb.getRemainInventory()) {
return new ResultData(ErrorCode.REMAIN_IS_EMPTY);
}
}

wxCouponSend.setTenantId(wxCoupon.getTenantId()); wxCouponSend.setTenantId(wxCoupon.getTenantId());
wxCouponSend.setTitle(wxCoupon.getTitle()); wxCouponSend.setTitle(wxCoupon.getTitle());




+ 1
- 0
mallinkService/src/main/java/com/iformall/common/ErrorCode.java Просмотреть файл

@@ -191,6 +191,7 @@ public enum ErrorCode{
COUPON_ORDER_IS_EARLIER_THAN_VALIDDATE(4006, "卡券使用期还未开始"), COUPON_ORDER_IS_EARLIER_THAN_VALIDDATE(4006, "卡券使用期还未开始"),
COUPON_ORDER_IS_LATER_THAN_VALIDDATE(4007, "卡券使用期已结束"), COUPON_ORDER_IS_LATER_THAN_VALIDDATE(4007, "卡券使用期已结束"),
COUPON_ORDER_IS_PRE_VERIFY(4008, "卡券已被预核销"), COUPON_ORDER_IS_PRE_VERIFY(4008, "卡券已被预核销"),
COUPON_SEND_LIMIT_VERIFY(4009, "商户卡库存错误"),


/** /**
* 卡 * 卡


+ 11
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java Просмотреть файл

@@ -16,10 +16,21 @@ import java.util.List;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class WxCouponSend extends BaseEntity { public class WxCouponSend extends BaseEntity {


/**
* 卡券ids
*/
@Transient @Transient
public static final String KEY_COUPONIDS = "couponIds" ; public static final String KEY_COUPONIDS = "couponIds" ;
/**
* beforeDays
*/
@Transient @Transient
public static final String KEY_BEFOREDAYS = "beforeDays" ; public static final String KEY_BEFOREDAYS = "beforeDays" ;
/**
* limit 商户券库存
*/
@Transient
public static final String KEY_LIMIT = "limit" ;


@Id @Id
protected Long id; protected Long id;


Загрузка…
Отмена
Сохранить