From 8179c56cef12e494e19e1beca97de7c2c9e215a6 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Wed, 23 Oct 2019 11:24:54 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=94=B6=E9=93=B6=E5=8F=B0][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9]:=E6=94=B6=E9=93=B6=E5=8F=B0=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E5=88=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxMicroPayController.java | 6 ++--- .../java/com/iformall/pay/WxPayConstant.java | 2 ++ .../impl/WxCouponOrderServiceImpl.java | 26 ++++++++----------- 3 files changed, 16 insertions(+), 18 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java index d575ec359..bd0e46644 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java @@ -334,7 +334,7 @@ public class WxMicroPayController extends BaseController { 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(); if (order != null) { Map orderMap = new HashMap(); @@ -342,8 +342,8 @@ public class WxMicroPayController extends BaseController { orderMap.put("payment", order.getPayment()); retMap.put("order", orderMap); } - if (avaList.size() > 0) { - retMap.put("avaList", avaList); + if (coList.size() > 0) { + retMap.put("coList", coList); } return new ResultData(retMap); } diff --git a/mallinkService/src/main/java/com/iformall/pay/WxPayConstant.java b/mallinkService/src/main/java/com/iformall/pay/WxPayConstant.java index 401d55a26..087113564 100644 --- a/mallinkService/src/main/java/com/iformall/pay/WxPayConstant.java +++ b/mallinkService/src/main/java/com/iformall/pay/WxPayConstant.java @@ -92,6 +92,8 @@ public class WxPayConstant { public final static String COUPON_ID = "coupon_id"; 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"; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index 4997ad56b..55685f01d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -1051,7 +1051,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { public JSONArray queryMicroPayCouponOrder(WxMerchantBUser user, WxCUser cUser, Integer payPrice) { Map coQ = new HashMap<>(); coQ.put("tenantId", user.getTenantId()); - coQ.put("cUserId", user.getId()); + coQ.put("cUserId", cUser.getId()); coQ.put("merchantId", user.getMerchantId()); List avaCoList = wxCouponOrderMapper.findAvailCouponOrder(coQ); JSONArray couponList = new JSONArray(); @@ -1117,29 +1117,25 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { 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. 生成优惠券抵扣信息 retObj.put(WxPayConstant.COUPON_ID, couponOrderCVo.getId().toString()); 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())); 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 (payPrice < couponOrderCVo.getUsePrice()) { + retObj.put(WxPayConstant.ENABLE, EnumPosEnableType.Disable.getCode()); + } else { + retObj.put(WxPayConstant.ENABLE, EnumPosEnableType.Enable.getCode()); + } } 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); } return retObj;