chenzihao/sac
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

编号：ZSSAC-585 描述：订单做数据隔离

Browse Source
This commit is contained in:
pengren 2024-04-26 14:08:00 +08:00
parent 8365f735bd
commit 934f440394
8 changed files with 32 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sf-order/src/main/java/com/sf/order/controller/OrderInfoController.java
View File

@ -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<OrderListResVo> 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));
}

4
sf-order/src/main/java/com/sf/order/domain/OrderInfo.java
View File

@ -178,6 +178,10 @@ public class OrderInfo extends BaseEntity {
* 商品编号
*/
private String goodsCode;
/**
* appCode
*/
private String appCode;
}

13
sf-order/src/main/java/com/sf/order/domain/dto/OrderCreateDto.java
View File

@ -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;
}
}

2
sf-order/src/main/java/com/sf/order/domain/req/OrderListReqVo.java
View File

@ -22,4 +22,6 @@ public class OrderListReqVo extends BaseEntity {
private Integer pageNo;
private String appCode;
}

4
sf-order/src/main/java/com/sf/order/domain/res/OrderListResVo.java
View File

@ -88,6 +88,10 @@ public class OrderListResVo {
* 商品编码
*/
private String goodsCode;
/**
* 应用编码
*/
private String appCode;
}

1
sf-order/src/main/java/com/sf/order/service/impl/OrderInfoServiceImpl.java
View File

@ -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();
}

6
sf-order/src/main/resources/mapper/order/OrderInfoMapper.xml
View File

@ -45,13 +45,14 @@
<result property="goodsType" column="goods_type" />
<result property="goodsPrice" column="goods_price" />
<result property="goodsCode" column="goods_code" />
<result property="appCode" column="app_code" />
</resultMap>
<sql id="selectOrderInfoVo">
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
</sql>
<sql id="OrderListInfoVo">
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
</sql>
@ -85,6 +86,7 @@
<select id="queryList" parameterType="OrderListReqVo" resultMap="OrderListResVo">
<include refid="OrderListInfoVo"/>
<where>
<if test="appCode != null "> and a.app_code = #{appCode}</if>
<if test="orderStatus != null "> and a.order_status = #{orderStatus}</if>
<if test="userId != null "> and a.create_user_id = #{userId}</if>
</where>
@ -131,6 +133,7 @@
<if test="goodsType != null">goods_type,</if>
<if test="goodsPrice != null">goods_price,</if>
<if test="goodsCode != null">goods_code,</if>
<if test="appCode != null">app_code,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
@ -161,6 +164,7 @@
<if test="goodsType != null">#{goodsType},</if>
<if test="goodsPrice != null">#{goodsPrice},</if>
<if test="goodsCode != null">#{goodsCode},</if>
<if test="appCode != null">#{appCode},</if>
</trim>
</insert>

8
sf-ui/nginx.conf
View File

@ -37,14 +37,6 @@ http {
proxy_pass http://zt-sac-java:7781/;
}
location /stage-file/ {
proxy_set_header Host $http_host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header REMOTE-HOST $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_pass http://192.168.1.23:9000/;
}
error_page 500 502 503 504 /50x.html;
location = /50x.html {
root html;