diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumMsgRecordType.java b/mallinkService/src/main/java/com/iformall/enums/EnumMsgRecordType.java index fa0472022..8ac778b73 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumMsgRecordType.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumMsgRecordType.java @@ -23,6 +23,9 @@ public enum EnumMsgRecordType { INSIDE_ORDER_REFUND(107, "退款提交成功"), INSIDE_ORDER_PUSH(108, "订单同步"), INSIDE_PRODUCT_PUSH(109, "商品状态或库存同步"), + + MALL_COO_USER_PUSH(110, "猫酷同步会员"), + ORDER_SNAPSHOT_PUSH(111, "订单快照"), ; public static EnumMsgRecordType getEnum(Integer code) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java index 26bece179..1514fbee8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -969,13 +969,13 @@ public class WxCouponServiceImpl implements WxCouponService { } private void spuStockSync(TenantEntity tenantEntity,Long id){ - new Thread(() -> { - //1秒之后同步poi - try { - Thread.currentThread().sleep(1000); - } catch (Exception e) { - logger.error("sleep error: " + e.getMessage()); - } +// new Thread(() -> { +// //1秒之后同步poi +// try { +// Thread.currentThread().sleep(1000); +// } catch (Exception e) { +// logger.error("sleep error: " + e.getMessage()); +// } List couponChannelIds = wxCouponChannelMapper.getPoiProductIdList(tenantEntity.getTenantId(),id); if(couponChannelIds != null && couponChannelIds.size() > 0){ @@ -991,7 +991,7 @@ public class WxCouponServiceImpl implements WxCouponService { } } - }).start(); +// }).start(); } 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());