Просмотр исходного кода

//..coupon_

release_toaliyun_real
xhxu 2 лет назад
Родитель
Сommit
0ad137218b
16 измененных файлов: 331 добавлений и 139 удалений
  1. +1
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/market/TtCouponGoodsController.java
  2. +16
    -16
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java
  3. +57
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java
  4. +23
    -19
      mallinkCallback/src/main/java/com/iformall/controller/callback/TtWebController.java
  5. +1
    -2
      mallinkService/src/main/java/com/iformall/domain/po/TtCouponChannelPoi.java
  6. +2
    -0
      mallinkService/src/main/java/com/iformall/mapper/TtCouponChannelPoiMapper.java
  7. +2
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java
  8. +2
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxCouponMerchantMapper.java
  9. +2
    -0
      mallinkService/src/main/java/com/iformall/service/TtCouponGoodsService.java
  10. +170
    -67
      mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java
  11. +26
    -26
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java
  12. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponMallServiceImpl.java
  13. +6
    -6
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java
  14. +7
    -0
      mallinkService/src/main/resources/mapper/TtCouponChannelPoiMapper.xml
  15. +9
    -0
      mallinkService/src/main/resources/mapper/WxCouponMapper.xml
  16. +5
    -1
      mallinkService/src/main/resources/mapper/WxCouponMerchantMapper.xml

+ 1
- 0
mallinkAdmin/src/main/java/com/iformall/controller/market/TtCouponGoodsController.java Просмотреть файл

@@ -153,6 +153,7 @@ public class TtCouponGoodsController extends DouyinBaseController {
}
}

@TenantIgnore
@ApiOperation("实时查询审核状态")
@GetMapping("product/draft")
@SystemControllerLog(description = "实时查询审核状态")


+ 16
- 16
mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java Просмотреть файл

@@ -107,22 +107,22 @@ public class WxCouponChannelController extends BaseController {
return resultData;
}

@ApiOperation("预审核上架")
@PostMapping("updateOnline")
@SystemControllerLog(description = "预审核上架")
public ResultData updateOnline(@RequestBody WxCouponChannel wxCouponChannel) {
wxCouponChannel.updateTenantInfo(getTenantInfo());
if (wxCouponChannel.getId() == null) {
return new ResultData(ResultData.ERROR, "缺少id");
}
ResultData resultData = wxCouponChannelService.updateOnline(wxCouponChannel);
if(resultData.code == 200){
CouponCacheUtils.removeCouponChannelCache(redisTemplate, wxCouponChannel.getId());
CouponCacheUtils.removeDouyinLivePageCache(redisTemplate, wxCouponChannel.getTenantId(), null, null);
}
return resultData;
}
// @ApiOperation("预审核上架")
// @PostMapping("updateOnline")
// @SystemControllerLog(description = "预审核上架")
// public ResultData updateOnline(@RequestBody WxCouponChannel wxCouponChannel) {
// wxCouponChannel.updateTenantInfo(getTenantInfo());
// if (wxCouponChannel.getId() == null) {
// return new ResultData(ResultData.ERROR, "缺少id");
// }
// ResultData resultData = wxCouponChannelService.updateOnline(wxCouponChannel);
// if(resultData.code == 200){
// CouponCacheUtils.removeCouponChannelCache(redisTemplate, wxCouponChannel.getId());
// CouponCacheUtils.removeDouyinLivePageCache(redisTemplate, wxCouponChannel.getTenantId(), null, null);
// }
//
// return resultData;
// }





+ 57
- 0
mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java Просмотреть файл

@@ -250,6 +250,63 @@ public class WxCouponController extends BaseController {
return result;
}

@TenantIgnore
@ApiOperation("根据id更新接口")
@PostMapping("updateOnlie")
@SystemControllerLog(description = "券投放-更新")
public ResultData updateOnlie(@RequestBody WxCoupon wxCoupon) {
logger.debug("[" + getIpAddr() + "] WxCouponController::update");
if (wxCoupon.getId() == null) {
return new ResultData(ResultData.ERROR, "缺少id");
}
wxCoupon.updateTenantInfo(getTenantInfo());
WxCoupon coupon = wxCouponService.getById(wxCoupon.getId(),wxCoupon.getTenantId());
if (null == coupon) {
return new ResultData(ResultData.ERROR, "券未查询到。"+wxCoupon.getId());
}


if(EnumDelFlag.YES.getCode().equals(wxCoupon.getIsDel())){
if(!EnumCouponStatus.COUPON_STATUS_TAKE_OFFF.getCode().equals(coupon.getStatus())){
return new ResultData(ResultData.ERROR, "请先作废,再进行删除。");
}
wxCouponService.deleteById(wxCoupon.getId(),wxCoupon.getTenantId());
CouponCacheUtils.removeCouponCache(redisTemplate, wxCoupon.getId());
CouponCacheUtils.removeCouponMerchantCache(redisTemplate, wxCoupon.getId(),null);
CouponCacheUtils.removeOnlyCouponCache(redisTemplate, wxCoupon.getId());
return new ResultData();
}

//启动审批流
if (wxCoupon.getFlowParams() != null && wxCoupon.getFlowParams().size() > 0) {
logger.info("------coupon.update().businessType:"+wxCoupon.getFlowParams().get("businessType"));
wxCoupon.getFlowParams().put("businessId",wxCoupon.getId());
wxFlowService.start(wxCoupon.getFlowParams(), getUserId(), getUser().getName(), getTenantInfo());
//作废审批
if (EnumCouponStatus.COUPON_STATUS_TAKE_OFFF.getCode().equals(wxCoupon.getStatus())) {
wxCoupon.setCancleApplyStatus(EnumRentContractAppStatus.APPLYING.getCode());
return new ResultData(wxCoupon);
} else {
//投放审批
wxCoupon.setPutApplyStatus(EnumRentContractAppStatus.APPLYING.getCode());
}
}

ResultData result = null;
if(EnumCouponStatus.COUPON_STATUS_TAKE_OFFF.getCode().equals(wxCoupon.getStatus())){
result = wxCouponService.disable(wxCoupon, wxCoupon.getId(),getUser());
}else{
result = wxCouponService.saveOrUpdate(wxCoupon, null);
if(wxCoupon.getRemainInventory() != null){
redisLock.setCouponStock(wxCoupon.getId(), wxCoupon.getRemainInventory());
}
}

CouponCacheUtils.removeCouponCache(redisTemplate, wxCoupon.getId());
CouponCacheUtils.removeCouponMerchantCache(redisTemplate, wxCoupon.getId(),null);
return result;
}

@ApiOperation("根据id更新接口")
@PostMapping("continueAdd")
@SystemControllerLog(description = "继续添加")


+ 23
- 19
mallinkCallback/src/main/java/com/iformall/controller/callback/TtWebController.java Просмотреть файл

@@ -107,26 +107,30 @@ public class TtWebController extends BaseController {
// String product_id = content.get("product_id").toString();
// String reason = (String) content.get("reason");
// String status = (String) content.get("status");
TtCouponChannelPoi couponChannelPoi = ttCouponGoodsService.getCouponChannelBySpuId(product_id);

// TtCouponChannelPoi couponChannelPoi = new TtCouponChannelPoi();
//// couponChannelPoi.updateTenantInfo(appInfo);
// couponChannelPoi.setSpuId(product_id);
// if("FAIL".equals(status)){
// couponChannelPoi.setStatus(EnumSpuSyncStatus.sync_audit_rejection.getCode());
// couponChannelPoi.setStatusDesc(reason);
//
// }else if("PASS".equals(status)){
//// couponChannelPoi.setLastStatus(EnumSpuSyncStatus.sync_audit_pass.getCode());
// //抖音审核通过既上架
// couponChannelPoi.setStatus(EnumSpuSyncStatus.sync_put_on.getCode());
// couponChannelPoi.setStatusDesc(reason);
//
// }else{
// resultMap.put("err_code",1000);
// resultMap.put("err_tips","error");
// return resultMap;
// }
// ttCouponGoodsService.handlerTtGoodsAudit(couponChannelPoi);

ttCouponGoodsService.productDraftGet(couponChannelPoi,couponChannelPoi.getId(),false);

TtCouponChannelPoi couponChannelPoi = new TtCouponChannelPoi();
// couponChannelPoi.updateTenantInfo(appInfo);
couponChannelPoi.setSpuId(product_id);
if("FAIL".equals(status)){
couponChannelPoi.setLastStatus(EnumSpuSyncStatus.sync_audit_rejection.getCode());
couponChannelPoi.setLastStatusDesc(reason);

}else if("PASS".equals(status)){
// couponChannelPoi.setLastStatus(EnumSpuSyncStatus.sync_audit_pass.getCode());
//抖音审核通过既上架
couponChannelPoi.setLastStatus(EnumSpuSyncStatus.sync_put_on.getCode());
couponChannelPoi.setLastStatusDesc(reason);

}else{
resultMap.put("err_code",1000);
resultMap.put("err_tips","error");
return resultMap;
}
ttCouponGoodsService.handlerTtGoodsAudit(couponChannelPoi);
resultMap.put("err_code",0);
resultMap.put("err_tips","success");
openRedisTemplate.opsForValue().set(key,"1",16*60, TimeUnit.SECONDS);


+ 1
- 2
mallinkService/src/main/java/com/iformall/domain/po/TtCouponChannelPoi.java Просмотреть файл

@@ -25,8 +25,7 @@ public class TtCouponChannelPoi extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value="spuId",name="spuId")
private String spuId;

//该字段状态更新不及时,不作为业务使用
@io.swagger.annotations.ApiModelProperty(value="状态:0-审核中,1-上架,2-下架,3-审核拒绝 4-审核通过",name="status")
@io.swagger.annotations.ApiModelProperty(value=" EnumSpuSyncStatus 状态:0-审核中,1-上架,2-下架,3-审核拒绝 4-审核通过",name="status")
private Integer status;

@io.swagger.annotations.ApiModelProperty(value="描述",name="statusDesc")


+ 2
- 0
mallinkService/src/main/java/com/iformall/mapper/TtCouponChannelPoiMapper.java Просмотреть файл

@@ -18,4 +18,6 @@ public interface TtCouponChannelPoiMapper extends CommonMapper<TtCouponChannelPo

TtCouponChannelPoi selectById(@Param("tenantId")String tenantId,@Param("id")Long id);

TtCouponChannelPoi selectBySpuId(@Param("spuId")String spuId);

}

+ 2
- 0
mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java Просмотреть файл

@@ -126,4 +126,6 @@ public interface WxCouponMapper extends CommonMapper<WxCoupon, Long> {

Integer findCategoryIdById(@Param("id")Long id,@Param("tenantId")String tenantId);

WxCoupon selectDraftCoupon(@Param("couponId")Long id,@Param("tenantId")String tenantId);

}

+ 2
- 0
mallinkService/src/main/java/com/iformall/mapper/WxCouponMerchantMapper.java Просмотреть файл

@@ -30,4 +30,6 @@ public interface WxCouponMerchantMapper extends CommonMapper<WxCouponMerchant, L

//自动加tenant
int insertList(@Param("addList")List<WxCouponMerchant> addList);

void delteAllByProductId(WxCouponMerchant couponMerchant);
}

+ 2
- 0
mallinkService/src/main/java/com/iformall/service/TtCouponGoodsService.java Просмотреть файл

@@ -16,6 +16,8 @@ public interface TtCouponGoodsService {

ResultData productSave(WxCoupon coupon,boolean isSaas) throws Exception;

TtCouponChannelPoi getCouponChannelBySpuId(String spuId);

int handlerTtGoodsAudit(TtCouponChannelPoi couponChannelPoi);

ResultData productDraftGet(TenantEntity tenantEntity,Long id,boolean isSaas);


+ 170
- 67
mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java Просмотреть файл

@@ -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 {


+ 26
- 26
mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java Просмотреть файл

@@ -164,8 +164,8 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService {
}
if(EnumCouponType.getDouYinType().contains(wxCoupon.getType())){
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(),"该券未提交审核或审核未通过");
}
}
@@ -906,7 +906,7 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService {
}
TtCouponChannelPoi ttCouponChannelPoi = ttCouponChannelPoiMapper.selectById(tenantInfo.getTenantId(), couponChannel.getCouponId());

if(ttCouponChannelPoi != null && ttCouponChannelPoi.getLastStatus() != null && ttCouponChannelPoi.getLastStatus().intValue() > 0){
if(ttCouponChannelPoi != null && ttCouponChannelPoi.getStatus() != null && ttCouponChannelPoi.getStatus().intValue() > 0){
return new ResultData(ttCouponChannelPoi);
}
return new ResultData(ErrorCode.SYS_NULLPOINTER_ERROR.getCode(),"未找到可用的数据");
@@ -931,29 +931,29 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService {
return pageInfo;
}

@Override
public ResultData updateOnline(WxCouponChannel wxCouponChannel) {
WxCouponChannel couponChannel = this.getById(wxCouponChannel.getId(), wxCouponChannel.getTenantId());
if(couponChannel == null){
return new ResultData(ErrorCode.SYS_NULLPOINTER_ERROR.getCode(),"未找到可用的数据");
}
TtCouponChannelPoi ttCouponChannelPoi = ttCouponChannelPoiMapper.selectById(couponChannel.getTenantId(), couponChannel.getCouponId());
if(ttCouponChannelPoi == null || EnumSpuSyncStatus.sync_auditing.getCode().equals(ttCouponChannelPoi.getLastStatus())
|| EnumSpuSyncStatus.sync_audit_rejection.getCode().equals(ttCouponChannelPoi.getLastStatus())
|| EnumSpuSyncStatus.sync_audit_disable.getCode().equals(ttCouponChannelPoi.getLastStatus())){
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"该券未提交审核或审核未通过");
}
Date date = new Date();
WxCouponChannel updChannel = new WxCouponChannel();
updChannel.setId(wxCouponChannel.getId());
updChannel.updateTenantInfo(wxCouponChannel);
updChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode());
updChannel.setShowBeginTime(date);
updChannel.setUpdateDate(date);
wxCouponChannelMapper.updateById(updChannel);
return new ResultData();
}
// @Override
// public ResultData updateOnline(WxCouponChannel wxCouponChannel) {
// WxCouponChannel couponChannel = this.getById(wxCouponChannel.getId(), wxCouponChannel.getTenantId());
// if(couponChannel == null){
// return new ResultData(ErrorCode.SYS_NULLPOINTER_ERROR.getCode(),"未找到可用的数据");
// }
// TtCouponChannelPoi ttCouponChannelPoi = ttCouponChannelPoiMapper.selectById(couponChannel.getTenantId(), couponChannel.getCouponId());
//
// if(ttCouponChannelPoi == null || EnumSpuSyncStatus.sync_auditing.getCode().equals(ttCouponChannelPoi.getLastStatus())
// || EnumSpuSyncStatus.sync_audit_rejection.getCode().equals(ttCouponChannelPoi.getLastStatus())
// || EnumSpuSyncStatus.sync_audit_disable.getCode().equals(ttCouponChannelPoi.getLastStatus())){
// return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"该券未提交审核或审核未通过");
// }
// Date date = new Date();
// WxCouponChannel updChannel = new WxCouponChannel();
// updChannel.setId(wxCouponChannel.getId());
// updChannel.updateTenantInfo(wxCouponChannel);
// updChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode());
// updChannel.setShowBeginTime(date);
// updChannel.setUpdateDate(date);
// wxCouponChannelMapper.updateById(updChannel);
// return new ResultData();
// }

@Override
public Long getCouponOneMerchantId(Long couponChannelId, String tenantId) {


+ 2
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxCouponMallServiceImpl.java Просмотреть файл

@@ -40,7 +40,7 @@ public class WxCouponMallServiceImpl implements WxCouponMallService {
List<WxCouponMall> list = wxCouponMallMapper.findList(wxCouponMall);
if (queryMall) {
if (null != list && list.size() > 0 ) {
List<String> mallTenantList = new ArrayList<String>();;
List<String> mallTenantList = new ArrayList<String>();
for (int i = 0 ;i <list.size() ; i++) {
String mt = list.get(i).getMallTenantId();
if (!mallTenantList.contains(mt)) {
@@ -100,7 +100,7 @@ public class WxCouponMallServiceImpl implements WxCouponMallService {
EnumAppPlat plat = EnumCouponType.getAppPlat(couponType);
if (plat == EnumAppPlat.TOUTIAO) {
TtCouponChannelPoi poi = ttCouponChannelPoiMapper.selectById(couponTenantId, couponId);
if (null != poi &&( EnumSpuSyncStatus.isValid(poi.getLastStatus()))) {
if (null != poi &&( EnumSpuSyncStatus.isValid(poi.getStatus()))) {
throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(),"券已在抖音审核流程中,无法修改。");
}
}else if (plat == EnumAppPlat.WX) {


+ 6
- 6
mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java Просмотреть файл

@@ -668,9 +668,9 @@ public class WxCouponServiceImpl implements WxCouponService {
if(EnumCouponType.getDouYinType().contains(record.getType())){
TtCouponChannelPoi ttCouponChannelPoi = ttCouponChannelPoiMapper.selectById(record.getTenantId(),record.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()))){
(EnumSpuSyncStatus.sync_auditing.getCode().equals(ttCouponChannelPoi.getStatus())
|| EnumSpuSyncStatus.sync_put_on.getCode().equals(ttCouponChannelPoi.getStatus())
|| EnumSpuSyncStatus.sync_audit_disable.getCode().equals(ttCouponChannelPoi.getStatus()))){
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"该券状态不允许修改");
}
}
@@ -1077,9 +1077,9 @@ public class WxCouponServiceImpl implements WxCouponService {
if(EnumCouponType.getDouYinType().contains(record.getType())){
TtCouponChannelPoi ttCouponChannelPoi = ttCouponChannelPoiMapper.selectById(record.getTenantId(),record.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()))){
(EnumSpuSyncStatus.sync_auditing.getCode().equals(ttCouponChannelPoi.getStatus())
|| EnumSpuSyncStatus.sync_put_on.getCode().equals(ttCouponChannelPoi.getStatus())
|| EnumSpuSyncStatus.sync_audit_disable.getCode().equals(ttCouponChannelPoi.getStatus()))){
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"该券状态不允许修改");
}
}


+ 7
- 0
mallinkService/src/main/resources/mapper/TtCouponChannelPoiMapper.xml Просмотреть файл

@@ -110,6 +110,13 @@
</select>


<select id="selectBySpuId" resultMap="BaseResultMap">
select
<include refid="allColumns"/>
from tt_coupon_channel_poi
where `spu_id` = #{spuId}
</select>

<update id="updateBySpuId" parameterType="com.iformall.domain.po.TtCouponChannelPoi">
update tt_coupon_channel_poi set update_date = now()
<if test=" null != status ">,`status` = #{status}</if>


+ 9
- 0
mallinkService/src/main/resources/mapper/WxCouponMapper.xml Просмотреть файл

@@ -65,9 +65,12 @@
<result column="html" property="html"/>
<result column="source_type" jdbcType="INTEGER" property="sourceType"/>
<result column="merchant_type" jdbcType="INTEGER" property="merchantType"/>
<result column="gift_list" jdbcType="VARCHAR" property="giftList"/>
<result column="product_type" jdbcType="INTEGER" property="productType"/>
<result column="category_id" jdbcType="INTEGER" property="categoryId"/>
<result column="goods_id" jdbcType="VARCHAR" property="goodsId"/>
<result column="product_attrs" jdbcType="VARCHAR" property="productAttrs"/>
<result column="sku_attrs" jdbcType="VARCHAR" property="skuAttrs"/>
<result column="is_after_set_price" jdbcType="INTEGER" property="isAfterSetPrice"/>

<result column="spu_id" jdbcType="VARCHAR" property="spuId"/>
@@ -1598,4 +1601,10 @@
and tenant_id = #{tenantId}
</select>

<select id="selectDraftCoupon" parameterType="java.util.HashMap" resultMap="BaseResultMap">
select <include refid="allColumns"/> ,c.html,c.gift_list,c.product_attrs,c.sku_attrs
from wx_coupon c
where c.`version` = 1 and coupon_id = #{couponId} and tenant_id = #{tenantId}
</select>

</mapper>

+ 5
- 1
mallinkService/src/main/resources/mapper/WxCouponMerchantMapper.xml Просмотреть файл

@@ -219,5 +219,9 @@
#{item.status,jdbcType=INTEGER})
</foreach>
</insert>

<update id = "delteAllByProductId" parameterType="com.iformall.domain.po.WxCouponMerchant">
delete from wx_coupon_merchant where `product_id` = #{productId} and `tenant_id` = #{tenantId}
</update>

</mapper>

Загрузка…
Отмена
Сохранить