From c5dfad219835b81eea775f233b0374acd15cec75 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Thu, 15 Aug 2019 17:48:11 +0800 Subject: [PATCH] =?UTF-8?q?[POS][=E4=BF=AE=E6=94=B9]:=E4=BC=9A=E5=91=98?= =?UTF-8?q?=E8=AF=86=E5=88=AB=E5=88=B8=E8=BF=94=E5=9B=9E=E5=80=BC=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxCouponOrderController.java | 2 +- .../iformall/controller/PosController.java | 44 ++++++++++-- .../iformall/service/impl/PosServiceImpl.java | 19 +++-- .../com/iformall/pos/test/PosAppTest.java | 72 +++++++++++-------- .../java/com/iformall/common/ErrorCode.java | 2 + .../java/com/iformall/pay/WxPayConstant.java | 4 ++ .../service/WxCouponOrderService.java | 2 +- .../impl/WxCouponOrderServiceImpl.java | 8 +-- .../resources/mapper/WxCouponOrderMapper.xml | 18 ++++- 9 files changed, 118 insertions(+), 53 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java index 92eec461f..02c65b5e9 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java @@ -163,7 +163,7 @@ public class WxCouponOrderController extends BaseController { } if(couponOrder != null) { - wxCouponOrderService.sendInsideCouponVerifyMsg(couponOrder, wxMerchantBUser); + wxCouponOrderService.sendInsideCouponVerifyMsg(couponOrder.getTenantId(), couponOrderId, wxMerchantBUser.getId()); } return new ResultData(couponOrder); diff --git a/mallinkPosApi/src/main/java/com/iformall/controller/PosController.java b/mallinkPosApi/src/main/java/com/iformall/controller/PosController.java index 317c6fdc6..e920a1411 100644 --- a/mallinkPosApi/src/main/java/com/iformall/controller/PosController.java +++ b/mallinkPosApi/src/main/java/com/iformall/controller/PosController.java @@ -30,6 +30,7 @@ public class PosController extends BaseController { private final PosService posService; private final ThDevInfoService thDevInfoService; + private final WxCouponOrderService couponOrderService; @ApiOperation(value = "获取会员折扣/优惠券/消费卡是否启用", notes = "{" + "\"dev_id\":\"string(必填)\"," + @@ -106,7 +107,7 @@ public class PosController extends BaseController { "\"pos_amount\":\"string(单位:分)(必填)\"," + "\"nonce_str\":\"string(必填)\"}") @PostMapping("/checkMem") - @SystemControllerLog(description = "获取会员折扣/优惠券/消费卡是否启用") + @SystemControllerLog(description = "会员识别") public Map checkMem(@RequestBody Map params) { JSONObject payContent = new JSONObject(); @@ -145,6 +146,7 @@ public class PosController extends BaseController { "\"pos_order_id\":\"string(选填)\"," + "\"pos_amount\":\"单位(分)(选填)\"}") @PostMapping("/checkCouponOrderForVerify") + @SystemControllerLog(description = "券核销检查") public Map checkCouponOrderVerify(@RequestBody Map params) { JSONObject payContent = new JSONObject(); @@ -182,6 +184,7 @@ public class PosController extends BaseController { "\"pos_order_id\":\"string(必填)\"," + "\"pos_amount\":\"string(必填)\"}") @PostMapping("/couponOrderPreVerify") + @SystemControllerLog(description = "券预核销") public Map couponOrderPreVerify(@RequestBody Map params) { JSONObject payContent = new JSONObject(); @@ -218,6 +221,7 @@ public class PosController extends BaseController { "\"nonce_str\":\"string(必填)\" +" + "\"pos_order_id\":\"string(必填)\" }") @PostMapping("/couponOrderPreVerifyCancel") + @SystemControllerLog(description = "券预核销取消") public Map couponOrderPreVerifyCancel(@RequestBody Map params) { JSONObject payContent = new JSONObject(); @@ -254,6 +258,7 @@ public class PosController extends BaseController { "\"nonce_str\":\"string(必填)\" +" + "\"pos_order_id\":\"string(必填)\" }") @PostMapping("/couponOrderIndependentVerify") + @SystemControllerLog(description = "券独立核销") public Map couponOrderIndependentVerify(@RequestBody Map params) { JSONObject payContent = new JSONObject(); @@ -268,8 +273,6 @@ public class PosController extends BaseController { try { retMap = posService.couponOrderVerifyDo(params, EnumVerifyActionType.VERIFY_INDEPENT); - return buildReturnMap(retMap, resKey, WxPayConstant.RET_SUCCESS, "", - WxPayConstant.RET_SUCCESS, null); } catch (MallinkException e) { return buildReturnMap(retMap, resKey, WxPayConstant.RET_SUCCESS, "", WxPayConstant.RET_FAIL, @@ -279,6 +282,30 @@ public class PosController extends BaseController { WxPayConstant.RET_FAIL, 500, e.getMessage()); } + + String tenantId = params.get(WxPayConstant.TENANT_ID); // 租户ID + String buUserIdStr = params.get(WxPayConstant.BUSER_ID); // POS操作员ID + String couponOrderIdStr = params.get(WxPayConstant.COUPON_ORDER_ID); // 券ID + Long buUserId, couponOrderId; + try { + buUserId = Long.valueOf(buUserIdStr); + couponOrderId = Long.valueOf(couponOrderIdStr); + } catch (NumberFormatException e) { + logger.error(e.getMessage()); + throw new MallinkException(ErrorCode.SYS_PARAMETER_CAST_ERROR.getCode(), e.getMessage()); + } + String returnCode = retMap.get(WxPayConstant.RETURN_CODE); + String resultCode = retMap.get(WxPayConstant.RESULT_CODE); + String errCode = retMap.get(WxPayConstant.ERR_CODE); + if(returnCode.equalsIgnoreCase(WxPayConstant.RET_SUCCESS) && + resultCode.equalsIgnoreCase(WxPayConstant.RET_SUCCESS) && + StringUtils.isBlank(errCode)) { + // 无异常信息,核销成功 + couponOrderService.sendInsideCouponVerifyMsg(tenantId, couponOrderId, buUserId); + } + + return buildReturnMap(retMap, resKey, WxPayConstant.RET_SUCCESS, "", + WxPayConstant.RET_SUCCESS, null); } @ApiOperation(value = "券交易核销-单个优惠券接口", notes = "{" + @@ -290,6 +317,7 @@ public class PosController extends BaseController { "\"nonce_str\":\"string(必填)\" +" + "\"pos_order_id\":\"string(必填)\" }") @PostMapping("/couponOrderPayVerifyOne") + @SystemControllerLog(description = "券交易核销-单个优惠券接口") public Map couponOrderPayVerify(@RequestBody Map params) { JSONObject payContent = new JSONObject(); @@ -327,6 +355,7 @@ public class PosController extends BaseController { "\"pos_order_id\":\"string(必填)\"" + "\"pay_amount\":\"单位(分)(必填)\" }") @PostMapping("/couponOrderPayVerifyList") + @SystemControllerLog(description = "券交易核销-优惠券列表接口") public Map couponOrderPayVerifyList(@RequestBody Map params) { JSONObject payContent = new JSONObject(); @@ -364,6 +393,7 @@ public class PosController extends BaseController { "\"pos_order_id\":\"string(必填)\"" + "\"force\":\"string(选填true/false)\" }") @PostMapping("/couponOrderVerifyCancel") + @SystemControllerLog(description = "券核销取消") public Map couponOrderIndependentVerifyCancel(@RequestBody Map params) { JSONObject payContent = new JSONObject(); @@ -391,7 +421,7 @@ public class PosController extends BaseController { } } - @ApiOperation(value = "消费卡支付接口", notes = "{" + + @ApiOperation(value = "消费卡预支付", notes = "{" + "\"dev_id\":\"string(必填)\"," + "\"tenant_id\":\"string(必填)\"," + "\"merchant_id\":\"string(必填)\"," + @@ -400,7 +430,8 @@ public class PosController extends BaseController { "\"pos_order_id\":\"string(必填)\"," + "\"pos_amount\":\"string(必填)\"," + "\"card_id\":\"string(必填)\" }") - @PostMapping("/cardPay") + @PostMapping("/cardPayPre") + @SystemControllerLog(description = "消费卡预支付") public Map cardPay(@RequestBody Map params) { JSONObject payContent = new JSONObject(); @@ -428,7 +459,7 @@ public class PosController extends BaseController { } } - @ApiOperation(value = "卡支付取消", notes = "{" + + @ApiOperation(value = "消费卡支付取消", notes = "{" + "\"dev_id\":\"string(必填)\"," + "\"tenant_id\":\"string(必填)\"," + "\"merchant_id\":\"string(必填)\"," + @@ -438,6 +469,7 @@ public class PosController extends BaseController { "\"nonce_str\":\"string(必填)\"," + "\"force\":\"string(选填true/false)\" }") @PostMapping("/cardPayCancel") + @SystemControllerLog(description = "消费卡支付取消") public Map cardPayCancel(@RequestBody Map params) { JSONObject payContent = new JSONObject(); diff --git a/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java b/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java index e50231624..18880222d 100644 --- a/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java +++ b/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java @@ -232,19 +232,12 @@ public class PosServiceImpl implements PosService { coQ.put("cUserId", user.getId()); coQ.put("merchantId", merchantId); coQ.put("posOrderId", posOrderId); + coQ.put("posPayVerify", "1"); // 支付核销券需要 + /// coQ.put("posIndepVerify", "1"); List couponOrderList = couponOrderService.findAvailCouponOrder(coQ); if (couponOrderList.size() > 0) { retMap.put(WxPayConstant.AVAIL_CO_LIST, - JSONArray.toJSONString( - couponOrderList - .stream() - .filter(co -> - (co.get("type") == EnumCouponType.COUPON_MULTIMCH.getCode() || - co.get("type") == EnumCouponType.COUPON_MANJIAN.getCode() || - co.get("type") == EnumCouponType.COUPON_DAIJIN.getCode() - )) - .collect(Collectors.toList()) - )); + JSONArray.toJSONString(couponOrderList)); } else { retMap.put(WxPayConstant.AVAIL_CO_LIST, "[]"); } @@ -827,6 +820,12 @@ public class PosServiceImpl implements PosService { logger.error(ErrorCode.COUPON_ORDER_IS_NULL.getMessage() + ": " + couponOrderIdStr); throw new MallinkException(ErrorCode.COUPON_ORDER_IS_NULL); } + // 5. 有价券无法反向, 补贴券无法反向 + WxCoupon coupon = couponMapper.selectByPrimaryKey(couponOrderCVo.getCouponId()); + if (coupon.getSalePrice() > 0 || coupon.getSubsidyNum() > 0) { + logger.error("券包ID: " + couponOrderCVo.getId() + "核销无法退回"); + throw new MallinkException(ErrorCode.POS_COUPON_ORDER_VERIFY_NOT_CANCEL); + } // 6. 检查适用门店 WxCouponMerchant wxCouponMerchant = new WxCouponMerchant(); wxCouponMerchant.setProductId(couponOrderCVo.getCouponId()); diff --git a/mallinkPosApi/src/test/java/com/iformall/pos/test/PosAppTest.java b/mallinkPosApi/src/test/java/com/iformall/pos/test/PosAppTest.java index 567effc14..df7536bca 100644 --- a/mallinkPosApi/src/test/java/com/iformall/pos/test/PosAppTest.java +++ b/mallinkPosApi/src/test/java/com/iformall/pos/test/PosAppTest.java @@ -45,6 +45,20 @@ public class PosAppTest { private static final String devResKey = "VE#1fB2PhUe@&3Of"; private static final String tenantId = "456"; + private static final String merchantId = "320833942159982592"; // 东软专用 + private static final String buUserId = "320834180694245376"; + + /* + coupon_order_id, coupon_type, 售价, 面额 + 321872988134408192, 4, 0, 2000, 免费券 + 321877927162249216, 2, 0, 10000, 免费券 + 321878123232591872, 2, 1, 10000, 有价券 + 321878185355214848, 1, 0, 10000, 免费券 + 321878223800205312, 6, 0, 1000, 免费券 + 321878329906921472, 6, 1, 1000, 有价券 + 321882224846667776, 8, 1, 1500, 有价券 + 321883878446825472, 100, 1, 50000, 消费卡 + */ @Test public void versionTest() throws Exception { @@ -60,8 +74,8 @@ public class PosAppTest { public void signErrorTest() throws Exception { Map reqObj = new HashMap<>(); reqObj.put(WxPayConstant.DEV_ID, ""); - reqObj.put(WxPayConstant.TENANT_ID, "456"); - reqObj.put(WxPayConstant.MERCHANT_ID, "456"); + reqObj.put(WxPayConstant.TENANT_ID, tenantId); + reqObj.put(WxPayConstant.MERCHANT_ID, merchantId); reqObj.put(WxPayConstant.BUSER_ID, ""); reqObj.put(WxPayConstant.COUPON_ORDER_ID, ""); reqObj.put(WxPayConstant.NONCE_STR, ""); @@ -127,7 +141,7 @@ public class PosAppTest { Map reqObj = new HashMap<>(); reqObj.put(WxPayConstant.DEV_ID, devId); reqObj.put(WxPayConstant.TENANT_ID, tenantId); - reqObj.put(WxPayConstant.MERCHANT_ID, "320833942159982592"); + reqObj.put(WxPayConstant.MERCHANT_ID, merchantId); // reqObj.put(WxPayConstant.MEM_ID, "321178010928119808"); reqObj.put(WxPayConstant.MEM_PHONE, "13910154397"); reqObj.put(WxPayConstant.POS_ORDER_ID, "1"); @@ -152,10 +166,10 @@ public class PosAppTest { public void checkCouponOrderForIndeepdentVerifyTest() throws Exception { Map reqObj = new HashMap<>(); reqObj.put(WxPayConstant.DEV_ID, devId); - reqObj.put(WxPayConstant.TENANT_ID, "456"); - reqObj.put(WxPayConstant.MERCHANT_ID, "317109453987631104"); - reqObj.put(WxPayConstant.BUSER_ID, "317111133332426752"); - reqObj.put(WxPayConstant.COUPON_ORDER_ID, "318978990426783744"); + reqObj.put(WxPayConstant.TENANT_ID, tenantId); + reqObj.put(WxPayConstant.MERCHANT_ID, merchantId); + reqObj.put(WxPayConstant.BUSER_ID, buUserId); + reqObj.put(WxPayConstant.COUPON_ORDER_ID, "321872988134408192"); reqObj.put(WxPayConstant.NONCE_STR, "1"); reqObj.put(WxPayConstant.VERIFY_TYPE, "independent"); reqObj.put(WxPayConstant.POS_ORDER_ID, "1"); @@ -180,9 +194,9 @@ public class PosAppTest { public void checkCouponOrderForPayVerifyTest() throws Exception { Map reqObj = new HashMap<>(); reqObj.put(WxPayConstant.DEV_ID, devId); - reqObj.put(WxPayConstant.TENANT_ID, "456"); - reqObj.put(WxPayConstant.MERCHANT_ID, "317109453987631104"); - reqObj.put(WxPayConstant.BUSER_ID, "317111133332426752"); + reqObj.put(WxPayConstant.TENANT_ID, tenantId); + reqObj.put(WxPayConstant.MERCHANT_ID, merchantId); + reqObj.put(WxPayConstant.BUSER_ID, buUserId); reqObj.put(WxPayConstant.COUPON_ORDER_ID, "318978990426783744"); reqObj.put(WxPayConstant.NONCE_STR, "1"); reqObj.put(WxPayConstant.VERIFY_TYPE, "pay"); @@ -208,10 +222,10 @@ public class PosAppTest { public void couponOrderIndependentVerifyTest() throws Exception { Map reqObj = new HashMap<>(); reqObj.put(WxPayConstant.DEV_ID, devId); - reqObj.put(WxPayConstant.TENANT_ID, "456"); - reqObj.put(WxPayConstant.MERCHANT_ID, "317109453987631104"); - reqObj.put(WxPayConstant.BUSER_ID, "317111133332426752"); - reqObj.put(WxPayConstant.COUPON_ORDER_ID, "318978990426783744"); + reqObj.put(WxPayConstant.TENANT_ID, tenantId); + reqObj.put(WxPayConstant.MERCHANT_ID, merchantId); + reqObj.put(WxPayConstant.BUSER_ID, buUserId); + reqObj.put(WxPayConstant.COUPON_ORDER_ID, "321872988134408192"); reqObj.put(WxPayConstant.NONCE_STR, "1"); reqObj.put(WxPayConstant.POS_ORDER_ID, "1"); reqObj.put(WxPayConstant.SIGN, WxPayment.createSignHMAC(reqObj, devReqKey)); @@ -235,9 +249,9 @@ public class PosAppTest { public void couponOrderVerifyCancelTest() throws Exception { Map reqObj = new HashMap<>(); reqObj.put(WxPayConstant.DEV_ID, devId); - reqObj.put(WxPayConstant.TENANT_ID, "456"); - reqObj.put(WxPayConstant.MERCHANT_ID, "317109453987631104"); - reqObj.put(WxPayConstant.BUSER_ID, "317111133332426752"); + reqObj.put(WxPayConstant.TENANT_ID, tenantId); + reqObj.put(WxPayConstant.MERCHANT_ID, merchantId); + reqObj.put(WxPayConstant.BUSER_ID, buUserId); reqObj.put(WxPayConstant.COUPON_ORDER_ID, "318978990426783744"); reqObj.put(WxPayConstant.NONCE_STR, "1"); reqObj.put(WxPayConstant.POS_ORDER_ID, "1"); @@ -261,9 +275,9 @@ public class PosAppTest { public void couponOrderPreVerifyTest() throws Exception { Map reqObj = new HashMap<>(); reqObj.put(WxPayConstant.DEV_ID, devId); - reqObj.put(WxPayConstant.TENANT_ID, "456"); - reqObj.put(WxPayConstant.MERCHANT_ID, "317109453987631104"); - reqObj.put(WxPayConstant.BUSER_ID, "317111133332426752"); + reqObj.put(WxPayConstant.TENANT_ID, tenantId); + reqObj.put(WxPayConstant.MERCHANT_ID, merchantId); + reqObj.put(WxPayConstant.BUSER_ID, buUserId); reqObj.put(WxPayConstant.COUPON_ORDER_ID, "318978990426783744"); reqObj.put(WxPayConstant.NONCE_STR, "1"); reqObj.put(WxPayConstant.POS_ORDER_ID, "1"); @@ -288,9 +302,9 @@ public class PosAppTest { public void couponOrderPreVerifyCancelTest() throws Exception { Map reqObj = new HashMap<>(); reqObj.put(WxPayConstant.DEV_ID, devId); - reqObj.put(WxPayConstant.TENANT_ID, "456"); - reqObj.put(WxPayConstant.MERCHANT_ID, "317109453987631104"); - reqObj.put(WxPayConstant.BUSER_ID, "317111133332426752"); + reqObj.put(WxPayConstant.TENANT_ID, tenantId); + reqObj.put(WxPayConstant.MERCHANT_ID, merchantId); + reqObj.put(WxPayConstant.BUSER_ID, buUserId); reqObj.put(WxPayConstant.COUPON_ORDER_ID, "318978990426783744"); reqObj.put(WxPayConstant.NONCE_STR, "1"); reqObj.put(WxPayConstant.POS_ORDER_ID, "1"); @@ -314,9 +328,9 @@ public class PosAppTest { public void couponOrderPayVerifyTest() throws Exception { Map reqObj = new HashMap<>(); reqObj.put(WxPayConstant.DEV_ID, devId); - reqObj.put(WxPayConstant.TENANT_ID, "456"); - reqObj.put(WxPayConstant.MERCHANT_ID, "317109453987631104"); - reqObj.put(WxPayConstant.BUSER_ID, "317111133332426752"); + reqObj.put(WxPayConstant.TENANT_ID, tenantId); + reqObj.put(WxPayConstant.MERCHANT_ID, merchantId); + reqObj.put(WxPayConstant.BUSER_ID, buUserId); reqObj.put(WxPayConstant.COUPON_ORDER_ID, "318978990426783744"); reqObj.put(WxPayConstant.NONCE_STR, "1"); reqObj.put(WxPayConstant.POS_ORDER_ID, "1"); @@ -341,9 +355,9 @@ public class PosAppTest { public void couponOrderPayVerifyListTest() throws Exception { Map reqObj = new HashMap<>(); reqObj.put(WxPayConstant.DEV_ID, devId); - reqObj.put(WxPayConstant.TENANT_ID, "456"); - reqObj.put(WxPayConstant.MERCHANT_ID, "317109453987631104"); - reqObj.put(WxPayConstant.BUSER_ID, "317111133332426752"); + reqObj.put(WxPayConstant.TENANT_ID, tenantId); + reqObj.put(WxPayConstant.MERCHANT_ID, merchantId); + reqObj.put(WxPayConstant.BUSER_ID, buUserId); reqObj.put(WxPayConstant.SELECTED_COUPON_ORDER_LIST, "[\"318978990426783744\"]"); reqObj.put(WxPayConstant.NONCE_STR, "1"); reqObj.put(WxPayConstant.POS_ORDER_ID, "1"); diff --git a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java index f7f3c87d6..3efb6245e 100644 --- a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java +++ b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java @@ -238,6 +238,8 @@ public enum ErrorCode{ POS_CONFIG_NOT_FOUND(11100, "POS会员相关未设置"), POS_CONFIG_MEM_DISCOUNT_DISABLE(11101, "POS会员折扣未启用"), POS_CONFIG_MEM_COUPON_DISABLE(11102, "POS会员优惠券未启用"), + POS_COUPON_ORDER_VERIFY_NOT_CANCEL(11103, "此券核销无法取消"), + POS_CAR_PAY_NOT_CANCEL(11104, "卡支付无法取消"), /** diff --git a/mallinkService/src/main/java/com/iformall/pay/WxPayConstant.java b/mallinkService/src/main/java/com/iformall/pay/WxPayConstant.java index 01ea446f7..2b45dd78a 100644 --- a/mallinkService/src/main/java/com/iformall/pay/WxPayConstant.java +++ b/mallinkService/src/main/java/com/iformall/pay/WxPayConstant.java @@ -49,6 +49,10 @@ public class WxPayConstant { public final static String DEDUCT_AMOUNT = "deduct_amount"; public final static String REMAIN_AMOUNT = "remain_amount"; + public final static String REAL_AMOUNT = "real_amount"; + public final static String SALE_PRICE = "sale_price"; + public final static String SALE_FEE = "sale_fee"; + public final static String ORG_AMOUNT = "org_amount"; public final static String RET = "ret"; diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java index 42e63f8dd..58a2bfbf3 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java @@ -57,7 +57,7 @@ public interface WxCouponOrderService { /** * 核销后发送消息 */ - void sendInsideCouponVerifyMsg(WxCouponOrder couponOrder, WxMerchantBUser bUser); + void sendInsideCouponVerifyMsg(String tenantId, Long couponOrderId, Long buUserId); /** * 核销后处理 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 3570c364a..2fafcbdfc 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -387,12 +387,12 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { } @Override - public void sendInsideCouponVerifyMsg(WxCouponOrder couponOrder, WxMerchantBUser bUser) { + public void sendInsideCouponVerifyMsg(String tenantId, Long couponOrderId, Long buUserId) { FmInsideCouponVerifyMsg verifyMsg = new FmInsideCouponVerifyMsg(); verifyMsg.setMsgType(EnumMsgRecordType.INSIDE_COUPON_VERIFY.getCode()); - verifyMsg.setTenantId(couponOrder.getTenantId()); - verifyMsg.setCouponOrderId(couponOrder.getId()); - verifyMsg.setBUserId(bUser.getId()); + verifyMsg.setTenantId(tenantId); + verifyMsg.setCouponOrderId(couponOrderId); + verifyMsg.setBUserId(buUserId); mqBaseProducer.sendMessage(verifyMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); } diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index 81b2efc72..837668451 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -1044,7 +1044,8 @@