q792602257/FrameTour-BE
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
longbinbin
2024-12-11 11:35:50 +08:00
parent 6ad8541b2e 48c285d3ed
commit b3ecacf3a3
7 changed files with 77 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/ycwl/basic/controller/pc/OrderController.java
View File

@ -2,6 +2,7 @@ package com.ycwl.basic.controller.pc;
import com.github.pagehelper.PageInfo;
import com.ycwl.basic.model.mobile.order.RefundOrderReq;
import com.ycwl.basic.model.pc.order.entity.OrderEntity;
import com.ycwl.basic.model.pc.order.req.OrderReqQuery;
import com.ycwl.basic.model.pc.order.resp.OrderRespVO;
import com.ycwl.basic.service.pc.OrderService;
@ -49,4 +50,11 @@ public class OrderController {
return orderService.detail(orderId);
}
@ApiOperation("订单备注")
@PostMapping("remark/{id}")
public ApiResponse<?> updateRemark(@PathVariable("id") Long orderId, @RequestBody OrderEntity query) {
orderService.remarkOrder(orderId, query);
return ApiResponse.success(null);
}
}

12
src/main/java/com/ycwl/basic/mapper/pc/OrderOperationMapper.java Normal file
View File

@ -0,0 +1,12 @@
package com.ycwl.basic.mapper.pc;
import com.ycwl.basic.model.pc.orderOp.entity.OrderOperationEntity;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@Mapper
public interface OrderOperationMapper {
int add(OrderOperationEntity order);
List<OrderOperationEntity> list(Long orderId);
}

18
src/main/java/com/ycwl/basic/model/pc/orderOp/entity/OrderOperationEntity.java Normal file
View File

@ -0,0 +1,18 @@
package com.ycwl.basic.model.pc.orderOp.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.util.Date;
@Data
@TableName("order_operation")
public class OrderOperationEntity {
private Long id;
private Long orderId;
private String type;
private String remark;
private String user;
private String userId;
private Date createTime;
}

21
src/main/java/com/ycwl/basic/service/impl/pc/OrderServiceImpl.java
View File

@ -3,6 +3,7 @@ package com.ycwl.basic.service.impl.pc;
import cn.hutool.core.bean.BeanUtil;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.ycwl.basic.constant.BaseContextHandler;
import com.ycwl.basic.constant.NumberConstant;
import com.ycwl.basic.enums.BizCodeEnum;
import com.ycwl.basic.enums.GoodsTypeEnum;
@ -10,6 +11,7 @@ import com.ycwl.basic.enums.OrderStateEnum;
import com.ycwl.basic.enums.SourceTypeNameEnum;
import com.ycwl.basic.exception.AppException;
import com.ycwl.basic.mapper.pc.OrderMapper;
import com.ycwl.basic.mapper.pc.OrderOperationMapper;
import com.ycwl.basic.mapper.pc.SourceMapper;
import com.ycwl.basic.mapper.pc.VideoMapper;
import com.ycwl.basic.model.mobile.goods.GoodsDetailVO;
@ -17,6 +19,7 @@ import com.ycwl.basic.model.mobile.goods.GoodsPriceQueryReq;
import com.ycwl.basic.model.mobile.order.OrderAppPageReq;
import com.ycwl.basic.model.mobile.order.RefundOrderReq;
import com.ycwl.basic.model.pc.member.resp.MemberRespVO;
import com.ycwl.basic.model.pc.order.entity.OrderEntity;
import com.ycwl.basic.model.pc.order.entity.OrderItemEntity;
import com.ycwl.basic.model.pc.order.req.OrderAddOrUpdateReq;
import com.ycwl.basic.model.pc.order.req.OrderItemDTO;
@ -24,6 +27,7 @@ import com.ycwl.basic.model.pc.order.req.OrderReqQuery;
import com.ycwl.basic.model.pc.order.resp.OrderAppRespVO;
import com.ycwl.basic.model.pc.order.resp.OrderItemVO;
import com.ycwl.basic.model.pc.order.resp.OrderRespVO;
import com.ycwl.basic.model.pc.orderOp.entity.OrderOperationEntity;
import com.ycwl.basic.model.pc.source.entity.SourceEntity;
import com.ycwl.basic.model.pc.source.resp.SourceRespVO;
import com.ycwl.basic.model.pc.video.entity.VideoEntity;
@ -69,6 +73,8 @@ public class OrderServiceImpl implements OrderService {
private AppMemberService memberService;
@Autowired
private GoodsService goodsService;
@Autowired
private OrderOperationMapper orderOperationMapper;
@Override
public ApiResponse<PageInfo<OrderRespVO>> pageQuery(OrderReqQuery query) {
@ -304,4 +310,19 @@ public class OrderServiceImpl implements OrderService {
return ApiResponse.buildResult(BizCodeEnum.REQUEST_OK);
}
@Override
public void remarkOrder(Long orderId, OrderEntity query) {
OrderAddOrUpdateReq updateOrder = new OrderAddOrUpdateReq();
updateOrder.setId(orderId);
updateOrder.setRemark(query.getRemark());
orderMapper.update(updateOrder);
OrderOperationEntity orderOperationEntity = new OrderOperationEntity();
orderOperationEntity.setOrderId(orderId);
orderOperationEntity.setType("修改备注");
orderOperationEntity.setRemark("备注修改为："+query.getRemark());
orderOperationEntity.setUser(BaseContextHandler.getAccount());
orderOperationEntity.setUserId(BaseContextHandler.getUserId());
orderOperationMapper.add(orderOperationEntity);
}
}

3
src/main/java/com/ycwl/basic/service/pc/OrderService.java
View File

@ -4,6 +4,7 @@ import com.github.pagehelper.PageInfo;
import com.ycwl.basic.enums.OrderStateEnum;
import com.ycwl.basic.model.mobile.order.OrderAppPageReq;
import com.ycwl.basic.model.mobile.order.RefundOrderReq;
import com.ycwl.basic.model.pc.order.entity.OrderEntity;
import com.ycwl.basic.model.pc.order.req.OrderAddOrUpdateReq;
import com.ycwl.basic.model.pc.order.req.OrderReqQuery;
import com.ycwl.basic.model.pc.order.resp.OrderAppRespVO;
@ -53,4 +54,6 @@ public interface OrderService {
* @return
*/
ApiResponse<?> auditRefundOrder(RefundOrderReq refundOrderReq);
void remarkOrder(Long orderId, OrderEntity query);
}