diff --git a/sf-admin/pom.xml b/sf-admin/pom.xml
index 781eeae..f411a21 100644
--- a/sf-admin/pom.xml
+++ b/sf-admin/pom.xml
@@ -60,12 +60,6 @@
com.smarterFramework
sf-file
-
- com.smarterFramework
- sf-order
- 1.0.0
- compile
-
diff --git a/sf-admin/src/main/java/com/sf/order/controller/OrderInfoController.java b/sf-admin/src/main/java/com/sf/order/controller/OrderInfoController.java
new file mode 100644
index 0000000..c1e356d
--- /dev/null
+++ b/sf-admin/src/main/java/com/sf/order/controller/OrderInfoController.java
@@ -0,0 +1,109 @@
+package com.sf.order.controller;
+
+import com.sf.common.annotation.Log;
+import com.sf.common.core.controller.BaseController;
+import com.sf.common.core.domain.AjaxResult;
+import com.sf.common.core.page.TableDataInfo;
+import com.sf.common.enums.BusinessType;
+import com.sf.common.utils.poi.ExcelUtil;
+import com.sf.order.domain.OrderInfo;
+import com.sf.order.domain.dto.OrderCreateDto;
+import com.sf.order.domain.req.OrderListreqVo;
+import com.sf.order.domain.res.OrderListResVo;
+import com.sf.order.service.IOrderInfoService;
+import io.swagger.v3.oas.annotations.Operation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 订单基础信息Controller
+ *
+ * @author ztzh
+ * @date 2024-04-09
+ */
+@RestController
+@RequestMapping("/order")
+public class OrderInfoController extends BaseController {
+
+ @Autowired
+ private IOrderInfoService orderInfoService;
+
+ /**
+ * 查询订单基础信息列表
+ */
+ @GetMapping("/list")
+ public TableDataInfo list(OrderInfo orderInfo) {
+ startPage();
+ List list = orderInfoService.selectOrderInfoList(orderInfo);
+ return getDataTable(list);
+ }
+
+ /**
+ * 查询订单基础信息列表
+ */
+ @GetMapping("/query/list")
+ public TableDataInfo queryList(OrderListreqVo vo) {
+ startPage();
+ List list = orderInfoService.queryList(vo);
+ return getDataTable(list);
+ }
+
+ /**
+ * 导出订单基础信息列表
+ */
+ @Log(title = "订单基础信息", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, OrderInfo orderInfo) {
+ List list = orderInfoService.selectOrderInfoList(orderInfo);
+ ExcelUtil util = new ExcelUtil(OrderInfo.class);
+ util.exportExcel(response, list, "订单基础信息数据");
+ }
+
+ /**
+ * 获取订单基础信息详细信息
+ */
+ @GetMapping(value = "/{id}")
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
+ return success(orderInfoService.selectOrderInfoById(id));
+ }
+
+ /**
+ * 新增订单基础信息
+ */
+ @Log(title = "创建订单基础信息", businessType = BusinessType.INSERT)
+ @PostMapping(value = "/createOrder")
+ public AjaxResult createOrder(@RequestBody OrderCreateDto orderCreateDto) {
+ return toAjax(orderInfoService.createOrder(orderCreateDto));
+ }
+
+ /**
+ * 修改订单基础信息
+ */
+ @Log(title = "订单基础信息", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody OrderInfo orderInfo) {
+ return toAjax(orderInfoService.updateOrderInfo(orderInfo));
+ }
+
+ /**
+ * 支付订单
+ */
+ @Operation(summary = "支付订单")
+ @PostMapping(value = "/pay/{orderId}")
+ private String orderPay(@PathVariable(value = "orderId") Long orderId) {
+ orderInfoService.orderPay(orderId);
+ return null;
+ }
+
+ /**
+ * 删除订单基础信息
+ */
+ @Log(title = "订单基础信息", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids) {
+ return toAjax(orderInfoService.deleteOrderInfoByIds(ids));
+ }
+}
diff --git a/sf-order/src/main/java/com/sf/order/domain/OrderInfo.java b/sf-admin/src/main/java/com/sf/order/domain/OrderInfo.java
similarity index 100%
rename from sf-order/src/main/java/com/sf/order/domain/OrderInfo.java
rename to sf-admin/src/main/java/com/sf/order/domain/OrderInfo.java
diff --git a/sf-order/src/main/java/com/sf/order/domain/dto/OrderCreateDto.java b/sf-admin/src/main/java/com/sf/order/domain/dto/OrderCreateDto.java
similarity index 100%
rename from sf-order/src/main/java/com/sf/order/domain/dto/OrderCreateDto.java
rename to sf-admin/src/main/java/com/sf/order/domain/dto/OrderCreateDto.java
diff --git a/sf-order/src/main/java/com/sf/order/domain/req/OrderListreqVo.java b/sf-admin/src/main/java/com/sf/order/domain/req/OrderListreqVo.java
similarity index 84%
rename from sf-order/src/main/java/com/sf/order/domain/req/OrderListreqVo.java
rename to sf-admin/src/main/java/com/sf/order/domain/req/OrderListreqVo.java
index 3cbbbd8..52b41c9 100644
--- a/sf-order/src/main/java/com/sf/order/domain/req/OrderListreqVo.java
+++ b/sf-admin/src/main/java/com/sf/order/domain/req/OrderListreqVo.java
@@ -1,6 +1,5 @@
package com.sf.order.domain.req;
-import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@Data
diff --git a/sf-order/src/main/java/com/sf/order/domain/res/OrderListResVo.java b/sf-admin/src/main/java/com/sf/order/domain/res/OrderListResVo.java
similarity index 96%
rename from sf-order/src/main/java/com/sf/order/domain/res/OrderListResVo.java
rename to sf-admin/src/main/java/com/sf/order/domain/res/OrderListResVo.java
index 502a641..b5cda3e 100644
--- a/sf-order/src/main/java/com/sf/order/domain/res/OrderListResVo.java
+++ b/sf-admin/src/main/java/com/sf/order/domain/res/OrderListResVo.java
@@ -3,8 +3,6 @@ package com.sf.order.domain.res;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
-import java.time.LocalDateTime;
-
/**
* 活动信息详情
*
diff --git a/sf-order/src/main/java/com/sf/order/mapper/OrderInfoMapper.java b/sf-admin/src/main/java/com/sf/order/mapper/OrderInfoMapper.java
similarity index 100%
rename from sf-order/src/main/java/com/sf/order/mapper/OrderInfoMapper.java
rename to sf-admin/src/main/java/com/sf/order/mapper/OrderInfoMapper.java
diff --git a/sf-order/src/main/java/com/sf/order/service/IOrderInfoService.java b/sf-admin/src/main/java/com/sf/order/service/IOrderInfoService.java
similarity index 100%
rename from sf-order/src/main/java/com/sf/order/service/IOrderInfoService.java
rename to sf-admin/src/main/java/com/sf/order/service/IOrderInfoService.java
diff --git a/sf-order/src/main/java/com/sf/order/service/impl/OrderInfoServiceImpl.java b/sf-admin/src/main/java/com/sf/order/service/impl/OrderInfoServiceImpl.java
similarity index 99%
rename from sf-order/src/main/java/com/sf/order/service/impl/OrderInfoServiceImpl.java
rename to sf-admin/src/main/java/com/sf/order/service/impl/OrderInfoServiceImpl.java
index 38c43c8..b70d05b 100644
--- a/sf-order/src/main/java/com/sf/order/service/impl/OrderInfoServiceImpl.java
+++ b/sf-admin/src/main/java/com/sf/order/service/impl/OrderInfoServiceImpl.java
@@ -1,7 +1,5 @@
package com.sf.order.service.impl;
-import java.util.List;
-
import com.sf.common.exception.ServiceException;
import com.sf.common.utils.DateUtils;
import com.sf.common.utils.SnowflakeIdWorker;
@@ -14,6 +12,7 @@ import com.sf.order.service.IOrderInfoService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.util.List;
/**
* 订单基础信息Service业务层处理
diff --git a/sf-order/src/main/resources/mapper/order/OrderInfoMapper.xml b/sf-admin/src/main/resources/mapper/order/OrderInfoMapper.xml
similarity index 98%
rename from sf-order/src/main/resources/mapper/order/OrderInfoMapper.xml
rename to sf-admin/src/main/resources/mapper/order/OrderInfoMapper.xml
index 811f46a..e9141e7 100644
--- a/sf-order/src/main/resources/mapper/order/OrderInfoMapper.xml
+++ b/sf-admin/src/main/resources/mapper/order/OrderInfoMapper.xml
@@ -1,172 +1,172 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- select id, order_no, order_status, pay_type, pay_channel, order_amt, freight_amt, pay_amt, really_amt, receive_type, goods_id, business_id, receive_addr_id, create_time, pay_time, create_user_id, update_user_id, is_delete, update_time, track_no, order_type, out_order_no, pay_data, reduction_amout from ORDER_INFO
-
-
- select id, order_no, order_status, pay_type, productTitle, order_amt, freight_amt, pay_amt, really_amt, receive_type, goods_id, business_id, receive_addr_id, create_time, pay_time, create_user_id, update_user_id, is_delete, update_time, track_no, order_type, out_order_no, pay_data, reduction_amout from ORDER_INFO
-
-
-
-
-
-
-
-
- insert into ORDER_INFO
-
- id,
- order_no,
- order_status,
- pay_type,
- pay_channel,
- order_amt,
- freight_amt,
- pay_amt,
- really_amt,
- receive_type,
- goods_id,
- business_id,
- receive_addr_id,
- create_time,
- pay_time,
- create_user_id,
- update_user_id,
- is_delete,
- update_time,
- track_no,
- order_type,
- out_order_no,
- pay_data,
- reduction_amout,
-
-
- #{id},
- #{orderNo},
- #{orderStatus},
- #{payType},
- #{payChannel},
- #{orderAmt},
- #{freightAmt},
- #{payAmt},
- #{reallyAmt},
- #{receiveType},
- #{goodsId},
- #{businessId},
- #{receiveAddrId},
- #{createTime},
- #{payTime},
- #{createUserId},
- #{updateUserId},
- #{isDelete},
- #{updateTime},
- #{trackNo},
- #{orderType},
- #{outOrderNo},
- #{payData},
- #{reductionAmout},
-
-
-
-
- update ORDER_INFO
-
- order_no = #{orderNo},
- order_status = #{orderStatus},
- pay_type = #{payType},
- pay_channel = #{payChannel},
- order_amt = #{orderAmt},
- freight_amt = #{freightAmt},
- pay_amt = #{payAmt},
- really_amt = #{reallyAmt},
- receive_type = #{receiveType},
- goods_id = #{goodsId},
- business_id = #{businessId},
- receive_addr_id = #{receiveAddrId},
- create_time = #{createTime},
- pay_time = #{payTime},
- create_user_id = #{createUserId},
- update_user_id = #{updateUserId},
- is_delete = #{isDelete},
- update_time = #{updateTime},
- track_no = #{trackNo},
- order_type = #{orderType},
- out_order_no = #{outOrderNo},
- pay_data = #{payData},
- reduction_amout = #{reductionAmout},
-
- where id = #{id}
-
-
-
- delete from ORDER_INFO where id = #{id}
-
-
-
- delete from ORDER_INFO where id in
-
- #{id}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ select id, order_no, order_status, pay_type, pay_channel, order_amt, freight_amt, pay_amt, really_amt, receive_type, goods_id, business_id, receive_addr_id, create_time, pay_time, create_user_id, update_user_id, is_delete, update_time, track_no, order_type, out_order_no, pay_data, reduction_amout from ORDER_INFO
+
+
+ select id, order_no, order_status, pay_type, productTitle, order_amt, freight_amt, pay_amt, really_amt, receive_type, goods_id, business_id, receive_addr_id, create_time, pay_time, create_user_id, update_user_id, is_delete, update_time, track_no, order_type, out_order_no, pay_data, reduction_amout from ORDER_INFO
+
+
+
+
+
+
+
+
+ insert into ORDER_INFO
+
+ id,
+ order_no,
+ order_status,
+ pay_type,
+ pay_channel,
+ order_amt,
+ freight_amt,
+ pay_amt,
+ really_amt,
+ receive_type,
+ goods_id,
+ business_id,
+ receive_addr_id,
+ create_time,
+ pay_time,
+ create_user_id,
+ update_user_id,
+ is_delete,
+ update_time,
+ track_no,
+ order_type,
+ out_order_no,
+ pay_data,
+ reduction_amout,
+
+
+ #{id},
+ #{orderNo},
+ #{orderStatus},
+ #{payType},
+ #{payChannel},
+ #{orderAmt},
+ #{freightAmt},
+ #{payAmt},
+ #{reallyAmt},
+ #{receiveType},
+ #{goodsId},
+ #{businessId},
+ #{receiveAddrId},
+ #{createTime},
+ #{payTime},
+ #{createUserId},
+ #{updateUserId},
+ #{isDelete},
+ #{updateTime},
+ #{trackNo},
+ #{orderType},
+ #{outOrderNo},
+ #{payData},
+ #{reductionAmout},
+
+
+
+
+ update ORDER_INFO
+
+ order_no = #{orderNo},
+ order_status = #{orderStatus},
+ pay_type = #{payType},
+ pay_channel = #{payChannel},
+ order_amt = #{orderAmt},
+ freight_amt = #{freightAmt},
+ pay_amt = #{payAmt},
+ really_amt = #{reallyAmt},
+ receive_type = #{receiveType},
+ goods_id = #{goodsId},
+ business_id = #{businessId},
+ receive_addr_id = #{receiveAddrId},
+ create_time = #{createTime},
+ pay_time = #{payTime},
+ create_user_id = #{createUserId},
+ update_user_id = #{updateUserId},
+ is_delete = #{isDelete},
+ update_time = #{updateTime},
+ track_no = #{trackNo},
+ order_type = #{orderType},
+ out_order_no = #{outOrderNo},
+ pay_data = #{payData},
+ reduction_amout = #{reductionAmout},
+
+ where id = #{id}
+
+
+
+ delete from ORDER_INFO where id = #{id}
+
+
+
+ delete from ORDER_INFO where id in
+
+ #{id}
+
+
\ No newline at end of file
diff --git a/sf-order/pom.xml b/sf-order/pom.xml
deleted file mode 100644
index 08b9c37..0000000
--- a/sf-order/pom.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
- smarterFramework
- com.smarterFramework
- 1.0.0
-
- 4.0.0
-
- sf-order
-
-
- order订单模块
-
-
-
-
-
-
- com.smarterFramework
- sf-common
-
-
- io.swagger.core.v3
- swagger-annotations
- 2.1.2
- compile
-
-
-
-
-
\ No newline at end of file