From 86b7f6b155a8561b9467aa9bd2e84e519584d677 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Thu, 16 Sep 2021 15:33:06 +0800 Subject: [PATCH] fix order --- .../java/com/iformall/controller/WxCouponOrderController.java | 3 ++- .../com/iformall/service/impl/WxCouponOrderServiceImpl.java | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java index 980031e13..7532e6f81 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java @@ -322,7 +322,8 @@ public class WxCouponOrderController extends BaseController { return new ResultData(couponOrder); } - + + @ApiOperation(value = "根据couponOrderId查询接口", notes = "{\"couponOrderId\":\"string\"}") @PostMapping("/findById") public ResultData findById(@RequestBody Map paramMap) { 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 4045a8f3b..d55cea112 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -572,14 +572,14 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { if (EnumComposeOrder.isSingle(couponOrder.getComposeOrderType())) { try { // 核销分账 - shareAfterVerify(couponOrder, bUser.getMerchantId(),couponOrder.getPayVendor(),true); + shareAfterVerify(couponOrder, bUser.getMerchantId(),couponOrder.getPayVendor(),false); } catch (Exception e) { logger.error("核销记账失败"+e.getMessage(),e); } }else { try { // 核销分账 - shareAfterVerify(couponOrder, bUser.getMerchantId(),couponOrder.getPayVendor(),false); + shareAfterVerify(couponOrder, bUser.getMerchantId(),couponOrder.getPayVendor(),true); } catch (Exception e) { logger.error("核销记账失败"+e.getMessage(),e); }