From 569260ea7e27016783aaf0ab848c6f603002c385 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Fri, 16 Aug 2019 11:03:53 +0800 Subject: [PATCH] =?UTF-8?q?[POS][=E4=BF=AE=E6=94=B9]:=E5=88=B8=E6=A0=B8?= =?UTF-8?q?=E9=94=80/=E6=A0=B8=E9=94=80=E5=8F=96=E6=B6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/iformall/service/impl/PosServiceImpl.java | 6 +++--- .../src/test/java/com/iformall/pos/test/PosAppTest.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) 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 f9c49b422..b013fa978 100644 --- a/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java +++ b/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java @@ -26,7 +26,6 @@ import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; @Service @AllArgsConstructor @@ -1014,11 +1013,12 @@ public class PosServiceImpl implements PosService { couponOrder.setId(couponOrderCVo.getId()); couponOrder.setTenantId(couponOrderCVo.getTenantId()); couponOrder.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USED.getCode()); //1核销 - if (actionType.equals(EnumVerifyActionType.VERIFY_PAY)) { + if (couponOrderCVo.getCouponOrderStatus().equals(EnumCouponOrderStatus.POS_PRE_VERIFY.getCode()) && + actionType.equals(EnumVerifyActionType.VERIFY_PAY)) { couponOrder.setBUserId(buUserId); } couponOrder.setUpdateDate(new Date()); - if (actionType.equals(EnumVerifyActionType.VERIFY_INDEPENT)) { + if (couponOrder.getBUserId() == null) { num = couponOrderMapper.updateVerifyCouponOrder(couponOrder); } else { num = couponOrderMapper.updateVerifyCouponOrderStatus(couponOrder); 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 08e7e9799..319fc62d7 100644 --- a/mallinkPosApi/src/test/java/com/iformall/pos/test/PosAppTest.java +++ b/mallinkPosApi/src/test/java/com/iformall/pos/test/PosAppTest.java @@ -360,7 +360,7 @@ public class PosAppTest { 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.SELECTED_COUPON_ORDER_LIST, "[\"321878223800205312\"]"); reqObj.put(WxPayConstant.NONCE_STR, "1"); reqObj.put(WxPayConstant.POS_ORDER_ID, "1"); reqObj.put(WxPayConstant.POS_AMOUNT, "200");