diff --git a/CoreCms.Net.Services/Bill/CoreCmsBillAftersalesServices.cs b/CoreCms.Net.Services/Bill/CoreCmsBillAftersalesServices.cs
index 9223026..b5cc2b5 100644
--- a/CoreCms.Net.Services/Bill/CoreCmsBillAftersalesServices.cs
+++ b/CoreCms.Net.Services/Bill/CoreCmsBillAftersalesServices.cs
@@ -636,11 +636,11 @@ namespace CoreCms.Net.Services
if (tt["id"].ToString() == item.id.ToString())
{
item.reshipNums += tt["nums"].ObjectToInt(0);
- }
-
- if (type == (int)GlobalEnumVars.BillAftersalesIsReceive.Reship)
- {
- item.reshipedNums += tt["nums"].ObjectToInt(0);
+ //判断 商品id相等,才能判断是否已发货,才能赋值给 reshipedNums 已发货的退货商品
+ if (type == (int)GlobalEnumVars.BillAftersalesIsReceive.Reship)
+ {
+ item.reshipedNums += tt["nums"].ObjectToInt(0);
+ }
}
}
}
diff --git a/CoreCms.Net.Services/Order/CoreCmsOrderServices.cs b/CoreCms.Net.Services/Order/CoreCmsOrderServices.cs
index b41d757..1a960ac 100644
--- a/CoreCms.Net.Services/Order/CoreCmsOrderServices.cs
+++ b/CoreCms.Net.Services/Order/CoreCmsOrderServices.cs
@@ -2028,6 +2028,7 @@ namespace CoreCms.Net.Services
if (!bl)
{
jm.msg = "确认收货失败";
+ return jm;
}
//修改发货单,如果有为确认收货的发货单,那么给他们回传上去确认收货时间
diff --git a/CoreCms.Net.Services/Pay/WeChatPayServices.cs b/CoreCms.Net.Services/Pay/WeChatPayServices.cs
index 5cb1db3..d7a2788 100644
--- a/CoreCms.Net.Services/Pay/WeChatPayServices.cs
+++ b/CoreCms.Net.Services/Pay/WeChatPayServices.cs
@@ -105,7 +105,7 @@ namespace CoreCms.Net.Services
var request = new WeChatPayUnifiedOrderRequest
{
- Body = entity.payTitle,
+ Body = entity.payTitle.Length > 127 ? entity.payTitle[..125] : entity.payTitle,
OutTradeNo = entity.paymentId,
TotalFee = Convert.ToInt32(entity.money * 100),
SpBillCreateIp = entity.ip,
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/address/list/list.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/address/list/list.vue
index a4d5889..ad4e5eb 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/address/list/list.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/address/list/list.vue
@@ -23,10 +23,7 @@
-
-
-
-
+
@@ -91,54 +88,6 @@
// this.$u.route("/pages/placeOrder/index/index")
}
},
- // #ifdef MP-WEIXIN
- wechatAddress: function () {
- let _that = this;
- wx.chooseAddress({
- success: res => {
- if (res.errMsg == "chooseAddress:ok") {
- //获取成功
- //存储这个收获地区信息到数据库
- let data = {
- provinceName: res.provinceName,
- cityName: res.cityName,
- countyName: res.countyName,
- postalCode: res.postalCode
- };
- let areaId = 0;
- this.$u.api.getAreaId(data).then(res1 => {
- if (res1.status) {
- //存储用户收货信息
- let userShipId = 0;
- let userShipData = {
- areaId: res1.data,
- name: res.userName,
- address: res.detailInfo,
- mobile: res.telNumber,
- isDefault: 2
- }
- this.$u.api.saveUserShipWx(userShipData).then(res2 => {
- if (res2.status) {
- this.$refs.uToast.show({
- title: '存储微信地址成功', type: 'success', callback: function () {
- _that.userShipList();
- }
- });
- } else {
- this.$refs.uToast.show({ title: '存储微信地址失败', type: 'error' });
- }
- });
- } else {
- this.$refs.uToast.show({ title: '获取微信地址失败', type: 'error' });
- }
- });
- } else {
- this.$refs.uToast.show({ title: '获取微信地址失败', type: 'error' });
- }
- }
- });
- },
- // #endif
}
}
diff --git a/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsBillReshipController.cs b/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsBillReshipController.cs
index f5c02ba..72bd4f8 100644
--- a/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsBillReshipController.cs
+++ b/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsBillReshipController.cs
@@ -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,