caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 增加商家订单备注功能

Browse Source
This commit is contained in:
lele0521 2024-05-11 09:21:27 +08:00
parent 6311767320
commit 6deed61311
8 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DB/2024-05-10_order.sql Normal file
View File

@ -0,0 +1,2 @@
ALTER TABLE `li_order`
ADD COLUMN `seller_remark` varchar(255) NULL COMMENT '商家订单备注' AFTER `remark`;

3
framework/src/main/java/cn/lili/modules/order/order/entity/dos/Order.java
View File

@ -148,6 +148,9 @@ public class Order extends BaseEntity {
@ApiModelProperty(value = "买家订单备注")
private String remark;
@ApiModelProperty(value = "卖家订单备注")
private String sellerRemark;
@ApiModelProperty(value = "订单取消原因")
private String cancelReason;

3
framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderSimpleVO.java
View File

@ -148,6 +148,9 @@ public class OrderSimpleVO {
@ApiModelProperty(value = "退款金额")
private String groupRefundPrice;
@ApiModelProperty(value = "卖家订单备注")
private String sellerRemark;
public List<OrderItemVO> getOrderItems() {
if (CharSequenceUtil.isEmpty(groupGoodsId)) {
return new ArrayList<>();

3
framework/src/main/java/cn/lili/modules/order/order/mapper/OrderMapper.java
View File

@ -60,7 +60,8 @@ public interface OrderMapper extends BaseMapper<Order> {
* @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" +

8
framework/src/main/java/cn/lili/modules/order/order/service/OrderService.java
View File

@ -320,4 +320,12 @@ public interface OrderService extends IService<Order> {
*/
Order partDelivery(PartDeliveryParamsDTO partDeliveryParamsDTO);
/**
* 卖家订单备注
*
* @param orderSn 订单编号
* @param sellerRemark 卖家订单备注
* @return 订单
*/
Order updateSellerRemark(String orderSn, String sellerRemark);
}

8
framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java
View File

@ -883,6 +883,14 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
return order;
}
@Override
public Order updateSellerRemark(String orderSn, String sellerRemark) {
Order order = this.getBySn(orderSn);
order.setSellerRemark(sellerRemark);
this.updateById(order);
return order;
}
/**
* 虚拟成团
*

7
manager-api/src/main/java/cn/lili/controller/order/OrderManagerController.java
View File

@ -127,4 +127,11 @@ public class OrderManagerController {
public ResultMessage<Object> getTraces(@NotBlank(message = "订单编号不能为空") @PathVariable String orderSn) {
return ResultUtil.data(orderService.getTraces(orderSn));
}
@ApiOperation(value = "卖家订单备注")
@PutMapping("/{orderSn}/sellerRemark")
public ResultMessage<Object> sellerRemark(@PathVariable String orderSn, @RequestParam String sellerRemark) {
orderService.updateSellerRemark(orderSn, sellerRemark);
return ResultUtil.success();
}
}

7
seller-api/src/main/java/cn/lili/controller/order/OrderStoreController.java
View File

@ -251,4 +251,11 @@ public class OrderStoreController {
public ResultMessage<Object> delivery(@RequestBody PartDeliveryParamsDTO partDeliveryParamsDTO) {
return ResultUtil.data(orderService.partDelivery(partDeliveryParamsDTO));
}
@ApiOperation(value = "卖家订单备注")
@PutMapping("/{orderSn}/sellerRemark")
public ResultMessage<Object> sellerRemark(@PathVariable String orderSn, @RequestParam String sellerRemark) {
orderService.updateSellerRemark(orderSn, sellerRemark);
return ResultUtil.success();
}
}