|
|
@@ -312,7 +312,9 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { |
|
|
ttCouponChannelPoiMapper.updateById(ttCouponChannelPoi); |
|
|
ttCouponChannelPoiMapper.updateById(ttCouponChannelPoi); |
|
|
|
|
|
|
|
|
}else if(product.getDraftStatus().intValue() == 1 && !EnumSpuSyncStatus.sync_audit_pass.getCode().equals(ttCouponChannelPoi.getLastStatus())){ |
|
|
}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_audit_pass.getCode()); |
|
|
|
|
|
//审核通过 |
|
|
|
|
|
ttCouponChannelPoi.setLastStatus(EnumSpuSyncStatus.sync_put_on.getCode()); |
|
|
ttCouponChannelPoi.setLastStatusDesc(""); |
|
|
ttCouponChannelPoi.setLastStatusDesc(""); |
|
|
ttCouponChannelPoi.setUpdateDate(new Date()); |
|
|
ttCouponChannelPoi.setUpdateDate(new Date()); |
|
|
ttCouponChannelPoiMapper.updateById(ttCouponChannelPoi); |
|
|
ttCouponChannelPoiMapper.updateById(ttCouponChannelPoi); |
|
|
@@ -341,14 +343,17 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { |
|
|
Product product = products.get(0); |
|
|
Product product = products.get(0); |
|
|
if(product.getOnlineStatus().intValue() == 1 && !EnumSpuSyncStatus.sync_put_on.getCode().equals(ttCouponChannelPoi.getStatus())){ |
|
|
if(product.getOnlineStatus().intValue() == 1 && !EnumSpuSyncStatus.sync_put_on.getCode().equals(ttCouponChannelPoi.getStatus())){ |
|
|
ttCouponChannelPoi.setStatus(EnumSpuSyncStatus.sync_put_on.getCode()); |
|
|
ttCouponChannelPoi.setStatus(EnumSpuSyncStatus.sync_put_on.getCode()); |
|
|
|
|
|
ttCouponChannelPoi.setLastStatus(EnumSpuSyncStatus.sync_put_on.getCode()); |
|
|
ttCouponChannelPoi.setUpdateDate(new Date()); |
|
|
ttCouponChannelPoi.setUpdateDate(new Date()); |
|
|
ttCouponChannelPoiMapper.updateById(ttCouponChannelPoi); |
|
|
ttCouponChannelPoiMapper.updateById(ttCouponChannelPoi); |
|
|
}else if(product.getOnlineStatus().intValue() == 2 && !EnumSpuSyncStatus.sync_pull_off.getCode().equals(ttCouponChannelPoi.getStatus())){ |
|
|
}else if(product.getOnlineStatus().intValue() == 2 && !EnumSpuSyncStatus.sync_pull_off.getCode().equals(ttCouponChannelPoi.getStatus())){ |
|
|
ttCouponChannelPoi.setStatus(EnumSpuSyncStatus.sync_pull_off.getCode()); |
|
|
ttCouponChannelPoi.setStatus(EnumSpuSyncStatus.sync_pull_off.getCode()); |
|
|
|
|
|
ttCouponChannelPoi.setLastStatus(EnumSpuSyncStatus.sync_pull_off.getCode()); |
|
|
ttCouponChannelPoi.setUpdateDate(new Date()); |
|
|
ttCouponChannelPoi.setUpdateDate(new Date()); |
|
|
ttCouponChannelPoiMapper.updateById(ttCouponChannelPoi); |
|
|
ttCouponChannelPoiMapper.updateById(ttCouponChannelPoi); |
|
|
}else if(product.getOnlineStatus().intValue() == 3 && !EnumSpuSyncStatus.sync_audit_disable.getCode().equals(ttCouponChannelPoi.getStatus())){ |
|
|
}else if(product.getOnlineStatus().intValue() == 3 && !EnumSpuSyncStatus.sync_audit_disable.getCode().equals(ttCouponChannelPoi.getStatus())){ |
|
|
ttCouponChannelPoi.setStatus(EnumSpuSyncStatus.sync_audit_disable.getCode()); |
|
|
ttCouponChannelPoi.setStatus(EnumSpuSyncStatus.sync_audit_disable.getCode()); |
|
|
|
|
|
ttCouponChannelPoi.setLastStatus(EnumSpuSyncStatus.sync_audit_disable.getCode()); |
|
|
ttCouponChannelPoi.setUpdateDate(new Date()); |
|
|
ttCouponChannelPoi.setUpdateDate(new Date()); |
|
|
ttCouponChannelPoiMapper.updateById(ttCouponChannelPoi); |
|
|
ttCouponChannelPoiMapper.updateById(ttCouponChannelPoi); |
|
|
} |
|
|
} |
|
|
@@ -369,12 +374,13 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { |
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"该券未找到"); |
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"该券未找到"); |
|
|
} |
|
|
} |
|
|
TtCouponChannelPoi ttCouponChannelPoi = ttCouponChannelPoiMapper.selectById(tenantInfo.getTenantId(),id); |
|
|
TtCouponChannelPoi ttCouponChannelPoi = ttCouponChannelPoiMapper.selectById(tenantInfo.getTenantId(),id); |
|
|
if(ttCouponChannelPoi == null || !EnumSpuSyncStatus.sync_audit_pass.getCode().equals(ttCouponChannelPoi.getLastStatus())){ |
|
|
|
|
|
|
|
|
if(ttCouponChannelPoi == null || EnumSpuSyncStatus.sync_auditing.getCode().equals(ttCouponChannelPoi.getLastStatus()) |
|
|
|
|
|
|| EnumSpuSyncStatus.sync_audit_rejection.getCode().equals(ttCouponChannelPoi.getLastStatus())){ |
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"该券未提交审核或审核未通过"); |
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"该券未提交审核或审核未通过"); |
|
|
} |
|
|
} |
|
|
//查询上架 |
|
|
//查询上架 |
|
|
//op_type int64 TRUE 1-上线 2-下线 |
|
|
|
|
|
Integer op_type = 2; |
|
|
|
|
|
|
|
|
//op_type int64 TRUE EnumSpuSyncStatus 1-上线 2-下线 |
|
|
|
|
|
Integer op_type = EnumSpuSyncStatus.sync_pull_off.getCode(); |
|
|
if(!EnumCouponStatus.COUPON_STATUS_TAKE_OFFF.getCode().equals(wxCoupon.getStatus())){ |
|
|
if(!EnumCouponStatus.COUPON_STATUS_TAKE_OFFF.getCode().equals(wxCoupon.getStatus())){ |
|
|
WxCouponChannel wxCouponChannelQuery = new WxCouponChannel(); |
|
|
WxCouponChannel wxCouponChannelQuery = new WxCouponChannel(); |
|
|
wxCouponChannelQuery.updateTenantInfo(wxCoupon); |
|
|
wxCouponChannelQuery.updateTenantInfo(wxCoupon); |
|
|
@@ -383,7 +389,7 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { |
|
|
wxCouponChannelQuery.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); |
|
|
wxCouponChannelQuery.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); |
|
|
List<WxCouponChannel> wxCouponChannels = wxCouponChannelMapper.findList(wxCouponChannelQuery); |
|
|
List<WxCouponChannel> wxCouponChannels = wxCouponChannelMapper.findList(wxCouponChannelQuery); |
|
|
if(wxCouponChannels.size() > 0){ |
|
|
if(wxCouponChannels.size() > 0){ |
|
|
op_type = 1; |
|
|
|
|
|
|
|
|
op_type = EnumSpuSyncStatus.sync_put_on.getCode(); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@@ -391,6 +397,12 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { |
|
|
TtWebService ttWebService = ttMerchantPoiService.getTtWebService(ttCouponChannelPoi); |
|
|
TtWebService ttWebService = ttMerchantPoiService.getTtWebService(ttCouponChannelPoi); |
|
|
boolean b = ttWebService.getGoodsService().productOperate(null,wxCoupon.getId().toString(),op_type); |
|
|
boolean b = ttWebService.getGoodsService().productOperate(null,wxCoupon.getId().toString(),op_type); |
|
|
if(b){ |
|
|
if(b){ |
|
|
|
|
|
TtCouponChannelPoi ccPoi = new TtCouponChannelPoi(); |
|
|
|
|
|
ccPoi.setId(ttCouponChannelPoi.getId()); |
|
|
|
|
|
ccPoi.updateTenantInfo(ttCouponChannelPoi); |
|
|
|
|
|
ccPoi.setLastStatus(op_type); |
|
|
|
|
|
ccPoi.setUpdateDate(new Date()); |
|
|
|
|
|
ttCouponChannelPoiMapper.updateById(ccPoi); |
|
|
return new ResultData(); |
|
|
return new ResultData(); |
|
|
}else{ |
|
|
}else{ |
|
|
return new ResultData(ErrorCode.SYS_SERVER_ERROR.getCode(),"同步失败"); |
|
|
return new ResultData(ErrorCode.SYS_SERVER_ERROR.getCode(),"同步失败"); |
|
|
@@ -409,7 +421,8 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { |
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"该券未找到"); |
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"该券未找到"); |
|
|
} |
|
|
} |
|
|
TtCouponChannelPoi ttCouponChannelPoi = ttCouponChannelPoiMapper.selectById(tenantInfo.getTenantId(),id); |
|
|
TtCouponChannelPoi ttCouponChannelPoi = ttCouponChannelPoiMapper.selectById(tenantInfo.getTenantId(),id); |
|
|
if(ttCouponChannelPoi == null || !EnumSpuSyncStatus.sync_audit_pass.getCode().equals(ttCouponChannelPoi.getLastStatus())){ |
|
|
|
|
|
|
|
|
if(ttCouponChannelPoi == null || EnumSpuSyncStatus.sync_auditing.getCode().equals(ttCouponChannelPoi.getLastStatus()) |
|
|
|
|
|
|| EnumSpuSyncStatus.sync_audit_rejection.getCode().equals(ttCouponChannelPoi.getLastStatus())){ |
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"该券未提交审核或审核未通过"); |
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"该券未提交审核或审核未通过"); |
|
|
} |
|
|
} |
|
|
try { |
|
|
try { |
|
|
@@ -434,7 +447,8 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { |
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"该券未找到"); |
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"该券未找到"); |
|
|
} |
|
|
} |
|
|
TtCouponChannelPoi ttCouponChannelPoi = ttCouponChannelPoiMapper.selectById(tenantInfo.getTenantId(),id); |
|
|
TtCouponChannelPoi ttCouponChannelPoi = ttCouponChannelPoiMapper.selectById(tenantInfo.getTenantId(),id); |
|
|
if(ttCouponChannelPoi == null || !EnumSpuSyncStatus.sync_audit_pass.getCode().equals(ttCouponChannelPoi.getLastStatus())){ |
|
|
|
|
|
|
|
|
if(ttCouponChannelPoi == null || EnumSpuSyncStatus.sync_auditing.getCode().equals(ttCouponChannelPoi.getLastStatus()) |
|
|
|
|
|
|| EnumSpuSyncStatus.sync_audit_rejection.getCode().equals(ttCouponChannelPoi.getLastStatus())){ |
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"该券未提交审核或审核未通过"); |
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"该券未提交审核或审核未通过"); |
|
|
} |
|
|
} |
|
|
try { |
|
|
try { |
|
|
@@ -537,7 +551,8 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { |
|
|
@Override |
|
|
@Override |
|
|
public ResultData poiPlanList(TenantEntity tenantInfo,Long couponId, Integer pageNum, Integer pageSize) { |
|
|
public ResultData poiPlanList(TenantEntity tenantInfo,Long couponId, Integer pageNum, Integer pageSize) { |
|
|
TtCouponChannelPoi ttCouponChannelPoi = ttCouponChannelPoiMapper.selectById(tenantInfo.getTenantId(),couponId); |
|
|
TtCouponChannelPoi ttCouponChannelPoi = ttCouponChannelPoiMapper.selectById(tenantInfo.getTenantId(),couponId); |
|
|
if(ttCouponChannelPoi == null || !EnumSpuSyncStatus.sync_audit_pass.getCode().equals(ttCouponChannelPoi.getLastStatus())){ |
|
|
|
|
|
|
|
|
if(ttCouponChannelPoi == null || EnumSpuSyncStatus.sync_auditing.getCode().equals(ttCouponChannelPoi.getLastStatus()) |
|
|
|
|
|
|| EnumSpuSyncStatus.sync_audit_rejection.getCode().equals(ttCouponChannelPoi.getLastStatus())){ |
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"该券未提交审核或审核未通过"); |
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"该券未提交审核或审核未通过"); |
|
|
} |
|
|
} |
|
|
try { |
|
|
try { |
|
|
@@ -553,7 +568,8 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { |
|
|
@Override |
|
|
@Override |
|
|
public ResultData poiOrientedPlanList(TenantEntity tenantInfo,Long couponId, Integer pageNum, Integer pageSize) { |
|
|
public ResultData poiOrientedPlanList(TenantEntity tenantInfo,Long couponId, Integer pageNum, Integer pageSize) { |
|
|
TtCouponChannelPoi ttCouponChannelPoi = ttCouponChannelPoiMapper.selectById(tenantInfo.getTenantId(),couponId); |
|
|
TtCouponChannelPoi ttCouponChannelPoi = ttCouponChannelPoiMapper.selectById(tenantInfo.getTenantId(),couponId); |
|
|
if(ttCouponChannelPoi == null || !EnumSpuSyncStatus.sync_audit_pass.getCode().equals(ttCouponChannelPoi.getLastStatus())){ |
|
|
|
|
|
|
|
|
if(ttCouponChannelPoi == null || EnumSpuSyncStatus.sync_auditing.getCode().equals(ttCouponChannelPoi.getLastStatus()) |
|
|
|
|
|
|| EnumSpuSyncStatus.sync_audit_rejection.getCode().equals(ttCouponChannelPoi.getLastStatus())){ |
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"该券未提交审核或审核未通过"); |
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"该券未提交审核或审核未通过"); |
|
|
} |
|
|
} |
|
|
try { |
|
|
try { |
|
|
@@ -576,7 +592,8 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { |
|
|
return new ResultData(ErrorCode.COUPON_ORDER_TYPE_NOT_SUPPORTED); |
|
|
return new ResultData(ErrorCode.COUPON_ORDER_TYPE_NOT_SUPPORTED); |
|
|
} |
|
|
} |
|
|
TtCouponChannelPoi ttCouponChannelPoi = ttCouponChannelPoiMapper.selectById(wxCoupon.getTenantId(),wxCoupon.getId()); |
|
|
TtCouponChannelPoi ttCouponChannelPoi = ttCouponChannelPoiMapper.selectById(wxCoupon.getTenantId(),wxCoupon.getId()); |
|
|
if(ttCouponChannelPoi == null || !EnumSpuSyncStatus.sync_audit_pass.getCode().equals(ttCouponChannelPoi.getLastStatus())){ |
|
|
|
|
|
|
|
|
if(ttCouponChannelPoi == null || EnumSpuSyncStatus.sync_auditing.getCode().equals(ttCouponChannelPoi.getLastStatus()) |
|
|
|
|
|
|| EnumSpuSyncStatus.sync_audit_rejection.getCode().equals(ttCouponChannelPoi.getLastStatus())){ |
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"该券未提交审核或审核未通过"); |
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"该券未提交审核或审核未通过"); |
|
|
} |
|
|
} |
|
|
try { |
|
|
try { |
|
|
@@ -627,7 +644,8 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { |
|
|
return new ResultData(ErrorCode.COUPON_ORDER_TYPE_NOT_SUPPORTED); |
|
|
return new ResultData(ErrorCode.COUPON_ORDER_TYPE_NOT_SUPPORTED); |
|
|
} |
|
|
} |
|
|
TtCouponChannelPoi ttCouponChannelPoi = ttCouponChannelPoiMapper.selectById(wxCoupon.getTenantId(),wxCoupon.getId()); |
|
|
TtCouponChannelPoi ttCouponChannelPoi = ttCouponChannelPoiMapper.selectById(wxCoupon.getTenantId(),wxCoupon.getId()); |
|
|
if(ttCouponChannelPoi == null || !EnumSpuSyncStatus.sync_audit_pass.getCode().equals(ttCouponChannelPoi.getLastStatus())){ |
|
|
|
|
|
|
|
|
if(ttCouponChannelPoi == null || EnumSpuSyncStatus.sync_auditing.getCode().equals(ttCouponChannelPoi.getLastStatus()) |
|
|
|
|
|
|| EnumSpuSyncStatus.sync_audit_rejection.getCode().equals(ttCouponChannelPoi.getLastStatus())){ |
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"该券未提交审核或审核未通过"); |
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"该券未提交审核或审核未通过"); |
|
|
} |
|
|
} |
|
|
try { |
|
|
try { |
|
|
|