Merge branch 'sdzq-ld' of http://gitlab.oytour.com/Kui2/mall.oytour.com into sdzq

Mall.Module.User/MiniProgramMsgModule.cs

@@ -399,7 +399,7 @@ namespace Mall.Module.User
                 };
 
                 wenXinResult = HttpHelper.HttpPost(Url, JsonHelper.Serialize(postdata), "");
-                LogHelper.WriteInfo("退款通知发送订阅消息:" + wenXinResult);
+                LogHelper.WriteInfo("SendOrderRefundMsg 退款通知发送订阅消息:" + wenXinResult);
                 JObject jo = (JObject)JsonConvert.DeserializeObject(wenXinResult);
                 int errcode = Convert.ToInt32(jo["errcode"].ToString());
                 if (errcode == 0)

Mall.Repository/Product/RB_Goods_OrderRepository.cs

@@ -907,7 +907,7 @@ GROUP BY o.OrderId
 SELECT o.OrderId,SUM(oc.Commission) FROM rb_goods_order o
 INNER JOIN rb_goods_ordercommission oc on o.OrderId =oc.OrderId
 WHERE o.MallBaseId ={mallBaseId} and o.OrderStatus in(2,3,4,5,6) and o.Recycled=2 and o.`Status`=0 
-and oc.UserId ={userId} and o.CreateDate >= '{startTime}' AND o.CreateDate <= '{endTime} 23:59:59'
+and oc.UserId ={userId} and o.CreateDate >= '{startTime}' AND o.CreateDate <= '{endTime}'
 GROUP BY o.OrderId)t";
             var obj = ExecuteScalar(sql);
             return obj != null ? Convert.ToInt32(obj) : 0;
@@ -926,7 +926,7 @@ GROUP BY o.OrderId)t";
             string sql = $@"SELECT SUM(oc.Commission) FROM rb_goods_order o
 INNER JOIN rb_goods_ordercommission oc on o.OrderId =oc.OrderId
 WHERE o.MallBaseId ={mallBaseId} and o.OrderStatus in(2,3,4,5,6) and o.Recycled=2 and o.`Status`=0 
-and oc.UserId ={userId} and o.CreateDate >= '{startTime}' AND o.CreateDate <= '{endTime} 23:59:59'";
+and oc.UserId ={userId} and o.CreateDate >= '{startTime}' AND o.CreateDate <= '{endTime}'";
             var obj = ExecuteScalar(sql);
             return obj != null ? Convert.ToDecimal(obj) : 0;
         }

Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs

@@ -1174,7 +1174,13 @@ namespace Mall.WebApi.Controllers.TradePavilion
         {
             var parms = RequestParm;
             var userInfo = AppletUserInfo;
-            var query = JsonConvert.DeserializeObject<RB_Collect_Extend>(RequestParm.msg.ToString());
+            JObject jobj = JObject.Parse(RequestParm.msg.ToString());
+            var query = new RB_Collect_Extend()
+            {
+                Id=jobj.GetInt("Id"),
+                Type=jobj.GetInt("Type"),
+                SourceId=jobj.GetInt("SourceId"),
+            };
             query.TenantId = userInfo.TenantId;
             query.MallBaseId = userInfo.MallBaseId;
             query.UserId = userInfo.UserId;