feat: 人员维度下单规则

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

@@ -1287,8 +1287,10 @@ public class BmsSupplierController {
                     List<String> otherUserIds = new ArrayList<>();
                     otherUserCodes.forEach(b->{
                         SysUser sysUser = sysUserMap.get(b);
-                        otherUserNames.add(sysUser.getName());
-                        otherUserIds.add(sysUser.getId());
+                        if(sysUser!=null){
+                            otherUserNames.add(sysUser.getName());
+                            otherUserIds.add(sysUser.getId());
+                        }
                     });
                     supplier.setOtherUserCodes(otherUserCodes.stream().collect(Collectors.joining(",")));
                     supplier.setOtherUserNames(otherUserNames.stream().collect(Collectors.joining(",")));

src/main/java/com/qs/serve/modules/goods/controller/GoodsSpuController.java

@@ -141,7 +141,8 @@ public class GoodsSpuController {
         }
 
         //客户规则设置
-        this.toSetSpuParam(param, supplier);
+        String userId = AuthContextUtils.getSysUserId();
+        this.toSetSpuParam(param, supplier,userId);
         //产品规则设置
         this.tiSetSpuParam2(param, supplier);
 
@@ -185,8 +186,18 @@ public class GoodsSpuController {
      * @param param
      * @param supplier
      */
-    private void toSetSpuParam(GoodsSpu param, BmsSupplier supplier) {
+    private void toSetSpuParam(GoodsSpu param, BmsSupplier supplier,String userId) {
+
+        //用户维度的客户规则
+        List<GoodsRuleItem> userRules = goodsRuleService.listByUserId(userId);
         List<GoodsRuleItem> ruleItems = goodsRuleService.listBySupplierId(supplier.getId());
+        if(userRules!=null){
+            if(ruleItems!=null){
+                ruleItems.addAll(userRules);
+            }else {
+                ruleItems = userRules;
+            }
+        }
         GoodsRuleItemDTO ruleItemDTO = goodsRuleService.buildGoodsRuleItemDTO(ruleItems);
         if(ruleItemDTO!=null){
 
@@ -201,35 +212,8 @@ public class GoodsSpuController {
             if(CollUtil.isNotEmpty(ruleItemDTO.getOnlyCategoryIds())){
                 if (CollUtil.isEmpty(param.getSelectCateIds())){
                     param.setSelectCateIds(ruleItemDTO.getOnlyCategoryIds());
-                }else{
-                    List<String> onlyIds = ruleItemDTO.getOnlyCategoryIds();
-                    List<GoodsCategory> onlyCategoryList = goodsCategoryService.listByIds(onlyIds);
-                    for (GoodsCategory category : onlyCategoryList) {
-                        List<GoodsCategory> childList = goodsCategoryService.list(new LambdaQueryWrapper<GoodsCategory>()
-                                .likeRight(GoodsCategory::getLevelPath,category.getLevelPath()+"_"));
-                        if(CollUtil.isNotEmpty(childList)){
-                            List<String> childIds = childList.stream().map(a->a.getId().toString()).collect(Collectors.toList());
-                            onlyIds.addAll(childIds);
-                        }
-                    }
-                    List<String> selectCateIds = param.getSelectCateIds();
-                    List<GoodsCategory> goodsCategoryList = goodsCategoryService.listByIds(selectCateIds);
-                    for (GoodsCategory category : goodsCategoryList) {
-                        List<GoodsCategory> childList = goodsCategoryService.list(new LambdaQueryWrapper<GoodsCategory>()
-                                .likeRight(GoodsCategory::getLevelPath,category.getLevelPath()+"_"));
-                        if(CollUtil.isNotEmpty(childList)){
-                            List<String> childIds = childList.stream().map(a->a.getId().toString()).collect(Collectors.toList());
-                            selectCateIds.addAll(childIds);
-                        }
-                    }
-                    //交集
-                    Collection<String> ids = cn.hutool.core.collection.CollectionUtil
-                            .intersection(onlyIds, selectCateIds);
-                    List<String> idsList = new ArrayList<>();
-                    idsList.addAll(ids);
-                    idsList.add("#");
-                    param.setSelectCateIds(idsList);
-                }
+                }else.
+
             }
 
             if(CollUtil.isNotEmpty(ruleItemDTO.getOnlySpuIds())){

src/main/java/com/qs/serve/modules/goods/entity/GoodsRule.java

@@ -31,6 +31,9 @@ public class GoodsRule implements Serializable {
 
     private String name;
 
+    /** 授权用户ID */
+    private String userId;
+
     /** 客户id */
     private Long supplierId;
 

src/main/java/com/qs/serve/modules/goods/entity/dto/GoodsRuleBaseDTO.java

@@ -18,4 +18,7 @@ public class GoodsRuleBaseDTO {
     /** 行政区域id */
     private String bizRegionId;
 
+    /** 人员ID */
+    private String userId;
+
 }

src/main/java/com/qs/serve/modules/goods/mapper/GoodsRuleMapper.java

@@ -22,5 +22,8 @@ public interface GoodsRuleMapper extends BaseMapper<GoodsRule> {
     @Select("select * from goods_rule where biz_region_id = #{bizRegionId} limit 1 ")
     GoodsRule selectRuleByBizRegionId(@Param("bizRegionId")String bizRegionId);
 
+    @Select("select * from goods_rule where user_id = #{userId} limit 1 ")
+    GoodsRule selectRuleByUserId(@Param("userId")String userId);
+
 }
 

src/main/java/com/qs/serve/modules/goods/service/GoodsRuleService.java

@@ -22,6 +22,7 @@ public interface GoodsRuleService extends IService<GoodsRule> {
 
     GoodsRuleVo getVoById(GoodsRuleBaseDTO baseDTO);
 
+    List<GoodsRuleItem> listByUserId(String userId);
 
     List<GoodsRuleItem> listBySupplierId(String supplierId);
 

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

@@ -21,6 +21,8 @@ import com.qs.serve.modules.goods.mapper.GoodsCategoryMapper;
 import com.qs.serve.modules.goods.mapper.GoodsSkuMapper;
 import com.qs.serve.modules.goods.mapper.GoodsSpuMapper;
 import com.qs.serve.modules.goods.service.GoodsRuleItemService;
+import com.qs.serve.modules.sys.entity.SysUser;
+import com.qs.serve.modules.sys.mapper.SysUserMapper;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.jetbrains.annotations.NotNull;
@@ -44,6 +46,7 @@ import java.util.stream.Collectors;
 @AllArgsConstructor
 public class GoodsRuleServiceImpl extends ServiceImpl<GoodsRuleMapper,GoodsRule> implements GoodsRuleService {
 
+    private SysUserMapper sysUserMapper;
     private BmsSupplierMapper supplierMapper;
     private BmsRegionMapper saleRegionMapper;
     private BmsRegion2Mapper bizRegionMapper;
@@ -209,6 +212,20 @@ public class GoodsRuleServiceImpl extends ServiceImpl<GoodsRuleMapper,GoodsRule>
         return null;
     }
 
+    @Override
+    public List<GoodsRuleItem> listByUserId(String userId) {
+        List<GoodsRule> goodsRules = this.list(new LambdaQueryWrapper<GoodsRule>()
+                .eq(GoodsRule::getUserId,userId)
+        );
+        List<Long> ruleIds = goodsRules.stream().map(GoodsRule::getId).collect(Collectors.toList());
+        if(CollUtil.isNotEmpty(ruleIds)){
+            return goodsRuleItemService.list(new LambdaQueryWrapper<GoodsRuleItem>()
+                    .in(GoodsRuleItem::getRuleId,ruleIds)
+            );
+        }
+        return null;
+    }
+
     @Override
     public List<GoodsRuleItem> listBySupplierId(String supplierId) {
         BmsSupplier supplier = supplierMapper.selectById(supplierId);
@@ -381,6 +398,17 @@ public class GoodsRuleServiceImpl extends ServiceImpl<GoodsRuleMapper,GoodsRule>
                     goodsRule.setName(region.getName());
                 }
             }
+        }else if (StringUtils.hasText(param.getUserId())){
+            SysUser sysUser = sysUserMapper.selectById(param.getUserId());
+            if(sysUser!=null){
+                goodsRule = super.baseMapper.selectRuleByUserId(param.getUserId());
+                if(goodsRule ==null){
+                    goodsRule = new GoodsRule();
+                    goodsRule.setUserId(sysUser.getId());
+                    goodsRule.setCode(sysUser.getCode());
+                    goodsRule.setName(sysUser.getName());
+                }
+            }
         }
         return goodsRule;
     }

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

@@ -465,7 +465,19 @@ public class TbsActivityController {
     @GetMapping("/flushAmount/{id}")
     @SysLog(module = SystemModule.Budget, title = "费用活动", biz = BizType.DELETE)
     public R<?> flushActivityAmount(@PathVariable("id") Long id){
-        vtbFundFlowService.flushActivityAmount(id);
+        Long[] ids = new Long[]{};
+        List<Long> errorIds = new ArrayList<>();
+        for (Long aLong : ids) {
+            try {
+                vtbFundFlowService.flushActivityAmount(aLong);
+            } catch (Exception e) {
+                errorIds.add(aLong);
+            }
+        }
+        for (Long errorId : errorIds) {
+            System.out.println(errorId);
+        }
+        //vtbFundFlowService.flushActivityAmount(id);
         return R.ok();
     }
 
@@ -485,6 +497,8 @@ public class TbsActivityController {
         return R.ok();
     }
 
+
+
     /**
      * 获取默认的成本中心
      * @param defaultCenterBo

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

@@ -98,6 +98,26 @@ public class TbsCostApplyCheckController {
         return R.ok();
     }
 
+    /**
+     * 重置申请
+     * @return
+     */
+    @PostMapping("/replaceCommit/{id}")
+    public R<?> replaceApplySyData(@PathVariable("id") Long id){
+        Long[] ids = new Long[]{ id };
+        LambdaQueryWrapper<TbsCostApply> lqw = new LambdaQueryWrapper<>();
+        lqw.in(TbsCostApply::getId,Arrays.asList(ids));
+        //lqw.notIn(TbsCostApply::getId,Arrays.asList(notIds));
+        lqw.notLike(TbsCostApply::getRemark,"审批节点重置");
+        lqw.select(TbsCostApply::getId);
+        List<TbsCostApply> costApplyList = tbsCostApplyService.list(lqw);
+
+        for (TbsCostApply costApply : costApplyList) {
+            tbsCostApplyService.replaceApplySyData(costApply.getId()+"");
+        }
+        return R.ok();
+    }
+
     /**
      * 审批列表(用于详情页)
      * @param costApplyId

src/main/java/com/qs/serve/modules/tbs/mapper/TbsBudgetLogMapper.java

@@ -17,6 +17,9 @@ import java.util.List;
  */
 public interface TbsBudgetLogMapper extends BaseMapper<TbsBudgetLog> {
 
+    @Select("SELECT count(1) FROM `tbs_budget_log` WHERE cost_apply_id = #{errorCostId} AND del_flag = '3'")
+    Long countErrorCostId(@Param("errorCostId")Long errorCostId );
+
     @Select("SELECT SUM(amount) FROM `tbs_budget_log` WHERE budget_id = #{budgetId} AND schedule_item_id = #{itemId} AND del_flag = '0'")
     BigDecimal countBudgetItemAmount(@Param("budgetId")Long budgetId,@Param("itemId")Long itemId );
 

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

@@ -57,6 +57,11 @@ public interface TbsCostApplyService extends IService<TbsCostApply> {
      */
     void commitApply(String id);
 
+    /**
+     * 事故修复方法，替换原来的审批流程(仅支持无核销的审批)
+     * @param id
+     */
+    void replaceApplySyData(String id);
 
     /**
      * 获取致远data

src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyPart1ServiceImpl.java

@@ -193,7 +193,14 @@ public class TbsCostApplyPart1ServiceImpl implements TbsCostApplyPart1Service {
             qw.eq(VtbVerification::getVerificationState, VtbVerificationState.Commiting.getCode())
                     .or().eq(VtbVerification::getVerificationState,VtbVerificationState.Finished.getCode());
         });
+
         TbsCostApply extCost = tbsCostApplyService.getById(costId);
+
+        long countErr = tbsBudgetLogMapper.countErrorCostId(extCost.getChangeSourceId());
+        if(countErr>0){
+            Assert.throwEx("审批流程错误无法取消异动");
+        }
+
         if(checkThrow){
             Long count = verificationMapper.selectCount(vtbLqwCount);
             if(count>0){

src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java

@@ -88,6 +88,7 @@ import java.util.stream.Collectors;
 @AllArgsConstructor
 public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsCostApply> implements TbsCostApplyService {
 
+    private VtbVerificationMapper vtbVerificationMapper;
     private TbsBudgetApplicationService budgetApplicationService;
     private TbsBudgetCostItemService budgetCostItemService;
     private TbsBudgetLogService budgetLogService;
@@ -351,6 +352,142 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
         return data;
     }
 
+    @Override
+    public void replaceApplySyData(String id) {
+        TbsCostApply tbsCostApply = this.getById(id);
+
+        //确保只能执行一次
+        if(tbsCostApply.getRemark()!=null && tbsCostApply.getRemark().contains("审批节点重置")){
+            return;
+        }
+
+        LambdaQueryWrapper<VtbVerification> vtbLqw = new LambdaQueryWrapper<>();
+        vtbLqw.eq(VtbVerification::getCostApplyId,id).in(VtbVerification::getVerificationState,0,1);
+        if(vtbVerificationMapper.selectCount(vtbLqw)>0){
+            return;
+        }
+
+        BmsSupplier supplier = bmsSupplierService.getById(tbsCostApply.getSupplierId());
+
+        SysUser sysUser = sysUserService.getById(tbsCostApply.getUserId());
+
+        //相关活动
+        LambdaQueryWrapper<TbsActivity> actLqw = new LambdaQueryWrapper<>();
+        actLqw.eq(TbsActivity::getCostApplyId,id);
+        List<TbsActivity> activityList = tbsActivityMapper.selectList(actLqw);
+
+        this.releaseCost(tbsCostApply.getId(),0);
+        Map<String, Object> data = new HashMap<>(10);
+        List<String> oaAttachmentsIdList = new ArrayList<>();
+        List<String> oaContractAttachmentsIdList = new ArrayList<>();
+        //新方式保存接口
+        Map<String,Object> newWayData = new HashMap<>();
+        if(tbsCostApply.getContractFlag()!=null&&tbsCostApply.getContractFlag().equals(1)){
+
+            LambdaQueryWrapper<TbsActivityPayCondition> conLqw = new LambdaQueryWrapper<>();
+            conLqw.eq(TbsActivityPayCondition::getCostApplyId,id);
+            List<TbsActivityPayCondition> payConditions = tbsActivityPayConditionMapper.selectList(conLqw);
+
+            LambdaQueryWrapper<TbsCostContract> lqw = new LambdaQueryWrapper<>();
+            lqw.eq(TbsCostContract::getCostApplyId, tbsCostApply.getId());
+            List<TbsCostContract> contracts = costContractMapper.selectList(lqw);
+            for (TbsCostContract contract : contracts) {
+                if(contract.getAttachIds()==null||contract.getAttachIds().length<1){
+                    continue;
+                }
+                oaContractAttachmentsIdList.addAll(Arrays.asList(contract.getAttachIds()));
+            }
+            // 协议条款
+            LambdaQueryWrapper<TbsCostTodo> todoLqw = new LambdaQueryWrapper<>();
+            todoLqw.eq(TbsCostTodo::getCostApplyId, tbsCostApply.getId());
+            List<TbsCostTodo> costTodoList = tbsCostTodoMapper.selectList(todoLqw);
+            for (TbsCostTodo costTodo : costTodoList) {
+                if(costTodo.getAttachIds()==null||costTodo.getAttachIds().length<1){
+                    continue;
+                }
+                oaAttachmentsIdList.addAll(Arrays.asList(costTodo.getAttachIds()));
+            }
+            //创建协议的费用申请Data
+            this.buildContractApplyData(id, tbsCostApply, activityList, payConditions, supplier, sysUser, data,contracts,costTodoList,newWayData);
+        }else {
+            //创建通用的费用申请Data
+            this.buildCommonApplyData(id, tbsCostApply, activityList, supplier,sysUser, data);
+        }
+        //协议类走新流程
+        String templateCode = tbsCostApply.getContractFlag().equals(1)
+                ?TbsSeeYonConst.CostApplyContractConf.Code()
+                :TbsSeeYonConst.CostApplyConf.Code();
+        R<String> flowIdResult = null;
+        //启用新方法开关
+        if( tbsCostApply.getContractFlag().equals(1)){
+            List<OaUploadFile> uploadFileList = new ArrayList<>();
+            if(CollectionUtil.isNotEmpty(oaAttachmentsIdList)){
+                List<SysAttach> attachList = sysAttachService.listByIds(oaAttachmentsIdList);
+                for (SysAttach sysAttach : attachList) {
+                    OaUploadFile uploadFile = new OaUploadFile();
+                    uploadFile.setField("file");
+                    uploadFile.setName("协议附件"+sysAttach.getName());
+                    uploadFile.setUrl("https://qsjslservice.oss-cn-guangzhou.aliyuncs.com/"+sysAttach.getRelativePath());
+                    uploadFileList.add(uploadFile);
+                }
+            }
+            if(CollectionUtil.isNotEmpty(oaContractAttachmentsIdList)){
+                List<SysAttach> attachContractList = sysAttachService.listByIds(oaContractAttachmentsIdList);
+                for (SysAttach sysAttach : attachContractList) {
+                    OaUploadFile uploadFile = new OaUploadFile();
+                    uploadFile.setField("file");
+                    uploadFile.setName("合同附件"+sysAttach.getName());
+                    uploadFile.setUrl("https://qsjslservice.oss-cn-guangzhou.aliyuncs.com/"+sysAttach.getRelativePath());
+                    uploadFileList.add(uploadFile);
+                }
+            }
+            OaFormMainProcess mainProcess = new OaFormMainProcess();
+            mainProcess.setTargetId(id);
+            mainProcess.setUploadFiles(uploadFileList);
+            newWayData.put("formmain_1987",data);
+            mainProcess.setData(newWayData);
+            mainProcess.setTemplateCode(TbsSeeYonConst.CostApplyContractConf.Code());
+            mainProcess.setSenderLoginName(sysUser.getAccount());
+            flowIdResult = seeYonService.newCreateProcess(mainProcess);
+        }else {
+            //修改申请编码
+            BaseCreateProcessBo createProcess = new BaseCreateProcessBo();
+            createProcess.setTemplateCode(templateCode);
+            createProcess.setMemberLoginName(sysUser.getSyAccount());
+            createProcess.setSubjectTitle(TbsSeeYonConst.PRE_TITLE_COST_APPLY + tbsCostApply.getChargeTheme());
+            createProcess.setTargetId(tbsCostApply.getId()+"");
+            createProcess.setDataJson(JsonUtil.objectToJson(data));
+            flowIdResult = seeYonService.baseCreateProcess(createProcess);
+        }
+
+        if(flowIdResult==null||flowIdResult.getStatus()!=200){
+            Assert.throwEx("远程服务调用失败:"+flowIdResult.getMsg());
+        }
+        String flowId = flowIdResult.getData();
+        if(flowId!=null&&flowId.length()>45){
+            flowId = flowId.substring(0,40);
+        }
+        String formId = null;
+        R<String> formIdResult = seeYonService.getFormId(templateCode,tbsCostApply.getId());
+        if(formIdResult.getStatus()==200){
+            formId = formIdResult.getData();
+        }
+        TbsCostApply costApply = new TbsCostApply();
+        costApply.setId(tbsCostApply.getId());
+        costApply.setSyFlowId(flowId);
+        costApply.setSyFormId(formId);
+        costApply.setEditAmountFlag(0);
+        costApply.setChargeState(TbsCostApplyState.State_1_apply.getCode());
+        costApply.setSubmitTime(LocalDateTime.now());
+        costApply.setRemark("审批节点重置("+tbsCostApply.getSyFormId()+");"
+                +tbsCostApply.getRemark()==null?"":tbsCostApply.getRemark());
+        this.updateById(costApply);
+
+        //创建流程后回调
+        BaseCreateCallbackBo callbackBo = new BaseCreateCallbackBo(templateCode,costApply.getId()+"");
+        seeYonService.createCallbackStatus(callbackBo);
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void commitApply(String id) {
@@ -1122,19 +1259,9 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
         List<TbsActivitySubject> tbsActivitySubjects = tbsActivitySubjectService.listByCostApplyId(Long.parseLong(id));
         List<String> subjectNames = tbsActivitySubjects.stream().map(TbsActivitySubject::getSubjectName).distinct().collect(Collectors.toList());
         List<Object> subList = new ArrayList<>();
-        //创建子表数据
-        try {
-            this.buildSubList(tbsActivityCenters, subjectNames, subList,supplier.getCode());
-        } catch (Exception e) {
-            log.error("【费用申请，创建子表数据】：{}",e.getMessage());
-        }
-        //构造客户维度的 年度、季度合计
-//        try {
-//            List<TbsContractCostSubItem.CusCenterRate> cusCenterRateList = buildCusRateMain(supplier);
-//            subList.addAll(cusCenterRateList);
-//        } catch (Exception e) {
-//            log.error("【费用申请，创建客户维度费率数据】：{}",e.getMessage());
-//        }
+        //创建子表数据（任由异常 这里数据用来判断流程走向）
+        this.buildSubList(tbsActivityCenters, subjectNames, subList,supplier.getCode());
+
         //创建商品抬头列表
         List<TbsActivityGoods> tbsActivityGoods = tbsActivityGoodsService.listByCostApplyId(Long.parseLong(id));
         Set<String> bands = new HashSet<>();
@@ -1152,6 +1279,7 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
      * @param tbsCostApply
      * @param data
      */
+    @Override
     public void buildMainData4ROI(TbsCostApply tbsCostApply, Map<String, Object> data) {
         YtdQtdToOAVo ytdQtdToOAVo =  birRoiRateService.buildYtdAndQtdData(tbsCostApply);
         String defaultNum = "-2";
@@ -1172,27 +1300,6 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
         data.put("adminiExpenseRate",ytdQtdToOAVo.getQtdRegion2Percent()==null?
                 defaultNum:BigDecimal.valueOf(ytdQtdToOAVo.getQtdRegion2Percent()).setScale(2, RoundingMode.HALF_UP)+"");
 
-        //插入记录表前移除历史记录
-//        tbsCostPercentMapper.delByCostApplyId(tbsCostApply.getId());
-//        TbsCostPercent costPercent = new TbsCostPercent();
-//        costPercent.setCostApplyId(tbsCostApply.getId());
-//        costPercent.setYtdCustomerPercent(ytdQtdToOAVo.getYtdCustomerPercent()==null?
-//                BigDecimal.ZERO:BigDecimal.valueOf(ytdQtdToOAVo.getYtdCustomerPercent()));
-//        costPercent.setYtdUserPercent(ytdQtdToOAVo.getYtdUserPercent()==null?
-//                BigDecimal.ZERO:BigDecimal.valueOf(ytdQtdToOAVo.getYtdUserPercent()));
-//        costPercent.setYtdRegion2Percent(ytdQtdToOAVo.getYtdRegion2Percent()==null?
-//                BigDecimal.ZERO:BigDecimal.valueOf(ytdQtdToOAVo.getYtdRegion2Percent()));
-//        costPercent.setYtdRegionPercent(ytdQtdToOAVo.getYtdRegionPercent()==null?
-//                BigDecimal.ZERO:BigDecimal.valueOf(ytdQtdToOAVo.getYtdRegionPercent()));
-//        costPercent.setQtdCustomerPercent(ytdQtdToOAVo.getQtdCustomerPercent()==null?
-//                BigDecimal.ZERO:BigDecimal.valueOf(ytdQtdToOAVo.getQtdCustomerPercent()));
-//        costPercent.setQtdUserPercent(ytdQtdToOAVo.getQtdUserPercent()==null?
-//                BigDecimal.ZERO:BigDecimal.valueOf(ytdQtdToOAVo.getQtdUserPercent()));
-//        costPercent.setQtdRegion2Percent(ytdQtdToOAVo.getQtdRegion2Percent()==null?
-//                BigDecimal.ZERO:BigDecimal.valueOf(ytdQtdToOAVo.getQtdRegion2Percent()));
-//        costPercent.setQtdRegionPercent(ytdQtdToOAVo.getQtdRegionPercent()==null?
-//                BigDecimal.ZERO:BigDecimal.valueOf(ytdQtdToOAVo.getQtdRegionPercent()));
-//        tbsCostPercentMapper.insert(costPercent);
     }
 
     /**
@@ -1208,15 +1315,10 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
         //成本中心去重
         Map<String,List<TbsActivityCenter>> centerMapList = tbsActivityCenters.stream().collect(Collectors.groupingBy(a->a.getCenterType()+"-"+a.getCenterId()));
         List<TbsActivityCenter> centerList = centerMapList.values().stream().map(a->a.get(0)).collect(Collectors.toList());
-        //有异常
         for(TbsActivityCenter center : centerList){
-            try {
-                TbsCostSubItem.CostCenterTranStr costCenter = BirHttpUtil.buildCostCenter(center.getCenterType(),center.getCenterId(),center.getCenterName(),supplierCode);
-                if(costCenter!=null){
-                    subList.add(costCenter);
-                }
-            } catch (Exception e) {
-                e.printStackTrace();
+            TbsCostSubItem.CostCenterTranStr costCenter = BirHttpUtil.buildCostCenter(center.getCenterType(),center.getCenterId(),center.getCenterName(),supplierCode);
+            if(costCenter!=null){
+                subList.add(costCenter);
             }
         }
     }

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

@@ -599,14 +599,6 @@ public class PortalOfCostApplication {
 
     }
 
-
-
-
-
-
-
-
-
     @Transactional(rollbackFor = Exception.class)
     public void createCostProcess(ProcessCreateCostApplyBo createBo){
         SysUser user = userService.getByAccount(createBo.getUserCode());
@@ -967,7 +959,7 @@ public class PortalOfCostApplication {
         verificationSubjectService.save(verificationSubject);
 
         //保存支付信息(DHX赠品)
-        if(costCode.indexOf("DHX")==0) {
+        if(costCode.indexOf("DHX")==0||costCode.contains("YX06")) {
             //发货单的
             String json = ThirtyVerificationUtil.buildJson(supplier, subject, totalAmount, activity, verification);
             String COST_TO_PAY_API = projectApisProperties.getCostToPay();

src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java

@@ -530,11 +530,6 @@ public class VtbVerificationController {
     @GetMapping("/toPayDev")
     public R<?> toPayDev(){
         Long[] ids = new Long[]{
-                10480363L,
-                10480364L,
-                10480365L,
-                10480366L,
-                10480367L
         };
         for (Long id : ids) {
             vtbVerificationService.toPayRequest(id);