Browse Source

[卡转赠][修改][查询状态]

release_toaliyun_real
gongbiao 7 years ago
parent
commit
b88dc8de40
3 changed files with 8 additions and 9 deletions
  1. +0
    -7
      mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java
  2. +2
    -2
      mallinkService/src/main/java/com/iformall/common/ErrorCode.java
  3. +6
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java

+ 0
- 7
mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java View File

@@ -183,13 +183,6 @@ public class WxCouponOrderController extends BaseController {
if (cUserId == null) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "cUserId不能为空");
}
//当前领取人
wxCouponOrder.setOwnerId(getUserId());
//转赠者与当前领取人是否为同一个
if (cUserId.equals(wxCouponOrder.getOwnerId())) {
logger.info("转赠人与卡所有者相同");
return new ResultData(ErrorCode.CARD_TRANSFER_INVALID.getCode(), "转赠人与卡所有者相同");
}

return wxCouponOrderService.queryCardStatus(wxCouponOrder);
}


+ 2
- 2
mallinkService/src/main/java/com/iformall/common/ErrorCode.java View File

@@ -166,8 +166,8 @@ public enum ErrorCode{
CARD_IS_NOT_FOUND(9001, "优惠卡不存在"),
CARD_REMAIN_AMOUNT_IS_NOT_ENOUGH(9002, "优惠卡余额不足"),
CARD_IS_NOT_COST(9003, "优惠卡未消费,退款请用卡券退款,钱直接退回购买人手里"),
CARD_TRANSFERED(9004, "消费卡已被领取"),
CARD_TRANSFER_INVALID(9005, "消费卡已失效"),
CARD_TRANSFERED(9004, "卡已被领取"),
CARD_TRANSFER_INVALID(9005, "卡转赠已失效"),

/**
* 卡消费


+ 6
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java View File

@@ -772,6 +772,12 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
logger.info("转赠人与目前卡所有者不相同," + "转赠人:" + cUserId + ",当前所有者:" + ownerId);
return new ResultData(ErrorCode.CARD_TRANSFERED);
}
//判断卡是否已消费
//面额与余额是否相同
if (!cardCVo.getAmount().equals(cardCVo.getRemainingAmount())) {
logger.info("面额与余额不相同");
return new ResultData(ErrorCode.CARD_TRANSFER_INVALID);
}
return new ResultData(Result.SUCCESS, "查询成功");
}



Loading…
Cancel
Save