From 4040856595952ea0b8f8b764ba2770d5c244c891 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期五, 14 十月 2022 11:19:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into local_20221010
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComBatteryCommodityOrderController.java | 187 ++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 187 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComBatteryCommodityOrderController.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComBatteryCommodityOrderController.java
new file mode 100644
index 0000000..3a37d00
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComBatteryCommodityOrderController.java
@@ -0,0 +1,187 @@
+package com.panzhihua.service_community.api;
+
+import com.panzhihua.common.model.dtos.shop.WxPayNotifyOrderDTO;
+import com.panzhihua.service_community.service.ComBatteryCommodityOrderService;
+import com.panzhihua.common.model.dtos.common.*;
+import com.panzhihua.common.model.vos.R;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * title: 电动车商城-订单表(ComBatteryCommodityOrder) 表控制层
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 电动车商城-订单表
+ *
+ * @author lyq
+ * @date 2022-03-29 16:05:04
+ */
+@RestController
+@RequestMapping("/comBatteryCommodityOrder")
+public class ComBatteryCommodityOrderController {
+
+ @Resource
+ private ComBatteryCommodityOrderService comBatteryCommodityOrderService;
+
+ /**
+ * description queryByPage 分页查询
+ *
+ * @param comBatteryCommodityOrder 请求参数
+ * @return 分页查询返回参数
+ * @author lyq
+ * @date 2022-03-29 16:05:04
+ */
+ @PostMapping("/page")
+ public R queryByPage(@RequestBody PageComBatteryCommodityOrderDto comBatteryCommodityOrder) {
+ return this.comBatteryCommodityOrderService.queryByPage(comBatteryCommodityOrder);
+ }
+
+ /**
+ * description add 新增数据
+ *
+ * @param comBatteryCommodityOrder 请求参数
+ * @return 新增结果
+ * @author lyq
+ * @date 2022-03-29 16:05:04
+ */
+ @PostMapping("/add")
+ public R add(@RequestBody AddComBatteryCommodityOrderDto comBatteryCommodityOrder) {
+ return this.comBatteryCommodityOrderService.insert(comBatteryCommodityOrder);
+ }
+
+ /**
+ * description edit 编辑数据
+ *
+ * @param comBatteryCommodityOrder 请求参数
+ * @return 编辑结果
+ * @author lyq
+ * @date 2022-03-29 16:05:04
+ */
+ @PutMapping("/edit")
+ public R edit(@RequestBody EditComBatteryCommodityOrderDto comBatteryCommodityOrder) {
+ return this.comBatteryCommodityOrderService.update(comBatteryCommodityOrder);
+ }
+
+ /**
+ * description deleteById 删除数据
+ *
+ * @param id 主键id
+ * @return 删除结果
+ * @author lyq
+ * @date 2022-03-29 16:05:04
+ */
+ @GetMapping("/delete")
+ public R deleteById(@RequestParam("id") Long id) {
+ return this.comBatteryCommodityOrderService.deleteById(id);
+ }
+
+ /**
+ * description detailById 查询详情
+ *
+ * @param id 主键id
+ * @return 详情数据
+ * @author lyq
+ * @date 2022-03-29 16:05:04
+ */
+ @GetMapping("/detail")
+ public R detailById(@RequestParam("id") Long id) {
+ return this.comBatteryCommodityOrderService.detailById(id);
+ }
+
+ /**
+ * description queryByPage 查询列表
+ *
+ * @param comBatteryCommodityOrder 请求参数
+ * @return 列表数据
+ * @author lyq
+ * @date 2022-03-29 16:05:04
+ */
+ @PostMapping("/list")
+ public R queryByList(@RequestBody PageComBatteryCommodityOrderDto comBatteryCommodityOrder) {
+ return this.comBatteryCommodityOrderService.queryByList(comBatteryCommodityOrder);
+ }
+
+ /**
+ * 修改订单收货地址
+ * @param editOrderAddressDto 请求参数
+ * @return 修改结果
+ */
+ @PutMapping("/update/address")
+ public R updateOrderAddress(@RequestBody EditOrderAddressDto editOrderAddressDto) {
+ return this.comBatteryCommodityOrderService.updateOrderAddress(editOrderAddressDto);
+ }
+
+ /**
+ * 修改订单物流信息
+ * @param editOrderLogisticsDto 请求参数
+ * @return 修改结果
+ */
+ @PutMapping("/update/logistics")
+ public R updateOrderLogistics(@RequestBody EditOrderLogisticsDto editOrderLogisticsDto) {
+ return this.comBatteryCommodityOrderService.updateOrderLogistics(editOrderLogisticsDto);
+ }
+
+ /**
+ * 小程序用户创建订单
+ * @param createOrderDto 请求参数
+ * @return 创建结果
+ */
+ @PostMapping("/applets/create")
+ public R appletsOrderCreate(@RequestBody UserCreateOrderDto createOrderDto){
+ return this.comBatteryCommodityOrderService.appletsOrderCreate(createOrderDto);
+ }
+
+ /**
+ * 电动车商城购买商品支付回调
+ * @param notifyOrderDTO 请求参数
+ * @return 购买商品支付回调
+ */
+ @PostMapping("/batteryPayNotify")
+ public R batteryPayNotify(@RequestBody WxPayNotifyOrderDTO notifyOrderDTO){
+ return this.comBatteryCommodityOrderService.batteryPayNotify(notifyOrderDTO);
+ }
+
+ /**
+ * 电动车商城用户确认收货
+ * @param id 订单id
+ * @param userId 用户id
+ * @return 确认结果
+ */
+ @GetMapping("/applets/receiving")
+ public R appletsOrderReceiving(@RequestParam("id") Long id,@RequestParam("userId") Long userId){
+ return this.comBatteryCommodityOrderService.appletsOrderReceiving(id,userId);
+ }
+
+ /**
+ * 定时关闭5分钟未支付订单
+ * @return 操作结果
+ */
+ @GetMapping("/sync/close/order")
+ public R syncCloseOrder(){
+ return this.comBatteryCommodityOrderService.syncCloseOrder();
+ }
+
+ /**
+ * 后台订单发货
+ * @param deliverAdminDto 请求参数
+ * @return 发货结果
+ */
+ @PostMapping("/deliver")
+ public R orderDeliver(@RequestBody OrderDeliverAdminDto deliverAdminDto){
+ return this.comBatteryCommodityOrderService.orderDeliver(deliverAdminDto);
+ }
+
+ /**
+ * 电动车商城购买活动商品支付回调
+ * @param notifyOrderDTO 请求参数
+ * @return 购买商品支付回调
+ */
+ @PostMapping("/batteryActivityPayNotify")
+ public R batteryActivityPayNotify(@RequestBody WxPayNotifyOrderDTO notifyOrderDTO){
+ return this.comBatteryCommodityOrderService.batteryActivityPayNotify(notifyOrderDTO);
+ }
+
+}
+
--
Gitblit v1.7.1