fix

zhongzheng-common/src/main/java/com/zhongzheng/common/utils/DateUtils.java

@@ -395,4 +395,26 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
            return null;
        }
     }
+
+    public static  Integer getTodayWeek(){
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(new Date());
+        int weekIdx = calendar.get(Calendar.DAY_OF_WEEK) - 1;
+        switch (weekIdx) {
+            case 1:
+                return 1;
+            case 2:
+                return 2;
+            case 3:
+                return 3;
+            case 4:
+                return 4;
+            case 5:
+                return 5;
+            case 6:
+                return 6;
+            default:
+                return 7;
+        }
+    }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/bo/TopCostTpItemAddBo.java

@@ -55,4 +55,13 @@ public class TopCostTpItemAddBo {
     /** 项目id */
     @ApiModelProperty("项目id")
     private Integer projectId;
+    /**  1启用成本扣除 0不启用 */
+    @ApiModelProperty(" 1启用成本扣除 0不启用")
+    private Integer dockStatus;
+    /** 扣除类型 1百分比 2固定成本 */
+    @ApiModelProperty("扣除类型 1百分比 2固定成本")
+    private Integer dockType;
+    /** 百分比值为 0到 100 */
+    @ApiModelProperty("百分比值为 0到 100")
+    private BigDecimal dockValue;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/bo/TopCostTpItemEditBo.java

@@ -63,5 +63,13 @@ public class TopCostTpItemEditBo {
     /** 百分比值为 0到 100 */
     @ApiModelProperty("百分比值为 0到 100")
     private BigDecimal typeValue;
-
+    /**  1启用成本扣除 0不启用 */
+    @ApiModelProperty(" 1启用成本扣除 0不启用")
+    private Integer dockStatus;
+    /** 扣除类型 1百分比 2固定成本 */
+    @ApiModelProperty("扣除类型 1百分比 2固定成本")
+    private Integer dockType;
+    /** 百分比值为 0到 100 */
+    @ApiModelProperty("百分比值为 0到 100")
+    private BigDecimal dockValue;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/domain/TopCostTpItem.java

@@ -59,4 +59,11 @@ private static final long serialVersionUID=1L;
 
     private BigDecimal minValue;
 
+    /**  1启用成本扣除 0不启用 */
+    private Integer dockStatus;
+    /** 扣除类型 1百分比 2固定成本 */
+    private Integer dockType;
+    /** 百分比值为 0到 100 */
+    private BigDecimal dockValue;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/vo/TopCostTpItemVo.java

@@ -61,4 +61,16 @@ public class TopCostTpItemVo {
 	private BigDecimal maxValue;
 	@ApiModelProperty("最小值")
 	private BigDecimal minValue;
+	/**  1启用成本扣除 0不启用 */
+	@Excel(name = " 1启用成本扣除 0不启用")
+	@ApiModelProperty(" 1启用成本扣除 0不启用")
+	private Integer dockStatus;
+	/** 扣除类型 1百分比 2固定成本 */
+	@Excel(name = "扣除类型 1百分比 2固定成本")
+	@ApiModelProperty("扣除类型 1百分比 2固定成本")
+	private Integer dockType;
+	/** 百分比值为 0到 100 */
+	@Excel(name = "百分比值为 0到 100")
+	@ApiModelProperty("百分比值为 0到 100")
+	private BigDecimal dockValue;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/order/service/impl/TopOrderRecNoteServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.common.utils.ToolsUtils;
@@ -129,6 +130,11 @@ public class TopOrderRecNoteServiceImpl extends ServiceImpl<TopOrderRecNoteMappe
         } catch (IOException e) {
             throw new CustomException("同步请求错误"+e.getMessage());
         }
+        LambdaUpdateWrapper<TopOrderRecNote> objectLambdaUpdateWrapper = Wrappers.lambdaUpdate();
+        objectLambdaUpdateWrapper.eq(TopOrderRecNote::getOrderSn, orderSn);
+        objectLambdaUpdateWrapper.set(TopOrderRecNote::getLastTime, nowTime);
+        objectLambdaUpdateWrapper.set(TopOrderRecNote::getUpdateTime, DateUtils.getNowTime());
+        this.update(null, objectLambdaUpdateWrapper);
         return true;
     }
 
@@ -163,7 +169,49 @@ public class TopOrderRecNoteServiceImpl extends ServiceImpl<TopOrderRecNoteMappe
             Long time = DateUtils.dateTimeSec(DateUtils.YYYY_MM_DD_HH_MM_SS,timeStr);
             if(DateUtils.getNowTime().longValue()>time.longValue()){
                 //推送
-                System.out.println("推送");
+                pushOldNote(vo.getOrderSn());
+            }
+        }
+        //每周
+        TopOrderRecNoteQueryBo queryBo2 = new TopOrderRecNoteQueryBo();
+        queryBo1.setNoteType(3L);
+        queryBo1.setStatus(1);
+        queryBo1.setLastTime(DateUtils.getNowTime()-(24*3600));//一天只推一次
+        List<TopOrderRecNoteVo> list2 = queryList(queryBo2);
+        for(TopOrderRecNoteVo vo : list2){
+            String[] splitWeek=vo.getWeekTime().split(",");
+            for(String week : splitWeek){
+                if(DateUtils.getTodayWeek()==Integer.parseInt(week)){
+                    String dayStr = DateUtils.getDate();
+                    String timeStr = dayStr+" "+vo.getDayTime()+":00";
+                    Long time = DateUtils.dateTimeSec(DateUtils.YYYY_MM_DD_HH_MM_SS,timeStr);
+                    if(DateUtils.getNowTime().longValue()>time.longValue()){
+                        //推送
+                        pushOldNote(vo.getOrderSn());
+                    }
+                }
+            }
+        }
+        //每月
+        TopOrderRecNoteQueryBo queryBo3 = new TopOrderRecNoteQueryBo();
+        queryBo1.setNoteType(4L);
+        queryBo1.setStatus(1);
+        queryBo1.setLastTime(DateUtils.getNowTime()-(24*3600));//一天只推一次
+        List<TopOrderRecNoteVo> list3 = queryList(queryBo3);
+        for(TopOrderRecNoteVo vo : list3){
+            String[] splitMonth=vo.getMonthTime().split(",");
+            for(String month : splitMonth){
+                Calendar cal = Calendar.getInstance();
+                Integer day_moneth=cal.get(Calendar.DAY_OF_MONTH);
+                if(day_moneth==Integer.parseInt(month)){
+                    String dayStr = DateUtils.getDate();
+                    String timeStr = dayStr+" "+vo.getDayTime()+":00";
+                    Long time = DateUtils.dateTimeSec(DateUtils.YYYY_MM_DD_HH_MM_SS,timeStr);
+                    if(DateUtils.getNowTime().longValue()>time.longValue()){
+                        //推送
+                        pushOldNote(vo.getOrderSn());
+                    }
+                }
             }
         }
         return null;

zhongzheng-system/src/main/resources/mapper/modules/top/TopCostTpItemMapper.xml

@@ -19,6 +19,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="projectId" column="project_id"/>
         <result property="maxValue" column="max_value"/>
         <result property="minValue" column="min_value"/>
+        <result property="dockStatus" column="dock_status"/>
+        <result property="dockType" column="dock_type"/>
+        <result property="dockValue" column="dock_value"/>
     </resultMap>
 
     <select id="getCostByBusiness" parameterType="map" resultType="com.zhongzheng.modules.top.financial.domain.TopCostTpItem">