From 77ab396aa777bddb2beecea31d46e84364877653 Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 26 Apr 2022 13:19:13 +0800 Subject: [PATCH] //update push --- .../com/iformall/service/impl/WxPayOrderServiceImpl.java | 4 +++- .../msg/impl/FmInsideOrderPushMsgServiceImpl.java | 9 ++++----- .../pay/douyin/miniApp/TtMiniAppPayAdapterService.java | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java index 4e5f2b208..c071bc562 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java @@ -1325,8 +1325,10 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { @Override public WxPayOrder getByObj(WxPayOrder payOrderQ) { List list = wxPayOrderMapper.findList(payOrderQ); - if (list.size() > 0) { + if (list != null && list.size() == 1) { return list.get(0); + }else if(list != null && list.size() > 1){ + throw new MallinkException(ErrorCode.PAY_ORDER_ERROR); } return null; } diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideOrderPushMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideOrderPushMsgServiceImpl.java index e35f774c3..e4e90559d 100644 --- a/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideOrderPushMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideOrderPushMsgServiceImpl.java @@ -4,15 +4,10 @@ import com.iformall.common.ErrorCode; import com.iformall.domain.po.*; import com.iformall.domain.po.msg.BaseMsg; import com.iformall.domain.po.msg.FmInsideOrderPushMsg; -import com.iformall.domain.po.msg.FmInsideOrderRefundMsg; -import com.iformall.domain.vo.WxOrderCouponVo; import com.iformall.enums.EnumComposeOrder; -import com.iformall.enums.EnumPayType; import com.iformall.enums.EnumPayWay; import com.iformall.exception.MallinkException; import com.iformall.mapper.TtCUserMapper; -import com.iformall.mapper.WxBatchOrderMapper; -import com.iformall.mapper.WxCUserMapper; import com.iformall.mapper.WxPayOrderMapper; import com.iformall.service.*; import com.iformall.service.msg.MsgSendService; @@ -49,6 +44,9 @@ public class FmInsideOrderPushMsgServiceImpl implements MsgSendService { @Autowired TtCUserMapper ttCUserMapper; + @Autowired + WxPayOrderMapper wxPayOrderMapper; + @Override public void send(BaseMsg baseMsg) throws Exception{ @@ -67,6 +65,7 @@ public class FmInsideOrderPushMsgServiceImpl implements MsgSendService { logger.error("主订单未找到: " + msg.getBatchOrderId()); throw new MallinkException(ErrorCode.ORDER_IS_NOT_FIND.getCode(), "主订单未找到" + msg.getBatchOrderId()); } + if(EnumPayWay.PAY_WAY_TT.getCode().equals(batchOrder.getPayVendor()) && EnumComposeOrder.SINGLE.getCode().equals(batchOrder.getOrderType()) && batchOrder.getOrders().size() == 1){ diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/douyin/miniApp/TtMiniAppPayAdapterService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/douyin/miniApp/TtMiniAppPayAdapterService.java index fa7bf01e9..f9a0a0619 100644 --- a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/douyin/miniApp/TtMiniAppPayAdapterService.java +++ b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/douyin/miniApp/TtMiniAppPayAdapterService.java @@ -104,7 +104,7 @@ public class TtMiniAppPayAdapterService extends BaseTtPayAdapterService implemen WxOrderCouponVo wxOrderCouponVo = batchOrder.getOrders().get(0); Map orderDetail = new HashMap<>(); - orderDetail.put("order_id",batchOrder.getId().toString()); + orderDetail.put("order_id",payOrder.getPayOrderNo()); orderDetail.put("create_time",batchOrder.getCreateDate().getTime()); orderDetail.put("status", getTtOrderStatus(wxOrderCouponVo.getOrderStatus(),wxOrderCouponVo.getCouponOrderStatus()).getMessage()); orderDetail.put("total_price",batchOrder.getPayment());