From f8a32eecf2452103515d115dbb69607c31b3224d Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 15 Mar 2022 15:13:16 +0800 Subject: [PATCH] //push --- .../schedule/OrderExpiringSchedule.java | 17 +------------ .../com/iformall/domain/po/WxBatchOrder.java | 2 +- .../com/iformall/service/WxOrderService.java | 2 +- .../service/impl/WxOrderServiceImpl.java | 13 ++++------ .../service/impl/WxPayOrderServiceImpl.java | 2 +- .../FmInsideCouponVerifyMsgServiceImpl.java | 5 ++++ .../impl/FmInsideOrderPushMsgServiceImpl.java | 4 ++- .../miniApp/TtMiniAppPayAdapterService.java | 25 ++++++++++++------- .../main/resources/mapper/WxCouponMapper.xml | 4 +-- 9 files changed, 35 insertions(+), 39 deletions(-) diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java index b83218c50..5051d3e9e 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java @@ -353,7 +353,7 @@ public class OrderExpiringSchedule { wxOrderMapper.updateById(updateOrder); logger.info("券订单: " + order.getId() + " create at " + order.getCreateDate() + " expired at " + new Date()); - sendInsideOrderPushMsg(order,order.getComposeOrderId()); + wxOrderService.sendInsideOrderPushMsg(order,order.getComposeOrderId()); } @@ -466,19 +466,4 @@ public class OrderExpiringSchedule { } } - public void sendInsideOrderPushMsg(TenantEntity tenantEntity, Long mainOrderId) { - try{ - FmInsideOrderPushMsg orderPush = new FmInsideOrderPushMsg(); - orderPush.setDelayTimeLevel(5); - orderPush.setMsgType(EnumMsgRecordType.INSIDE_ORDER_PUSH.getCode()); - orderPush.updateTenantInfo(tenantEntity); - orderPush.setBatchOrderId(mainOrderId); - logger.info(">>>>>>>>>>>send sendInsideOrderPushMsg :"+orderPush); - mqBaseProducer.sendMessage(orderPush, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); - }catch(Exception e){ - logger.info(">>>>>>>>>>>send sendInsideOrderPushMsg : error"+e.getMessage()); - } - - } - } \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBatchOrder.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBatchOrder.java index 9587f1842..f6d69ef47 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBatchOrder.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBatchOrder.java @@ -46,7 +46,7 @@ public class WxBatchOrder extends TenantEntity { if(EnumAppPlat.WX.equals(appPlat)){ }else if (EnumAppPlat.TOUTIAO.equals(appPlat)){ - return Constant.mainPageUrl + "?type=dd&couponOrderId=" + id; + return Constant.mainPageUrl + "?type=dt&couponOrderId=" + id; } return null; } diff --git a/mallinkService/src/main/java/com/iformall/service/WxOrderService.java b/mallinkService/src/main/java/com/iformall/service/WxOrderService.java index acb8ef521..51d57d9d1 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxOrderService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxOrderService.java @@ -243,7 +243,7 @@ public interface WxOrderService { ResultData composeSaveOrder(boolean allowUnPayOrder,EnumComposeOrder composeOrderType,List composeOrderSaveDto,Long cUserId,EnumPayWay payWay,TenantEntity tenantEntity); - void sendInsideOrderPushMsg(WxComposeOrder composeOrder); + void sendInsideOrderPushMsg(TenantEntity tenantEntity,Long composeOrderId); PageInfo listGoodsCAsPage(WxOrder wxOrder, Integer pageNum, Integer pageSize); 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 5fdd75f29..ba9e4c3f6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -2060,10 +2060,7 @@ public class WxOrderServiceImpl implements WxOrderService { } if(ret == 1){ //订单同步 - WxComposeOrder composeOrder = new WxComposeOrder(); - composeOrder.updateTenantInfo(oldOrder); - composeOrder.setMainOrderId(oldOrder.getComposeOrderId()); - sendInsideOrderPushMsg(composeOrder); + sendInsideOrderPushMsg(oldOrder,oldOrder.getComposeOrderId()); } return ret; @@ -3064,7 +3061,7 @@ public class WxOrderServiceImpl implements WxOrderService { try { WxComposeOrder order = proxy.saveOrderForCoupon(tenantEntity,allowUnPayOrder,composeOrderType,wxCUserBasicInfo, composeOrderSaveDto, payWay); //订单同步消息 - sendInsideOrderPushMsg(order); + sendInsideOrderPushMsg(order,order.getMainOrderId()); return new ResultData(order); } catch (MallinkException e) { logger.error("saveOrderForCoupon error.",e); @@ -3084,13 +3081,13 @@ public class WxOrderServiceImpl implements WxOrderService { } @Override - public void sendInsideOrderPushMsg(WxComposeOrder composeOrder) { + public void sendInsideOrderPushMsg(TenantEntity tenantEntity,Long composeOrderId) { try{ FmInsideOrderPushMsg orderPush = new FmInsideOrderPushMsg(); orderPush.setDelayTimeLevel(5); orderPush.setMsgType(EnumMsgRecordType.INSIDE_ORDER_PUSH.getCode()); - orderPush.updateTenantInfo(composeOrder); - orderPush.setBatchOrderId(composeOrder.getMainOrderId()); + orderPush.updateTenantInfo(tenantEntity); + orderPush.setBatchOrderId(composeOrderId); logger.info(">>>>>>>>>>>send sendInsideOrderPushMsg :"+orderPush); mqBaseProducer.sendMessage(orderPush, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); }catch(Exception e){ 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 05c10059d..de4bba6aa 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java @@ -173,7 +173,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { } } //订单同步消息 - wxOrderService.sendInsideOrderPushMsg(composeOrder); + wxOrderService.sendInsideOrderPushMsg(composeOrder,composeOrder.getMainOrderId()); } } diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideCouponVerifyMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideCouponVerifyMsgServiceImpl.java index 740678eba..8b7967063 100644 --- a/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideCouponVerifyMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideCouponVerifyMsgServiceImpl.java @@ -25,6 +25,9 @@ public class FmInsideCouponVerifyMsgServiceImpl implements MsgSendService { @Autowired private WxCouponOrderService couponOrderService; + @Autowired + private WxOrderService orderService; + @Autowired private WxMerchantBUserService merchantBUserService; @@ -46,6 +49,8 @@ public class FmInsideCouponVerifyMsgServiceImpl implements MsgSendService { throw new MallinkException(ErrorCode.USER_IS_EMPTY.getCode(), "门店未找到" + msg.getMerchantId()); } + orderService.sendInsideOrderPushMsg(couponOrder,couponOrder.getComposeOrderId()); + couponOrderService.actionAfterVerify(couponOrder, merchant); } } 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 f81cd4c2f..06bae2e68 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 @@ -5,6 +5,7 @@ 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.enums.EnumComposeOrder; import com.iformall.enums.EnumPayWay; import com.iformall.exception.MallinkException; import com.iformall.mapper.TtCUserMapper; @@ -58,7 +59,8 @@ 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())){ + if(EnumPayWay.PAY_WAY_TT.getCode().equals(batchOrder.getPayVendor()) + && EnumComposeOrder.SINGLE.getCode().equals(batchOrder.getOrderType())){ WxAppinfo appinfo = wxAppinfoService.getCAppInfo(batchOrder,EnumPayWay.PAY_WAY_TT.getPlat()); WxPayOrder orderq = new WxPayOrder(); 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 80608abd1..84905395f 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 @@ -9,6 +9,7 @@ import com.iformall.douyin.pay.DouYinPayHelper; import com.iformall.douyin.pay.preOrder.CreatePreOrderResult; import com.iformall.douyin.pay.preOrder.DouYinCreatePreOrder; import com.iformall.enums.EnumAppPlat; +import com.iformall.enums.EnumCouponOrderStatus; import com.iformall.enums.EnumOrderStatus; import com.iformall.enums.EnumPayShare; import com.iformall.service.order.entity.WxComposeOrder; @@ -103,7 +104,7 @@ public class TtMiniAppPayAdapterService extends BaseTtPayAdapterService implemen Map orderDetail = new HashMap<>(); orderDetail.put("order_id",batchOrder.getId().toString()); orderDetail.put("create_time",batchOrder.getCreateDate().getTime()); - orderDetail.put("status", getTtOrderStatus(wxOrderCouponVo.getOrderStatus()).getMessage()); + orderDetail.put("status", getTtOrderStatus(wxOrderCouponVo.getOrderStatus(),wxOrderCouponVo.getCouponOrderStatus()).getMessage()); orderDetail.put("total_price",batchOrder.getPayment()); orderDetail.put("detail_url",batchOrder.getWeappOrderPath(EnumAppPlat.TOUTIAO)); @@ -125,7 +126,7 @@ public class TtMiniAppPayAdapterService extends BaseTtPayAdapterService implemen // map.put("scene","");//小程序场景值 // map.put("location","");//小程序场景值 // map.put("launch_from","");//小程序场景值 - map.put("order_status", getTtOrderStatus(wxOrderCouponVo.getOrderStatus()).getCode()); + map.put("order_status", getTtOrderStatus(wxOrderCouponVo.getOrderStatus(),wxOrderCouponVo.getCouponOrderStatus()).getCode()); map.put("payment_order_no", payOrder.getTransactionId()); try { @@ -145,23 +146,29 @@ public class TtMiniAppPayAdapterService extends BaseTtPayAdapterService implemen } } - private EnumTtOrderStatus getTtOrderStatus(Integer code) throws Exception { - if(EnumOrderStatus.getEnum(code).equals(EnumOrderStatus.ORDER_STATUS_PENDING_PAYMENT)){ + private EnumTtOrderStatus getTtOrderStatus(Integer orderStatus,Integer couponOrderStatus) throws Exception { + if(EnumOrderStatus.getEnum(orderStatus).equals(EnumOrderStatus.ORDER_STATUS_PENDING_PAYMENT)){ return EnumTtOrderStatus.ORDER_STATUS_0; } - else if(EnumOrderStatus.getEnum(code).equals(EnumOrderStatus.ORDER_STATUS_PAYMENT_SUCCESS)){ + else if(EnumOrderStatus.getEnum(orderStatus).equals(EnumOrderStatus.ORDER_STATUS_PAYMENT_SUCCESS)){ + if(EnumCouponOrderStatus.getEnum(couponOrderStatus).equals(EnumCouponOrderStatus.COUPON_ORDER_USED)){ + return EnumTtOrderStatus.ORDER_STATUS_4; + } + if(EnumCouponOrderStatus.getEnum(couponOrderStatus).equals(EnumCouponOrderStatus.COUPON_ORDER_OVER_TIME)){ + return EnumTtOrderStatus.ORDER_STATUS_3; + } return EnumTtOrderStatus.ORDER_STATUS_1; } - else if(EnumOrderStatus.getEnum(code).equals(EnumOrderStatus.ORDER_STATUS_OVERTIME_CANCEL)){ + else if(EnumOrderStatus.getEnum(orderStatus).equals(EnumOrderStatus.ORDER_STATUS_OVERTIME_CANCEL)){ return EnumTtOrderStatus.ORDER_STATUS_2; } - else if(EnumOrderStatus.getEnum(code).equals(EnumOrderStatus.ORDER_STATUS_PENDING_REFUND)){ + else if(EnumOrderStatus.getEnum(orderStatus).equals(EnumOrderStatus.ORDER_STATUS_PENDING_REFUND)){ return EnumTtOrderStatus.ORDER_STATUS_5; } - else if(EnumOrderStatus.getEnum(code).equals(EnumOrderStatus.ORDER_STATUS_REFUND_SUCCESS)){ + else if(EnumOrderStatus.getEnum(orderStatus).equals(EnumOrderStatus.ORDER_STATUS_REFUND_SUCCESS)){ return EnumTtOrderStatus.ORDER_STATUS_6; } - else if(EnumOrderStatus.getEnum(code).equals(EnumOrderStatus.ORDER_STATUS_REFUND_FAILD)){ + else if(EnumOrderStatus.getEnum(orderStatus).equals(EnumOrderStatus.ORDER_STATUS_REFUND_FAILD)){ return EnumTtOrderStatus.ORDER_STATUS_8; } log.error("订单状态异常 。。。"); diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index e95ce9b8f..c47b49286 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -343,7 +343,7 @@ @@ -359,7 +359,7 @@