fix：修复因本地化bir导致的常规申请成本中心丢失

fix：修复因退回未适配，修改费用的活动状态异常
fix：订单空指针查询

src/main/java/com/qs/serve/common/util/BirHttpUtil.java

@@ -44,11 +44,7 @@ public class BirHttpUtil {
 
     public static String getBaseUrl(){
         ProjectProperties projectProperties = SpringUtils.getBean(ProjectProperties.class);
-        boolean isRestBir = projectProperties.getBirService().equals("true");
+        return projectProperties.getBirServiceUrl();
-        if(isRestBir){
-            return projectProperties.getBirServiceUrl();
-        }
-        return null;
     }
 
     public static R get(String action){
@@ -83,6 +79,10 @@ public class BirHttpUtil {
         if(PageUtil.getPageNum()!=null){
             url += "&pageNum="+PageUtil.getPageNum();
         }
+        url = url.replace("//","/");
+        url = url.replace("http:/","http://");
+        url = url.replace("https:/","https://");
+        log.debug("请求BIR中转URL:{}",url);
         String result = HttpUtil.doGet(url,hearders);
         log.debug("请求BIR中转URL:{}\n数据返回：{}",url,result);
         JSONObject object = JSON.parseObject(result);
@@ -106,7 +106,7 @@ public class BirHttpUtil {
             String json = result.getData().toString();
             return JsonUtil.jsonToPojo(json,TbsCostSubItem.CostCenterTranStr.class);
         } catch (Exception e) {
-
+            e.printStackTrace();
         }
         return null;
     }

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

@@ -29,9 +29,11 @@ import com.qs.serve.modules.bms.service.BmsChannelService;
 import com.qs.serve.modules.bms.service.BmsSupplierChannelService;
 import com.qs.serve.modules.his.service.HisUserChannelPointService;
 import com.qs.serve.modules.oss.service.OssService;
+import com.qs.serve.modules.tbs.entity.TbsActivityCenterGoods;
 import com.qs.serve.modules.tbs.entity.TbsActivityChannel;
 import com.qs.serve.modules.tbs.entity.TbsCostApply;
 import com.qs.serve.modules.tbs.entity.TbsCostBirLog;
+import com.qs.serve.modules.tbs.mapper.TbsActivityCenterGoodsMapper;
 import com.qs.serve.modules.tbs.mapper.TbsCostBirLogMapper;
 import com.qs.serve.modules.tbs.service.TbsActivityChannelService;
 import com.qs.serve.modules.tbs.service.TbsCostApplyService;
@@ -64,6 +66,7 @@ public class BirActivityCenterGoodsController {
     private TbsCostApplyService tbsCostApplyService;
     private ProjectProperties projectProperties;
     private TbsCostBirLogMapper tbsCostBirLogMapper;
+    private TbsActivityCenterGoodsMapper tbsActivityCenterGoodsMapper;
 
     @GetMapping("/toSyncBir")
     public R<?> syncBir(Long costId){
@@ -84,6 +87,25 @@ public class BirActivityCenterGoodsController {
         return R.ok();
     }
 
+    @GetMapping("/toSyncBirToday")
+    public R<?> toSyncBirEcro2(){
+        //Long[] ids = new Long[]{301897L};
+        Set<Long> ids = tbsActivityCenterGoodsMapper.selectUpdateCostApplyIds();
+        List<Long> errIds = new ArrayList<>();
+        for (Long id : ids) {
+            try {
+                centerGoodsService.rebuildBir(Arrays.asList(id));
+            } catch (Exception e) {
+                e.printStackTrace();
+                errIds.add(id);
+            }
+        }
+        for (Long errId : errIds) {
+            log.error("错误的费用申请ID：{}",errId);
+        }
+        return R.ok();
+    }
+
     /**
      * 移除因作废的费用申请导致的bir数据
      * @return

src/main/java/com/qs/serve/modules/bir/service/impl/BirCenterRateServiceImpl.java

@@ -281,7 +281,7 @@ public class BirCenterRateServiceImpl implements BirCenterRateService {
         List<TbsBudget> tbsBudgetList = tbsBudgetMapper.selectList(budgetLambdaQueryWrapper);
         //通过预算ID取预算的发货和金额
         LambdaQueryWrapper<TbsScheduleItemBudget> scheduleItemBudgetLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        scheduleItemBudgetLambdaQueryWrapper.in(TbsScheduleItemBudget::getBudgetId,tbsBudgetList.stream().map(a->a.getId()).collect(Collectors.toList()));
+        scheduleItemBudgetLambdaQueryWrapper.in(TbsScheduleItemBudget::getBudgetId,tbsBudgetList.stream().map(TbsBudget::getId).collect(Collectors.toList()));
         List<TbsScheduleItemBudget> scheduleItemBudgetList = tbsScheduleItemBudgetMapper.selectList(scheduleItemBudgetLambdaQueryWrapper);
         //合计目标发货和金定额
         BigDecimal targetDispatchAmout = scheduleItemBudgetList.stream().map(a->a.getPreDispatchAmount()==null?BigDecimal.ZERO:a.getPreDispatchAmount()).reduce(BigDecimal.ZERO,BigDecimal::add);

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

@@ -39,7 +39,7 @@ public class GoodsCategory implements Serializable {
     private Long parentId;
 
     /** 名称 */
-    @Length(max = 16,message = "名称长度不能超过16字")
+    @Length(max = 64,message = "名称长度不能超过16字")
     private String name;
 
     /** 排序 */

src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java

@@ -329,6 +329,9 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper,OmsOrder> im
 
         List<String> skuCodes = newOrderItemList.stream().map(OmsOrderItem::getSkuCode).collect(Collectors.toList());
 
+        //防止空指针
+        skuCodes.add("NULL");
+
         List<GoodsCustomerPrice> customerPrices = goodsCustomerPriceService.getBySupplierCodeAndCode(supplier.getCode(),skuCodes);
         for (OmsOrderItem orderItem : newOrderItemList) {
             for (GoodsCustomerPrice customerPrice : customerPrices) {

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

@@ -477,6 +477,10 @@ public class TbsActivityController {
     @GetMapping("/flushAmount2/{id}")
     @SysLog(module = SystemModule.Budget, title = "费用活动", biz = BizType.DELETE)
     public R<?> flushActivityAmount2(@PathVariable("id") Long id){
+//        Long[] ids = new Long[]{}
+//        for (Long aLong : ids) {
+//            tbsCostApplyPart1Service.updateAmtAndRateByActSubject(aLong);
+//        }
         tbsCostApplyPart1Service.updateAmtAndRateByActSubject(id);
         return R.ok();
     }

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

@@ -121,6 +121,9 @@ public class TbsActivityPayConditionController {
         }
         TbsActivityPayCondition entity = CopierUtil.copy(param,new TbsActivityPayCondition());
         List<TbsActivity> activityList = tbsActivityService.listByCostApplyId(param.getCostApplyId());
+        if(activityList.size()<1){
+            Assert.throwEx("未存在有效活动");
+        }
         Long actId = activityList.get(0).getId();
         entity.setActivityId(actId);
         entity.setPreNotifyStatus(param.getPreNotifyTime()==null?0:1);

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

@@ -8,6 +8,7 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
+import java.util.Set;
 
 /**
  * 活动成本中心配比项 Mapper
@@ -16,6 +17,14 @@ import java.util.List;
  */
 public interface TbsActivityCenterGoodsMapper extends BaseMapper<TbsActivityCenterGoods> {
 
+    @InterceptorIgnore(tenantLine = "1")
+    @Select("SELECT cost_apply_id FROM tbs_activity_center_goods \n" +
+            "left join tbs_cost_apply on tbs_activity_center_goods.cost_apply_id = tbs_cost_apply.id\n" +
+            "where tbs_cost_apply.del_flag = 0 and tbs_activity_center_goods.del_flag = 0\n" +
+            "and DATE(tbs_activity_center_goods.update_time) = DATE(CURDATE())\n" +
+            "GROUP BY cost_apply_id")
+    Set<Long> selectUpdateCostApplyIds();
+
     @Select("<script>"+
             "select activity_id,tbs_activity.total_amount,tmp.sum_goods_amt from tbs_activity " +
             " left join (SELECT activity_id, sum(center_goods_amount) AS sum_goods_amt,sum(center_amount) as sum_center_amt " +

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

@@ -22,6 +22,12 @@ public interface TbsCostCheckStateMapper {
     @Update("update tbs_cost_apply set check_state = 0 where charge_state is null ")
     int updateCheckState0();
 
+    @Update("update tbs_cost_apply set check_state = 0 " +
+            "where id not in ( " +
+            " select vtb.cost_apply_id from vtb_verification vtb where vtb.del_flag = 0 AND vtb.verification_state in (0,1) and vtb.cost_apply_id is not null group by vtb.cost_apply_id " +
+            ") and del_flag = 0 and charge_state = 2")
+    int updateCheckState0ByVtb();
+
     @Update("update tbs_cost_apply set check_state = 1 where charge_state = 3 ")
     int updateCheckState1();
 

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

@@ -628,7 +628,9 @@ public class TbsCostApplyOperationServiceImpl implements SeeYonOperationService
 
             BigDecimal goodsRateTotal = BigDecimal.ZERO;
             for (TbsActivityCenterGoods centerGoods : activityCenterGoodsTmpList) {
-                goodsRateTotal = goodsRateTotal.add(centerGoods.getCenterGoodsRate());
+                if(centerGoods.getCenterGoodsRate().compareTo(BigDecimal.ZERO)>0){
+                    goodsRateTotal = goodsRateTotal.add(centerGoods.getCenterGoodsRate());
+                }
             }
             if(goodsRateTotal.compareTo(n100)!=0){
                 log.error("活动ID:{} 的商品比例错误：{} ,即将重新分配活动成本中心比例",subject.getActivityId(),goodsRateTotal);
@@ -649,7 +651,9 @@ public class TbsCostApplyOperationServiceImpl implements SeeYonOperationService
 
         BigDecimal centerRateTotal = BigDecimal.ZERO;
         for (TbsActivityCenter center : currentActivityCenterList) {
-            centerRateTotal = centerRateTotal.add(center.getCenterRate());
+            if(center.getCenterRate().compareTo(BigDecimal.ZERO)>0){
+                centerRateTotal = centerRateTotal.add(center.getCenterRate());
+            }
         }
 
         //确保科目的百分比正确

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.qs.serve.common.config.properties.ProjectProperties;
 import com.qs.serve.common.model.dto.R;
+import com.qs.serve.common.model.enums.BudgetLogOptFlag;
 import com.qs.serve.common.util.*;
 import com.qs.serve.modules.bir.consts.BirActivityCenterGoodsUtil;
 import com.qs.serve.modules.bir.service.BirCenterRateService;
@@ -32,6 +33,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -363,6 +365,47 @@ public class TbsCostApplyPart1ServiceImpl implements TbsCostApplyPart1Service {
                             .eq(TbsBudgetCostItem::getCenterGoodItemId,centerGoods.getId()));
         }
 
+        //更新预算占用
+        List<TbsBudgetLog> budgetLogList = tbsBudgetLogMapper.selectList(new LambdaQueryWrapper<TbsBudgetLog>()
+                .eq(TbsBudgetLog::getActivityId,activityId)
+                .eq(TbsBudgetLog::getOptType, BudgetLogOptFlag.State_1.getCode()));
+
+        if(budgetLogList.size()<1){
+            log.warn("活动ID：{} 无申请预算的日志",activityId);
+            return;
+        }
+
+        if(budgetLogList.size()!=activityCenterGoodsList.size()){
+            log.warn("活动ID：{} 申请预算的日志数量不匹配",activityId);
+            return;
+        }
+        List<TbsBudgetLog> updateBudgetLog = new ArrayList<>();
+
+        for (TbsActivityCenterGoods centerGoods : activityCenterGoodsList) {
+            for (TbsBudgetLog budgetLog : budgetLogList) {
+                boolean eqSubjectId = centerGoods.getSubjectId().equals(budgetLog.getSubjectId());
+                boolean eqCenterId = centerGoods.getCenterId().equals(budgetLog.getCenterId());
+                boolean eqCenterType = centerGoods.getCenterType().equals(budgetLog.getCenterType());
+                boolean eqTargetType = centerGoods.getTargetType().equals(budgetLog.getTargetType());
+                boolean eqTargetId = centerGoods.getTargetId().equals(budgetLog.getTargetId());
+                if(eqSubjectId&&eqCenterId&&eqCenterType&&eqTargetType&&eqTargetId){
+                    TbsBudgetLog param = new TbsBudgetLog();
+                    param.setId(budgetLog.getId());
+                    //负数
+                    param.setAmount(centerGoods.getCenterGoodsAmount().negate());
+                    updateBudgetLog.add(param);
+                }
+            }
+        }
+
+        if(updateBudgetLog.size() == activityCenterGoodsList.size()){
+            for (TbsBudgetLog budgetLog : updateBudgetLog) {
+                tbsBudgetLogMapper.updateById(budgetLog);
+            }
+        }else {
+            log.warn("活动ID：{} 申请预算的日志，更新数量不匹配",activityId);
+        }
+
     }
 
 

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

@@ -123,7 +123,7 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
     private TbsBudgetMatchApplication tbsBudgetMatchApplication;
 
     private TbsCostCheckStateMapper costCheckStateMapper;
-
+    private TbsCostApplyMapper tbsCostApplyMapper;
     private ProjectApisProperties projectApisProperties;
 
     @Override
@@ -135,6 +135,7 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
     public void updateCheckState() {
         AuthContextUtils.setTenant("001");
         costCheckStateMapper.updateCheckState0();
+        costCheckStateMapper.updateCheckState0ByVtb();
         costCheckStateMapper.updateCheckState1();
         costCheckStateMapper.updateCheckState2();
         List<Long> costIds = costCheckStateMapper.selectCheckState3();
@@ -142,6 +143,7 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
             costCheckStateMapper.updateCheckState3(costIds);
         }
         costCheckStateMapper.updateCheckState4();
+        tbsCostApplyMapper.updateContractFinishedState();
     }
 
     @Override
@@ -1208,8 +1210,14 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
         List<TbsActivityCenter> centerList = centerMapList.values().stream().map(a->a.get(0)).collect(Collectors.toList());
         //有异常
         for(TbsActivityCenter center : centerList){
-            TbsCostSubItem.CostCenterTranStr costCenter = centerRateService.buildCostCenter(center.getCenterType(),center.getCenterId(),center.getCenterName(),supplierCode);
+            try {
-            subList.add(costCenter);
+                TbsCostSubItem.CostCenterTranStr costCenter = BirHttpUtil.buildCostCenter(center.getCenterType(),center.getCenterId(),center.getCenterName(),supplierCode);
+                if(costCenter!=null){
+                    subList.add(costCenter);
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
         }
     }
 

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

@@ -3,6 +3,7 @@ package com.qs.serve.modules.vtb.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qs.serve.common.config.DevEnvironmentConfig;
 import com.qs.serve.common.config.properties.ProjectApisProperties;
 import com.qs.serve.common.config.properties.ProjectProperties;
 import com.qs.serve.common.framework.manager.AsyncFactory;

src/main/resources/application-dev.yml

@@ -2,7 +2,7 @@
 project:
   bir-service: 'false'
   bir-service-sync: 'false'
-  bir-service-url: 'http://192.168.0.9:7400'
+  bir-service-url: 'http://192.168.0.9:7401'
   web_url: 'http://192.168.0.9:6031'
   host_url: 'http://192.168.0.9:7400'
   pc-web-local: 'D:\Software\Nginx1.8\html\jslcrm3\'
@@ -87,7 +87,7 @@ spring:
           username: kpjsl
           password: 123456
         qisheng:
-          url: jdbc:sqlserver://192.168.10.11:1433;DatabaseName=JSL_COST_QS_TEST
+          url: jdbc:sqlserver://192.168.10.11:1433;DatabaseName=JSL_COST_QS
           username: sa
           password: JSL2282125
           driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver