From ad1ce9044ea6bda5b6050ea2c35e8b3bb8170600 Mon Sep 17 00:00:00 2001 From: JianWeie Date: Tue, 29 Mar 2022 02:15:12 +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 --- .../SendWxTemplateMessageSubscribe.cs | 117 ++++++++++++++---- .../Bill/CoreCmsBillAftersalesServices.cs | 10 +- .../Order/CoreCmsOrderServices.cs | 2 + CoreCms.Net.Services/Pay/WeChatPayServices.cs | 2 +- .../groupBuyingDetails/groupBuyingDetails.vue | 16 +-- .../pinTuan/pinTuanDetails/pinTuanDetails.vue | 16 +-- .../seckill/seckillDetails/seckillDetails.vue | 16 +-- .../pages/goods/goodDetails/goodDetails.vue | 24 ++-- .../pages/member/agent/panel/panel.vue | 2 +- .../Order/CoreCmsBillReshipController.cs | 2 +- .../message/wechatappletsmessage/index.html | 61 ++++----- 11 files changed, 170 insertions(+), 98 deletions(-) diff --git a/CoreCms.Net.RedisMQ/Subscribe/SendWxTemplateMessageSubscribe.cs b/CoreCms.Net.RedisMQ/Subscribe/SendWxTemplateMessageSubscribe.cs index 3d90edd9..bb5fb543 100644 --- a/CoreCms.Net.RedisMQ/Subscribe/SendWxTemplateMessageSubscribe.cs +++ b/CoreCms.Net.RedisMQ/Subscribe/SendWxTemplateMessageSubscribe.cs @@ -101,50 +101,119 @@ namespace CoreCms.Net.RedisMQ.Subscribe if (request.code == GlobalEnumVars.PlatformMessageTypes.CreateOrder.ToString()) { - templateMessageData[templateData.data01] = new CgibinMessageSubscribeSendRequest.Types.DataItem() { Value = parameters["orderId"].ToString() }; - templateMessageData[templateData.data02] = new CgibinMessageSubscribeSendRequest.Types.DataItem() { Value = parameters["orderAmount"].ToString() }; - templateMessageData[templateData.data03] = new CgibinMessageSubscribeSendRequest.Types.DataItem() { Value = parameters["shipName"].ToString() }; - templateMessageData[templateData.data04] = new CgibinMessageSubscribeSendRequest.Types.DataItem() { Value = parameters["shipMobile"].ToString() }; - templateMessageData[templateData.data05] = new CgibinMessageSubscribeSendRequest.Types.DataItem() { Value = parameters["shipAddress"].ToString() }; + if (!string.IsNullOrEmpty(parameters["orderId"]!.ToString())) + { + templateMessageData[templateData.data01] = new CgibinMessageSubscribeSendRequest.Types.DataItem() { Value = parameters["orderId"].ToString() }; + } + if (!string.IsNullOrEmpty(parameters["orderAmount"]!.ToString())) + { + templateMessageData[templateData.data02] = new CgibinMessageSubscribeSendRequest.Types.DataItem() { Value = parameters["orderAmount"].ToString() }; + } + if (!string.IsNullOrEmpty(parameters["shipName"]!.ToString())) + { + templateMessageData[templateData.data03] = new CgibinMessageSubscribeSendRequest.Types.DataItem() { Value = parameters["shipName"].ToString() }; + } + if (!string.IsNullOrEmpty(parameters["shipMobile"]!.ToString())) + { + templateMessageData[templateData.data04] = new CgibinMessageSubscribeSendRequest.Types.DataItem() { Value = parameters["shipMobile"].ToString() }; + } + if (!string.IsNullOrEmpty(parameters["orderAmount"]!.ToString())) + { + templateMessageData[templateData.data05] = new CgibinMessageSubscribeSendRequest.Types.DataItem() { Value = parameters["orderAmount"].ToString() }; + } pageUrl = "/pages/member/order/detail/detail?orderId=" + parameters["orderId"]; } else if (request.code == GlobalEnumVars.PlatformMessageTypes.RemindOrderPay.ToString()) { - templateMessageData[templateData.data01] = new CgibinMessageSubscribeSendRequest.Types.DataItem() { Value = parameters["orderId"].ToString() }; - templateMessageData[templateData.data02] = new CgibinMessageSubscribeSendRequest.Types.DataItem() { Value = parameters["orderAmount"].ToString() }; - templateMessageData[templateData.data03] = new CgibinMessageSubscribeSendRequest.Types.DataItem() { Value = parameters["createTime"].ToString() }; + if (!string.IsNullOrEmpty(parameters["orderId"]!.ToString())) + { + templateMessageData[templateData.data01] = new CgibinMessageSubscribeSendRequest.Types.DataItem() { Value = parameters["orderId"].ToString() }; + } + if (!string.IsNullOrEmpty(parameters["orderAmount"]!.ToString())) + { + templateMessageData[templateData.data02] = new CgibinMessageSubscribeSendRequest.Types.DataItem() { Value = parameters["orderAmount"].ToString() }; + } + if (!string.IsNullOrEmpty(parameters["createTime"]!.ToString())) + { + templateMessageData[templateData.data03] = new CgibinMessageSubscribeSendRequest.Types.DataItem() { Value = parameters["createTime"].ToString() }; + } templateMessageData[templateData.data04] = new CgibinMessageSubscribeSendRequest.Types.DataItem() { Value = "订单即将失效，请及时付款！" }; pageUrl = "/pages/member/order/detail/detail?orderId=" + parameters["orderId"]; } else if (request.code == GlobalEnumVars.PlatformMessageTypes.OrderPayed.ToString()) { - templateMessageData[templateData.data01] = new CgibinMessageSubscribeSendRequest.Types.DataItem() { Value = parameters["orderId"].ToString() }; - templateMessageData[templateData.data02] = new CgibinMessageSubscribeSendRequest.Types.DataItem() { Value = parameters["orderAmount"].ToString() }; - templateMessageData[templateData.data03] = new CgibinMessageSubscribeSendRequest.Types.DataItem() { Value = parameters["paymentTime"].ToString() }; + if (!string.IsNullOrEmpty(parameters["orderId"]!.ToString())) + { + templateMessageData[templateData.data01] = new CgibinMessageSubscribeSendRequest.Types.DataItem() { Value = parameters["orderId"].ToString() }; + } + if (!string.IsNullOrEmpty(parameters["orderAmount"]!.ToString())) + { + templateMessageData[templateData.data02] = new CgibinMessageSubscribeSendRequest.Types.DataItem() { Value = parameters["orderAmount"].ToString() }; + } + if (!string.IsNullOrEmpty(parameters["paymentTime"]!.ToString())) + { + templateMessageData[templateData.data03] = new CgibinMessageSubscribeSendRequest.Types.DataItem() { Value = parameters["paymentTime"].ToString() }; + } pageUrl = "/pages/member/order/detail/detail?orderId=" + parameters["orderId"]; } else if (request.code == GlobalEnumVars.PlatformMessageTypes.DeliveryNotice.ToString()) { - templateMessageData[templateData.data01] = new CgibinMessageSubscribeSendRequest.Types.DataItem() { Value = parameters["orderId"].ToString() }; - templateMessageData[templateData.data02] = new CgibinMessageSubscribeSendRequest.Types.DataItem() { Value = parameters["logiName"].ToString() }; - templateMessageData[templateData.data03] = new CgibinMessageSubscribeSendRequest.Types.DataItem() { Value = parameters["logiNo"].ToString() }; + if (!string.IsNullOrEmpty(parameters["orderId"]!.ToString())) + { + templateMessageData[templateData.data01] = new CgibinMessageSubscribeSendRequest.Types.DataItem() { Value = parameters["orderId"].ToString() }; + } + if (!string.IsNullOrEmpty(parameters["logiName"]!.ToString())) + { + templateMessageData[templateData.data02] = new CgibinMessageSubscribeSendRequest.Types.DataItem() { Value = parameters["logiName"].ToString() }; + } + if (!string.IsNullOrEmpty(parameters["logiNo"]!.ToString())) + { + templateMessageData[templateData.data03] = new CgibinMessageSubscribeSendRequest.Types.DataItem() { Value = parameters["logiNo"].ToString() }; + } pageUrl = "/pages/member/order/detail/detail?orderId=" + parameters["orderId"]; } else if (request.code == GlobalEnumVars.PlatformMessageTypes.AfterSalesPass.ToString()) { - templateMessageData[templateData.data01] = new CgibinMessageSubscribeSendRequest.Types.DataItem() { Value = parameters["orderId"].ToString() }; - templateMessageData[templateData.data02] = new CgibinMessageSubscribeSendRequest.Types.DataItem() { Value = parameters["orderAmount"].ToString() }; - templateMessageData[templateData.data03] = new CgibinMessageSubscribeSendRequest.Types.DataItem() { Value = parameters["aftersalesId"].ToString() }; - templateMessageData[templateData.data04] = new CgibinMessageSubscribeSendRequest.Types.DataItem() { Value = parameters["aftersalesStatus"].ToString() }; + if (!string.IsNullOrEmpty(parameters["orderId"]!.ToString())) + { + templateMessageData[templateData.data01] = new CgibinMessageSubscribeSendRequest.Types.DataItem() { Value = parameters["orderId"].ToString() }; + } + if (!string.IsNullOrEmpty(parameters["orderAmount"]!.ToString())) + { + templateMessageData[templateData.data02] = new CgibinMessageSubscribeSendRequest.Types.DataItem() { Value = parameters["orderAmount"].ToString() }; + } + if (!string.IsNullOrEmpty(parameters["aftersalesId"]!.ToString())) + { + templateMessageData[templateData.data03] = new CgibinMessageSubscribeSendRequest.Types.DataItem() { Value = parameters["aftersalesId"].ToString() }; + } + if (!string.IsNullOrEmpty(parameters["aftersalesStatus"]!.ToString())) + { + templateMessageData[templateData.data04] = new CgibinMessageSubscribeSendRequest.Types.DataItem() { Value = parameters["aftersalesStatus"].ToString() }; + } pageUrl = "/pages/member/order/detail/detail?orderId=" + parameters["orderId"]; } else if (request.code == GlobalEnumVars.PlatformMessageTypes.RefundSuccess.ToString()) { - templateMessageData[templateData.data01] = new CgibinMessageSubscribeSendRequest.Types.DataItem() { Value = parameters["sourceId"].ToString() }; - templateMessageData[templateData.data02] = new CgibinMessageSubscribeSendRequest.Types.DataItem() { Value = parameters["aftersalesId"].ToString() }; - templateMessageData[templateData.data03] = new CgibinMessageSubscribeSendRequest.Types.DataItem() { Value = parameters["money"].ToString() }; - templateMessageData[templateData.data04] = new CgibinMessageSubscribeSendRequest.Types.DataItem() { Value = parameters["paymentCode"].ToString() }; - templateMessageData[templateData.data05] = new CgibinMessageSubscribeSendRequest.Types.DataItem() { Value = parameters["createTime"].ToString() }; + if (!string.IsNullOrEmpty(parameters["sourceId"]!.ToString())) + { + templateMessageData[templateData.data01] = new CgibinMessageSubscribeSendRequest.Types.DataItem() { Value = parameters["sourceId"].ToString() }; + } + if (!string.IsNullOrEmpty(parameters["aftersalesId"]!.ToString())) + { + templateMessageData[templateData.data02] = new CgibinMessageSubscribeSendRequest.Types.DataItem() { Value = parameters["aftersalesId"].ToString() }; + } + if (!string.IsNullOrEmpty(parameters["money"]!.ToString())) + { + templateMessageData[templateData.data03] = new CgibinMessageSubscribeSendRequest.Types.DataItem() { Value = parameters["money"].ToString() }; + } + if (!string.IsNullOrEmpty(parameters["paymentCode"]!.ToString())) + { + templateMessageData[templateData.data04] = new CgibinMessageSubscribeSendRequest.Types.DataItem() { Value = parameters["paymentCode"].ToString() }; + } + if (!string.IsNullOrEmpty(parameters["createTime"]!.ToString())) + { + templateMessageData[templateData.data05] = new CgibinMessageSubscribeSendRequest.Types.DataItem() { Value = parameters["createTime"].ToString() }; + } } var result = await Send(weChatUserInfo.openid, templateData.templateId, templateMessageData, pageUrl); @@ -173,7 +242,7 @@ namespace CoreCms.Net.RedisMQ.Subscribe /// private async Task GetUserIsTip(int userId, string code) { - var newCode = string.Empty; + string newCode; if (code == GlobalEnumVars.PlatformMessageTypes.CreateOrder.ToString()) { newCode = GlobalEnumVars.WeChatMsgTemplateType.order.ToString(); diff --git a/CoreCms.Net.Services/Bill/CoreCmsBillAftersalesServices.cs b/CoreCms.Net.Services/Bill/CoreCmsBillAftersalesServices.cs index f84f0cc9..b1a13aec 100644 --- a/CoreCms.Net.Services/Bill/CoreCmsBillAftersalesServices.cs +++ b/CoreCms.Net.Services/Bill/CoreCmsBillAftersalesServices.cs @@ -658,11 +658,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 d1d0df1c..c5833d29 100644 --- a/CoreCms.Net.Services/Order/CoreCmsOrderServices.cs +++ b/CoreCms.Net.Services/Order/CoreCmsOrderServices.cs @@ -2047,6 +2047,7 @@ namespace CoreCms.Net.Services { jm.status = false; jm.msg = "订单查询失败"; + return jm; } var bl = await _dal.UpdateAsync( @@ -2058,6 +2059,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 8068cba0..929acccd 100644 --- a/CoreCms.Net.Services/Pay/WeChatPayServices.cs +++ b/CoreCms.Net.Services/Pay/WeChatPayServices.cs @@ -124,7 +124,7 @@ namespace CoreCms.Net.Services var orderRequest = 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/activity/groupBuying/groupBuyingDetails/groupBuyingDetails.vue b/CoreCms.Net.Uni-App/CoreShop/pages/activity/groupBuying/groupBuyingDetails/groupBuyingDetails.vue index 1c1a77e0..ff56d61c 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/activity/groupBuying/groupBuyingDetails/groupBuyingDetails.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/activity/groupBuying/groupBuyingDetails/groupBuyingDetails.vue @@ -569,14 +569,14 @@ let products = res.data.product; _this.goodsInfo = info; - if (_this.goodsInfo.album && _this.goodsInfo.video) { - var videoObj = { - url: _this.goodsInfo.video, - poster: _this.goodsInfo.image - }; - _this.goodsInfo.album.unshift(videoObj); - _this.autoplay = false; - } + //if (_this.goodsInfo.album && _this.goodsInfo.video) { + // var videoObj = { + // url: _this.goodsInfo.video, + // poster: _this.goodsInfo.image + // }; + // _this.goodsInfo.album.unshift(videoObj); + // _this.autoplay = false; + //} _this.isfav = _this.goodsInfo.isfav; _this.type = _this.goodsInfo.groupType; diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/activity/pinTuan/pinTuanDetails/pinTuanDetails.vue b/CoreCms.Net.Uni-App/CoreShop/pages/activity/pinTuan/pinTuanDetails/pinTuanDetails.vue index e12e6e3b..a1ed34a0 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/activity/pinTuan/pinTuanDetails/pinTuanDetails.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/activity/pinTuan/pinTuanDetails/pinTuanDetails.vue @@ -708,14 +708,14 @@ _this.goodsInfo = info; - if (_this.goodsInfo.album && _this.goodsInfo.video) { - var videoObj = { - url: _this.goodsInfo.video, - poster: _this.goodsInfo.image - }; - _this.goodsInfo.album.unshift(videoObj); - _this.autoplay = false; - } + //if (_this.goodsInfo.album && _this.goodsInfo.video) { + // var videoObj = { + // url: _this.goodsInfo.video, + // poster: _this.goodsInfo.image + // }; + // _this.goodsInfo.album.unshift(videoObj); + // _this.autoplay = false; + //} _this.discountAmount = parseFloat(info.pinTuanRule.discountAmount).toFixed(2); _this.product = _this.spesClassHandle(products); diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/activity/seckill/seckillDetails/seckillDetails.vue b/CoreCms.Net.Uni-App/CoreShop/pages/activity/seckill/seckillDetails/seckillDetails.vue index 599eafe1..b37a94ab 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/activity/seckill/seckillDetails/seckillDetails.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/activity/seckill/seckillDetails/seckillDetails.vue @@ -573,14 +573,14 @@ _this.goodsInfo = info; - if (_this.goodsInfo.album && _this.goodsInfo.video) { - var videoObj = { - url: _this.goodsInfo.video, - poster: _this.goodsInfo.image - }; - _this.goodsInfo.album.unshift(videoObj); - _this.autoplay = false; - } + //if (_this.goodsInfo.album && _this.goodsInfo.video) { + // var videoObj = { + // url: _this.goodsInfo.video, + // poster: _this.goodsInfo.image + // }; + // _this.goodsInfo.album.unshift(videoObj); + // _this.autoplay = false; + //} _this.isfav = _this.goodsInfo.isfav; _this.type = _this.goodsInfo.groupType; diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/goods/goodDetails/goodDetails.vue b/CoreCms.Net.Uni-App/CoreShop/pages/goods/goodDetails/goodDetails.vue index da478eec..8d872d0d 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/goods/goodDetails/goodDetails.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/goods/goodDetails/goodDetails.vue @@ -607,14 +607,14 @@ let products = res.data.product; _this.goodsInfo = info; - if (_this.goodsInfo.album && _this.goodsInfo.video) { - var videoObj = { - url: _this.goodsInfo.video, - poster: _this.goodsInfo.image - }; - _this.goodsInfo.album.unshift(videoObj); - _this.autoplay = false; - } + //if (_this.goodsInfo.album && _this.goodsInfo.video) { + // var videoObj = { + // url: _this.goodsInfo.video, + // poster: _this.goodsInfo.image + // }; + // _this.goodsInfo.album.unshift(videoObj); + // _this.autoplay = false; + //} _this.isfav = res.data.isFav; _this.product = _this.spesClassHandle(products); @@ -641,10 +641,10 @@ let products = res.data.product; _this.goodsInfo = info; - if (_this.goodsInfo.album && _this.goodsInfo.video) { - _this.goodsInfo.album.unshift(_this.goodsInfo.video); - _this.autoplay = false; - } + //if (_this.goodsInfo.album && _this.goodsInfo.video) { + // _this.goodsInfo.album.unshift(_this.goodsInfo.video); + // _this.autoplay = false; + //} _this.isfav = res.data.isFav; _this.product = _this.spesClassHandle(products); diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/panel/panel.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/panel/panel.vue index 7d4add33..cb6923cc 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/panel/panel.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/panel/panel.vue @@ -132,7 +132,7 @@ if (res.data.verifyStatus != 1) { //审核通过 _this.$u.route({ type: 'redirectTo', url: '/pages/member/agent/index/index' }); } - if (_this.$store.state.config.distributionStore == '1') { + if (_this.$store.state.config.agentStore == '1') { _this.utilityMenus.myStore.router = '/pages/member/agent/myStore/myStore?store=' + _this.info.store; } } else { diff --git a/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsBillReshipController.cs b/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsBillReshipController.cs index f5c02bae..72bd4f81 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, diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/shop/message/wechatappletsmessage/index.html b/CoreCms.Net.Web.Admin/wwwroot/views/shop/message/wechatappletsmessage/index.html index 875eee03..b7aea740 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/views/shop/message/wechatappletsmessage/index.html +++ b/CoreCms.Net.Web.Admin/wwwroot/views/shop/message/wechatappletsmessage/index.html @@ -26,6 +26,7 @@ 4、发货通知：指由商家对订单进行发货处理，填写快递单号后的提醒，一般使用【订单发货通知】模板。
5、售后通知：当客户对订单申请了售后，后台对售后订单进行审核处理的提醒，一般使用【订单售后审核通知】模板。
6、退款通知：对于审核通过后的订单，如果商家财务模块做了退款处理，则会进行提醒，一般使用【退款通知】模板。
+

字段可以从后少，但是中间不能少，或者间隔少，因为发送模板判断的是从后是否存在

@@ -42,7 +43,7 @@
-
- +
- +
@@ -64,37 +65,37 @@
- +
- +
- +
- +
- +
- +
@@ -102,25 +103,25 @@
- +
- +
- +
- +
@@ -128,25 +129,25 @@
- +
- +
- +
- +
@@ -154,25 +155,25 @@
- +
- +
- +
- +
@@ -180,31 +181,31 @@
- +
- +
- +
- +
- +
@@ -212,25 +213,25 @@
- +
- +
- +
- +