gxwebsoft/mp-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(shop): 重构店铺相关实体和参数类

Browse Source 
- 将 ShopStore 中的 shopName 和 shopAddress 字段重命名为 name 和 address
- 在 ShopStore 中新增 location、district 和 points 字段
- 在 ShopStoreRider 中将 dealerId 重命名为 storeId，并新增 storeName 字段
- 更新 ShopStoreRiderMapper.xml 以关联查询门店名称
- 将 ShopStoreRiderParam 和 ShopStoreUserParam 中的 dealerId 重命名为 storeId
- 修改 application-prod.yml 中的微信支付场景信息，将岗位类型改为配送员，报酬说明改为12月份配送费
This commit is contained in:
赵忠林
2026-01-31 21:37:53 +08:00
parent 40aecd7c22
commit 5fe3801a4d
9 changed files with 33 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/gxwebsoft/shop/entity/ShopStore.java
View File

@@ -26,10 +26,10 @@ public class ShopStore implements Serializable {
private Integer id;
@Schema(description = "店铺名称")
private String shopName;
private String name;
@Schema(description = "门店地址")
private String shopAddress;
private String address;
@Schema(description = "手机号码")
private String phone;
@@ -55,6 +55,15 @@ public class ShopStore implements Serializable {
@Schema(description = "经度和纬度")
private String lngAndLat;
@Schema(description = "位置")
private String location;
@Schema(description = "区域")
private String district;
@Schema(description = "轮廓")
private String points;
@Schema(description = "用户ID")
private Integer userId;

9
src/main/java/com/gxwebsoft/shop/entity/ShopStoreRider.java
View File

@@ -2,6 +2,7 @@ package com.gxwebsoft.shop.entity;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import java.io.Serializable;
@@ -26,8 +27,12 @@ public class ShopStoreRider implements Serializable {
@TableId(value = "id", type = IdType.AUTO)
private Long id;
@Schema(description = "配送点ID（shop_dealer.id）")
private Integer dealerId;
@Schema(description = "门店ID")
private Integer storeId;
@Schema(description = "门店名称")
@TableField(exist = false)
private String storeName;
@Schema(description = "骑手编号（可选）")
private String riderNo;

2
src/main/java/com/gxwebsoft/shop/entity/ShopStoreUser.java
View File

@@ -25,7 +25,7 @@ public class ShopStoreUser implements Serializable {
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
@Schema(description = "配送点ID（shop_dealer.id）")
@Schema(description = "门店ID")
private Integer storeId;
@Schema(description = "用户ID")

8
src/main/java/com/gxwebsoft/shop/mapper/xml/ShopStoreMapper.xml
View File

@@ -10,11 +10,11 @@
<if test="param.id != null">
AND a.id = #{param.id}
</if>
<if test="param.shopName != null">
AND a.shop_name LIKE CONCAT('%', #{param.shopName}, '%')
<if test="param.name != null">
AND a.name LIKE CONCAT('%', #{param.name}, '%')
</if>
<if test="param.shopAddress != null">
AND a.shop_address LIKE CONCAT('%', #{param.shopAddress}, '%')
<if test="param.address != null">
AND a.address LIKE CONCAT('%', #{param.address}, '%')
</if>
<if test="param.phone != null">
AND a.phone LIKE CONCAT('%', #{param.phone}, '%')

7
src/main/java/com/gxwebsoft/shop/mapper/xml/ShopStoreRiderMapper.xml
View File

@@ -4,14 +4,15 @@
<!-- 关联查询sql -->
<sql id="selectSql">
SELECT a.*
SELECT a.*, b.name AS storeName
FROM shop_store_rider a
LEFT JOIN shop_store b ON a.store_id = b.id
<where>
<if test="param.id != null">
AND a.id = #{param.id}
</if>
<if test="param.dealerId != null">
AND a.dealer_id = #{param.dealerId}
<if test="param.storeId != null">
AND a.store_id = #{param.storeId}
</if>
<if test="param.riderNo != null">
AND a.rider_no LIKE CONCAT('%', #{param.riderNo}, '%')

4
src/main/java/com/gxwebsoft/shop/param/ShopStoreParam.java
View File

@@ -27,10 +27,10 @@ public class ShopStoreParam extends BaseParam {
private Integer id;
@Schema(description = "店铺名称")
private String shopName;
private String name;
@Schema(description = "门店地址")
private String shopAddress;
private String address;
@Schema(description = "手机号码")
private String phone;

4
src/main/java/com/gxwebsoft/shop/param/ShopStoreRiderParam.java
View File

@@ -26,9 +26,9 @@ public class ShopStoreRiderParam extends BaseParam {
@QueryField(type = QueryType.EQ)
private Long id;
@Schema(description = "配送点ID（shop_dealer.id）")
@Schema(description = "门店ID")
@QueryField(type = QueryType.EQ)
private Integer dealerId;
private Integer storeId;
@Schema(description = "骑手编号（可选）")
private String riderNo;

2
src/main/java/com/gxwebsoft/shop/param/ShopStoreUserParam.java
View File

@@ -26,7 +26,7 @@ public class ShopStoreUserParam extends BaseParam {
@QueryField(type = QueryType.EQ)
private Integer id;
@Schema(description = "配送点ID（shop_dealer.id）")
@Schema(description = "门店ID")
@QueryField(type = QueryType.EQ)
private Integer storeId;

2
src/main/resources/application-prod.yml
View File

@@ -80,4 +80,4 @@ aliyun:
wechatpay:
transfer:
scene-id: 1005
scene-report-infos-json: '[{"info_type":"岗位类型","info_content":"业务员"},{"info_type":"报酬说明","info_content":"配送费"}]'
scene-report-infos-json: '[{"info_type":"岗位类型","info_content":"配送员"},{"info_type":"报酬说明","info_content":"12月份配送费"}]'