From 9e163f6f4a177867b65fdb2ca1d74104a95d4c38 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 5 Mar 2019 17:44:36 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=8B=BC=E5=9B=A2][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E4=B8=8B=E5=8D=95=E9=97=AE=E9=A2=98]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/controller/WxOrderController.java | 2 +- .../java/com/iformall/service/impl/WxOrderServiceImpl.java | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java index 4bbd798dd..45092e3ce 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java @@ -98,7 +98,7 @@ public class WxOrderController extends BaseController { if (StringUtils.isBlank(couponChannelIdStr)) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "couponChannelId不能为空"); } - Long couponChannelId = 0L, couponId = 0L, orderGroupId = 0L; + Long couponChannelId = 0L, couponId = 0L, orderGroupId = null; boolean isPress = false; if (StringUtils.isNotBlank(couponChannelIdStr)) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java index 5e9678379..6da867701 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -341,6 +341,11 @@ public class WxOrderServiceImpl implements WxOrderService { payment = coupon.getPrice(); } + if (orderGroupId == null) { + // 拼团券 初始是全价即面额 + payment = coupon.getPrice(); + } + final IdWorker idWorker = IdWorker.get(); Long orderNumber = idWorker.nextId(); @@ -370,6 +375,7 @@ public class WxOrderServiceImpl implements WxOrderService { record.setCreateDate(curr); record.setUpdateDate(curr); record.setOrderGroupId(orderGroupId); + if (isPress) { // 初始砍价信息 record.setPressCurrentNum(0);