From e373601b828bb6d7bca84091b52d74a398844727 Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 22 Jul 2022 15:37:22 +0800 Subject: [PATCH] // test --- .../iformall/controller/WxOrderController.java | 16 ++++++++-------- .../service/impl/WxOrderServiceImpl.java | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java index 92daa8dfe..8c398ce43 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java @@ -253,14 +253,14 @@ public class WxOrderController extends BaseController { data.put("pay_expire_seconds",14*60); data.put("order_entry_schema",wxOrderService.getOrderEntrySchema(order.getMainOrderId())); - List> order_goods_info = new ArrayList<>(); - for (CreateOrderCallback.Good good:createOrderCallback.getGoods()) { - Map map_info = new HashMap<>(); - map_info.put("goods_id",good.getGoodsId()); - map_info.put("merchant_uid","71070743816369953633"); - order_goods_info.add(map_info); - } - data.put("order_goods_info",order_goods_info); +// List> order_goods_info = new ArrayList<>(); +// for (CreateOrderCallback.Good good:createOrderCallback.getGoods()) { +// Map map_info = new HashMap<>(); +// map_info.put("goods_id",good.getGoodsId()); +// map_info.put("merchant_uid","71070743816369953633"); +// order_goods_info.add(map_info); +// } +// data.put("order_goods_info",order_goods_info); 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 3e7a3a07e..23b2518d0 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -3831,8 +3831,8 @@ public class WxOrderServiceImpl implements WxOrderService { } } - if (wxCouponChannel.getStatus() == EnumCouponChannelStatus.STATUS_TAKE_OFFF.getCode()) { - throw new MallinkException(ErrorCode.COUPON_CHANNEL_IS_TAKE_OFF.getCode(),premsg+"已下架"); + if (wxCouponChannel.getStatus() != EnumCouponChannelStatus.STATUS_THROW_IN.getCode()) { + throw new MallinkException(ErrorCode.COUPON_CHANNEL_IS_TAKE_OFF.getCode(),premsg+"暂未上架"); } if (null != wxCouponChannel.getChannelStock() && wxCouponChannel.getChannelStock() <= 0) {