修改bug

tangxiaobao

2022-04-24 a87a8432a1107b30884023b4c278cfbda2933932

修改bug

 springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ComBatteryCommodityOrderApi.java

@@ -43,6 +43,7 @@
    @ApiOperation(value = "分页查询订单列表",response = ComBatteryCommodityOrderVo.class)
    @PostMapping("/page")
    public R queryByPage(@RequestBody PageComBatteryCommodityOrderDto comBatteryCommodityOrder) {
        comBatteryCommodityOrder.setIsAdmin(1);
        return this.comBatteryCommodityOrderService.queryByPage(comBatteryCommodityOrder);
    }


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComBatteryCommodityOrderFeign.java

@@ -122,7 +122,7 @@
     * 定时关闭5分钟未支付订单
     * @return  操作结果
     */
    @PostMapping("/sync/close/order")
    @GetMapping("/sync/close/order")
    R syncCloseOrder();

    /**

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComBatteryCommodityOrderApi.java

@@ -99,5 +99,11 @@
        return this.comBatteryCommodityOrderService.orderDeliver(deliverAdminDto);
    }

    @ApiOperation(value = "定时关闭5分钟未支付订单")
    @GetMapping("/syncCloseOrder")
    public R syncCloseOrder(){
        return this.comBatteryCommodityOrderService.syncCloseOrder();
    }

}


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComBatteryCommodityOrderController.java

@@ -158,7 +158,7 @@
     * 定时关闭5分钟未支付订单
     * @return  操作结果
     */
    @PostMapping("/sync/close/order")
    @GetMapping("/sync/close/order")
    public R syncCloseOrder(){
        return this.comBatteryCommodityOrderService.syncCloseOrder();
    }

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComBatteryCommodityOrderServiceImpl.java

@@ -382,7 +382,7 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R syncCloseOrder() {
        log.info("定时器定时关闭超过30分钟未支付订单，并返回商品库存");
        log.info("定时器定时关闭超过5分钟未支付订单，并返回商品库存");
        Date nowDate = new Date();
        //获取当前时间减30分钟时间
        Date oldDate = DateUtils.addMinutes(nowDate, -5);

 springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/filters/JWTAuthenticationTokenFilter.java

@@ -304,6 +304,7 @@
                noLoginUrl.add("/api/applets/fms/service/detail");
                noLoginUrl.add("/api/applets/wx/batteryPayNotify");
                noLoginUrl.add("/api/applets/wx/batteryActivityPayNotify");
                noLoginUrl.add("/api/communitybackstage/comBatteryCommodityOrder/syncCloseOrder");
                if (noLoginUrl.contains(requestURI)) {
                    List<SimpleGrantedAuthority> authorities = new ArrayList<>();
                    authorities.add(new SimpleGrantedAuthority(SecurityConstants.ROLE_APPLETS));