Log调整；添加申请后置补偿；伟成接口对接；

src/main/java/com/qs/serve/common/framework/mvc/HttpServletRequestFilter.java

@@ -70,7 +70,7 @@ public class HttpServletRequestFilter implements Filter{
         if (ServletUtils.isJsonRequest(request)&&requestWrapper!=null) {
             reqBody = requestWrapper.getBody();
         }
-        StringBuffer buffer = new StringBuffer("["+method+"] "+url);
+        StringBuffer buffer = new StringBuffer("\n["+method+"] "+url);
         if(supplierId!=null){
             buffer.append(" 供应商ID: "+supplierId);
         }
@@ -91,7 +91,7 @@ public class HttpServletRequestFilter implements Filter{
                 buffer.append("  时间:["+ LocalDateTime.now().format(DateTimeFormatter.ISO_LOCAL_DATE_TIME)+"]");
             }
         } catch (Exception e) {}
-        System.out.println(buffer);
+        log.debug(buffer.toString());
     }
 
     @Override

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

@@ -6,6 +6,7 @@ import com.qs.serve.common.model.dto.PageVo;
 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.JsonUtil;
 import com.qs.serve.common.util.PageUtil;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
 import com.qs.serve.modules.bms.service.BmsSupplierService;
@@ -81,8 +82,8 @@ public class BmsSupplierAddressController {
         if(count>0){
             return R.error("tms_sys_id is exist!!");
         }
-        boolean result = bmsSupplierAddressService.updateById(param);
-        return R.isTrue(result);
+        bmsSupplierAddressService.updateById(param);
+        return R.ok(param);
     }
 
     /**

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

@@ -93,6 +93,18 @@ public class TbsCostApplyController {
     private TbsCostChangeInfoService tbsCostChangeInfoService;
 
 
+    /**
+     * 临时接口
+     * 重建费用申请的预算占用(用于OA已经生成表单，但是费用申请回调报错后补发)
+     * @param id
+     * @return
+     */
+    @PostMapping("/rebuildBudgetInit")
+    public R<?> bu(Long id){
+        tbsCostApplyService.rebuildBudgetInit(id);
+        return R.ok();
+    }
+
     /**
      * 复制
      * @param id

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

@@ -36,6 +36,12 @@ public interface TbsCostApplyService extends IService<TbsCostApply> {
      */
     void removeCostById(Long id);
 
+    /**
+     * 重建费用申请的预算占用(用于OA已经生成表单，但是费用申请回调报错后补发)
+     * @param costId
+     */
+    void rebuildBudgetInit(Long costId);
+
     /**
      * 统计即将逾期
      * @param userId

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

@@ -188,6 +188,82 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
 
     }
 
+    @Override
+    public void rebuildBudgetInit(Long costId) {
+
+        TbsCostApply costApply = this.getById(costId);
+        SysUser sysUser = sysUserService.getById(costApply.getUserId());
+        //相关活动
+        LambdaQueryWrapper<TbsActivity> actLqw = new LambdaQueryWrapper<>();
+        actLqw.eq(TbsActivity::getCostApplyId,costId);
+        List<TbsActivity> activityList = tbsActivityMapper.selectList(actLqw);
+
+        List<TbsBudgetCostItem> allBudgetItem = new ArrayList<>();
+
+        TbsBudgetTableResultVo result1 = tbsBudgetMatchApplication.getMatchResult(costApply.getId(),false,true);
+        Map<Long, TbsScheduleItemBudget> matchItemBudgetsMap = result1.getMatchItemBudgetsMap();
+        List<TbsBudgetLog> budgetLogList = new ArrayList<>();
+        for (TbsActivityCenterGoods centerGoods : result1.getActivityCenterGoodsList()) {
+            TbsBudgetCostItem costItem = new TbsBudgetCostItem();
+            costItem.setCenterGoodsCode(centerGoods.getCenterGoodsCode());
+            costItem.setCostApplyId(centerGoods.getCostApplyId());
+            costItem.setActivityId(centerGoods.getActivityId());
+            costItem.setActivityCode(centerGoods.getActivityCode());
+            costItem.setSupplierId(centerGoods.getSupplierId());
+            costItem.setSupplierCode(centerGoods.getSupplierCode());
+            costItem.setSupplierName(centerGoods.getSupplierName());
+            costItem.setSubjectId(centerGoods.getSubjectId());
+            costItem.setSubjectCode(centerGoods.getSubjectCode());
+            costItem.setSubjectName(centerGoods.getSubjectName());
+            costItem.setCenterType(centerGoods.getCenterType());
+            costItem.setCenterId(centerGoods.getCenterId());
+            costItem.setCenterCode(centerGoods.getCenterCode());
+            costItem.setCenterName(centerGoods.getCenterName());
+            costItem.setCenterAmount(centerGoods.getCenterAmount());
+            costItem.setCenterRate(centerGoods.getCenterRate());
+            costItem.setCenterGoodsAmount(centerGoods.getCenterGoodsAmount());
+            costItem.setCenterGoodsRate(centerGoods.getCenterGoodsRate());
+            costItem.setTargetType(centerGoods.getTargetType());
+            costItem.setTargetId(centerGoods.getTargetId());
+            costItem.setTargetCode(centerGoods.getTargetCode());
+            costItem.setTargetName(centerGoods.getTargetName());
+            costItem.setTargetLevelPathIds(centerGoods.getTargetLevelPathIds());
+            costItem.setTargetLevelPathNames(centerGoods.getTargetLevelPathNames());
+            costItem.setActStartDate(centerGoods.getActStartDate());
+            costItem.setActEndDate(centerGoods.getActEndDate());
+            costItem.setPreStartDate(centerGoods.getPreStartDate());
+            costItem.setPreEndDate(centerGoods.getPreEndDate());
+            costItem.setPreCheckDate(centerGoods.getPreCheckDate());
+            costItem.setCenterGoodItemId(centerGoods.getId());
+
+            if(centerGoods.getScheduleItemBudgetId()!=null){
+                TbsScheduleItemBudget itemBudget = matchItemBudgetsMap.get(centerGoods.getScheduleItemBudgetId());
+                TbsActivity currActivity = null;
+                for (TbsActivity activity : activityList) {
+                    if(centerGoods.getActivityId().equals(activity.getId())){
+                        currActivity = activity;
+                    }
+                }
+                TbsBudgetLog budgetLog = TbsBudgetLogBuildUtil.buildTbsBudgetLog(BudgetLogOptFlag.State_1,sysUser, costApply, itemBudget, centerGoods,centerGoods.getCenterGoodsAmount(),currActivity);
+                budgetLogList.add(budgetLog);
+
+                costItem.setBudgetId(itemBudget.getBudgetId());
+                costItem.setScheduleId(itemBudget.getScheduleId());
+                costItem.setScheduleItemId(itemBudget.getScheduleItemId());
+                costItem.setScheduleItemName(itemBudget.getItemName());
+                costItem.setScheduleItemAmount(itemBudget.getFinalBudgetAmount());
+                costItem.setScheduleItemAmountUsed(itemBudget.getUsedBudgetAmount());
+                costItem.setScheduleItemAmountApply(itemBudget.getUnUsedBudgetAmount());
+                costItem.setScheduleItemBudgetId(itemBudget.getId());
+            }
+            allBudgetItem.add(costItem);
+        }
+//        budgetCostItemService.saveBatch(allBudgetItem);
+//        if(CollectionUtil.isNotEmpty(budgetLogList)){
+//            budgetLogService.saveBatch(budgetLogList);
+//        }
+    }
+
     @Override
     public Long selectCountOverdueState(String userId) {
         int sysConfOfWarningDays = 0;
@@ -452,7 +528,7 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
             Assert.throwEx("远程服务调用失败:"+flowIdResult.getMsg());
         }
         String flowId = flowIdResult.getData();
-        if(flowId.length()>45){
+        if(flowId!=null&&flowId.length()>45){
             flowId = flowId.substring(0,40);
         }
         String formId = null;

src/main/java/com/qs/serve/modules/third/PortalSupplierController.java

@@ -107,10 +107,10 @@ public class PortalSupplierController {
 
 
     /**
-    * 新增
-    * @param param
-    * @return
-    */
+     * 新增
+     * @param param
+     * @return
+     */
     @PostMapping("/save")
     @PreAuthorize("hasRole('bms:supplier:insert')")
     public R<?> save(@RequestBody @Valid BmsSupplierBo param, HttpServletRequest request){

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

@@ -628,7 +628,7 @@ public class PortalOfCostApplication {
                     missCodes.add(code);
                 }
             }
-            Assert.throwEx("品类缺失:"+missCodes.stream().collect(Collectors.joining(",")));
+            Assert.throwEx("品类缺失("+skuList.size()+"-"+invCodeList.size()+"-"+missCodes.size()+"):"+missCodes.stream().collect(Collectors.joining(",")));
         }
         if(skuList.size()<1){
             Assert.throwEx("请选择品类再提交");

src/main/java/com/qs/serve/modules/tzc/entity/dto/PolicyItemDto.java

@@ -1,5 +1,6 @@
 package com.qs.serve.modules.tzc.entity.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 
@@ -24,8 +25,10 @@ public class PolicyItemDto {
 
     private String cusCode;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date startDate;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date endDate;
 
     /** 满减金额 */

src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyApplicationServiceImpl.java

@@ -184,9 +184,8 @@ public class TzcPolicyApplicationServiceImpl implements TzcPolicyApplicationServ
 
         String policySyncUrl = projectApisProperties.getPolicySync();
 
-        //String rs = HttpUtil.doPost(policySyncUrl, JsonUtil.objectToJson(policyItemDto), null);
-
-        //log.debug("PolicySync() ==>{} \n{}",JsonUtil.objectToJson(policyItemDto),rs);
+//        String rs = HttpUtil.doPost(policySyncUrl, JsonUtil.objectToJson(policyItemDto), null);
+//        log.debug("PolicySync() ==>{} \n{}",JsonUtil.objectToJson(policyItemDto),rs);
 
         //TODO 测试临时注释
         //保存异步处理的

src/main/resources/log4j2.xml

@@ -7,28 +7,37 @@
     <!--变量配置-->
     <Properties>
         <property name="LOG_PATTERN" value="%d %highlight{%-5level}{ERROR=Bright RED, WARN=Bright Yellow, INFO=Bright Green, DEBUG=Bright Cyan, TRACE=Bright White} %style{[%t]}{bright,magenta} %style{%c{1.}.%M(%L)}{cyan}: %msg%n" />
-        <!--<property name="LOG_PATTERN" value="%date{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n" />-->
         <property name="FILE_PATH" value="logs" />
-        <property name="FILE_NAME" value="api" />
     </Properties>
 
     <appenders>
 		<!-- console -->
         <console name="Console" target="SYSTEM_OUT">
             <PatternLayout pattern="${LOG_PATTERN}"/>
-            <ThresholdFilter level="debug" onMatch="ACCEPT" onMismatch="DENY"/>
+            <ThresholdFilter level="all" onMatch="ACCEPT" onMismatch="DENY"/>
         </console>
-        <File name="Filelog" fileName="${FILE_PATH}/test.log" append="false">
+
+        <File name="FileLog" fileName="${FILE_PATH}/test.log" append="false" filePattern="${FILE_PATH}/test-%d{yyyy-MM-dd}_%i.log.gz">
             <PatternLayout pattern="${LOG_PATTERN}"/>
             <Policies>
                 <TimeBasedTriggeringPolicy interval="1"/>
-                <SizeBasedTriggeringPolicy size="20MB"/>
+                <SizeBasedTriggeringPolicy size="10MB"/>
             </Policies>
             <DefaultRolloverStrategy max="15"/>
         </File>
 
+        <!-- debug -->
+        <RollingFile name="RollingFileDebug" fileName="${FILE_PATH}/debug.log" filePattern="${FILE_PATH}/debug-%d{yyyy-MM-dd}_%i.log.gz">
+            <ThresholdFilter level="all" onMatch="ACCEPT" onMismatch="DENY"/>
+            <Policies>
+                <TimeBasedTriggeringPolicy interval="1"/>
+                <SizeBasedTriggeringPolicy size="10MB"/>
+            </Policies>
+            <DefaultRolloverStrategy max="15"/>
+        </RollingFile>
+
 		<!-- info -->
-        <RollingFile name="RollingFileInfo" fileName="${FILE_PATH}/info.log" filePattern="${FILE_PATH}/${FILE_NAME}-INFO-%d{yyyy-MM-dd}_%i.log.gz">
+        <RollingFile name="RollingFileInfo" fileName="${FILE_PATH}/info.log" filePattern="${FILE_PATH}/info-%d{yyyy-MM-dd}_%i.log.gz">
             <ThresholdFilter level="info" onMatch="ACCEPT" onMismatch="DENY"/>
             <PatternLayout pattern="${LOG_PATTERN}"/>
             <Policies>
@@ -37,9 +46,8 @@
             </Policies>
             <DefaultRolloverStrategy max="15"/>
         </RollingFile>
-
 		<!-- warn -->
-        <RollingFile name="RollingFileWarn" fileName="${FILE_PATH}/warn.log" filePattern="${FILE_PATH}/${FILE_NAME}-WARN-%d{yyyy-MM-dd}_%i.log.gz">
+        <RollingFile name="RollingFileWarn" fileName="${FILE_PATH}/warn.log" filePattern="${FILE_PATH}/warn-%d{yyyy-MM-dd}_%i.log.gz">
             <ThresholdFilter level="warn" onMatch="ACCEPT" onMismatch="DENY"/>
             <PatternLayout pattern="${LOG_PATTERN}"/>
             <Policies>
@@ -49,7 +57,7 @@
             <DefaultRolloverStrategy max="15"/>
         </RollingFile>
 		<!-- error -->
-        <RollingFile name="RollingFileError" fileName="${FILE_PATH}/error.log" filePattern="${FILE_PATH}/${FILE_NAME}-ERROR-%d{yyyy-MM-dd}_%i.log.gz">
+        <RollingFile name="RollingFileError" fileName="${FILE_PATH}/error.log" filePattern="${FILE_PATH}/error-%d{yyyy-MM-dd}_%i.log.gz">
             <ThresholdFilter level="error" onMatch="ACCEPT" onMismatch="DENY"/>
             <PatternLayout pattern="${LOG_PATTERN}"/>
             <Policies>
@@ -58,19 +66,14 @@
             </Policies>
             <DefaultRolloverStrategy max="15"/>
         </RollingFile>
+
     </appenders>
 
     <loggers>
-        <logger name="org.mybatis" level="info" additivity="false">
-            <AppenderRef ref="Console"/>
-        </logger>
-        <Logger name="org.springframework" level="info" additivity="false">
-            <AppenderRef ref="Console"/>
-        </Logger>
-
-        <root level="info">
+        <root level="debug">
             <appender-ref ref="Console"/>
-            <appender-ref ref="Filelog"/>
+            <appender-ref ref="FileLog"/>
+            <appender-ref ref="RollingFileDebug"/>
             <appender-ref ref="RollingFileInfo"/>
             <appender-ref ref="RollingFileWarn"/>
             <appender-ref ref="RollingFileError"/>