feat：修复异常

src/main/java/com/qs/serve/modules/bms/controller/BmsChannelController.java

@@ -194,6 +194,13 @@ public class BmsChannelController {
             param.setHeadChannel("");
             param.setHeadChannelCode("");
         }
+        //编码不可重复
+        Long count = bmsChannelService.count(new LambdaQueryWrapper<BmsChannel>()
+                .ne(BmsChannel::getId,param.getId())
+                .eq(BmsChannel::getChannelCode,param.getChannelCode()));
+        if(count > 0){
+            return R.error("编码不可重复");
+        }
         boolean result = bmsChannelService.updateById(param);
         if(!ori.getChannelName().equals(param.getChannelName())){
             List<BmsChannelPoint> channelPoints = bmsChannelPointService.listByChannelId(param.getId());

src/main/java/com/qs/serve/modules/bms/service/impl/BmsChannelPointServiceImpl.java

@@ -3,6 +3,7 @@ package com.qs.serve.modules.bms.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qs.serve.common.model.dto.R;
 import com.qs.serve.common.model.dto.RowParam;
 import com.qs.serve.common.util.Assert;
 import com.qs.serve.common.util.AuthContextUtils;
@@ -98,6 +99,14 @@ public class BmsChannelPointServiceImpl extends ServiceImpl<BmsChannelPointMappe
             //更新底层的关联表
             //hisUserChannelPointService.initSetupByPointId(channelPoint.getId());
         }else {
+            //编码不可重复
+            Long count = this.count(new LambdaQueryWrapper<BmsChannelPoint>()
+                    .ne(BmsChannelPoint::getId,channelPoint.getId())
+                    .eq(BmsChannelPoint::getPointCode,channelPoint.getPointCode()));
+            if(count > 0){
+                Assert.throwEx("编码不可重复");
+            }
+
            BmsChannelPoint orgData = this.getById(channelPoint.getId());
            sysBusinessLogService.buildLog4Change(BusinessLogType.Point,
                     channelPoint.getId()+"",channelPoint.getPointCode(),channelPoint.getPointName(),null,orgData,channelPoint);

src/main/java/com/qs/serve/modules/goods/service/impl/GoodsSpuServiceImpl.java

@@ -167,9 +167,6 @@ public class GoodsSpuServiceImpl extends ServiceImpl<GoodsSpuMapper,GoodsSpu> im
     @Transactional(rollbackFor = Exception.class)
     public GoodsSpu editTasteSpu(GoodsSpuBo param) {
         GoodsSpu spu  = CopierUtil.copy(param,new GoodsSpu());
-        if(param.getId()!=null){
-            spu.setSpuCode(null);
-        }
         if(StringUtils.hasText(param.getCategoryId())){
             GoodsCategory category = goodsCategoryService.getById(param.getCategoryId());
             relateCate(spu,category);

src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetLogController.java

@@ -61,7 +61,7 @@ public class TbsBudgetLogController {
      */
     @GetMapping("/debug")
     public R<?> debug(){
-        tbsBudgetReleaseApplicationService.check();
+        //tbsBudgetReleaseApplicationService.check();
         return R.ok();
     }
 
@@ -72,7 +72,7 @@ public class TbsBudgetLogController {
      */
     @GetMapping("/debugActivity")
     public R<?> debugActivity(Long activityId){
-        tbsBudgetReleaseApplicationService.initHis(activityId);
+        //tbsBudgetReleaseApplicationService.initHis(activityId);
         return R.ok();
     }
 

src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetReleaseApplicationService.java

@@ -112,11 +112,11 @@ public class TbsBudgetReleaseApplicationService {
     /**
      * 依据剩余预算刷新释放金额
      */
-    public void check(){
+    public void check(Long actId){
         //校验活动的核销金额是否匹配，不匹配则中断
         //查询需要补偿释放的活动ID
         //List<Long> activityIds = vtbFundFlowMapper.listMissReleaseActivityId();
-        Long[] activityIds = new Long[]{229065L,229066L,229067L,229068L,229069L,229070L,229071L,229072L,229073L,229074L,229075L};
+        Long[] activityIds = new Long[]{actId};
         for (Long activityId : activityIds) {
             TbsActivity activity = activityService.getById(activityId);
             TbsCostApply costApply = costApplyService.getById(activity.getCostApplyId());

src/main/java/com/qs/serve/modules/tbs/service/TbsCostContractApplication.java

@@ -8,6 +8,7 @@ import com.qs.serve.modules.tbs.entity.TbsActivity;
 import com.qs.serve.modules.tbs.entity.TbsActivityPayCondition;
 import com.qs.serve.modules.tbs.entity.TbsCostApply;
 import com.qs.serve.modules.tbs.mapper.TbsActivityPayConditionMapper;
+import com.qs.serve.modules.vtb.service.VtbVerificationService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -23,10 +24,12 @@ import java.util.List;
 @AllArgsConstructor
 public class TbsCostContractApplication {
 
+    private final TbsBudgetReleaseApplicationService tbsBudgetReleaseApplicationService;
     private final TbsActivityPayConditionMapper activityPayConditionMapper;
     private final TbsActivityPayConditionService activityPayConditionService;
     private final TbsActivityService tbsActivityService;
     private final TbsCostApplyService tbsCostApplyService;
+    private final VtbVerificationService verificationService;
 
     public void resetState(){
         //更新遗漏的已完成费用申请
@@ -52,6 +55,7 @@ public class TbsCostContractApplication {
                     activity.setReleaseFlag(1);
                     activity.setReleaseAmount(activity.getTotalAmount().subtract(activity.getUsedAmount()));
                     activity.setActivityState(TbsActivityState.STATE_4_Release);
+                    tbsBudgetReleaseApplicationService.check(activity.getId());
                 }
             }
             tbsActivityService.updateBatchById(activityList);

src/main/java/com/qs/serve/modules/third/service/PortalOfCostApplication.java

@@ -1151,6 +1151,7 @@ public class PortalOfCostApplication {
             paymentItemService.save(paymentItem);
             verificationSubjectService.save(verificationSubject);
         }
+
         if(subjectSurplus.compareTo(BigDecimal.ZERO)>0){
             Assert.throwEx("余额不足");
         }

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

@@ -475,6 +475,12 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
         }
         log.warn("费用释放 activityId:{}  url:{}",activityId,url);
         SysUser sysUser = sysUserService.getByAccount(userCode);
+        if(userCode.equals("0")){
+            sysUser = new SysUser();
+            sysUser.setCode("0");
+            sysUser.setName("系统执行");
+            sysUser.setId("0");
+        }
         if(sysUser==null){
             Assert.throwEx("用户编码不存在："+userCode);
         }