bug修改

无关风月

18 小时以前 7cab5bda99ca42188bc15b2dae7d1fa4d1833fd9

bug修改

 ruoyi-api/ruoyi-api-admin/src/main/java/com/ruoyi/admin/api/entity/Order.java

@@ -27,7 +27,9 @@

    @TableId("id")
    private Integer id;

    @ApiModelProperty("师傅填写备注")
    @TableField("remark")
    private String remark;
    @ApiModelProperty("下单城市")
    @TableField("city")
    private String city;

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/Order.java

@@ -34,6 +34,9 @@
    @ApiModelProperty("下单城市")
    @TableField("city")
    private String city;
    @ApiModelProperty("师傅填写备注")
    @TableField("remark")
    private String remark;
    @TableField("province_code")
    private String provinceCode;
    @TableField("are_code")

 ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java

@@ -619,24 +619,19 @@
            @ApiImplicitParam(value = "页码", name = "pageNum", dataType = "Integer", required = true),
            @ApiImplicitParam(value = "每页条数", name = "pageSize", dataType = "Integer", required = true)
    })
    public R<Page<OrderCountVO>> orderCount(String name, String phone,
                                            @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
                                            @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
    public R<Page<OrderCountVO>> orderCount(@RequestBody OrderCountDataRequest orderCountDataRequest) {
        LoginUser loginUser = tokenService.getLoginUser();
        if (null == loginUser) {
            return R.loginExpire("登录失效！");
        }
        List<String> cityList = new ArrayList<>();
        if (loginUser.getIsFranchisee()) {
            cityList = loginUser.getCityList();
        if (orderCountDataRequest.getCityList().isEmpty()) {
            List<String> cityList = new ArrayList<>();
            if (loginUser.getIsFranchisee()) {
                cityList = loginUser.getCityList();
                orderCountDataRequest.setCityList(cityList);
            }
        }
        // 查询参数
        OrderCountDataRequest orderCountDataRequest = new OrderCountDataRequest();
        orderCountDataRequest.setWorkerName(name);
        orderCountDataRequest.setWorkerPhone(phone);
        orderCountDataRequest.setCityList(cityList);
        orderCountDataRequest.setPageNum(pageNum);
        orderCountDataRequest.setPageSize(pageSize);



        Integer franchiseeId = loginUser.getSysUser().getFranchiseeId();

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java

@@ -755,6 +755,7 @@
        order.setCompleteTime(new Date());
        order.setState(Constants.THREE);
        order.setFake(orderSubmitRequest.getFake());
        order.setRemark(orderSubmitRequest.getRemark());
        boolean update = orderService.updateById(order);
        // 服务记录
        ServeRecord serveRecord = new ServeRecord();

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/entity/Order.java

@@ -34,7 +34,9 @@
    @ApiModelProperty("下单城市")
    @TableField("city")
    private String city;

    @ApiModelProperty("师傅填写备注")
    @TableField("remark")
    private String remark;
    @TableField("province_code")
    private String provinceCode;


 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/request/OrderSubmitRequest.java

@@ -16,7 +16,8 @@

    @ApiModelProperty("订单id")
    private String orderId;

    @ApiModelProperty("师傅填写备注")
    private String remark;
    @ApiModelProperty("现场照片")
    private List<String> photo;
    @ApiModelProperty("是否虚假订单")