From ffa60d65f54aa793d3ada146df90ef18df600a43 Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 10 Jun 2022 15:26:09 +0800 Subject: [PATCH] //tt product --- .../java/com/iformall/enums/EnumPushType.java | 3 ++- .../service/TtCouponGoodsService.java | 2 ++ .../impl/TtCouponGoodsServiceImpl.java | 26 +++++++++++++++++++ .../service/impl/WxCouponServiceImpl.java | 26 +++++++++++++++++-- .../FmInsideProductPushMsgServiceImpl.java | 2 ++ 5 files changed, 56 insertions(+), 3 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumPushType.java b/mallinkService/src/main/java/com/iformall/enums/EnumPushType.java index 9989176bf..fdbae5e68 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumPushType.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumPushType.java @@ -5,10 +5,11 @@ package com.iformall.enums; */ public enum EnumPushType { - // 1-B端, 2-C端, 3-服务号, 4-订阅号 + // SPU_STATUS_SYNC(1, "同步状态"), SPU_STOCK_SYNC(2, "同步库存"), + SPU_FREE_AUDIT_SYNC(3, "免审修改"), ; public static EnumPushType getEnum(Integer code) { diff --git a/mallinkService/src/main/java/com/iformall/service/TtCouponGoodsService.java b/mallinkService/src/main/java/com/iformall/service/TtCouponGoodsService.java index adcf68944..726ac8a95 100644 --- a/mallinkService/src/main/java/com/iformall/service/TtCouponGoodsService.java +++ b/mallinkService/src/main/java/com/iformall/service/TtCouponGoodsService.java @@ -25,4 +25,6 @@ public interface TtCouponGoodsService { ResultData productOperate(TenantEntity tenantInfo, Long id); ResultData productStockSync(TenantEntity tenantInfo, Long id); + + ResultData productFreeAudit(TenantEntity tenantInfo, Long id); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java index 41e9e94e3..c667fe06f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java @@ -348,6 +348,32 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { } } + @Override + public ResultData productFreeAudit(TenantEntity tenantInfo, Long id) { + WxCoupon wxCoupon = wxCouponMapper.selectById(id, tenantInfo.getTenantId()); + if(wxCoupon == null || EnumCouponStatus.COUPON_STATUS_TAKE_OFFF.getCode().equals(wxCoupon.getStatus())){ + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"该券未找到或已作废"); + } + TtCouponChannelPoi ttCouponChannelPoi = ttCouponChannelPoiMapper.selectById(tenantInfo.getTenantId(),id); + if(ttCouponChannelPoi == null || !EnumSpuSyncStatus.sync_audit_pass.getCode().equals(ttCouponChannelPoi.getLastStatus())){ + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"该券未提交审核或审核未通过"); + } + try { + TtWebService ttWebService = ttMerchantPoiService.getTtWebService(ttCouponChannelPoi); + boolean b = ttWebService.getGoodsService().productFreeAudit(null,wxCoupon.getId().toString(), + wxCoupon.getValidEndDate().getTime(),wxCoupon.getInventory()); + if(b){ + return new ResultData(); + }else{ + return new ResultData(ErrorCode.SYS_SERVER_ERROR.getCode(),"修改失败"); + } + + } catch (WxErrorException e) { + e.printStackTrace(); + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),e.getMessage()); + } + } + private void syncCouponChannelPoi(WxCoupon coupon,Long couponChannelId,String productId){ TtCouponChannelPoi ttCouponChannelPoi = ttCouponChannelPoiMapper.selectById(coupon.getTenantId(),coupon.getId()); Date date = new Date(); 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 32fe1f7c1..4de080f0b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -981,9 +981,9 @@ public class WxCouponServiceImpl implements WxCouponService { if(ret != 1) { throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "数据库更新数量错误"); } - // 更新库存后同步 + // 免审修改 try{ - spuStockSync(wxCoupon,wxCoupon.getId()); + spuFreeAuditSync(wxCoupon,wxCoupon.getId()); }catch(Exception e){ logger.error("send spuStockSync error: " + e.getMessage()); } @@ -1064,6 +1064,28 @@ public class WxCouponServiceImpl implements WxCouponService { logger.info(">>>>>>>>>>>send FmInsideProductPushMsg :"+productPush); mqBaseProducer.sendMessage(productPush, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); +// }).start(); + + } + + private void spuFreeAuditSync(TenantEntity tenantEntity,Long couponId){ +// new Thread(() -> { +// //1秒之后同步poi +// try { +// Thread.currentThread().sleep(1000); +// } catch (Exception e) { +// logger.error("sleep error: " + e.getMessage()); +// } + + FmInsideProductPushMsg productPush = new FmInsideProductPushMsg(); + productPush.setDelayTimeLevel(3); + productPush.setMsgType(EnumMsgRecordType.INSIDE_PRODUCT_PUSH.getCode()); + productPush.updateTenantInfo(tenantEntity); + productPush.setCouponId(couponId); + productPush.setSyncType(EnumPushType.SPU_FREE_AUDIT_SYNC); + logger.info(">>>>>>>>>>>send FmInsideProductPushMsg :"+productPush); + mqBaseProducer.sendMessage(productPush, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); + // }).start(); } diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideProductPushMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideProductPushMsgServiceImpl.java index 4a93820e1..6cefce384 100644 --- a/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideProductPushMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideProductPushMsgServiceImpl.java @@ -38,6 +38,8 @@ public class FmInsideProductPushMsgServiceImpl implements MsgSendService { }else if(EnumPushType.SPU_STOCK_SYNC.equals(msg.getSyncType())){ ttCouponGoodsService.productOperate(msg.getTenantInfo(),msg.getCouponId()); // poiService.spuStockSync(msg.getTenantInfo(),msg.getCouponId()); + }else if(EnumPushType.SPU_FREE_AUDIT_SYNC.equals(msg.getSyncType())){ + ttCouponGoodsService.productFreeAudit(msg.getTenantInfo(),msg.getCouponId()); } }