20220810

xiaoyong931011

2022-08-10 72c995726194612b74566a9a3fb6f536a8eb79d0

20220810

 src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java

@@ -59,6 +59,10 @@
    private final MallOrderInfoMapper mallOrderInfoMapper;
    private final SpringContextHolder springContextHolder;

    private final IXcxPayService iXcxPayService;
    private final MallTeamLeaderMapper mallTeamLeaderMapper;
    private final MallMemberMapper mallMemberMapper;

    /**
     * 订单列表
     *
@@ -294,12 +298,8 @@
        return null;
    }

    private final IXcxPayService iXcxPayService;
    private final MallTeamLeaderMapper mallTeamLeaderMapper;
    private final MallMemberMapper mallMemberMapper;

    @GetMapping("confirmOrder")
    @ControllerEndpoint(operation = "确认货到达自提点", exceptionMessage = "确认货到达自提点")
    @ControllerEndpoint(operation = "确认货到达自提点", exceptionMessage = "操作失败")
    public FebsResponse confirmOrder(MallOrderInfo mallOrderInfoDto){
        String orderIds = mallOrderInfoDto.getOrderIds();
        List<String> ids = StrUtil.splitTrim(orderIds, ",");
@@ -310,8 +310,9 @@
                continue;
//                return new FebsResponse().fail().message("订单不存在");
            }
            Integer status = mallOrderInfo.getStatus();
            if(OrderStatusEnum.WAIT_FINISH.getValue() != status && mallOrderInfo.getDeliveryState() != 2){
            Integer status = mallOrderInfo.getStatus() == null ? 0 : mallOrderInfo.getStatus();
            Integer deliveryState = mallOrderInfo.getDeliveryState() == null ? 0 : mallOrderInfo.getDeliveryState();
            if(OrderStatusEnum.WAIT_FINISH.getValue() != status || 2 != deliveryState){
                continue;
//                return new FebsResponse().fail().message("订单不是待确认到货状态");
            }
@@ -330,7 +331,7 @@
            orderStateDto.setTemplateId(WechatConfigure.WX_ORDER_STATEMSG_TEMPLATE_ID);
            iXcxPayService.pushOrderToAddress(orderStateDto);
        }
        return new FebsResponse().success().message("确认成功");
        return new FebsResponse().success();
    }

    /**

 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java

@@ -140,8 +140,9 @@
                continue;
//                return new FebsResponse().fail().message("订单不存在");
            }
            Integer status = mallOrderInfo.getStatus();
            if(OrderStatusEnum.WAIT_FINISH.getValue() != status && mallOrderInfo.getDeliveryState() != 2){
            Integer status = mallOrderInfo.getStatus() == null ? 0 : mallOrderInfo.getStatus();
            Integer deliveryState = mallOrderInfo.getDeliveryState() == null ? 0 : mallOrderInfo.getDeliveryState();
            if(OrderStatusEnum.WAIT_FINISH.getValue() != status || 2 != deliveryState){
                continue;
//                return new FebsResponse().fail().message("订单不是待确认到货状态");
            }

 src/main/java/cc/mrbird/febs/pay/service/IXcxPayService.java

@@ -14,5 +14,5 @@
    /**
     * 发送订单送达消息
     */
    String pushOrderToAddress(OrderStateDto info);
    void pushOrderToAddress(OrderStateDto info);
}

 src/main/java/cc/mrbird/febs/pay/service/impl/XcxPayServiceImpl.java

@@ -67,7 +67,7 @@
    }

    @Override
    public String pushOrderToAddress(OrderStateDto info) {
    public void pushOrderToAddress(OrderStateDto info) {
        RestTemplate restTemplate = new RestTemplate();
        String url =  WechatConfigure.SEND_INFO_URL  + redisUtils.get(WechatConfigure.WX_ACCESS_TOKEN_REDIS_KEY);
        //拼接推送的模版
@@ -84,7 +84,7 @@
        m.put("thing16", new WxTemplateData(info.getTakeCode()));
        orderStateMsgVo.setData(m);
        ResponseEntity<String> responseEntity = restTemplate.postForEntity(url, orderStateMsgVo, String.class);
        return responseEntity.getBody();
        log.info(responseEntity.getBody());
    }

    /**

 src/main/resources/templates/febs/views/modules/order/orderList.html

@@ -162,7 +162,11 @@
                    febs.alert.warn('请选择团长');
                    return;
                }
                window.location.href = ctx + "admin/order/confirmOrder?takeUniqueCode="+uniqueCodeValue+"&orderIds="+ids;
                febs.get(ctx + 'admin/order/confirmOrder?takeUniqueCode='+uniqueCodeValue+'&orderIds='+ids, null, function () {
                    febs.alert.success('操作成功');
                    $query.click();
                });
                // window.location.href = ctx + "admin/order/confirmOrder?takeUniqueCode="+uniqueCodeValue+"&orderIds="+ids;
            }
            if (event == 'exportDeliverOne') {
                let uniqueCodeValue = $searchForm.find("select[name='uniqueCode']").val();
@@ -191,17 +195,6 @@
        table.on('tool(orderTable)', function (obj) {
            var data = obj.data,
                layEvent = obj.event;
            // if (layEvent === 'deliverGoods') {
            //     febs.modal.open('发货', 'modules/order/deliverGoods/' + data.id, {
            //         btn: ['确认', '取消'],
            //         yes: function (index, layero) {
            //             $('#deliver-update').find('#submit').trigger('click');
            //         },
            //         btn2: function () {
            //             layer.closeAll();
            //         }
            //     });
            // }
            if (layEvent === 'deliverGoods') {
                febs.modal.open('发货', 'modules/order/deliverGoods/' + data.id, {
                    btn: ['确认', '取消'],