Przeglądaj źródła

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

release_toaliyun_real
Stormeye Wu 6 lat temu
rodzic
commit
8179c56cef
3 zmienionych plików z 16 dodań i 18 usunięć
  1. +3
    -3
      mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java
  2. +2
    -0
      mallinkService/src/main/java/com/iformall/pay/WxPayConstant.java
  3. +11
    -15
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java

+ 3
- 3
mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java Wyświetl plik

@@ -334,7 +334,7 @@ public class WxMicroPayController extends BaseController {
return new ResultData(ErrorCode.ORDER_IS_FAIL, e.getMessage()); return new ResultData(ErrorCode.ORDER_IS_FAIL, e.getMessage());
} }


JSONArray avaList = wxCouponOrderService.queryMicroPayCouponOrder(user, cUser, payment);
JSONArray coList = wxCouponOrderService.queryMicroPayCouponOrder(user, cUser, payment);
Map retMap = new HashMap(); Map retMap = new HashMap();
if (order != null) { if (order != null) {
Map orderMap = new HashMap(); Map orderMap = new HashMap();
@@ -342,8 +342,8 @@ public class WxMicroPayController extends BaseController {
orderMap.put("payment", order.getPayment()); orderMap.put("payment", order.getPayment());
retMap.put("order", orderMap); retMap.put("order", orderMap);
} }
if (avaList.size() > 0) {
retMap.put("avaList", avaList);
if (coList.size() > 0) {
retMap.put("coList", coList);
} }
return new ResultData(retMap); return new ResultData(retMap);
} }


+ 2
- 0
mallinkService/src/main/java/com/iformall/pay/WxPayConstant.java Wyświetl plik

@@ -92,6 +92,8 @@ public class WxPayConstant {
public final static String COUPON_ID = "coupon_id"; public final static String COUPON_ID = "coupon_id";
public final static String COUPON_TYPE = "coupon_type"; public final static String COUPON_TYPE = "coupon_type";
public final static String IS_SELECTED = "is_selected"; 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_RESULT = "coupon_refund_result";
public final static String COUPON_REFUND_ID = "coupon_refund_id"; public final static String COUPON_REFUND_ID = "coupon_refund_id";


+ 11
- 15
mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java Wyświetl plik

@@ -1051,7 +1051,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
public JSONArray queryMicroPayCouponOrder(WxMerchantBUser user, WxCUser cUser, Integer payPrice) { public JSONArray queryMicroPayCouponOrder(WxMerchantBUser user, WxCUser cUser, Integer payPrice) {
Map<String, Object> coQ = new HashMap<>(); Map<String, Object> coQ = new HashMap<>();
coQ.put("tenantId", user.getTenantId()); coQ.put("tenantId", user.getTenantId());
coQ.put("cUserId", user.getId());
coQ.put("cUserId", cUser.getId());
coQ.put("merchantId", user.getMerchantId()); coQ.put("merchantId", user.getMerchantId());
List<WxCouponOrderCVo> avaCoList = wxCouponOrderMapper.findAvailCouponOrder(coQ); List<WxCouponOrderCVo> avaCoList = wxCouponOrderMapper.findAvailCouponOrder(coQ);
JSONArray couponList = new JSONArray(); JSONArray couponList = new JSONArray();
@@ -1117,29 +1117,25 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
throw new MallinkException(ErrorCode.COUPON_ORDER_IS_EARLIER_THAN_VALIDDATE); throw new MallinkException(ErrorCode.COUPON_ORDER_IS_EARLIER_THAN_VALIDDATE);
} }


// 5. 满减券检查使用金额
if (couponType.equals(EnumCouponType.COUPON_MANJIAN)) {
if (payPrice < couponOrderCVo.getUsePrice()) {
logger.error(ErrorCode.VERIFY_MANJIAN_USER_PRICE_NOT_TOUCH.getMessage());
throw new MallinkException(ErrorCode.VERIFY_MANJIAN_USER_PRICE_NOT_TOUCH);
}
}

// 6. 生成优惠券抵扣信息 // 6. 生成优惠券抵扣信息
retObj.put(WxPayConstant.COUPON_ID, couponOrderCVo.getId().toString()); retObj.put(WxPayConstant.COUPON_ID, couponOrderCVo.getId().toString());
retObj.put(WxPayConstant.TITLE, couponOrderCVo.getTitle()); retObj.put(WxPayConstant.TITLE, couponOrderCVo.getTitle());
retObj.put(WxPayConstant.COUPON_TYPE, couponType.getMessage()); retObj.put(WxPayConstant.COUPON_TYPE, couponType.getMessage());
retObj.put(WxPayConstant.PRICE, couponOrderCVo.getPrice()); retObj.put(WxPayConstant.PRICE, couponOrderCVo.getPrice());
retObj.put(WxPayConstant.EXPIRE, mydateFormat.format(couponOrderCVo.getExpiredTime()));
if (couponType.equals(EnumCouponType.COUPON_MANJIAN)) { if (couponType.equals(EnumCouponType.COUPON_MANJIAN)) {
retObj.put(WxPayConstant.USE_PRICE, couponOrderCVo.getUsePrice()); 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); retObj.put(WxPayConstant.COUPON_DES, des);
if (payPrice < couponOrderCVo.getUsePrice()) {
retObj.put(WxPayConstant.ENABLE, EnumPosEnableType.Disable.getCode());
} else {
retObj.put(WxPayConstant.ENABLE, EnumPosEnableType.Enable.getCode());
}
} else { } else {
String des = String.format("%s-可抵%s元, 过期时间: %s",
couponType.getMessage(), couponOrderCVo.getPriceStr(),
mydateFormat.format(couponOrderCVo.getExpiredTime()));
retObj.put(WxPayConstant.ENABLE, EnumPosEnableType.Enable.getCode());
String des = String.format("可抵%s元", couponOrderCVo.getPriceStr());
retObj.put(WxPayConstant.COUPON_DES, des); retObj.put(WxPayConstant.COUPON_DES, des);
} }
return retObj; return retObj;


Ładowanie…
Anuluj
Zapisz