Merge branch 'after_sales'

netflix-dao/src/main/java/com/cyksj/mapper/OrderDonAfterSalesRecordMapper.java

@@ -0,0 +1,13 @@
+package com.cyksj.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cyksj.model.entity.OrderDonAfterSalesRecord;
+
+/**
+ * 项目名: yhlxj321312312312312312
+ * 文件名: OrderDonAfterSalesRecordMapper
+ * 创建者: JavaZou
+ * 创建时间:2025/12/19 15:40
+ */
+public interface OrderDonAfterSalesRecordMapper extends BaseMapper<OrderDonAfterSalesRecord> {
+}

netflix-dao/src/main/java/com/cyksj/model/entity/OrderDonAfterSalesRecord.java

@@ -0,0 +1,30 @@
+package com.cyksj.model.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 项目名: yhlxj321312312312312312
+ * 文件名: OrderDonAfterSalesRecord
+ * 创建者: JavaZou
+ * 创建时间:2025/12/19 15:39
+ */
+@Getter
+@Setter
+public class OrderDonAfterSalesRecord extends BaseEntity{
+
+	private Long userId;
+
+	private Long orderId;
+
+	private Long goodsId;
+
+	private Long relationId;
+
+	/**
+	 * 原因
+	 */
+	private String reason;
+
+	private String operator;
+}

netflix-web/src/main/java/com/cyksj/web/controller/manage/CmsOrderController.java

@@ -72,6 +72,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 /**
+ * admin/订单管理/售后操作
  * @author chan
  * @date 2021/10/12 下午11:05
  */
@@ -142,6 +143,8 @@ public class CmsOrderController {
 
 	private final ClaudeCodeDeductOrderRelateMapper claudeCodeDeductOrderRelateMapper;
 
+	private final OrderDonAfterSalesRecordMapper orderDonAfterSalesRecordMapper;
+
 	private static final GlobalThreadPoolTaskExecutor TASK_EXECUTOR = GlobalThreadPoolTaskExecutor.getInstance();
 
 	@GetMapping("/get")
@@ -1463,4 +1466,25 @@ public class CmsOrderController {
 				.build());
 		return GatewayResponse.SUCCESS.newBuilder().toResult(search);
 	}
+
+	/**
+	 * 添加售后操作
+	 */
+	@PostMapping("/afterSales/record")
+	public Result<String> recordAfterSales(@RequestBody OrderDonAfterSalesRecord salesRecord) {
+		long adminId = StpUtil.getLoginIdAsLong();
+		CmsUser cmsUser = cmsUserMapper.selectById(adminId);
+		salesRecord.setOperator(cmsUser.getNickname());
+		orderDonAfterSalesRecordMapper.insert(salesRecord);
+		return GatewayResponse.SUCCESS.newBuilder().toResult();
+	}
+
+	/**
+	 * 订单售后操作列表
+	 */
+	@GetMapping("/get/afterSales/reocrd")
+	public Result<SearchResult<OrderDonAfterSalesRecord>> getRecordAfterSales() {
+		SearchResult<OrderDonAfterSalesRecord> search = beanSearcher.search(OrderDonAfterSalesRecord.class, MapUtils.flatBuilder(request.getParameterMap()).build());
+		return GatewayResponse.SUCCESS.newBuilder().toResult(search);
+	}
 }