ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/RefundPass.java
@@ -73,6 +73,18 @@ @ApiModelProperty(value = "添加时间") @TableField("create_time") private LocalDateTime createTime; @ApiModelProperty("收货人姓名") @TableField("name") private String name; @ApiModelProperty("收货人电话") @TableField("phone") private String phone; @ApiModelProperty("收货地址") @TableField("address") private String address; } ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java
@@ -94,12 +94,13 @@ @ResponseBody @PutMapping("/deliverGoodsRefundPass/{id}") @PutMapping("/deliverGoodsRefundPass/{id}/{code}") @ApiOperation(value = "售后已发货操作", tags = {"我的订单-个人中心-小程序"}) @ApiImplicitParams({ @ApiImplicitParam(name = "id", value = "售后数据id", required = true, dataType = "long"), @ApiImplicitParam(name = "code", value = "快递单号", required = true, dataType = "string"), }) public R deliverGoodsRefundPass(@PathVariable("id") Long id){ public R deliverGoodsRefundPass(@PathVariable("id") Long id, @PathVariable("code") String code){ RefundPass refundPass = refundPassService.getById(id); if(null == refundPass){ return R.fail(); ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/RefundPassServiceImpl.java
@@ -1,5 +1,7 @@ package com.ruoyi.order.service.impl; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.core.domain.R; @@ -9,6 +11,8 @@ import com.ruoyi.order.service.OrderService; import com.ruoyi.order.service.RefundPassService; import com.ruoyi.order.vo.ApplyRefundPass; import com.ruoyi.other.api.domain.BaseSetting; import com.ruoyi.other.api.feignClient.BaseSettingClient; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -28,6 +32,12 @@ @Resource private OrderService orderService; @Resource private BaseSettingClient baseSettingClient; /** @@ -60,6 +70,11 @@ refundPass.setPassStatus(1); refundPass.setDelFlag(0); refundPass.setCreateTime(LocalDateTime.now()); BaseSetting baseSetting = baseSettingClient.getBaseSetting(5).getData(); JSONObject jsonObject = JSON.parseObject(baseSetting.getContent()); refundPass.setName(jsonObject.getString("name")); refundPass.setPhone(jsonObject.getString("phone")); refundPass.setAddress(jsonObject.getString("address")); this.save(refundPass); order.setOrderStatus(7); orderService.updateById(order);