diff --git a/DB/2024-05-10_order.sql b/DB/2024-05-10_order.sql new file mode 100644 index 000000000..e487269c9 --- /dev/null +++ b/DB/2024-05-10_order.sql @@ -0,0 +1,2 @@ +ALTER TABLE `li_order` + ADD COLUMN `seller_remark` varchar(255) NULL COMMENT '商家订单备注' AFTER `remark`; \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Order.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Order.java index 329c6a9a9..f2fc6e880 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Order.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Order.java @@ -148,6 +148,9 @@ public class Order extends BaseEntity { @ApiModelProperty(value = "买家订单备注") private String remark; + @ApiModelProperty(value = "卖家订单备注") + private String sellerRemark; + @ApiModelProperty(value = "订单取消原因") private String cancelReason; diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderSimpleVO.java b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderSimpleVO.java index b378d8568..9bf3f1101 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderSimpleVO.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderSimpleVO.java @@ -148,6 +148,9 @@ public class OrderSimpleVO { @ApiModelProperty(value = "退款金额") private String groupRefundPrice; + @ApiModelProperty(value = "卖家订单备注") + private String sellerRemark; + public List getOrderItems() { if (CharSequenceUtil.isEmpty(groupGoodsId)) { return new ArrayList<>(); diff --git a/framework/src/main/java/cn/lili/modules/order/order/mapper/OrderMapper.java b/framework/src/main/java/cn/lili/modules/order/order/mapper/OrderMapper.java index b21ccff45..f731d44d8 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/mapper/OrderMapper.java +++ b/framework/src/main/java/cn/lili/modules/order/order/mapper/OrderMapper.java @@ -60,7 +60,8 @@ public interface OrderMapper extends BaseMapper { * @param queryWrapper 查询条件 * @return 简短订单分页 */ - @Select("select o.sn,o.flow_price,o.create_time,o.order_status,o.pay_status,o.payment_method,o.payment_time,o.member_name,o.store_name as store_name,o.store_id as store_id,o.client_type,o.order_type,o.deliver_status,o.order_promotion_type " + + @Select("select o.sn,o.flow_price,o.create_time,o.order_status,o.pay_status,o.payment_method,o.payment_time,o.member_name,o.store_name as " + + "store_name,o.store_id as store_id,o.client_type,o.order_type,o.deliver_status,o.order_promotion_type,o.seller_remark " + ",GROUP_CONCAT(oi.goods_id) as group_goods_id," + " GROUP_CONCAT(oi.sku_id) as group_sku_id," + " GROUP_CONCAT(oi.num) as group_num" + diff --git a/framework/src/main/java/cn/lili/modules/order/order/service/OrderService.java b/framework/src/main/java/cn/lili/modules/order/order/service/OrderService.java index a18843653..aa363f3d0 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/service/OrderService.java +++ b/framework/src/main/java/cn/lili/modules/order/order/service/OrderService.java @@ -320,4 +320,12 @@ public interface OrderService extends IService { */ Order partDelivery(PartDeliveryParamsDTO partDeliveryParamsDTO); + /** + * 卖家订单备注 + * + * @param orderSn 订单编号 + * @param sellerRemark 卖家订单备注 + * @return 订单 + */ + Order updateSellerRemark(String orderSn, String sellerRemark); } \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java index da0bc58d8..1997be839 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java @@ -883,6 +883,14 @@ public class OrderServiceImpl extends ServiceImpl implements return order; } + @Override + public Order updateSellerRemark(String orderSn, String sellerRemark) { + Order order = this.getBySn(orderSn); + order.setSellerRemark(sellerRemark); + this.updateById(order); + return order; + } + /** * 虚拟成团 * diff --git a/manager-api/src/main/java/cn/lili/controller/order/OrderManagerController.java b/manager-api/src/main/java/cn/lili/controller/order/OrderManagerController.java index 07ef50e24..a1f9aa460 100644 --- a/manager-api/src/main/java/cn/lili/controller/order/OrderManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/order/OrderManagerController.java @@ -127,4 +127,11 @@ public class OrderManagerController { public ResultMessage getTraces(@NotBlank(message = "订单编号不能为空") @PathVariable String orderSn) { return ResultUtil.data(orderService.getTraces(orderSn)); } + + @ApiOperation(value = "卖家订单备注") + @PutMapping("/{orderSn}/sellerRemark") + public ResultMessage sellerRemark(@PathVariable String orderSn, @RequestParam String sellerRemark) { + orderService.updateSellerRemark(orderSn, sellerRemark); + return ResultUtil.success(); + } } \ No newline at end of file diff --git a/seller-api/src/main/java/cn/lili/controller/order/OrderStoreController.java b/seller-api/src/main/java/cn/lili/controller/order/OrderStoreController.java index a1255607e..cd06f6288 100644 --- a/seller-api/src/main/java/cn/lili/controller/order/OrderStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/order/OrderStoreController.java @@ -251,4 +251,11 @@ public class OrderStoreController { public ResultMessage delivery(@RequestBody PartDeliveryParamsDTO partDeliveryParamsDTO) { return ResultUtil.data(orderService.partDelivery(partDeliveryParamsDTO)); } + + @ApiOperation(value = "卖家订单备注") + @PutMapping("/{orderSn}/sellerRemark") + public ResultMessage sellerRemark(@PathVariable String orderSn, @RequestParam String sellerRemark) { + orderService.updateSellerRemark(orderSn, sellerRemark); + return ResultUtil.success(); + } } \ No newline at end of file