|
|
|
@@ -578,7 +578,7 @@ public class PosServiceImpl implements PosService { |
|
|
|
} |
|
|
|
|
|
|
|
// 3. 满减券检查使用金额 |
|
|
|
if (couponType.equals(EnumCouponType.COUPON_MANJIAN.getCode())) { |
|
|
|
if (couponType.equals(EnumCouponType.COUPON_MANJIAN)) { |
|
|
|
if (promotionCalc.getOrderAmount() < couponOrderCVo.getUsePrice()) { |
|
|
|
logger.error(ErrorCode.VERIFY_MANJIAN_USER_PRICE_NOT_TOUCH.getMessage()); |
|
|
|
throw new MallinkException(ErrorCode.VERIFY_MANJIAN_USER_PRICE_NOT_TOUCH); |
|
|
|
@@ -590,9 +590,20 @@ public class PosServiceImpl implements PosService { |
|
|
|
retObj.put(WxPayConstant.TITLE, couponOrderCVo.getTitle()); |
|
|
|
retObj.put(WxPayConstant.COUPON_TYPE, couponType.getMessage()); |
|
|
|
retObj.put(WxPayConstant.COVER_IMG, couponOrderCVo.getCoverImg()); |
|
|
|
retObj.put(WxPayConstant.PRICE, String.valueOf(couponOrderCVo.getPrice())); |
|
|
|
retObj.put(WxPayConstant.SALE_PRICE, String.valueOf(couponOrderCVo.getSalePrice())); |
|
|
|
retObj.put(WxPayConstant.COUPON_DES, String.format("过期时间: %s", mydateFormat.format(couponOrderCVo.getExpiredTime()))); |
|
|
|
retObj.put(WxPayConstant.PRICE, couponOrderCVo.getPrice()); |
|
|
|
retObj.put(WxPayConstant.SALE_PRICE, couponOrderCVo.getSalePrice()); |
|
|
|
if (couponType.equals(EnumCouponType.COUPON_MANJIAN)) { |
|
|
|
retObj.put(WxPayConstant.USE_PRICE, couponOrderCVo.getSalePrice()); |
|
|
|
String des = String.format("%s-满%s元可用,可抵%s元, 过期时间: %s", |
|
|
|
couponType.getMessage(), couponOrderCVo.getUsePriceStr(), couponOrderCVo.getPriceStr(), |
|
|
|
mydateFormat.format(couponOrderCVo.getExpiredTime())); |
|
|
|
retObj.put(WxPayConstant.COUPON_DES, des); |
|
|
|
} else { |
|
|
|
String des = String.format("%s-可抵%s元, 过期时间: %s", |
|
|
|
couponType.getMessage(), couponOrderCVo.getPriceStr(), |
|
|
|
mydateFormat.format(couponOrderCVo.getExpiredTime())); |
|
|
|
retObj.put(WxPayConstant.COUPON_DES, des); |
|
|
|
} |
|
|
|
if (couponSelected) { |
|
|
|
retObj.put(WxPayConstant.IS_SELECTED, String.valueOf(EnumPosSelect.SELECTED.getCode())); |
|
|
|
Integer remainAmount = promotionCalc.getAmountLeftAfterPay() - couponOrderCVo.getPrice(); |
|
|
|
|