Browse Source

[收银台][修改]:收银台支持券

release_toaliyun_real
Stormeye Wu 6 years ago
parent
commit
a175f20161
3 changed files with 29 additions and 11 deletions
  1. +18
    -7
      mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java
  2. +0
    -1
      mallinkService/src/main/java/com/iformall/pay/WxPayConstant.java
  3. +11
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java

+ 18
- 7
mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java View File

@@ -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


+ 0
- 1
mallinkService/src/main/java/com/iformall/pay/WxPayConstant.java View File

@@ -93,7 +93,6 @@ public class WxPayConstant {
public final static String COUPON_TYPE = "coupon_type";
public final static String IS_SELECTED = "is_selected";
public final static String ENABLE = "enable";
public final static String EXPIRE = "expire";

public final static String COUPON_REFUND_RESULT = "coupon_refund_result";
public final static String COUPON_REFUND_ID = "coupon_refund_id";


+ 11
- 3
mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java View File

@@ -1122,7 +1122,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
retObj.put(WxPayConstant.TITLE, couponOrderCVo.getTitle());
retObj.put(WxPayConstant.COUPON_TYPE, couponType.getMessage());
retObj.put(WxPayConstant.PRICE, couponOrderCVo.getPrice());
retObj.put(WxPayConstant.EXPIRE, mydateFormat.format(couponOrderCVo.getExpiredTime()));
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元",
@@ -1131,10 +1131,18 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
if (payPrice < couponOrderCVo.getUsePrice()) {
retObj.put(WxPayConstant.ENABLE, EnumPosEnableType.Disable.getCode());
} else {
retObj.put(WxPayConstant.ENABLE, EnumPosEnableType.Enable.getCode());
if (curDate.before(couponOrderCVo.getExpiredTime())) {
retObj.put(WxPayConstant.ENABLE, EnumPosEnableType.Enable.getCode());
} else {
retObj.put(WxPayConstant.ENABLE, EnumPosEnableType.Disable.getCode());
}
}
} else {
retObj.put(WxPayConstant.ENABLE, EnumPosEnableType.Enable.getCode());
if (curDate.before(couponOrderCVo.getExpiredTime())) {
retObj.put(WxPayConstant.ENABLE, EnumPosEnableType.Enable.getCode());
} else {
retObj.put(WxPayConstant.ENABLE, EnumPosEnableType.Disable.getCode());
}
String des = String.format("可抵%s元", couponOrderCVo.getPriceStr());
retObj.put(WxPayConstant.COUPON_DES, des);
}


Loading…
Cancel
Save