@@ -535,7 +535,7 @@ public class PosServiceImpl implements PosService {
*/
private JSONObject oneCouponPay(PromotionCalc promotionCalc, WxCouponOrderCVo couponOrderCVo, Long merchantId, Long buUserId, Long posOrderId, boolean couponSelected) {
JSONObject retObj = new JSONObject();
Date now = new Date();
Date curDate = new Date();
// 2. 检查券类型 支付可用(1, 2, 6),
EnumCouponType couponType = EnumCouponType.getEnum(couponOrderCVo.getCouponType());
@@ -561,17 +561,28 @@ public class PosServiceImpl implements PosService {
retObj.put(WxPayConstant.COVER_IMG, couponOrderCVo.getCoverImg());
retObj.put(WxPayConstant.PRICE, couponOrderCVo.getPrice());
retObj.put(WxPayConstant.SALE_PRICE, couponOrderCVo.getSalePrice());
retObj.put(WxPayConstant.EXPIRE_TIME, mydateFormat.format(couponOrderCVo.getExpiredTime()));
if (couponType.equals(EnumCouponType.COUPON_MANJIAN)) {
retObj.put(WxPayConstant.USE_PRICE, couponOrderCVo.getUsePrice());
String des = String.format("%s-满%s元可用,可抵%s元, 过期时间: %s",
couponType.getMessage(), couponOrderCVo.getUsePriceStr(), couponOrderCVo.getPriceStr(),
mydateFormat.format(couponOrderCVo.getExpiredTime()));
String des = String.format("满%s元可用,可抵%s元",couponOrderCVo.getUsePriceStr(), couponOrderCVo.getPriceStr());
retObj.put(WxPayConstant.COUPON_DES, des);
if (promotionCalc.getOrderAmount() < couponOrderCVo.getUsePrice()) {
retObj.put(WxPayConstant.ENABLE, EnumPosEnableType.Disable.getCode());
} else {
if (curDate.before(couponOrderCVo.getExpiredTime())) {
retObj.put(WxPayConstant.ENABLE, EnumPosEnableType.Enable.getCode());
} else {
retObj.put(WxPayConstant.ENABLE, EnumPosEnableType.Disable.getCode());
}
}
} else {
String des = String.format("%s-可抵%s元, 过期时间: %s",
couponType.getMessage(), couponOrderCVo.getPriceStr(),
mydateFormat.format(couponOrderCVo.getExpiredTime()));
String des = String.format("可抵%s元", couponOrderCVo.getPriceStr());
retObj.put(WxPayConstant.COUPON_DES, des);
if (curDate.before(couponOrderCVo.getExpiredTime())) {
retObj.put(WxPayConstant.ENABLE, EnumPosEnableType.Enable.getCode());
} else {
retObj.put(WxPayConstant.ENABLE, EnumPosEnableType.Disable.getCode());
}
}
if (couponSelected) {
// 5. get coupon