wgh/coreshoppro
1
0
Fork 0
mirror of http://git.coreshop.cn/jianweie/coreshoppro.git synced 2026-03-22 20:27:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

# 2022-03-29

Browse Source 
### 1.4.1开源社区版：
【修复】修复售后库存处理异常，未进行商品序列判断，导致迭加到其他序列累加，导致负库存的问题。#I4YYZQ
【修复】修复确认收货记录日志中productId传值错误的问题。
【修复】修复自动收货业务极端情况下，未主动retrun返回错误的问题。#I4XB3N
【调整】因微信自动获取地址功能，无法与后台区域areaId主动挂钩，故取消此功能。#I4WS4M
【修复】修复极端情况下，设置商品标题长度超过127位，导致发起支付，推送到微信获取订单数据失败的问题。#I4Z74W
### 0.3.2 专业版：
【修复】修复申请成为代理后，点击“我的店铺”后提示“店铺信息丢失”的问题。#I4Z9SV
【修复】修复售后库存处理异常，未进行商品序列判断，导致迭加到其他序列累加，导致负库存的问题。#I4YYZQ
【修复】修复确认收货记录日志中productId传值错误的问题。
【修复】修复自动收货业务极端情况下，未主动retrun返回错误的问题。#I4XB3N
【修复】修复极端情况下，设置商品标题长度超过127位，导致发起支付，推送到微信获取订单数据失败的问题。#I4Z74W
【优化】因不同小程序所申请的类目不同，会导致订阅消息模板获取的不同，小程序消息设置为支持灵活字段配置。不限制全部填写。#I4Y28U
【优化】因uview2.0.29版本斑斓图效果内组件与视频兼容性问题，暂时屏蔽视频功能。待uview作者修复bug后同步。
This commit is contained in:
JianWeie
2022-03-29 02:15:12 +08:00
parent 14c32f1241
commit ad1ce9044e
11 changed files with 170 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsBillReshipController.cs
View File

@@ -267,7 +267,7 @@ namespace CoreCms.Net.Web.Admin.Controllers
var sLog = new CoreCmsStockLog
{
stockId = entity.id,
productId = item.id,
productId = item.productId,
goodsId = item.goodsId,
nums = item.nums,
sn = item.sn,

61
CoreCms.Net.Web.Admin/wwwroot/views/shop/message/wechatappletsmessage/index.html
View File

@@ -26,6 +26,7 @@
4、发货通知：指由商家对订单进行发货处理，填写快递单号后的提醒，一般使用【订单发货通知】模板。<br />
5、售后通知：当客户对订单申请了售后，后台对售后订单进行审核处理的提醒，一般使用【订单售后审核通知】模板。<br />
6、退款通知：对于审核通过后的订单，如果商家财务模块做了退款处理，则会进行提醒，一般使用【退款通知】模板。<br />
<p style="color: #ff0000">字段可以从后少，但是中间不能少，或者间隔少，因为发送模板判断的是从后是否存在</p>
</blockquote>
<div class="layui-form">
@@ -42,7 +43,7 @@
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
<div class="layui-form-item">
<label class="layui-form-label">
<label class="layui-form-label layui-form-required">
模板ID：
</label>
<div class="layui-input-block">
@@ -50,13 +51,13 @@
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">订单编号：</label>
<label class="layui-form-label layui-form-required">订单编号：</label>
<div class="layui-input-block">
<input type="text" name="setting[0][data01]" required="" lay-verify="required" value="{{d.data.order.data01 || ''}}" placeholder="请输入订单编号" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">订单金额：</label>
<label class="layui-form-label layui-form-required">订单金额：</label>
<div class="layui-input-block">
<input type="text" name="setting[0][data02]" required="" lay-verify="required" value="{{d.data.order.data02 || ''}}" placeholder="请输入订单金额" autocomplete="off" class="layui-input">
</div>
@@ -64,37 +65,37 @@
<div class="layui-form-item">
<label class="layui-form-label">收货人名：</label>
<div class="layui-input-block">
<input type="text" name="setting[0][data03]" required="" lay-verify="required" value="{{d.data.order.data03 || ''}}" placeholder="请输入收货人名" autocomplete="off" class="layui-input">
<input type="text" name="setting[0][data03]" required="" value="{{d.data.order.data03 || ''}}" placeholder="请输入收货人名" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">收货电话：</label>
<div class="layui-input-block">
<input type="text" name="setting[0][data04]" required="" lay-verify="required" value="{{d.data.order.data04 || ''}}" placeholder="请输入收货电话" autocomplete="off" class="layui-input">
<input type="text" name="setting[0][data04]" required="" value="{{d.data.order.data04 || ''}}" placeholder="请输入收货电话" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">收货地址：</label>
<div class="layui-input-block">
<input type="text" name="setting[0][data05]" required="" lay-verify="required" value="{{d.data.order.data05 || ''}}" placeholder="请输入收货地址" autocomplete="off" class="layui-input">
<input type="text" name="setting[0][data05]" required="" value="{{d.data.order.data05 || ''}}" placeholder="请输入收货地址" autocomplete="off" class="layui-input">
</div>
</div>
</div>
<div class="layui-tab-item">
<div class="layui-form-item">
<label class="layui-form-label">模板ID：</label>
<label class="layui-form-label layui-form-required">模板ID：</label>
<div class="layui-input-block">
<input type="text" name="setting[1][templateId]" required="" lay-verify="required" value="{{d.data.cancel.templateId || ''}}" placeholder="请输入模板ID" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">订单编号：</label>
<label class="layui-form-label layui-form-required">订单编号：</label>
<div class="layui-input-block">
<input type="text" name="setting[1][data01]" required="" lay-verify="required" value="{{d.data.cancel.data01 || ''}}" placeholder="请输入订单编号" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">订单金额：</label>
<label class="layui-form-label layui-form-required">订单金额：</label>
<div class="layui-input-block">
<input type="text" name="setting[1][data02]" required="" lay-verify="required" value="{{d.data.cancel.data02 || ''}}" placeholder="请输入订单金额" autocomplete="off" class="layui-input">
</div>
@@ -102,25 +103,25 @@
<div class="layui-form-item">
<label class="layui-form-label">下单时间：</label>
<div class="layui-input-block">
<input type="text" name="setting[1][data03]" required="" lay-verify="required" value="{{d.data.cancel.data03 || ''}}" placeholder="请输入下单时间" autocomplete="off" class="layui-input">
<input type="text" name="setting[1][data03]" required="" value="{{d.data.cancel.data03 || ''}}" placeholder="请输入下单时间" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">温馨提示：</label>
<div class="layui-input-block">
<input type="text" name="setting[1][data04]" required="" lay-verify="required" value="{{d.data.cancel.data04 || ''}}" placeholder="请输入温馨提示" autocomplete="off" class="layui-input">
<input type="text" name="setting[1][data04]" required="" value="{{d.data.cancel.data04 || ''}}" placeholder="请输入温馨提示" autocomplete="off" class="layui-input">
</div>
</div>
</div>
<div class="layui-tab-item">
<div class="layui-form-item">
<label class="layui-form-label">模板ID：</label>
<label class="layui-form-label layui-form-required">模板ID：</label>
<div class="layui-input-block">
<input type="text" name="setting[2][templateId]" required="" lay-verify="required" value="{{d.data.pay.templateId || ''}}" placeholder="请输入模板ID" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">订单编号：</label>
<label class="layui-form-label layui-form-required">订单编号：</label>
<div class="layui-input-block">
<input type="text" name="setting[2][data01]" required="" lay-verify="required" value="{{d.data.pay.data01 || ''}}" placeholder="请输入订单编号" autocomplete="off" class="layui-input">
</div>
@@ -128,25 +129,25 @@
<div class="layui-form-item">
<label class="layui-form-label">支付金额：</label>
<div class="layui-input-block">
<input type="text" name="setting[2][data02]" required="" lay-verify="required" value="{{d.data.pay.data02 || ''}}" placeholder="请输入支付金额" autocomplete="off" class="layui-input">
<input type="text" name="setting[2][data02]" value="{{d.data.pay.data02 || ''}}" placeholder="请输入支付金额" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">支付时间：</label>
<div class="layui-input-block">
<input type="text" name="setting[2][data03]" required="" lay-verify="required" value="{{d.data.pay.data03 || ''}}" placeholder="请输入支付时间" autocomplete="off" class="layui-input">
<input type="text" name="setting[2][data03]" value="{{d.data.pay.data03 || ''}}" placeholder="请输入支付时间" autocomplete="off" class="layui-input">
</div>
</div>
</div>
<div class="layui-tab-item">
<div class="layui-form-item">
<label class="layui-form-label">模板ID：</label>
<label class="layui-form-label layui-form-required">模板ID：</label>
<div class="layui-input-block">
<input type="text" name="setting[3][templateId]" required="" lay-verify="required" value="{{d.data.ship.templateId || ''}}" placeholder="请输入模板ID" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">订单编号：</label>
<label class="layui-form-label layui-form-required">订单编号：</label>
<div class="layui-input-block">
<input type="text" name="setting[3][data01]" required="" lay-verify="required" value="{{d.data.ship.data01 || ''}}" placeholder="请输入订单编号" autocomplete="off" class="layui-input">
</div>
@@ -154,25 +155,25 @@
<div class="layui-form-item">
<label class="layui-form-label">快递公司：</label>
<div class="layui-input-block">
<input type="text" name="setting[3][data02]" required="" lay-verify="required" value="{{d.data.ship.data02 || ''}}" placeholder="请输入快递公司，例如：{{!character_string2.DATA!}}" autocomplete="off" class="layui-input">
<input type="text" name="setting[3][data02]" required="" value="{{d.data.ship.data02 || ''}}" placeholder="请输入快递公司，例如：{{!character_string2.DATA!}}" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">快递编号：</label>
<div class="layui-input-block">
<input type="text" name="setting[3][data03]" required="" lay-verify="required" value="{{d.data.ship.data03 || ''}}" placeholder="请输入快递编号，例如：{{!character_string3.DATA!}}" autocomplete="off" class="layui-input">
<input type="text" name="setting[3][data03]" required="" value="{{d.data.ship.data03 || ''}}" placeholder="请输入快递编号，例如：{{!character_string3.DATA!}}" autocomplete="off" class="layui-input">
</div>
</div>
</div>
<div class="layui-tab-item">
<div class="layui-form-item">
<label class="layui-form-label">模板ID：</label>
<label class="layui-form-label layui-form-required">模板ID：</label>
<div class="layui-input-block">
<input type="text" name="setting[4][templateId]" required="" lay-verify="required" value="{{d.data.aftersale.templateId || ''}}" placeholder="请输入模板ID" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">订单编号：</label>
<label class="layui-form-label layui-form-required">订单编号：</label>
<div class="layui-input-block">
<input type="text" name="setting[4][data01]" required="" lay-verify="required" value="{{d.data.aftersale.data01 || ''}}" placeholder="请输入订单编号" autocomplete="off" class="layui-input">
</div>
@@ -180,31 +181,31 @@
<div class="layui-form-item">
<label class="layui-form-label">订单金额：</label>
<div class="layui-input-block">
<input type="text" name="setting[4][data02]" required="" lay-verify="required" value="{{d.data.aftersale.data02 || ''}}" placeholder="请输入订单金额" autocomplete="off" class="layui-input">
<input type="text" name="setting[4][data02]" required="" value="{{d.data.aftersale.data02 || ''}}" placeholder="请输入订单金额" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">售后单号：</label>
<div class="layui-input-block">
<input type="text" name="setting[4][data03]" required="" lay-verify="required" value="{{d.data.aftersale.data03 || ''}}" placeholder="请输入售后单号" autocomplete="off" class="layui-input">
<input type="text" name="setting[4][data03]" required="" value="{{d.data.aftersale.data03 || ''}}" placeholder="请输入售后单号" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">售后状态：</label>
<div class="layui-input-block">
<input type="text" name="setting[4][data04]" required="" lay-verify="required" value="{{d.data.aftersale.data04 || ''}}" placeholder="请输入售后状态" autocomplete="off" class="layui-input">
<input type="text" name="setting[4][data04]" required="" value="{{d.data.aftersale.data04 || ''}}" placeholder="请输入售后状态" autocomplete="off" class="layui-input">
</div>
</div>
</div>
<div class="layui-tab-item">
<div class="layui-form-item">
<label class="layui-form-label">模板ID：</label>
<label class="layui-form-label layui-form-required">模板ID：</label>
<div class="layui-input-block">
<input type="text" name="setting[5][templateId]" required="" lay-verify="required" value="{{d.data.refund.templateId || ''}}" placeholder="请输入模板ID" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">订单编号：</label>
<label class="layui-form-label layui-form-required">订单编号：</label>
<div class="layui-input-block">
<input type="text" name="setting[5][data01]" required="" lay-verify="required" value="{{d.data.refund.data01 || ''}}" placeholder="请输入订单编号" autocomplete="off" class="layui-input">
</div>
@@ -212,25 +213,25 @@
<div class="layui-form-item">
<label class="layui-form-label">售后单号：</label>
<div class="layui-input-block">
<input type="text" name="setting[5][data02]" required="" lay-verify="required" value="{{d.data.refund.data02 || ''}}" placeholder="请输入售后单号" autocomplete="off" class="layui-input">
<input type="text" name="setting[5][data02]" required="" value="{{d.data.refund.data02 || ''}}" placeholder="请输入售后单号" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">退款金额：</label>
<div class="layui-input-block">
<input type="text" name="setting[5][data03]" required="" lay-verify="required" value="{{d.data.refund.data03 || ''}}" placeholder="请输入退款金额" autocomplete="off" class="layui-input">
<input type="text" name="setting[5][data03]" required="" value="{{d.data.refund.data03 || ''}}" placeholder="请输入退款金额" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">退款方式：</label>
<div class="layui-input-block">
<input type="text" name="setting[5][data04]" required="" lay-verify="required" value="{{d.data.refund.data04 || ''}}" placeholder="请输入退款方式" autocomplete="off" class="layui-input">
<input type="text" name="setting[5][data04]" required="" value="{{d.data.refund.data04 || ''}}" placeholder="请输入退款方式" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">退款时间：</label>
<div class="layui-input-block">
<input type="text" name="setting[5][data05]" required="" lay-verify="required" value="{{d.data.refund.data05 || ''}}" placeholder="请输入退款时间" autocomplete="off" class="layui-input">
<input type="text" name="setting[5][data05]" required="" value="{{d.data.refund.data05 || ''}}" placeholder="请输入退款时间" autocomplete="off" class="layui-input">
</div>
</div>
</div>