Преглед изворни кода

[卡券][修改]:卡券领取

release_toaliyun_real
Stormeye Wu пре 6 година
родитељ
комит
83c3f0bda7
2 измењених фајлова са 22 додато и 4 уклоњено
  1. +19
    -4
      mallinkCApi/src/main/java/com/iformall/controller/WxCouponPasswordController.java
  2. +3
    -0
      mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java

+ 19
- 4
mallinkCApi/src/main/java/com/iformall/controller/WxCouponPasswordController.java Прегледај датотеку

@@ -58,6 +58,16 @@ public class WxCouponPasswordController extends BaseController {
return new ResultData(500, e.getMessage());
}

WxCUser cuUser = getUser();
WxCoupon coupon = couponService.getById(couponPassword.getCouponId());
if (coupon == null) {
return new ResultData(ErrorCode.COUPON_IS_EMPTY);
}
if (coupon.getStatus().equals(EnumCouponStatus.COUPON_STATUS_TAKE_OFFF.getCode())) {
logger.error("此券已作废:" + coupon.getId());
return new ResultData(ErrorCode.COUPON_IS_TAKE_OFF);
}

// 2. 设置已使用
try {
WxCouponPassword updateCouponPwd = new WxCouponPassword();
@@ -71,10 +81,15 @@ public class WxCouponPasswordController extends BaseController {
}

// 3. 领取free coupon
WxCUser cuUser = getUser();
WxCoupon coupon = couponService.getById(couponPassword.getId());
// TODO ? check 卡券状态
orderService.saveFreeOrderForCoupon(cuUser, coupon, null, formId, couponPassword.getId());
try {
WxOrder order = orderService.saveFreeOrderForCoupon(cuUser, coupon, null, formId, couponPassword.getId());
} catch (MallinkException e) {
logger.error(e.getMessage());
return new ResultData(e.getErrorCode(), e.getMessage());
} catch (Exception e) {
logger.error(e.getMessage());
return new ResultData(500, e.getMessage());
}
return new ResultData();
}
}

+ 3
- 0
mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java Прегледај датотеку

@@ -83,6 +83,9 @@ public class WxOrderController extends BaseController {
if (coupon == null) {
return new ResultData(ErrorCode.COUPON_IS_EMPTY);
}
if (coupon.getStatus().equals(EnumCouponStatus.COUPON_STATUS_TAKE_OFFF.getCode())) {
return new ResultData(ErrorCode.COUPON_IS_TAKE_OFF);
}
WxOrder order = wxOrderService.saveOrderForCoupon(user, coupon, orderSaveDto, isPress);
return new ResultData(order);
} catch (MallinkException e) {


Loading…
Откажи
Сачувај