Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs into hylyasrs

18516761980

2022-06-16 fe739bd754d999f18094527ed3bca7a23f8a2ddf

Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs into hylyasrs

# Conflicts:
#	src/main/java/com/zy/asrs/controller/MatCodeController.java
#	src/main/java/com/zy/asrs/utils/VersionUtils.java
#	src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcel.java
#	src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcelListener.java
#	src/main/resources/application.yml

 src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java

@@ -29,4 +29,5 @@

    int modifyStatus(@Param("orderId") Long orderId, @Param("status")Integer status);

    int addToLogTable(OrderDetl orderDetl);
}

 src/main/java/com/zy/asrs/service/OrderDetlService.java

@@ -24,5 +24,5 @@

    boolean modifyStatus(Long orderId, Integer status);

    void addToLogTable(OrderDetl orderDetl);
    boolean addToLogTable(OrderDetl orderDetl);
}

 src/main/java/com/zy/asrs/service/OrderService.java

@@ -24,5 +24,5 @@

    List<Order> selectComplete();

    void addToLogTable(Order order);
    boolean addToLogTable(Order order);
}

 src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java

@@ -68,4 +68,8 @@
        return this.baseMapper.modifyStatus(orderId, status) > 0;
    }

    @Override
    public boolean addToLogTable(OrderDetl orderDetl) {
        return this.baseMapper.addToLogTable(orderDetl) > 0;
    }
}

 src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java

@@ -162,8 +162,8 @@
    }

    @Override
    public void addToLogTable(Order order) {
        this.baseMapper.addToLogTable(order);
    public boolean addToLogTable(Order order) {
        return this.baseMapper.addToLogTable(order) > 0;
    }

}

 src/main/java/com/zy/asrs/task/OrderMoveHistoryScheduler.java

@@ -9,14 +9,13 @@
@Component
public class OrderMoveHistoryScheduler {
    @Autowired
    private OrderMoveHistoryHandler handler;

    private OrderMoveHistoryHandler orderMoveHistoryHandler;

    /**
     * 将已完成order和orderDetl移动到log表
     */
    @Scheduled(cron = "0/30 * * * * ?")
    public void execute(){
        handler.move();
        orderMoveHistoryHandler.start();
    }
}

 src/main/java/com/zy/asrs/task/handler/OrderMoveHistoryHandler.java

@@ -20,11 +20,10 @@
public class OrderMoveHistoryHandler extends AbstractHandler<String> {
    @Autowired
    private OrderService orderService;

    @Autowired
    private OrderDetlService orderDetlService;

    public ReturnT<String> move(){
    public ReturnT<String> start(){
        List<Order> settleEqual6 = orderService.selectList(new EntityWrapper<Order>()
                .eq("settle", 6));
        for (Order order : settleEqual6) {
@@ -35,6 +34,7 @@
        }
        return SUCCESS;
    }

    private void moveBoth(Order order, List<OrderDetl> orderDetls){
        Date now = new Date();
        if (!Cools.isEmpty(orderDetls)) {

 src/main/resources/mapper/OrderDetlMapper.xml

@@ -165,4 +165,8 @@
        and order_id = #{orderId}
    </update>

    <insert id="addToLogTable">
        INSERT INTO man_order_detl_log SELECT * FROM man_order_detl WHERE id = #{id}
    </insert>

</mapper>