mirror of
http://git.coreshop.cn/jianweie/coreshoppro.git
synced 2025-12-06 17:23:26 +08:00
【优化】后台商家手机号码支持设置多个,方便多个商家管理员收到下单短信提醒
This commit is contained in:
@@ -103,7 +103,7 @@ namespace CoreCms.Net.RedisMQ.Subscribe
|
|||||||
//如果订单实际支付金额是0的话,那就是全积分。
|
//如果订单实际支付金额是0的话,那就是全积分。
|
||||||
var practicalProportion = order.orderAmount <= 0 ? 1 : Math.Round(order.pointMoney / order.orderAmount, 4);
|
var practicalProportion = order.orderAmount <= 0 ? 1 : Math.Round(order.pointMoney / order.orderAmount, 4);
|
||||||
|
|
||||||
//未发货的商品库存调整,如果订单未发货或者部分发货,并且用户未收到商品的情况下,需要解冻冻结库存
|
//未发货的商品库存调整,如果订单未发货或者部分发货,并且用户未收到商品的情况下
|
||||||
if ((order.shipStatus == (int)GlobalEnumVars.OrderShipStatus.No ||
|
if ((order.shipStatus == (int)GlobalEnumVars.OrderShipStatus.No ||
|
||||||
order.shipStatus == (int)GlobalEnumVars.OrderShipStatus.PartialYes) &&
|
order.shipStatus == (int)GlobalEnumVars.OrderShipStatus.PartialYes) &&
|
||||||
info.type == (int)GlobalEnumVars.BillAftersalesIsReceive.Refund && p.nums == 0)
|
info.type == (int)GlobalEnumVars.BillAftersalesIsReceive.Refund && p.nums == 0)
|
||||||
@@ -119,7 +119,8 @@ namespace CoreCms.Net.RedisMQ.Subscribe
|
|||||||
}
|
}
|
||||||
//如果是单品模式
|
//如果是单品模式
|
||||||
else if (pointExchangeModel == 2)
|
else if (pointExchangeModel == 2)
|
||||||
{
|
{
|
||||||
|
//未发货的商品库存调整,如果订单未发货或者部分发货,并且用户未收到商品的情况下
|
||||||
if ((order.shipStatus == (int)GlobalEnumVars.OrderShipStatus.No ||
|
if ((order.shipStatus == (int)GlobalEnumVars.OrderShipStatus.No ||
|
||||||
order.shipStatus == (int)GlobalEnumVars.OrderShipStatus.PartialYes) &&
|
order.shipStatus == (int)GlobalEnumVars.OrderShipStatus.PartialYes) &&
|
||||||
info.type == (int)GlobalEnumVars.BillAftersalesIsReceive.Refund && p.nums == 0)
|
info.type == (int)GlobalEnumVars.BillAftersalesIsReceive.Refund && p.nums == 0)
|
||||||
|
|||||||
BIN
数据库/MySql/20220819/新版完整数据库/coreshop20220819带商品演示脚本navicat导出.rar
Normal file
BIN
数据库/MySql/20220819/新版完整数据库/coreshop20220819带商品演示脚本navicat导出.rar
Normal file
Binary file not shown.
1
数据库/MySql/20220819/老数据库升级脚本/1、调整字段长度.sql
Normal file
1
数据库/MySql/20220819/老数据库升级脚本/1、调整字段长度.sql
Normal file
@@ -0,0 +1 @@
|
|||||||
|
ALTER TABLE `CoreCmsSms` MODIFY COLUMN `mobile` varchar(100);
|
||||||
@@ -1,3 +1,6 @@
|
|||||||
|
2022-08-19
|
||||||
|
【调整】表【CoreCmsSms】调整【mobile】字段长度。
|
||||||
|
|
||||||
2022-07-20
|
2022-07-20
|
||||||
【新增】新增表【CoreCmsAppUpdateLog】版本更新表,用于启动安卓app获取对应更新
|
【新增】新增表【CoreCmsAppUpdateLog】版本更新表,用于启动安卓app获取对应更新
|
||||||
|
|
||||||
|
|||||||
BIN
数据库/SqlServer/20220819/新版完整数据库/20220819完整数据库带演示商品.rar
Normal file
BIN
数据库/SqlServer/20220819/新版完整数据库/20220819完整数据库带演示商品.rar
Normal file
Binary file not shown.
1
数据库/SqlServer/20220819/老版本升级脚本/1、调整字段长度.sql
Normal file
1
数据库/SqlServer/20220819/老版本升级脚本/1、调整字段长度.sql
Normal file
@@ -0,0 +1 @@
|
|||||||
|
ALTER TABLE CoreCmsSms ALTER COLUMN mobile nvarchar(100);
|
||||||
@@ -1,3 +1,6 @@
|
|||||||
|
2022-08-19
|
||||||
|
【调整】表【CoreCmsSms】调整【mobile】字段长度。
|
||||||
|
|
||||||
2022-07-20
|
2022-07-20
|
||||||
【新增】新增表【CoreCmsAppUpdateLog】版本更新表,用于启动安卓app获取对应更新
|
【新增】新增表【CoreCmsAppUpdateLog】版本更新表,用于启动安卓app获取对应更新
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user