添加编辑订单物流单号接口

nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/ProductOrderController.java

@@ -161,4 +161,12 @@ public class ProductOrderController extends BaseController {
         return R.ok(detailVO);
     }
 
+    @PreAuthorize("@ss.hasPermi('product:order:edit')")
+    @GetMapping("/admin/edit/logisticsNo")
+    @ApiOperation("积分订单管理详情接口")
+    public R editLogisticsNo(@Validated @RequestBody ProductOrderEditLogisticsNo dto) {
+        this.productOrderInfoService.editLogisticsNo(dto);
+        return R.ok();
+    }
+
 }

nightFragrance-massage/src/main/java/com/ylx/massage/domain/dto/ProductOrderEditLogisticsNo.java

@@ -0,0 +1,22 @@
+package com.ylx.massage.domain.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+@Data
+@ApiModel("积分订单修改物流单号dto")
+public class ProductOrderEditLogisticsNo {
+
+    @NotNull(message = "订单ID不能为空")
+    @ApiModelProperty(value = "订单ID", required = true)
+    private Long orderId;
+
+    @NotBlank(message = "物流单号不能为空")
+    @ApiModelProperty(value = "物流单号", required = true)
+    private String logisticsNo;
+
+}

nightFragrance-massage/src/main/java/com/ylx/massage/domain/vo/ProductOrderPageItemVo.java

@@ -13,7 +13,7 @@ import java.time.LocalDateTime;
 public class ProductOrderPageItemVo {
 
     @ApiModelProperty("订单ID")
-    private Long id;
+    private String id;
 
     @ApiModelProperty("订单号")
     private String orderNo;

nightFragrance-massage/src/main/java/com/ylx/massage/service/IProductOrderInfoService.java

@@ -64,4 +64,6 @@ public interface IProductOrderInfoService extends IService<ProductOrderInfo> {
     ProductOrderDetailAdminVo getOrderDetailForAdmin(Long orderId);
 
     ProductOrderCountVo adminPageStats();
+
+    void editLogisticsNo(ProductOrderEditLogisticsNo dto);
 }

nightFragrance-massage/src/main/java/com/ylx/massage/service/impl/AfterSaleOrderServiceImpl.java

@@ -51,7 +51,14 @@ public class AfterSaleOrderServiceImpl extends ServiceImpl<AfterSaleOrderMapper,
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void edit(AfterSaleOrderUpdateDTO dto) {
+        AfterSaleOrder afterSaleOrder = this.afterSaleOrderMapper.selectById(dto.getAfterSaleOrderId());
+        if (ObjectUtil.isNull(afterSaleOrder)) {
+            throw new ServiceException("售后订单不存在");
+        }
 
+        afterSaleOrder.setLogisticsNo(dto.getLogisticsNo());
+        afterSaleOrder.setUpdateTime(LocalDateTime.now());
+        this.afterSaleOrderMapper.updateById(afterSaleOrder);
     }
 
     private WxLoginUser getCurrentWxLoginUser() {

nightFragrance-massage/src/main/java/com/ylx/massage/service/impl/ProductOrderInfoServiceImpl.java

@@ -516,6 +516,12 @@ public class ProductOrderInfoServiceImpl extends ServiceImpl<ProductOrderInfoMap
         return this.productOrderInfoMapper.getOrderTotalCount();
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void editLogisticsNo(ProductOrderEditLogisticsNo dto) {
+
+    }
+
     private WxLoginUser getCurrentWxLoginUser() {
         WxLoginUser loginUser = SecurityUtils.getWxLoginUser();
         if (ObjectUtil.isNull(loginUser)) {