backend/java-mall
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加商家自主配送常量

Browse Source
This commit is contained in:
Jack 2025-11-17 15:35:01 +08:00
parent d97523231d
commit 9cbf01f2ab
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mall-common/src/main/java/com/suisung/mall/common/api/StateCode.java
View File

@ -17,6 +17,7 @@ public class StateCode {
public static final int DELIVERY_TYPE_EXP = 10; // 普通快递 public static final int DELIVERY_TYPE_EXP = 10; // 普通快递
public static final int DELIVERY_TYPE_IN_STORE_SERVICE = 15; // 店铺配送 public static final int DELIVERY_TYPE_IN_STORE_SERVICE = 15; // 店铺配送
public static final int DELIVERY_TYPE_SAME_CITY = 16;//顺丰同城配送 public static final int DELIVERY_TYPE_SAME_CITY = 16;//顺丰同城配送
public static final int DELIVERY_TYPE_STORE_BY_SELF = 17; // 商家（线下）自己配送
public static final Map<Integer, String> DELIVERY_TYPE_MAP = new HashMap() { public static final Map<Integer, String> DELIVERY_TYPE_MAP = new HashMap() {
{ {

2
mall-shop/src/main/resources/bootstrap-prod.yml
View File

@ -184,7 +184,7 @@ feieyun:
sf-express: sf-express:
# 顺丰同城 api 接口配置 # 顺丰同城 api 接口配置
dev_id: 1715091463 dev_id: 1715091463
# 桂平顺丰平台商家id 2273453450129 2269768012593 # 桂平顺丰平台商家id 2273453450129 2269768012593 2281834525297
supplier_id: 2281834525297 supplier_id: 2281834525297
appid: 1715091463 appid: 1715091463
appkey: 47466ae69c530f831395e1bc405639fb appkey: 47466ae69c530f831395e1bc405639fb

6
mall-shop/src/main/resources/mapper/order/ShopOrderBaseMapper.xml
View File

@ -1004,12 +1004,12 @@
<!-- 1-进行中订单 --> <!-- 1-进行中订单 -->
<when test="status != null and status == 1 and expireSeconds != null and expireSeconds > 0"> <when test="status != null and status == 1 and expireSeconds != null and expireSeconds > 0">
AND ob.order_state_id IN (2011,2012,2013,2014,2020,2030,2040) AND ob.order_state_id IN (2011,2012,2013,2014,2020,2030,2040)
AND (oi.order_time + #{expireSeconds}*1000) <![CDATA[>=]]> UNIX_TIMESTAMP() * 1000 AND (oi.order_time + #{expireSeconds}*1000) <![CDATA[>]]> UNIX_TIMESTAMP() * 1000
</when> </when>
<!-- 2-异常（超时）订单 --> <!-- 2-异常（超时）订单 -->
<when test="status != null and status == 2 and expireSeconds != null and expireSeconds > 0"> <when test="status != null and status == 2 and expireSeconds != null and expireSeconds > 0">
AND ob.order_state_id IN (2011,2012,2013,2014,2020,2030,2040) AND ob.order_state_id IN (2011,2012,2013,2014,2020,2030)
AND (oi.order_time + #{expireSeconds}*1000) <![CDATA[<]]> UNIX_TIMESTAMP() * 1000 AND (oi.order_time + #{expireSeconds}*1000) <![CDATA[<=]]> UNIX_TIMESTAMP() * 1000
</when> </when>
<!-- 3-退款订单 --> <!-- 3-退款订单 -->
<when test="status != null and status == 3"> <when test="status != null and status == 3">