From 934f440394ce9b79223add7219292d43d17194d8 Mon Sep 17 00:00:00 2001 From: pengren Date: Fri, 26 Apr 2024 14:08:00 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E5=8F=B7=EF=BC=9AZSSAC-585=20?= =?UTF-8?q?=E6=8F=8F=E8=BF=B0=EF=BC=9A=E8=AE=A2=E5=8D=95=E5=81=9A=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=9A=94=E7=A6=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sf/order/controller/OrderInfoController.java | 4 ++++ .../main/java/com/sf/order/domain/OrderInfo.java | 4 ++++ .../com/sf/order/domain/dto/OrderCreateDto.java | 13 ++++++++++++- .../com/sf/order/domain/req/OrderListReqVo.java | 2 ++ .../com/sf/order/domain/res/OrderListResVo.java | 4 ++++ .../sf/order/service/impl/OrderInfoServiceImpl.java | 1 + .../main/resources/mapper/order/OrderInfoMapper.xml | 6 +++++- sf-ui/nginx.conf | 8 -------- 8 files changed, 32 insertions(+), 10 deletions(-) diff --git a/sf-order/src/main/java/com/sf/order/controller/OrderInfoController.java b/sf-order/src/main/java/com/sf/order/controller/OrderInfoController.java index 2011062..4ecbfab 100644 --- a/sf-order/src/main/java/com/sf/order/controller/OrderInfoController.java +++ b/sf-order/src/main/java/com/sf/order/controller/OrderInfoController.java @@ -5,6 +5,8 @@ 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.enums.RequestHeaderEnums; +import com.sf.common.utils.http.RequestUtils; import com.sf.common.utils.poi.ExcelUtil; import com.sf.order.domain.OrderInfo; import com.sf.order.domain.dto.OrderCreateDto; @@ -35,6 +37,7 @@ public class OrderInfoController extends BaseController { */ @GetMapping("/list") public TableDataInfo list(OrderListReqVo vo) { + vo.setAppCode(RequestUtils.getHeader(RequestHeaderEnums.APP_CODE.getCode())); startPage(); List list = orderInfoService.queryList(vo); return getDataTable(list); @@ -66,6 +69,7 @@ public class OrderInfoController extends BaseController { @Log(title = "创建订单基础信息", businessType = BusinessType.INSERT) @PostMapping(value = "/createOrder") public AjaxResult createOrder(@RequestBody OrderCreateDto orderCreateDto) { + orderCreateDto.setAppCode(RequestUtils.getHeader(RequestHeaderEnums.APP_CODE.getCode())); return AjaxResult.success(orderInfoService.createOrder(orderCreateDto)); } diff --git a/sf-order/src/main/java/com/sf/order/domain/OrderInfo.java b/sf-order/src/main/java/com/sf/order/domain/OrderInfo.java index 5a2ac0c..ca65473 100644 --- a/sf-order/src/main/java/com/sf/order/domain/OrderInfo.java +++ b/sf-order/src/main/java/com/sf/order/domain/OrderInfo.java @@ -178,6 +178,10 @@ public class OrderInfo extends BaseEntity { * 商品编号 */ private String goodsCode; + /** + * appCode + */ + private String appCode; } diff --git a/sf-order/src/main/java/com/sf/order/domain/dto/OrderCreateDto.java b/sf-order/src/main/java/com/sf/order/domain/dto/OrderCreateDto.java index 4ec904a..3107020 100644 --- a/sf-order/src/main/java/com/sf/order/domain/dto/OrderCreateDto.java +++ b/sf-order/src/main/java/com/sf/order/domain/dto/OrderCreateDto.java @@ -1,6 +1,5 @@ package com.sf.order.domain.dto; -import com.sf.common.annotation.Excel; import io.swagger.v3.oas.annotations.media.Schema; import javax.validation.constraints.NotNull; @@ -28,6 +27,9 @@ public class OrderCreateDto { @Schema(description = "用户id") @NotNull(message = "用户id不能空") private Long userId; + @Schema(description = "应用code") + @NotNull(message = "应用code不能空") + private String appCode; public Long getGoodsId() { return goodsId; @@ -66,4 +68,13 @@ public class OrderCreateDto { public void setOutOrderNo(String outOrderNo) { this.outOrderNo = outOrderNo; } + + public String getAppCode() { + return appCode; + } + + public void setAppCode(String appCode) { + this.appCode = appCode; + } + } diff --git a/sf-order/src/main/java/com/sf/order/domain/req/OrderListReqVo.java b/sf-order/src/main/java/com/sf/order/domain/req/OrderListReqVo.java index 11d3832..b640967 100644 --- a/sf-order/src/main/java/com/sf/order/domain/req/OrderListReqVo.java +++ b/sf-order/src/main/java/com/sf/order/domain/req/OrderListReqVo.java @@ -22,4 +22,6 @@ public class OrderListReqVo extends BaseEntity { private Integer pageNo; + private String appCode; + } diff --git a/sf-order/src/main/java/com/sf/order/domain/res/OrderListResVo.java b/sf-order/src/main/java/com/sf/order/domain/res/OrderListResVo.java index 1fe724d..85533be 100644 --- a/sf-order/src/main/java/com/sf/order/domain/res/OrderListResVo.java +++ b/sf-order/src/main/java/com/sf/order/domain/res/OrderListResVo.java @@ -88,6 +88,10 @@ public class OrderListResVo { * 商品编码 */ private String goodsCode; + /** + * 应用编码 + */ + private String appCode; } diff --git a/sf-order/src/main/java/com/sf/order/service/impl/OrderInfoServiceImpl.java b/sf-order/src/main/java/com/sf/order/service/impl/OrderInfoServiceImpl.java index c628cfa..2aa08de 100644 --- a/sf-order/src/main/java/com/sf/order/service/impl/OrderInfoServiceImpl.java +++ b/sf-order/src/main/java/com/sf/order/service/impl/OrderInfoServiceImpl.java @@ -74,6 +74,7 @@ public class OrderInfoServiceImpl implements IOrderInfoService { orderInfo.setCreateTime(DateUtils.getNowDate()); orderInfo.setUpdateTime(DateUtils.getNowDate()); orderInfo.setOutOrderNo(orderCreateDto.getOutOrderNo()); + orderInfo.setAppCode(orderCreateDto.getAppCode()); orderInfoMapper.insertOrderInfo(orderInfo); return snowflakeIdWorker.nextId(); } diff --git a/sf-order/src/main/resources/mapper/order/OrderInfoMapper.xml b/sf-order/src/main/resources/mapper/order/OrderInfoMapper.xml index bab236b..13ecb93 100644 --- a/sf-order/src/main/resources/mapper/order/OrderInfoMapper.xml +++ b/sf-order/src/main/resources/mapper/order/OrderInfoMapper.xml @@ -45,13 +45,14 @@ + 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 a.id,a.order_no,a.order_status,a.order_amt,a.pay_time,a.goods_count,a.subscription_cancellation_time,a.goods_type,a.goods_price,a.goods_code,b.product_title,b.product_picture,b.product_desc,b.goods_spec + SELECT a.id,a.app_code,a.order_no,a.order_status,a.order_amt,a.pay_time,a.goods_count,a.subscription_cancellation_time,a.goods_type,a.goods_price,a.goods_code,b.product_title,b.product_picture,b.product_desc,b.goods_spec FROM Order_info a LEFT JOIN GOODS_MESSAGES b ON a.goods_id = b.id @@ -85,6 +86,7 @@