From ca0be280d14c138a41d33f55dca3b788d3630810 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Sun, 3 May 2020 19:04:46 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=94=B6=E9=93=B6=E5=8F=B0][=E4=BC=98?= =?UTF-8?q?=E5=8C=96]:=E6=94=B6=E9=93=B6=E5=8F=B0=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E9=A2=84=E6=A0=B8=E9=94=80=E5=88=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/controller/WxMicroPayController.java | 9 +++++---- .../src/main/java/com/iformall/common/ErrorCode.java | 7 +++++++ .../java/com/iformall/mapper/WxCouponOrderMapper.java | 1 + .../service/impl/WxCouponOrderServiceImpl.java | 4 ++-- .../src/main/resources/mapper/WxCouponOrderMapper.xml | 10 ++++++++++ 5 files changed, 25 insertions(+), 6 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java index d2dcd8236..3279ed42a 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java @@ -415,6 +415,7 @@ public class WxMicroPayController extends BaseController { } wxCouponOrder = wxCouponOrderService.getById(couponOrderId); } + WxPayOrder couponPayOrder = null; Integer remainPrice = payPrice; if (wxCouponOrder != null) { @@ -437,12 +438,12 @@ public class WxMicroPayController extends BaseController { if (remainPrice > 0) { if (StringUtils.isBlank(authCode)) { - logger.error("authCode不能为空"); - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "authCode不能为空"); + logger.error("微信收款码/authCode不能为空"); + return new ResultData(ErrorCode.MICRO_PAY_NO_AUTHCODE.getCode(), "请提供微信收款码"); } if (!checkAuthCode(authCode)) { - logger.error("authCode不符合规则"); - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "authCode不符合规则"); + logger.error("微信收款码/authCode不符合规则: {}", authCode); + return new ResultData(ErrorCode.MICRO_PAY_ERR_AUTHCODE.getCode(), "请扫描微信收款码"); } WxPayOrder record = new WxPayOrder(); diff --git a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java index e884b878e..0e9ff5897 100644 --- a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java +++ b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java @@ -273,6 +273,13 @@ public enum ErrorCode{ POS_CARD_ORDER_NOT_FOUND(11113, "卡支付订单未找到"), POS_CMD_FAIL(11200, "POS命令错误"), + /** + * B端收银台 + */ + MICRO_PAY_NO_AUTHCODE(11300, "请提供微信收款码"), + MICRO_PAY_ERR_AUTHCODE(11301, "请提供微信收款码"), + + /** * 支付 diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderMapper.java index 32fb1e3dd..0c282b5c5 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderMapper.java @@ -24,6 +24,7 @@ public interface WxCouponOrderMapper extends CommonMapper { // 券包核销 int updateVerifyCouponOrder(WxCouponOrder wxCouponOrder); int updateVerifyCouponOrderStatus(WxCouponOrder wxCouponOrder); + int updateVerifyCouponOrderStatusForMicroPay(WxCouponOrder wxCouponOrder); int cancelVerifyCouponOrder(WxCouponOrder wxCouponOrder); //统一的计数接口 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 06413212b..e0c87eb76 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -1269,7 +1269,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { logger.error("核销异常:updatete num " + num); throw new MallinkException(ErrorCode.VERIFY_ERROR.getCode(), "updatete num " + num); } - } else if (couponOrder.getCouponOrderStatus() == EnumCouponOrderStatus.POS_PRE_VERIFY.getCode()) { + } else if (couponOrder.getCouponOrderStatus().equals(EnumCouponOrderStatus.POS_PRE_VERIFY.getCode())) { // 券已预核销后,但是未做支付,此券还能继续使用 // 1. update posOrderId PosCouponOrderVerify vQ = new PosCouponOrderVerify(); @@ -1294,7 +1294,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { couponOrder.setBUserId(bUser.getId()); couponOrder.setVerifyType(EnumCouponVerifyType.VERIFY_B.getCode()); couponOrder.setUpdateDate(new Date()); - num = wxCouponOrderMapper.updateVerifyCouponOrder(couponOrder); + num = wxCouponOrderMapper.updateVerifyCouponOrderStatusForMicroPay(couponOrder); } catch (Exception e) { logger.error("db failed: couponOrder-" + couponOrder.getId() + ", e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index e1901b3fa..9aae563c0 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -121,7 +121,17 @@ and `b_user_id` = #{bUserId} + + + update wx_coupon_order + set `coupon_order_status` = #{couponOrderStatus}, + `b_user_id` = #{bUserId}, + `update_date` = #{updateDate}, + `verify_type` = #{verifyType} + where 1=1 + and `tenant_id`=#{tenantId} + and id=#{id}