From 75b3ef0a36df233c2cda7971799d9c1fc0d2d2d3 Mon Sep 17 00:00:00 2001 From: JianWeie Date: Tue, 29 Mar 2022 02:15:08 +0800 Subject: [PATCH] =?UTF-8?q?#=202022-03-29=20###=201.4.1=E5=BC=80=E6=BA=90?= =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E7=89=88=EF=BC=9A=20=E3=80=90=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E3=80=91=E4=BF=AE=E5=A4=8D=E5=94=AE=E5=90=8E=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E5=A4=84=E7=90=86=E5=BC=82=E5=B8=B8=EF=BC=8C=E6=9C=AA?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E5=95=86=E5=93=81=E5=BA=8F=E5=88=97=E5=88=A4?= =?UTF-8?q?=E6=96=AD=EF=BC=8C=E5=AF=BC=E8=87=B4=E8=BF=AD=E5=8A=A0=E5=88=B0?= =?UTF-8?q?=E5=85=B6=E4=BB=96=E5=BA=8F=E5=88=97=E7=B4=AF=E5=8A=A0=EF=BC=8C?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E8=B4=9F=E5=BA=93=E5=AD=98=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E3=80=82#I4YYZQ=20=E3=80=90=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E3=80=91=E4=BF=AE=E5=A4=8D=E7=A1=AE=E8=AE=A4=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=97=A5=E5=BF=97=E4=B8=ADproductId=E4=BC=A0?= =?UTF-8?q?=E5=80=BC=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?= =?UTF-8?q?=20=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=94=B6=E8=B4=A7=E4=B8=9A=E5=8A=A1=E6=9E=81?= =?UTF-8?q?=E7=AB=AF=E6=83=85=E5=86=B5=E4=B8=8B=EF=BC=8C=E6=9C=AA=E4=B8=BB?= =?UTF-8?q?=E5=8A=A8retrun=E8=BF=94=E5=9B=9E=E9=94=99=E8=AF=AF=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82#I4XB3N=20=E3=80=90=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E3=80=91=E5=9B=A0=E5=BE=AE=E4=BF=A1=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=9C=B0=E5=9D=80=E5=8A=9F=E8=83=BD=EF=BC=8C?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E4=B8=8E=E5=90=8E=E5=8F=B0=E5=8C=BA=E5=9F=9F?= =?UTF-8?q?areaId=E4=B8=BB=E5=8A=A8=E6=8C=82=E9=92=A9=EF=BC=8C=E6=95=85?= =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=AD=A4=E5=8A=9F=E8=83=BD=E3=80=82#I4WS4M?= =?UTF-8?q?=20=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=9E=81=E7=AB=AF=E6=83=85=E5=86=B5=E4=B8=8B=EF=BC=8C=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E5=95=86=E5=93=81=E6=A0=87=E9=A2=98=E9=95=BF=E5=BA=A6?= =?UTF-8?q?=E8=B6=85=E8=BF=87127=E4=BD=8D=EF=BC=8C=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E5=8F=91=E8=B5=B7=E6=94=AF=E4=BB=98=EF=BC=8C=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E5=88=B0=E5=BE=AE=E4=BF=A1=E8=8E=B7=E5=8F=96=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E3=80=82#I4Z74W=20###=200.3.2=20=E4=B8=93=E4=B8=9A=E7=89=88?= =?UTF-8?q?=EF=BC=9A=20=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E7=94=B3=E8=AF=B7=E6=88=90=E4=B8=BA=E4=BB=A3=E7=90=86?= =?UTF-8?q?=E5=90=8E=EF=BC=8C=E7=82=B9=E5=87=BB=E2=80=9C=E6=88=91=E7=9A=84?= =?UTF-8?q?=E5=BA=97=E9=93=BA=E2=80=9D=E5=90=8E=E6=8F=90=E7=A4=BA=E2=80=9C?= =?UTF-8?q?=E5=BA=97=E9=93=BA=E4=BF=A1=E6=81=AF=E4=B8=A2=E5=A4=B1=E2=80=9D?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82#I4Z9SV=20=E3=80=90?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E3=80=91=E4=BF=AE=E5=A4=8D=E5=94=AE=E5=90=8E?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=A4=84=E7=90=86=E5=BC=82=E5=B8=B8=EF=BC=8C?= =?UTF-8?q?=E6=9C=AA=E8=BF=9B=E8=A1=8C=E5=95=86=E5=93=81=E5=BA=8F=E5=88=97?= =?UTF-8?q?=E5=88=A4=E6=96=AD=EF=BC=8C=E5=AF=BC=E8=87=B4=E8=BF=AD=E5=8A=A0?= =?UTF-8?q?=E5=88=B0=E5=85=B6=E4=BB=96=E5=BA=8F=E5=88=97=E7=B4=AF=E5=8A=A0?= =?UTF-8?q?=EF=BC=8C=E5=AF=BC=E8=87=B4=E8=B4=9F=E5=BA=93=E5=AD=98=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82#I4YYZQ=20=E3=80=90=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E3=80=91=E4=BF=AE=E5=A4=8D=E7=A1=AE=E8=AE=A4=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=E8=AE=B0=E5=BD=95=E6=97=A5=E5=BF=97=E4=B8=ADproductId?= =?UTF-8?q?=E4=BC=A0=E5=80=BC=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E3=80=82=20=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E8=87=AA=E5=8A=A8=E6=94=B6=E8=B4=A7=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E6=9E=81=E7=AB=AF=E6=83=85=E5=86=B5=E4=B8=8B=EF=BC=8C=E6=9C=AA?= =?UTF-8?q?=E4=B8=BB=E5=8A=A8retrun=E8=BF=94=E5=9B=9E=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82#I4XB3N=20=E3=80=90?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E3=80=91=E4=BF=AE=E5=A4=8D=E6=9E=81=E7=AB=AF?= =?UTF-8?q?=E6=83=85=E5=86=B5=E4=B8=8B=EF=BC=8C=E8=AE=BE=E7=BD=AE=E5=95=86?= =?UTF-8?q?=E5=93=81=E6=A0=87=E9=A2=98=E9=95=BF=E5=BA=A6=E8=B6=85=E8=BF=87?= =?UTF-8?q?127=E4=BD=8D=EF=BC=8C=E5=AF=BC=E8=87=B4=E5=8F=91=E8=B5=B7?= =?UTF-8?q?=E6=94=AF=E4=BB=98=EF=BC=8C=E6=8E=A8=E9=80=81=E5=88=B0=E5=BE=AE?= =?UTF-8?q?=E4=BF=A1=E8=8E=B7=E5=8F=96=E8=AE=A2=E5=8D=95=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82#I4Z74W?= =?UTF-8?q?=20=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91=E5=9B=A0=E4=B8=8D?= =?UTF-8?q?=E5=90=8C=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=89=80=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E7=9A=84=E7=B1=BB=E7=9B=AE=E4=B8=8D=E5=90=8C=EF=BC=8C=E4=BC=9A?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E8=AE=A2=E9=98=85=E6=B6=88=E6=81=AF=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E8=8E=B7=E5=8F=96=E7=9A=84=E4=B8=8D=E5=90=8C=EF=BC=8C?= =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=B6=88=E6=81=AF=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E4=B8=BA=E6=94=AF=E6=8C=81=E7=81=B5=E6=B4=BB=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E3=80=82=E4=B8=8D=E9=99=90=E5=88=B6=E5=85=A8?= =?UTF-8?q?=E9=83=A8=E5=A1=AB=E5=86=99=E3=80=82#I4Y28U=20=E3=80=90?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E3=80=91=E5=9B=A0uview2.0.29=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E6=96=91=E6=96=93=E5=9B=BE=E6=95=88=E6=9E=9C=E5=86=85?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E4=B8=8E=E8=A7=86=E9=A2=91=E5=85=BC=E5=AE=B9?= =?UTF-8?q?=E6=80=A7=E9=97=AE=E9=A2=98=EF=BC=8C=E6=9A=82=E6=97=B6=E5=B1=8F?= =?UTF-8?q?=E8=94=BD=E8=A7=86=E9=A2=91=E5=8A=9F=E8=83=BD=E3=80=82=E5=BE=85?= =?UTF-8?q?uview=E4=BD=9C=E8=80=85=E4=BF=AE=E5=A4=8Dbug=E5=90=8E=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Bill/CoreCmsBillAftersalesServices.cs | 10 ++-- .../Order/CoreCmsOrderServices.cs | 1 + CoreCms.Net.Services/Pay/WeChatPayServices.cs | 2 +- .../pages/member/address/list/list.vue | 53 +------------------ .../Order/CoreCmsBillReshipController.cs | 2 +- 5 files changed, 9 insertions(+), 59 deletions(-) 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,