订单

wang-hao-jie

2021-11-09 15c331e319fa2486534e786fe00c11ee3302b7c2

订单

 xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/CustomerReceiveController.java

@@ -67,6 +67,17 @@
        return new ResultUtil<CustomerReceive>().setErrorMsg("操作失败");
    }

    @RequestMapping(value = "/update", method = RequestMethod.POST)
    @ApiOperation(value = "修改头像")
    public Result<CustomerReceive> update(String id,String imgUrl) {
        CustomerReceive customerReceive = iCustomerReceiveService.getById(id);
        customerReceive.setImg(imgUrl);
        if (iCustomerReceiveService.saveOrUpdate(customerReceive)) {
            return new ResultUtil<CustomerReceive>().setData(customerReceive);
        }
        return new ResultUtil<CustomerReceive>().setErrorMsg("操作失败");
    }

    @RequestMapping(value = "/delByIds", method = RequestMethod.POST)
    @ApiOperation(value = "批量通过id删除")
    public Result<Object> delAllByIds(@RequestParam String[] ids) {

 xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTaskController.java

@@ -216,10 +216,18 @@

    @RequestMapping(value = "/signFor", method = RequestMethod.POST)
    @ApiOperation(value = "签收")
    public Object signFor(String orderId,int status,String content) {
    public Object signFor(String orderId,int status,String content,String customerReceiveId) {
        if(status==1){
            if(StrUtil.isEmpty(customerReceiveId)){
                return ResultUtil.error("正常签收，接货人id必填");
            }
        }
        OrderTask orderTask = iOrderTaskService.getById(orderId);
        orderTask.setStatus(status);
        orderTask.setUserId(securityUtil.getCurrUser().getId());
        if(StrUtil.isNotEmpty(customerReceiveId)){
            orderTask.setCustomerReceiveId(customerReceiveId);
        }

        if(!StrUtil.isEmpty(content)){
            orderTask.setRemarks(content);

 xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/CustomerReceive.java

@@ -49,4 +49,7 @@
    @ApiModelProperty(value = "头像")
    private String img;

    @ApiModelProperty(value = "指纹状态 0：未录入 1：已录入")
    private Integer fstatus=0;

}

 xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/OrderTask.java

@@ -91,6 +91,9 @@
    @ApiModelProperty(value = "签收评价")
    private String evaluate;

    @ApiModelProperty(value = "收货人id")
    private String customerReceiveId;

    @Transient
    @TableField(exist = false)
    @ApiModelProperty(value = "商户名称")