feat：微调

src/main/java/com/qs/serve/modules/bir/consts/BirActivityCenterGoodsUtil.java

@@ -26,14 +26,27 @@ public class BirActivityCenterGoodsUtil {
     }
 
     public static void buildBir(List<Long> costIds){
+        TbsCostBirLogMapper birLogMapper  = null;
+        try {
+            birLogMapper = SpringUtils.getBean(TbsCostBirLogMapper.class);
+        } catch (BeansException e) {
+            e.printStackTrace();
+        }
+        if(birLogMapper==null){
+            log.error("获取不到BEAN TbsCostBirLogMapper BirActivityCenterGoodsUtil ");
+            return;
+        }
         if(CollUtil.isEmpty(costIds)){
             return;
         }
         for (Long costId : costIds) {
-            TbsCostBirLogMapper birLogMapper  = SpringUtils.getBean(TbsCostBirLogMapper.class);
+            try {
                 TbsCostBirLog birLog = new TbsCostBirLog();
                 birLog.setCostId(costId);
                 birLogMapper.insert(birLog);
+            } catch (BeansException e) {
+                e.printStackTrace();
+            }
         }
     }
 

src/main/java/com/qs/serve/modules/bir/controller/BirActivityCenterGoodsController.java

@@ -87,8 +87,10 @@ public class BirActivityCenterGoodsController {
     public R<?> toSyncBirEcro(){
         List<Long> costIds = tbsCostBirLogMapper.listCostIds();
         if(CollectionUtil.isNotEmpty(costIds)){
-            centerGoodsService.rebuildBir(costIds);
-            tbsCostBirLogMapper.delete(new LambdaQueryWrapper<TbsCostBirLog>().in(TbsCostBirLog::getCostId,costIds));
+            for (Long costId : costIds) {
+                centerGoodsService.rebuildBir(Arrays.asList(costId));
+                tbsCostBirLogMapper.delete(new LambdaQueryWrapper<TbsCostBirLog>().eq(TbsCostBirLog::getCostId,costId));
+            }
         }
         return R.ok();
     }

src/main/java/com/qs/serve/modules/bir/entity/so/BirTbsVtbPayJoinSo.java

@@ -124,4 +124,10 @@ public class BirTbsVtbPayJoinSo {
 
     private String orderType;
 
+    /**
+     * 费用类型:0->常规；1->协议类;2->进场费
+     */
+    private Integer contractFlag;
+
+
 }

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

@@ -79,6 +79,15 @@ public class GoodsCategoryServiceImpl extends ServiceImpl<GoodsCategoryMapper,Go
             }
         }
 
+        //名称不能重复
+        long count = this.count(new LambdaQueryWrapper<GoodsCategory>()
+                .eq(GoodsCategory::getName,category.getName())
+                .ne(category.getId()!=null,GoodsCategory::getId,category.getId())
+        );
+        if(count>0){
+            Assert.throwEx("名称被占用了");
+        }
+
         if(category.getId()==null){
             this.save(category);
         }

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

@@ -10,6 +10,7 @@ import com.qs.serve.common.model.dto.R;
 import com.qs.serve.common.model.enums.BizType;
 import com.qs.serve.common.model.enums.SystemModule;
 import com.qs.serve.common.util.*;
+import com.qs.serve.modules.bir.consts.BirActivityCenterGoodsUtil;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
 import com.qs.serve.modules.bms.service.BmsSupplierService;
 import com.qs.serve.modules.seeyon.entity.CtpAffairQo;
@@ -63,11 +64,12 @@ public class TbsCostApplyCheckController {
      * 测试接口(正式环境无法调用)
      * @return
      */
-    @GetMapping("devDoFinished")
+    //@GetMapping("devDoFinished")
     public R<Long> devDoFinished(String costApplyId){
         TbsAffairCommitBo commitBo = new TbsAffairCommitBo();
         commitBo.setCostApplyId(Long.parseLong(costApplyId));
         //tbsCostApplyOperationServiceImpl.doFinished(commitBo);
+        BirActivityCenterGoodsUtil.buildBir(Long.parseLong(costApplyId));
         return R.ok();
     }
 
@@ -90,8 +92,9 @@ public class TbsCostApplyCheckController {
     @PostMapping("/commit/{id}")
     @SysLog(module = SystemModule.Budget, title = "费用申请", biz = BizType.UPDATE)
     @PreAuthorize("hasRole('tbs:costApply:update')")
-    public R<?> commit(@PathVariable("id") String id){
-        tbsCostApplyService.commitApply(id);
+    public R<?> commit(@PathVariable("id") Long id){
+        tbsCostApplyService.commitApply(id+"");
+        BirActivityCenterGoodsUtil.buildBir(id);
         return R.ok();
     }
 
@@ -124,9 +127,10 @@ public class TbsCostApplyCheckController {
     @SysLog(module = SystemModule.Budget, title = "费用申请", biz = BizType.DELETE)
     @PreAuthorize("hasRole('tbs:costApply:commit')")
     public R<?> commitAffair(@RequestBody @Valid TbsAffairCommitBo affairCommit){
-        return tbsCostApplyOperationServiceImpl.commitAffair(affairCommit);
+        tbsCostApplyOperationServiceImpl.commitAffair(affairCommit);
         //tbsCostApplyOperationServiceImpl.doFinished(affairCommit);
-        //return R.ok();
+        BirActivityCenterGoodsUtil.buildBir(affairCommit.getCostApplyId());
+        return R.ok();
     }
 
     /**
@@ -137,8 +141,10 @@ public class TbsCostApplyCheckController {
     @LimitSubmit
     @PostMapping("/compensate/{id}")
     @SysLog(module = SystemModule.Budget, title = "费用申请", biz = BizType.UPDATE)
-    public R<?> compensate(@PathVariable("id") String id){
-        return tbsCostApplyOperationServiceImpl.runCompensate(id);
+    public R<?> compensate(@PathVariable("id") Long id){
+        tbsCostApplyOperationServiceImpl.runCompensate(id+"");
+        BirActivityCenterGoodsUtil.buildBir(id);
+        return R.ok();
     }
 
     /**

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

@@ -100,7 +100,7 @@ public class TbsCostApplyController {
      * @param id
      * @return
      */
-    @PostMapping("/rebuildBudgetInit")
+    //@PostMapping("/rebuildBudgetInit")
     public R<?> bu(Long id){
         tbsCostApplyService.rebuildBudgetInit(id);
         return R.ok();
@@ -495,6 +495,7 @@ public class TbsCostApplyController {
             return R.ok("含活动数据无法删除");
         }
         boolean result = tbsCostApplyService.removeById(id);
+        BirActivityCenterGoodsUtil.buildBir(id);
         return R.isTrue(result);
     }
 
@@ -566,6 +567,7 @@ public class TbsCostApplyController {
      */
     @GetMapping("removeByAdmin")
     public R<?> removeByAdmin(Long costApplyId,String remark){
+        BirActivityCenterGoodsUtil.buildBir(costApplyId);
         deleteLogService.deleteCostApply(costApplyId,remark);
         return R.ok();
     }

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

@@ -71,6 +71,7 @@ public class TbsCostApplyPart1ServiceImpl implements TbsCostApplyPart1Service {
         costApply.setUserCode(sysUser.getCode());
         costApply.setUserName(sysUser.getName());
         costApply.setCode(newCostApplyCode);
+        costApply.setCheckState(null);
         costApply.setCreateBy(null);
         costApply.setCreateTime(null);
         costApply.setUpdateTime(null);

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

@@ -624,6 +624,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
         if(dbAct.getCancelFlag().equals(1)){
             return R.error("异动的费用无法操作");
         }
+        BirActivityCenterGoodsUtil.buildBir(costApply.getId());
         TbsActivity activity = new TbsActivity();
         activity.setId(param.getActivityId());
         if(param.getState().equals(1)){
@@ -868,6 +869,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
 //        costApplyService.updateById(costApply);
         //判断是否直接跳过审批的申请
         AsyncFactory.saveVtbSubmit( sysUser.getCode(),verification.getId(), totalAmount,false);
+        BirActivityCenterGoodsUtil.buildBir(costApply.getId());
     }
 
     private void validCreateVeriSubjectAndCenter(TbsActivity activity, List<VtbVerificationSubjectCenterBo> subjectCenterBoList, TbsCostApply costApply, BmsSupplier supplier, List<VtbVerificationSubject> verificationSubjects, List<VtbVerificationSubjectCenter> verificationCenters, String verificationCode) {
@@ -1418,6 +1420,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
             }
         }
         costApplyService.updateById(updCost);
+        BirActivityCenterGoodsUtil.buildBir(updCost.getId());
     }
 
     @Override

src/main/java/com/qs/serve/task/BirTask.java

@@ -0,0 +1,49 @@
+package com.qs.serve.task;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.qs.serve.common.config.properties.ProjectApisProperties;
+import com.qs.serve.common.model.AmountDTO;
+import com.qs.serve.common.util.AuthContextUtils;
+import com.qs.serve.common.util.HttpUtil;
+import com.qs.serve.modules.bir.controller.BirActivityCenterGoodsController;
+import com.qs.serve.modules.pay.mapper.PayPaymentItemMapper;
+import com.qs.serve.modules.pay.mapper.PayPaymentMapper;
+import com.qs.serve.modules.tbs.entity.TbsCostApply;
+import com.qs.serve.modules.tbs.service.TbsCostApplyService;
+import com.qs.serve.modules.vtb.mapper.VtbVerificationMapper;
+import com.qs.serve.modules.vtb.service.VtbVerificationService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @author YenHex
+ * @since 2023/11/7
+ */
+@Slf4j
+@Component
+@AllArgsConstructor
+@ConditionalOnProperty(value = "project.bir-service-sync", havingValue = "true")
+public class BirTask {
+
+    private final BirActivityCenterGoodsController birActivityCenterGoodsController;
+
+    /**
+     * 同步bir实时
+     */
+    @Scheduled(cron="0 0/15 * * * ?")
+    public void toSyncBirEcro(){
+        AuthContextUtils.setTenant("001");
+        birActivityCenterGoodsController.toSyncBirEcro();
+        log.warn("bir 更新 完成");
+    }
+
+
+}

src/main/java/com/qs/serve/task/TbsTask.java

@@ -113,7 +113,7 @@ public class TbsTask {
     /**
      * 每半小时执行一次
      */
-    @Scheduled(cron="0 0/30 * * * ?")
+    @Scheduled(cron="0 0/10 * * * ?")
     public void updateCheckState(){
         AuthContextUtils.setTenant("001");
         tbsCostApplyService.updateCheckState();

src/main/resources/application-dev.yml

@@ -1,6 +1,7 @@
 #项目配置
 project:
   bir-service: 'false'
+  bir-service-sync: 'false'
   bir-service-url: 'http://192.168.0.9:7400'
   web_url: 'http://192.168.0.9:6031'
   host_url: 'http://192.168.0.9:7400'

src/main/resources/mapper/bir/BirTbsVtbPayJoinMapper.xml

@@ -96,6 +96,9 @@
             and (act.del_flag = 0 or act.id is null )
             and (v.del_flag = 0 or v.id is null )
             and (p.del_flag = 0 or p.id is null )
+            <if test="query.contractFlag != null and query.contractFlag != ''">
+                AND a.contract_flag = #{query.contractFlag}
+            </if>
             <if test="query.costApplyCode != null and query.costApplyCode != ''">
                 AND a.code LIKE CONCAT('%', #{query.costApplyCode}, '%')
             </if>

src/main/resources/mapper/goods/GoodsSkuMapper.xml

@@ -46,6 +46,7 @@
         goods_sku.`sales_price`,
         goods_sku.`market_price`,
         goods_sku.`cost_price`,
+        goods_sku.`inv_unit_weight`,
         goods_sku.`spec_infos`,
         goods_sku.`stock`,
         goods_sku.`unit_id`,