|
|
|
@@ -22,6 +22,7 @@ import com.iformall.service.pay.service.fee.ServiceFeeAdapterService; |
|
|
|
import com.iformall.utils.Constant; |
|
|
|
import com.iformall.utils.DateUtils; |
|
|
|
import me.chanjar.weixin.common.error.WxErrorException; |
|
|
|
import org.apache.commons.beanutils.BeanUtils; |
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
import org.slf4j.Logger; |
|
|
|
import org.slf4j.LoggerFactory; |
|
|
|
@@ -40,6 +41,9 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { |
|
|
|
|
|
|
|
private final Logger logger = LoggerFactory.getLogger(this.getClass()); |
|
|
|
|
|
|
|
@Autowired |
|
|
|
WxMallService wxMallService; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
WxCouponMapper wxCouponMapper; |
|
|
|
|
|
|
|
@@ -83,6 +87,9 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { |
|
|
|
@Autowired |
|
|
|
WxCouponMallService wxCouponMallService; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
WxCouponMallMapper wxCouponMallMapper; |
|
|
|
|
|
|
|
@Lazy |
|
|
|
@Autowired |
|
|
|
WxMerchantService wxMerchantService; |
|
|
|
@@ -161,11 +168,22 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { |
|
|
|
@Transactional(isolation=Isolation.SERIALIZABLE, propagation = Propagation.REQUIRED, rollbackFor = {Exception.class}) |
|
|
|
public ResultData productSave(WxCoupon coupon,boolean isSaas) throws Exception { |
|
|
|
TtCouponChannelPoi ttCouponChannelPoi = ttCouponChannelPoiMapper.selectById(coupon.getTenantId(),coupon.getId()); |
|
|
|
if(ttCouponChannelPoi != null && |
|
|
|
(EnumSpuSyncStatus.sync_auditing.getCode().equals(ttCouponChannelPoi.getLastStatus()) |
|
|
|
|| EnumSpuSyncStatus.sync_put_on.getCode().equals(ttCouponChannelPoi.getLastStatus()) |
|
|
|
|| EnumSpuSyncStatus.sync_audit_disable.getCode().equals(ttCouponChannelPoi.getLastStatus()))){ |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"该券状态不允许提交审核"); |
|
|
|
if(EnumCouponVersion.online.getCode().equals(coupon.getVersion())){ |
|
|
|
if(ttCouponChannelPoi != null && |
|
|
|
(EnumSpuSyncStatus.sync_auditing.getCode().equals(ttCouponChannelPoi.getStatus()) |
|
|
|
|| EnumSpuSyncStatus.sync_put_on.getCode().equals(ttCouponChannelPoi.getStatus()) |
|
|
|
|| EnumSpuSyncStatus.sync_pull_off.getCode().equals(ttCouponChannelPoi.getStatus()) |
|
|
|
|| EnumSpuSyncStatus.sync_audit_pass.getCode().equals(ttCouponChannelPoi.getStatus())) |
|
|
|
){ |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"该券状态不允许提交审核"); |
|
|
|
} |
|
|
|
}else{ |
|
|
|
if(ttCouponChannelPoi != null && EnumSpuSyncStatus.sync_auditing.getCode().equals(ttCouponChannelPoi.getStatus())){ |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"该券状态审核中"); |
|
|
|
} |
|
|
|
} |
|
|
|
if(ttCouponChannelPoi != null && EnumSpuSyncStatus.sync_audit_disable.getCode().equals(ttCouponChannelPoi.getStatus())){ |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"该券已被封禁"); |
|
|
|
} |
|
|
|
|
|
|
|
WxCoupon ttattrs = wxCouponService.getAttrsById(coupon.getId(), coupon.getTenantId()); |
|
|
|
@@ -248,9 +266,9 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { |
|
|
|
if(pois == null || pois.isEmpty()){ |
|
|
|
return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND.getCode(),"未找到poi门店"); |
|
|
|
} |
|
|
|
if(pois.size() != merchantIds.size()){ |
|
|
|
return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND.getCode(),"存在未匹配poi的门店"); |
|
|
|
} |
|
|
|
// if(pois.size() != merchantIds.size()){ |
|
|
|
// return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND.getCode(),"存在未匹配poi的门店"); |
|
|
|
// } |
|
|
|
List<Product.PoiStruct> poiList = new ArrayList(); |
|
|
|
for (TtMerchantPoi poi: pois) { |
|
|
|
Product.PoiStruct poiStruct = new Product.PoiStruct(); |
|
|
|
@@ -262,30 +280,31 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { |
|
|
|
poiList.add(poiStruct); |
|
|
|
} |
|
|
|
|
|
|
|
WxMerchant payAccountMerchant = null; |
|
|
|
if (EnumCouponType.isParentCoupon(coupon.getType())) { |
|
|
|
if (EnumCouponType.COUPON_DOUYIN_PLAT.getCode() == coupon.getType()) { |
|
|
|
payAccountMerchant = wxMerchantService.findAdmin(coupon); |
|
|
|
}else if (EnumCouponType.COUPON_DOUYIN_BRAND.getCode() == coupon.getType()) { |
|
|
|
payAccountMerchant = wxMerchantService.findBrandAdmin(coupon, coupon.getBrand()); |
|
|
|
}else { |
|
|
|
return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND.getCode(),"当前券类型未找到收款商户"); |
|
|
|
} |
|
|
|
WxMall mall = wxMallService.getByTenantId(coupon.getTenantId()); |
|
|
|
|
|
|
|
}else { |
|
|
|
WxMerchant merchantQ = new WxMerchant(); |
|
|
|
merchantQ.updateTenantInfo(coupon); |
|
|
|
merchantQ.setIds(merchantIds); |
|
|
|
merchantQ.setSortColumns(BaseEntity.SortField.MerchantAdmin); |
|
|
|
payAccountMerchant = wxMerchantMapper.findIdNameList(merchantQ).get(0); |
|
|
|
} |
|
|
|
// WxMerchant payAccountMerchant = null; |
|
|
|
// if (EnumCouponType.isParentCoupon(coupon.getType())) { |
|
|
|
// if (EnumCouponType.COUPON_DOUYIN_PLAT.getCode() == coupon.getType()) { |
|
|
|
// payAccountMerchant = wxMerchantService.findAdmin(coupon); |
|
|
|
// }else if (EnumCouponType.COUPON_DOUYIN_BRAND.getCode() == coupon.getType()) { |
|
|
|
// payAccountMerchant = wxMerchantService.findBrandAdmin(coupon, coupon.getBrand()); |
|
|
|
// }else { |
|
|
|
// return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND.getCode(),"当前券类型未找到收款商户"); |
|
|
|
// } |
|
|
|
// |
|
|
|
// }else { |
|
|
|
// WxMerchant merchantQ = new WxMerchant(); |
|
|
|
// merchantQ.updateTenantInfo(coupon); |
|
|
|
// merchantQ.setIds(merchantIds); |
|
|
|
// merchantQ.setSortColumns(BaseEntity.SortField.MerchantAdmin); |
|
|
|
// payAccountMerchant = wxMerchantMapper.findIdNameList(merchantQ).get(0); |
|
|
|
// } |
|
|
|
|
|
|
|
//投放到抖音渠道,获取详情地址,以做审核 |
|
|
|
WxCouponChannel wxCouponChannelQuery = new WxCouponChannel(); |
|
|
|
wxCouponChannelQuery.updateTenantInfo(coupon); |
|
|
|
wxCouponChannelQuery.setCouponId(coupon.getId()); |
|
|
|
wxCouponChannelQuery.setCouponId(coupon.getCouponId()); |
|
|
|
wxCouponChannelQuery.setTargetAd(EnumCouponChannelType.COUPON_CHANNEL_ID_DOUYIN.getCode()); |
|
|
|
wxCouponChannelQuery.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); |
|
|
|
List<WxCouponChannel> wxCouponChannels = wxCouponChannelMapper.findList(wxCouponChannelQuery); |
|
|
|
WxCouponChannel wxCouponChannel = null; |
|
|
|
Date now = new Date(); |
|
|
|
@@ -317,7 +336,7 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { |
|
|
|
wxCouponChannel.setTitle(coupon.getTitle()); |
|
|
|
wxCouponChannelMapper.insert(wxCouponChannel); |
|
|
|
|
|
|
|
}else if(wxCouponChannels.size() == 1){ |
|
|
|
}else if(wxCouponChannels.size() >= 1){ |
|
|
|
wxCouponChannel = wxCouponChannels.get(0); |
|
|
|
wxCouponChannel.setShowBeginTime(showBeginTime); |
|
|
|
wxCouponChannel.setBeginTime(beginTime); |
|
|
|
@@ -347,7 +366,7 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { |
|
|
|
prostruct.setCategoryId(ttattrs.getCategoryId()); |
|
|
|
prostruct.setProductType(ttattrs.getProductType()); |
|
|
|
prostruct.setBizLine(5);//默认小程序 |
|
|
|
prostruct.setAccountName(payAccountMerchant.getName()); |
|
|
|
prostruct.setAccountName(mall.getName()); |
|
|
|
|
|
|
|
prostruct.setSoldStartTime((long) DateUtils.getSecondTimestamp(wxCouponChannel.getBeginTime())); |
|
|
|
prostruct.setSoldEndTime((long) DateUtils.getSecondTimestamp(wxCouponChannel.getEndTime())); |
|
|
|
@@ -426,12 +445,19 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
public TtCouponChannelPoi getCouponChannelBySpuId(String spuId) { |
|
|
|
return ttCouponChannelPoiMapper.selectBySpuId(spuId); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
public int handlerTtGoodsAudit(TtCouponChannelPoi couponChannelPoi) { |
|
|
|
return ttCouponChannelPoiMapper.updateBySpuId(couponChannelPoi); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
@Transactional(isolation=Isolation.SERIALIZABLE, propagation = Propagation.REQUIRED, rollbackFor = {Exception.class}) |
|
|
|
public ResultData productDraftGet(TenantEntity tenantEntity,Long id,boolean isSaas) { |
|
|
|
TtCouponChannelPoi ttCouponChannelPoi = ttCouponChannelPoiMapper.selectById(tenantEntity.getTenantId(),id); |
|
|
|
if(ttCouponChannelPoi == null){ |
|
|
|
@@ -440,26 +466,106 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { |
|
|
|
try { |
|
|
|
List<Product> products = null; |
|
|
|
if (isSaas) { |
|
|
|
products = ttMerchantPoiService.getTtGoodLifeSassService(ttCouponChannelPoi).getGoodsService().productDraftGet(getDouyinLaikeId(tenantEntity),null, ttCouponChannelPoi.getId().toString()); |
|
|
|
products = ttMerchantPoiService.getTtGoodLifeSassService(tenantEntity).getGoodsService().productDraftGet(getDouyinLaikeId(tenantEntity),null, id.toString()); |
|
|
|
}else { |
|
|
|
products = ttMerchantPoiService.getTtWebService(ttCouponChannelPoi).getGoodsService().productDraftGet(null, ttCouponChannelPoi.getId().toString()); |
|
|
|
products = ttMerchantPoiService.getTtWebService(tenantEntity).getGoodsService().productDraftGet(null, id.toString()); |
|
|
|
} |
|
|
|
|
|
|
|
if(null != products && products.size() > 0){ |
|
|
|
Product product = products.get(0); |
|
|
|
if(product.getDraftStatus().intValue() == 12 && !EnumSpuSyncStatus.sync_audit_rejection.getCode().equals(ttCouponChannelPoi.getLastStatus())){ |
|
|
|
ttCouponChannelPoi.setLastStatus(EnumSpuSyncStatus.sync_audit_rejection.getCode()); |
|
|
|
ttCouponChannelPoi.setLastStatusDesc(product.getAuditMsg()); |
|
|
|
ttCouponChannelPoi.setUpdateDate(new Date()); |
|
|
|
ttCouponChannelPoiMapper.updateById(ttCouponChannelPoi); |
|
|
|
//判断是否存在草稿数据 |
|
|
|
WxCoupon draftCoupon = wxCouponMapper.selectDraftCoupon(id,tenantEntity.getTenantId()); |
|
|
|
if(draftCoupon == null){ |
|
|
|
if(product.getDraftStatus().intValue() == 12 && !EnumSpuSyncStatus.sync_audit_rejection.getCode().equals(ttCouponChannelPoi.getStatus())){ |
|
|
|
ttCouponChannelPoi.setStatus(EnumSpuSyncStatus.sync_audit_rejection.getCode()); |
|
|
|
ttCouponChannelPoi.setStatusDesc(product.getAuditMsg()); |
|
|
|
ttCouponChannelPoi.setUpdateDate(new Date()); |
|
|
|
ttCouponChannelPoiMapper.updateById(ttCouponChannelPoi); |
|
|
|
}else if(product.getDraftStatus().intValue() == 1 && !EnumSpuSyncStatus.sync_audit_pass.getCode().equals(ttCouponChannelPoi.getStatus())){ |
|
|
|
//审核通过即上线 |
|
|
|
ttCouponChannelPoi.setStatus(EnumSpuSyncStatus.sync_put_on.getCode()); |
|
|
|
ttCouponChannelPoi.setStatusDesc(""); |
|
|
|
ttCouponChannelPoi.setUpdateDate(new Date()); |
|
|
|
ttCouponChannelPoiMapper.updateById(ttCouponChannelPoi); |
|
|
|
|
|
|
|
WxCouponChannel couponChannel = new WxCouponChannel(); |
|
|
|
couponChannel.setId(ttCouponChannelPoi.getCouponChannelId()); |
|
|
|
couponChannel.updateTenantInfo(ttCouponChannelPoi); |
|
|
|
couponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); |
|
|
|
couponChannel.setUpdateDate(new Date()); |
|
|
|
wxCouponChannelMapper.updateById(couponChannel); |
|
|
|
} |
|
|
|
|
|
|
|
}else{ |
|
|
|
TtCouponChannelPoi ttDraftCouponChannelPoi = ttCouponChannelPoiMapper.selectById(tenantEntity.getTenantId(),draftCoupon.getId()); |
|
|
|
if(ttDraftCouponChannelPoi == null){ |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"草稿数据异常"); |
|
|
|
} |
|
|
|
if(product.getDraftStatus().intValue() == 12 && !EnumSpuSyncStatus.sync_audit_rejection.getCode().equals(ttDraftCouponChannelPoi.getStatus())){ |
|
|
|
ttDraftCouponChannelPoi.setStatus(EnumSpuSyncStatus.sync_audit_rejection.getCode()); |
|
|
|
ttDraftCouponChannelPoi.setStatusDesc(product.getAuditMsg()); |
|
|
|
ttDraftCouponChannelPoi.setUpdateDate(new Date()); |
|
|
|
ttCouponChannelPoiMapper.updateById(ttDraftCouponChannelPoi); |
|
|
|
}else if(product.getDraftStatus().intValue() == 1 && !EnumSpuSyncStatus.sync_audit_pass.getCode().equals(ttDraftCouponChannelPoi.getStatus())){ |
|
|
|
//审核通过即上线,商品数据同步 |
|
|
|
WxCoupon wxCoupon = new WxCoupon(); |
|
|
|
BeanUtils.copyProperties(wxCoupon,draftCoupon); |
|
|
|
wxCoupon.setId(draftCoupon.getCouponId()); |
|
|
|
wxCoupon.setVersion(null); |
|
|
|
wxCoupon.setRemainInventory(null); |
|
|
|
wxCoupon.setInventory(null); |
|
|
|
wxCoupon.setUpdateDate(new Date()); |
|
|
|
wxCouponMapper.updateById(wxCoupon); |
|
|
|
//商场数据同步 |
|
|
|
//商户数据同步 |
|
|
|
final IdWorker idWorker = IdWorker.get(); |
|
|
|
if (EnumCouponType.isParentCoupon(draftCoupon.getType())) { |
|
|
|
WxCouponMall couponMall = new WxCouponMall(); |
|
|
|
couponMall.updateTenantInfo(draftCoupon); |
|
|
|
couponMall.setProductId(draftCoupon.getId()); |
|
|
|
List<WxCouponMall> couponMallList = wxCouponMallMapper.findList(couponMall); |
|
|
|
couponMall.setProductId(draftCoupon.getCouponId()); |
|
|
|
wxCouponMallMapper.delteAllByProductId(couponMall); |
|
|
|
|
|
|
|
for (WxCouponMall cm : couponMallList) { |
|
|
|
cm.setId(idWorker.nextId()); |
|
|
|
cm.setProductId(draftCoupon.getCouponId()); |
|
|
|
wxCouponMallMapper.insert(cm); |
|
|
|
|
|
|
|
WxCouponMerchant couponMerchant = new WxCouponMerchant(); |
|
|
|
couponMerchant.setTenantId(cm.getMallTenantId()); |
|
|
|
couponMerchant.setParentTenantId(cm.getTenantId()); |
|
|
|
couponMerchant.setProductId(draftCoupon.getId()); |
|
|
|
List<WxCouponMerchant> couponMerchantList = wxCouponMerchantMapper.findList(couponMerchant); |
|
|
|
couponMerchant.setProductId(draftCoupon.getCouponId()); |
|
|
|
wxCouponMerchantMapper.delteAllByProductId(couponMerchant); |
|
|
|
for (WxCouponMerchant cmt: couponMerchantList) { |
|
|
|
cmt.setId(idWorker.nextId()); |
|
|
|
cmt.setProductId(draftCoupon.getCouponId()); |
|
|
|
wxCouponMerchantMapper.insert(cmt); |
|
|
|
} |
|
|
|
} |
|
|
|
}else{ |
|
|
|
WxCouponMerchant couponMerchant = new WxCouponMerchant(); |
|
|
|
couponMerchant.updateTenantInfo(draftCoupon); |
|
|
|
couponMerchant.setProductId(draftCoupon.getId()); |
|
|
|
List<WxCouponMerchant> couponMerchantList = wxCouponMerchantMapper.findList(couponMerchant); |
|
|
|
couponMerchant.setProductId(draftCoupon.getCouponId()); |
|
|
|
wxCouponMerchantMapper.delteAllByProductId(couponMerchant); |
|
|
|
for (WxCouponMerchant cmt: couponMerchantList) { |
|
|
|
cmt.setId(idWorker.nextId()); |
|
|
|
cmt.setProductId(draftCoupon.getCouponId()); |
|
|
|
wxCouponMerchantMapper.insert(cmt); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
ttDraftCouponChannelPoi.setStatus(EnumSpuSyncStatus.sync_audit_pass.getCode()); |
|
|
|
ttDraftCouponChannelPoi.setStatusDesc(""); |
|
|
|
ttDraftCouponChannelPoi.setUpdateDate(new Date()); |
|
|
|
ttCouponChannelPoiMapper.updateById(ttDraftCouponChannelPoi); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
}else if(product.getDraftStatus().intValue() == 1 && !EnumSpuSyncStatus.sync_audit_pass.getCode().equals(ttCouponChannelPoi.getLastStatus())){ |
|
|
|
// ttCouponChannelPoi.setLastStatus(EnumSpuSyncStatus.sync_audit_pass.getCode()); |
|
|
|
//审核通过 |
|
|
|
ttCouponChannelPoi.setLastStatus(EnumSpuSyncStatus.sync_put_on.getCode()); |
|
|
|
ttCouponChannelPoi.setLastStatusDesc(""); |
|
|
|
ttCouponChannelPoi.setUpdateDate(new Date()); |
|
|
|
ttCouponChannelPoiMapper.updateById(ttCouponChannelPoi); |
|
|
|
} |
|
|
|
|
|
|
|
return new ResultData(product); |
|
|
|
@@ -468,9 +574,9 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { |
|
|
|
} |
|
|
|
} catch (WxErrorException e) { |
|
|
|
e.printStackTrace(); |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),e.getError().getErrorMsg()); |
|
|
|
throw new MallinkException(ErrorCode.SYS_PARAMETER_ERROR.getCode(),e.getError().getErrorMsg()); |
|
|
|
} catch (Exception e) { |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),e.getMessage()); |
|
|
|
throw new MallinkException(ErrorCode.SYS_PARAMETER_ERROR.getCode(),e.getMessage()); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@@ -492,17 +598,14 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { |
|
|
|
Product product = products.get(0); |
|
|
|
if(product.getOnlineStatus().intValue() == 1 && !EnumSpuSyncStatus.sync_put_on.getCode().equals(ttCouponChannelPoi.getStatus())){ |
|
|
|
ttCouponChannelPoi.setStatus(EnumSpuSyncStatus.sync_put_on.getCode()); |
|
|
|
ttCouponChannelPoi.setLastStatus(EnumSpuSyncStatus.sync_put_on.getCode()); |
|
|
|
ttCouponChannelPoi.setUpdateDate(new Date()); |
|
|
|
ttCouponChannelPoiMapper.updateById(ttCouponChannelPoi); |
|
|
|
}else if(product.getOnlineStatus().intValue() == 2 && !EnumSpuSyncStatus.sync_pull_off.getCode().equals(ttCouponChannelPoi.getStatus())){ |
|
|
|
ttCouponChannelPoi.setStatus(EnumSpuSyncStatus.sync_pull_off.getCode()); |
|
|
|
ttCouponChannelPoi.setLastStatus(EnumSpuSyncStatus.sync_pull_off.getCode()); |
|
|
|
ttCouponChannelPoi.setUpdateDate(new Date()); |
|
|
|
ttCouponChannelPoiMapper.updateById(ttCouponChannelPoi); |
|
|
|
}else if(product.getOnlineStatus().intValue() == 3 && !EnumSpuSyncStatus.sync_audit_disable.getCode().equals(ttCouponChannelPoi.getStatus())){ |
|
|
|
ttCouponChannelPoi.setStatus(EnumSpuSyncStatus.sync_audit_disable.getCode()); |
|
|
|
ttCouponChannelPoi.setLastStatus(EnumSpuSyncStatus.sync_audit_disable.getCode()); |
|
|
|
ttCouponChannelPoi.setUpdateDate(new Date()); |
|
|
|
ttCouponChannelPoiMapper.updateById(ttCouponChannelPoi); |
|
|
|
} |
|
|
|
@@ -525,8 +628,8 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"该券未找到"); |
|
|
|
} |
|
|
|
TtCouponChannelPoi ttCouponChannelPoi = ttCouponChannelPoiMapper.selectById(tenantInfo.getTenantId(),id); |
|
|
|
if(ttCouponChannelPoi == null || EnumSpuSyncStatus.sync_auditing.getCode().equals(ttCouponChannelPoi.getLastStatus()) |
|
|
|
|| EnumSpuSyncStatus.sync_audit_rejection.getCode().equals(ttCouponChannelPoi.getLastStatus())){ |
|
|
|
if(ttCouponChannelPoi == null || EnumSpuSyncStatus.sync_auditing.getCode().equals(ttCouponChannelPoi.getStatus()) |
|
|
|
|| EnumSpuSyncStatus.sync_audit_rejection.getCode().equals(ttCouponChannelPoi.getStatus())){ |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"该券未提交审核或审核未通过"); |
|
|
|
} |
|
|
|
//查询上架 |
|
|
|
@@ -544,7 +647,7 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
if(op_type.equals(ttCouponChannelPoi.getLastStatus())){ |
|
|
|
if(op_type.equals(ttCouponChannelPoi.getStatus())){ |
|
|
|
logger.info("与线上状态一致, 无需同步{}"+wxCoupon.getId()); |
|
|
|
return new ResultData(); |
|
|
|
} |
|
|
|
@@ -561,7 +664,7 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { |
|
|
|
TtCouponChannelPoi ccPoi = new TtCouponChannelPoi(); |
|
|
|
ccPoi.setId(ttCouponChannelPoi.getId()); |
|
|
|
ccPoi.updateTenantInfo(ttCouponChannelPoi); |
|
|
|
ccPoi.setLastStatus(op_type); |
|
|
|
ccPoi.setStatus(op_type); |
|
|
|
ccPoi.setUpdateDate(new Date()); |
|
|
|
ttCouponChannelPoiMapper.updateById(ccPoi); |
|
|
|
return new ResultData(); |
|
|
|
@@ -584,8 +687,8 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"该券未找到"); |
|
|
|
} |
|
|
|
TtCouponChannelPoi ttCouponChannelPoi = ttCouponChannelPoiMapper.selectById(tenantInfo.getTenantId(),id); |
|
|
|
if(ttCouponChannelPoi == null || EnumSpuSyncStatus.sync_auditing.getCode().equals(ttCouponChannelPoi.getLastStatus()) |
|
|
|
|| EnumSpuSyncStatus.sync_audit_rejection.getCode().equals(ttCouponChannelPoi.getLastStatus())){ |
|
|
|
if(ttCouponChannelPoi == null || EnumSpuSyncStatus.sync_auditing.getCode().equals(ttCouponChannelPoi.getStatus()) |
|
|
|
|| EnumSpuSyncStatus.sync_audit_rejection.getCode().equals(ttCouponChannelPoi.getStatus())){ |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"该券未提交审核或审核未通过"); |
|
|
|
} |
|
|
|
try { |
|
|
|
@@ -616,8 +719,8 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"该券未找到"); |
|
|
|
} |
|
|
|
TtCouponChannelPoi ttCouponChannelPoi = ttCouponChannelPoiMapper.selectById(tenantInfo.getTenantId(),id); |
|
|
|
if(ttCouponChannelPoi == null || EnumSpuSyncStatus.sync_auditing.getCode().equals(ttCouponChannelPoi.getLastStatus()) |
|
|
|
|| EnumSpuSyncStatus.sync_audit_rejection.getCode().equals(ttCouponChannelPoi.getLastStatus())){ |
|
|
|
if(ttCouponChannelPoi == null || EnumSpuSyncStatus.sync_auditing.getCode().equals(ttCouponChannelPoi.getStatus()) |
|
|
|
|| EnumSpuSyncStatus.sync_audit_rejection.getCode().equals(ttCouponChannelPoi.getStatus())){ |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"该券未提交审核或审核未通过"); |
|
|
|
} |
|
|
|
try { |
|
|
|
@@ -664,8 +767,8 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { |
|
|
|
if(ttCouponChannelPoi != null){ |
|
|
|
ttCouponChannelPoi.setCouponChannelId(couponChannelId); |
|
|
|
ttCouponChannelPoi.setSpuId(productId); |
|
|
|
// ttCouponChannelPoi.setStatus(EnumSpuSyncStatus.sync_auditing.getCode()); |
|
|
|
ttCouponChannelPoi.setLastStatus(EnumSpuSyncStatus.sync_auditing.getCode()); |
|
|
|
ttCouponChannelPoi.setStatus(EnumSpuSyncStatus.sync_auditing.getCode()); |
|
|
|
// ttCouponChannelPoi.setLastStatus(EnumSpuSyncStatus.sync_auditing.getCode()); |
|
|
|
ttCouponChannelPoi.setLastStatusDesc(""); |
|
|
|
ttCouponChannelPoi.setUpdateDate(date); |
|
|
|
ttCouponChannelPoiMapper.updateById(ttCouponChannelPoi); |
|
|
|
@@ -675,8 +778,8 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { |
|
|
|
ttCouponChannelPoi.updateTenantInfo(coupon); |
|
|
|
ttCouponChannelPoi.setCouponChannelId(couponChannelId); |
|
|
|
ttCouponChannelPoi.setSpuId(productId); |
|
|
|
// ttCouponChannelPoi.setStatus(EnumSpuSyncStatus.sync_auditing.getCode()); |
|
|
|
ttCouponChannelPoi.setLastStatus(EnumSpuSyncStatus.sync_auditing.getCode()); |
|
|
|
ttCouponChannelPoi.setStatus(EnumSpuSyncStatus.sync_auditing.getCode()); |
|
|
|
// ttCouponChannelPoi.setLastStatus(EnumSpuSyncStatus.sync_auditing.getCode()); |
|
|
|
ttCouponChannelPoi.setCreateDate(date); |
|
|
|
ttCouponChannelPoi.setUpdateDate(date); |
|
|
|
ttCouponChannelPoiMapper.insert(ttCouponChannelPoi); |
|
|
|
@@ -731,8 +834,8 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { |
|
|
|
@Override |
|
|
|
public ResultData poiPlanList(TenantEntity tenantInfo,Long couponId, Integer pageNum, Integer pageSize,boolean isGoodSaas) { |
|
|
|
TtCouponChannelPoi ttCouponChannelPoi = ttCouponChannelPoiMapper.selectById(tenantInfo.getTenantId(),couponId); |
|
|
|
if(ttCouponChannelPoi == null || EnumSpuSyncStatus.sync_auditing.getCode().equals(ttCouponChannelPoi.getLastStatus()) |
|
|
|
|| EnumSpuSyncStatus.sync_audit_rejection.getCode().equals(ttCouponChannelPoi.getLastStatus())){ |
|
|
|
if(ttCouponChannelPoi == null || EnumSpuSyncStatus.sync_auditing.getCode().equals(ttCouponChannelPoi.getStatus()) |
|
|
|
|| EnumSpuSyncStatus.sync_audit_rejection.getCode().equals(ttCouponChannelPoi.getStatus())){ |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"该券未提交审核或审核未通过"); |
|
|
|
} |
|
|
|
try { |
|
|
|
@@ -753,8 +856,8 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { |
|
|
|
@Override |
|
|
|
public ResultData poiOrientedPlanList(TenantEntity tenantInfo, Long couponId, Integer pageNum, Integer pageSize, boolean isGoodSaas) { |
|
|
|
TtCouponChannelPoi ttCouponChannelPoi = ttCouponChannelPoiMapper.selectById(tenantInfo.getTenantId(),couponId); |
|
|
|
if(ttCouponChannelPoi == null || EnumSpuSyncStatus.sync_auditing.getCode().equals(ttCouponChannelPoi.getLastStatus()) |
|
|
|
|| EnumSpuSyncStatus.sync_audit_rejection.getCode().equals(ttCouponChannelPoi.getLastStatus())){ |
|
|
|
if(ttCouponChannelPoi == null || EnumSpuSyncStatus.sync_auditing.getCode().equals(ttCouponChannelPoi.getStatus()) |
|
|
|
|| EnumSpuSyncStatus.sync_audit_rejection.getCode().equals(ttCouponChannelPoi.getStatus())){ |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"该券未提交审核或审核未通过"); |
|
|
|
} |
|
|
|
try { |
|
|
|
@@ -782,8 +885,8 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { |
|
|
|
return new ResultData(ErrorCode.COUPON_ORDER_TYPE_NOT_SUPPORTED); |
|
|
|
} |
|
|
|
TtCouponChannelPoi ttCouponChannelPoi = ttCouponChannelPoiMapper.selectById(wxCoupon.getTenantId(),wxCoupon.getId()); |
|
|
|
if(ttCouponChannelPoi == null || EnumSpuSyncStatus.sync_auditing.getCode().equals(ttCouponChannelPoi.getLastStatus()) |
|
|
|
|| EnumSpuSyncStatus.sync_audit_rejection.getCode().equals(ttCouponChannelPoi.getLastStatus())){ |
|
|
|
if(ttCouponChannelPoi == null || EnumSpuSyncStatus.sync_auditing.getCode().equals(ttCouponChannelPoi.getStatus()) |
|
|
|
|| EnumSpuSyncStatus.sync_audit_rejection.getCode().equals(ttCouponChannelPoi.getStatus())){ |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"该券未提交审核或审核未通过"); |
|
|
|
} |
|
|
|
try { |
|
|
|
@@ -840,8 +943,8 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { |
|
|
|
return new ResultData(ErrorCode.COUPON_ORDER_TYPE_NOT_SUPPORTED); |
|
|
|
} |
|
|
|
TtCouponChannelPoi ttCouponChannelPoi = ttCouponChannelPoiMapper.selectById(wxCoupon.getTenantId(),wxCoupon.getId()); |
|
|
|
if(ttCouponChannelPoi == null || EnumSpuSyncStatus.sync_auditing.getCode().equals(ttCouponChannelPoi.getLastStatus()) |
|
|
|
|| EnumSpuSyncStatus.sync_audit_rejection.getCode().equals(ttCouponChannelPoi.getLastStatus())){ |
|
|
|
if(ttCouponChannelPoi == null || EnumSpuSyncStatus.sync_auditing.getCode().equals(ttCouponChannelPoi.getStatus()) |
|
|
|
|| EnumSpuSyncStatus.sync_audit_rejection.getCode().equals(ttCouponChannelPoi.getStatus())){ |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"该券未提交审核或审核未通过"); |
|
|
|
} |
|
|
|
try { |
|
|
|
|