|
|
|
@@ -497,7 +497,7 @@ public class PosServiceImpl implements PosService { |
|
|
|
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()); |
|
|
|
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())); |
|
|
|
@@ -557,7 +557,7 @@ public class PosServiceImpl implements PosService { |
|
|
|
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()); |
|
|
|
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())); |
|
|
|
|