核销调整；商品导入调整

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;
                 }

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);
+        boolean v = vtbVerificationService.removeCheck(id);
-        return R.ok();
+        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,
+                22010L,
-                171471L,182920L,201033L,260717L,260809L,260811L,262948L,263110L,263609L,263821L,264088L,264259L,264259L,
+                264884L,
-                264378L,264524L,264538L,264568L,264684L,264780L,265036L,265373L,265542L,265730L,265730L,267538L,267699L,
+                266434L
-                267705L,267986L,268109L,268254L
         };
         List<Long> costIds2 = Arrays.asList(costIds);
 

src/main/java/com/qs/serve/modules/vtb/service/VtbFundFlowService.java

@@ -12,6 +12,8 @@ import java.util.List;
  */
 public interface VtbFundFlowService extends IService<VtbFundFlow> {
 
+    void removeByVerificationId(Long id);
+
     /**
      * 获取相关活动列表
      * @param activityId 不能空

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

src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationService.java

@@ -27,8 +27,9 @@ public interface VtbVerificationService extends IService<VtbVerification> {
     /**
      * 作废核销
      * @param id
+     * @return
      */
-    void removeCheck(Long id);
+    boolean removeCheck(Long id);
 
     /**
      * 释放活动费用

src/main/java/com/qs/serve/modules/vtb/service/impl/VtbFundFlowServiceImpl.java

@@ -46,6 +46,13 @@ public class VtbFundFlowServiceImpl extends ServiceImpl<VtbFundFlowMapper,VtbFun
     private final TbsActivityCenterGoodsService activityCenterGoodsService;
     private final VtbVerificationSubjectCenterService verificationSubjectCenterService;
 
+    @Override
+    public void removeByVerificationId(Long id) {
+        LambdaQueryWrapper<VtbFundFlow> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(VtbFundFlow::getVerificationId,id);
+        this.remove(lqw);
+    }
+
     @Override
     public List<VtbFundFlow> listByActivity(Long activityId,String... fundTypes) {
         return this.listByActivity(null,activityId,fundTypes);

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());

src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java

@@ -87,6 +87,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
     private final TbsActivityCenterService activityCenterService;
     private final TbsActivityPayConditionService activityPayConditionService;
     private final VtbVerificationSubjectCenterService vtbVerificationSubjectCenterService;
+    private final VtbFundFlowService vtbFundFlowService;
     private final TbsBudgetCostItemService budgetCostItemService;
     private final TbsBudgetLogService budgetLogService;
     private final TbsBudgetService budgetService;
@@ -350,7 +351,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void removeCheck(Long id) {
+    public boolean removeCheck(Long id) {
         VtbVerification verification = this.getById(id);
         if(verification.getVerificationState().equals(VtbVerificationState.Cancel.getCode())){
             Assert.throwEx("已作废，请勿重复提交");
@@ -369,6 +370,8 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
             Assert.throwEx("当前活动状态不可作废");
         }
 
+        String host = "http://59.37.164.96:9002/action/cms/cost/deletion";
+
         //TODO 请求伟成接口，删除 XLT_BIFyDbf
         SysUser sysUser = sysUserService.getById(AuthContextUtils.getSysUserId());
         XltDelVerificationDto delVerificationDto = new XltDelVerificationDto(
@@ -376,10 +379,29 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
                 null,
                 verification.getVerificationCode()
         );
-        //HttpUtil.doPost(null,JsonUtil.objectToJson(delVerificationDto),null);
+        String requestBody = JsonUtil.objectToJson(delVerificationDto);
+        String response = HttpUtil.doPost(host,requestBody,null);
+        String errorMsg = null;
+        if(!response.contains("删除成功")){
+            errorMsg = response;
+        }
+        SysSyncLog syncLog = new SysSyncLog();
+        syncLog.setFromPlat("移除核销记录");
+        syncLog.setUrl(host);
+        syncLog.setEntityClass(XltDelVerificationDto.class.getName());
+        syncLog.setRequestJson(requestBody);
+        syncLog.setFailReason(errorMsg);
+        syncLog.setSuccessStatus(errorMsg==null?0:1);
+        syncLog.setTodoState(0);
+        syncLog.setTryTimes(0);
+        sysSyncLogService.save(syncLog);
+        if(errorMsg!=null){
+            return false;
+        }
 
 
         verification.setVerificationState(VtbVerificationState.Cancel.getCode());
+        vtbFundFlowService.removeByVerificationId(verification.getId());
         this.updateById(verification);
         //判断费用申请类型
         TbsCostApply costApply = costApplyService.getById(verification.getCostApplyId());
@@ -413,7 +435,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
             costApplyUpdate.setChargeState(TbsCostApplyState.State_2_actioning.getCode());
             costApplyService.updateById(costApplyUpdate);
         }
-
+        return true;
     }
 
     private void removeWithVerification(Long verificationId){
@@ -777,6 +799,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
         //更新原来的核销为关闭
         if(orgData!=null){
             orgData.setVerificationState(VtbVerificationState.Close.getCode());
+            vtbFundFlowService.removeByVerificationId(verification.getId());
             this.updateById(orgData);
         }
 //        //记录核销状态到费用申请
@@ -1159,6 +1182,9 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
     public void successCommit(Long verificationId, boolean toPay) {
         log.info("活动核销提交成功。verificationId：{}",verificationId);
         VtbVerification verification = this.getById(verificationId);
+        if(verification.getVerificationState()>1){
+            return;
+        }
         boolean checkZero = verification.getAmount().compareTo(BigDecimal.ZERO)==0;
 
         List<VtbVerificationSubjectCenter> subjectCenterList = vtbVerificationSubjectCenterService.listByVerificationId(verificationId);

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);
+    }
+
 }