diff --git a/src/main/java/com/qs/serve/modules/goods/controller/GoodsSkuController.java b/src/main/java/com/qs/serve/modules/goods/controller/GoodsSkuController.java index 4d77b91a..58f6bf29 100644 --- a/src/main/java/com/qs/serve/modules/goods/controller/GoodsSkuController.java +++ b/src/main/java/com/qs/serve/modules/goods/controller/GoodsSkuController.java @@ -304,7 +304,7 @@ public class GoodsSkuController { skuItem.setErrMsg(skuItem.getErrMsg()==null?"已保存,新增失败;":skuItem.getErrMsg()+"\n已保存,新增失败;"); continue; } - if(spu!=null){ + if(spu==null){ skuItem.setErrMsg(skuItem.getErrMsg()==null?"SKU不存在,新增失败;":skuItem.getErrMsg()+"\nSKU不存在,新增失败;"); continue; } diff --git a/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java b/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java index 2b19fcb2..dc7fc983 100644 --- a/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java +++ b/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java @@ -97,8 +97,8 @@ public class VtbVerificationController { */ @DeleteMapping("/removeCheckById/{id}") public R removeVtbById(@PathVariable("id") Long id){ - vtbVerificationService.removeCheck(id); - return R.ok(); + boolean v = vtbVerificationService.removeCheck(id); + return R.isTrue(v); } /** @@ -463,14 +463,13 @@ public class VtbVerificationController { * 成功提交回调 * @return */ - //@GetMapping("successCommit2") + @GetMapping("successCommit2") public R successCommit2(){ //错误的 Long[] costIds = new Long[]{ - 21976L,22477L,62800L,63170L,63173L,63199L,63392L,63581L,63595L,73137L,115316L,115341L,115356L,148035L, - 171471L,182920L,201033L,260717L,260809L,260811L,262948L,263110L,263609L,263821L,264088L,264259L,264259L, - 264378L,264524L,264538L,264568L,264684L,264780L,265036L,265373L,265542L,265730L,265730L,267538L,267699L, - 267705L,267986L,268109L,268254L + 22010L, + 264884L, + 266434L }; List costIds2 = Arrays.asList(costIds); diff --git a/src/main/java/com/qs/serve/modules/vtb/service/VtbFundFlowService.java b/src/main/java/com/qs/serve/modules/vtb/service/VtbFundFlowService.java index 16e3b26a..b915fc7c 100644 --- a/src/main/java/com/qs/serve/modules/vtb/service/VtbFundFlowService.java +++ b/src/main/java/com/qs/serve/modules/vtb/service/VtbFundFlowService.java @@ -12,6 +12,8 @@ import java.util.List; */ public interface VtbFundFlowService extends IService { + void removeByVerificationId(Long id); + /** * 获取相关活动列表 * @param activityId 不能空 diff --git a/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java b/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java index 6f3cedee..c2b362de 100644 --- a/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java +++ b/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java @@ -68,6 +68,7 @@ public class VtbVerificationApplication { private TbsCostApplyService tbsCostApplyService; private SysUserService sysUserService; private SeeYonRequestService seeYonService; + private VtbFundFlowService vtbFundFlowService; public R commitAffair(@RequestBody @Valid TbsAffairCommitBo affairCommit){ //临时测试 @@ -456,11 +457,13 @@ public class VtbVerificationApplication { vtbVer.setSyFormId(""); vtbVer.setSyFlowId(""); vtbVerificationService.updateById(vtbVer); + vtbFundFlowService.removeByVerificationId(verification.getId()); }else { VtbVerification vtbVer = new VtbVerification(); vtbVer.setId(verification.getId()); vtbVer.setVerificationState(VtbVerificationState.Stop.getCode()); vtbVerificationService.updateById(vtbVer); + vtbFundFlowService.removeByVerificationId(verification.getId()); } //还原支付条件 if(verification.getPayConditionId()!=null){ diff --git a/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationService.java b/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationService.java index 5ec84a12..637ab02f 100644 --- a/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationService.java +++ b/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationService.java @@ -27,8 +27,9 @@ public interface VtbVerificationService extends IService { /** * 作废核销 * @param id + * @return */ - void removeCheck(Long id); + boolean removeCheck(Long id); /** * 释放活动费用 diff --git a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbFundFlowServiceImpl.java b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbFundFlowServiceImpl.java index 546abf69..d8763f74 100644 --- a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbFundFlowServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbFundFlowServiceImpl.java @@ -46,6 +46,13 @@ public class VtbFundFlowServiceImpl extends ServiceImpl lqw = new LambdaQueryWrapper<>(); + lqw.eq(VtbFundFlow::getVerificationId,id); + this.remove(lqw); + } + @Override public List listByActivity(Long activityId,String... fundTypes) { return this.listByActivity(null,activityId,fundTypes); diff --git a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationOperationServiceImpl.java b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationOperationServiceImpl.java index 69b38dd4..b296e2e7 100644 --- a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationOperationServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationOperationServiceImpl.java @@ -18,6 +18,7 @@ import com.qs.serve.modules.vtb.entity.VtbVerification; import com.qs.serve.modules.vtb.entity.VtbVerificationSubject; import com.qs.serve.modules.vtb.entity.VtbVerificationYard; import com.qs.serve.modules.vtb.mapper.VtbVerificationMapper; +import com.qs.serve.modules.vtb.service.VtbFundFlowService; import com.qs.serve.modules.vtb.service.VtbVerificationService; import com.qs.serve.modules.vtb.service.VtbVerificationSubjectService; import com.qs.serve.modules.vtb.service.VtbVerificationYardService; @@ -39,6 +40,7 @@ import java.util.List; public class VtbVerificationOperationServiceImpl implements SeeYonOperationService { private VtbVerificationMapper vtbVerificationMapper; + private VtbFundFlowService vtbFundFlowService; private TbsActivityPayConditionService activityPayConditionService; private TbsActivityService tbsActivityService; @@ -154,6 +156,7 @@ public class VtbVerificationOperationServiceImpl implements SeeYonOperationServi vtbVer.setId(verification.getId()); vtbVer.setVerificationState(VtbVerificationState.Stop.getCode()); vtbVerificationMapper.updateById(vtbVer); + vtbFundFlowService.removeByVerificationId(verification.getId()); //还原支付条件 if(verification.getPayConditionId()!=null){ TbsActivityPayCondition payCondition = activityPayConditionService.getById(verification.getPayConditionId()); diff --git a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java index 5798f594..691c753b 100644 --- a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java @@ -87,6 +87,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl1){ + return; + } boolean checkZero = verification.getAmount().compareTo(BigDecimal.ZERO)==0; List subjectCenterList = vtbVerificationSubjectCenterService.listByVerificationId(verificationId); diff --git a/src/main/java/com/qs/serve/task/GoodsTask.java b/src/main/java/com/qs/serve/task/GoodsTask.java index f06107e8..873ad504 100644 --- a/src/main/java/com/qs/serve/task/GoodsTask.java +++ b/src/main/java/com/qs/serve/task/GoodsTask.java @@ -1,5 +1,6 @@ package com.qs.serve.task; +import com.qs.serve.modules.goods.service.GoodsApplicationService; import com.qs.serve.modules.goods.service.GoodsSpuService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -18,10 +19,19 @@ import org.springframework.stereotype.Component; public class GoodsTask { private GoodsSpuService goodsSpuService; + private GoodsApplicationService goodsApplicationService; @Scheduled(cron="0 0 1 * * ?") public void buildTempTable(){ goodsSpuService.initSkuNum(); } + /** + * 每两个小时同步一次 + */ + @Scheduled(cron="0 0 0/2 * * ?") + public void syncStandGoods(){ + goodsApplicationService.syncStandGoods(false); + } + }