Browse Source

[订单购买限制][修改]:砍价券待支付状态添加

release_toaliyun_real
Stormeye Wu 7 years ago
parent
commit
fde5fce223
3 changed files with 62 additions and 12 deletions
  1. +23
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java
  2. +32
    -11
      mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java
  3. +7
    -0
      mallinkService/src/main/resources/mapper/WxOrderMapper.xml

+ 23
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java View File

@@ -99,6 +99,12 @@ public class WxOrder implements Serializable {
@io.swagger.annotations.ApiModelProperty(value="已砍价格",name="pressCurrentValue")
private Integer pressCurrentValue;

@Transient
protected List<Integer> statusS;

@Transient
protected String statusStr;



public Long getOrderNumber() {
@@ -236,7 +242,23 @@ public class WxOrder implements Serializable {
this.pressCurrentValue = pressCurrentValue;
}

public static enum Field
public List<Integer> getStatusS() {
return statusS;
}

public void setStatusS(List<Integer> statusS) {
this.statusS = statusS;
}

public String getStatusStr() {
return statusStr;
}

public void setStatusStr(String statusStr) {
this.statusStr = statusStr;
}

public static enum Field
{
Id_ASC("`id` ASC"),Id_DESC("`id` DESC")
,OrderNumber_ASC("`order_number` ASC"),OrderNumber_DESC("`order_number` DESC")


+ 32
- 11
mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java View File

@@ -173,19 +173,40 @@ public class WxOrderServiceImpl implements WxOrderService {
// + couponOrder ---待使用
int countOrder = 0, countCouponOrder = 0;

try {
WxOrder orderQ = new WxOrder();
orderQ.setTenantId(user.getTenantId());
orderQ.setProductId(counpon.getId());
orderQ.setType(EnumOrderType.COUPON.getCode());
orderQ.setcUserId(user.getId());
orderQ.setOrderStatus(EnumOrderStatus.ORDER_STATUS_PENDING_PAYMENT.getCode());
countOrder = wxOrderMapper.countList(orderQ);
} catch (Exception e) {
logger.error("购买是否超限-DB, couponId: " + counpon.getId() + ", e:" + e.getMessage());
throw new MallinkException(ErrorCode.ORDER_IS_FAIL);
if(counpon.getType().equals(EnumCouponType.COUPON_PRESS.getCode())) {
// 砍价券待支付有两个状态
try {
WxOrder orderQ = new WxOrder();
orderQ.setTenantId(user.getTenantId());
orderQ.setProductId(counpon.getId());
orderQ.setType(EnumOrderType.COUPON.getCode());
orderQ.setcUserId(user.getId());
List<Integer> statusS = new ArrayList<Integer>();
statusS.add(EnumOrderStatus.ORDER_STATUS_PRESSING.getCode());
statusS.add(EnumOrderStatus.ORDER_STATUS_PRESS_COMPLETE.getCode());
orderQ.setStatusS(statusS);
countOrder = wxOrderMapper.countList(orderQ);
} catch (Exception e) {
logger.error("购买是否超限-DB, couponId: " + counpon.getId() + ", e:" + e.getMessage());
throw new MallinkException(ErrorCode.ORDER_IS_FAIL);
}
} else {
// 非砍价券
try {
WxOrder orderQ = new WxOrder();
orderQ.setTenantId(user.getTenantId());
orderQ.setProductId(counpon.getId());
orderQ.setType(EnumOrderType.COUPON.getCode());
orderQ.setcUserId(user.getId());
orderQ.setOrderStatus(EnumOrderStatus.ORDER_STATUS_PENDING_PAYMENT.getCode());
countOrder = wxOrderMapper.countList(orderQ);
} catch (Exception e) {
logger.error("购买是否超限-DB, couponId: " + counpon.getId() + ", e:" + e.getMessage());
throw new MallinkException(ErrorCode.ORDER_IS_FAIL);
}
}


try {
WxCouponOrder couponOrderQ = new WxCouponOrder();
couponOrderQ.setTenantId(user.getTenantId());


+ 7
- 0
mallinkService/src/main/resources/mapper/WxOrderMapper.xml View File

@@ -97,6 +97,13 @@
and `press_current_value` = #{pressCurrentValue}
</if>

<if test=" null != statusS ">
and `status` in
<foreach collection="statusS" index="index" item="sItem" open="(" separator="," close=")">
#{sItem}
</foreach>
</if>

<if test=" null != ids ">
and id in
<foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")">


Loading…
Cancel
Save