From 176767299f9590fcbdfb4deba14db5da54a280a8 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Fri, 19 Oct 2018 15:31:08 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=81=9C=E8=BD=A6=E5=88=B8][=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D]:=E5=81=9C=E8=BD=A6=E5=88=B8=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=87=BA=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/controller/WxCarController.java | 3 +++ .../src/main/resources/mapper/WxCouponOrderMapper.xml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java index 3d0be0128..b0b07a7c8 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java @@ -649,7 +649,10 @@ public class WxCarController extends BaseController { WxCouponOrderCarCVo userCar = null; WxCouponOrderCarCVo userCarQ = new WxCouponOrderCarCVo(); userCarQ.setTenantId(user.getTenantId()); + userCarQ.setCUserId(user.getId()); + userCarQ.setType(EnumCouponType.COUPON_TINGCHE.getCode()); userCarQ.setId(couponOrderId); + userCarQ.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USE_WAIT.getCode()); List list = wxCouponOrderService.carlistCUserVo(userCarQ); if (list.size() > 0) { userCar = list.get(0); diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index c4d5fd9c5..2513c15da 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -569,6 +569,9 @@ and co.type = #{type} + + and c.id = #{id} + AND c.coupon_order_status = #{couponOrderStatus}