提交

Mall.Module.Product/OrderModule.cs

@@ -2297,7 +2297,7 @@ namespace Mall.Module.Product
                     item.InventoryNum = gmodel.InventoryNum ?? 0;
 
                     item.CommissionPrice = gmodel.Commission;// 粉象 返佣金额
-                    item.CostMoney = gmodel.CostPrice ?? 0;//(gmodel.IsCustomSpecification==2)?(gmodel.CostPrice ?? 0):(speciPList.Where(x => x.GoodsId == item.GoodsId && x.SpecificationSort == item.SpecificationSort).FirstOrDefault().CostMoney);
+                    item.CostMoney = (gmodel.IsCustomSpecification==2)?(gmodel.CostPrice ?? 0):(speciPList.Where(x => x.GoodsId == item.GoodsId && x.SpecificationSort == item.SpecificationSort).FirstOrDefault().CostMoney);//gmodel.CostPrice ?? 0;
 
                     item.PresentFXGrade = gmodel.PresentFXGrade ?? 0;//赠送粉象分销等级
                     item.PresentFXMonth = gmodel.PresentFXMonth ?? 0;

Mall.WebApi/Controllers/AppletWeChat/WeChatPayController.cs

@@ -48,6 +48,7 @@ namespace Mall.WebApi.Controllers.AppletWeChat
         private readonly UserModule userModule = new UserModule();
         private readonly RechargeModule rechargeModule = new RechargeModule();
         private readonly UserVipModule userVipModule = new UserVipModule();
+        private readonly UserCommonModule userCommonModule = new UserCommonModule();
         #region 商品支付
         /// <summary>
         /// 微信支付
@@ -457,8 +458,24 @@ namespace Mall.WebApi.Controllers.AppletWeChat
             return ApiResult.Success("", Robj);
         }
 
+
+
+        public ApiResult TestVIPBuyPayOrder()
+        {
+            RB_MiniProgram_Extend miniProgram = new RB_MiniProgram_Extend();  //2020年5月26号新增
+            miniProgram = new RB_MiniProgram_Extend { MiniAppId = "wxacd9f8cc3480d29e", WeChatApiSecret = "936110e2c2214340b9829a3608bde6b0", WeChatPayMerchants = "1562277941" }; // programModule.GetMiniProgramModule(new RB_MiniProgram_Extend { MallBaseId = 1, TenantId =1 });
+            string RefundOrderNo = System.DateTime.Now.ToString("yyyyMMddHHmmssfff");
+
+            var Robj = userCommonModule.InsertVipBuyCommission(21233, 3, "20200720152634009282", "20200720152634009282111", Common.Enum.Goods.OrderPayTypeEnum.WeChatPay, Convert.ToDecimal(365.00), System.DateTime.Now);
+            return ApiResult.Success("", Robj);
+        }
+
         #endregion
 
 
+
+
+
+
     }
 }
\ No newline at end of file

Mall.WebApi/Controllers/User/AppletUserController.cs

@@ -1280,9 +1280,9 @@ namespace Mall.WebApi.Controllers.User
             var userInfo = AppletUserInfo;
             ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(parms.msg.ToString());
             RB_Vip_Buy_Extend demodel = JsonConvert.DeserializeObject<RB_Vip_Buy_Extend>(parms.msg.ToString());
-            demodel.TenantId = parms.TenantId;
-            demodel.MallBaseId = parms.MallBaseId;
-            demodel.UserId = AppletUserInfo.UserId;
+            demodel.TenantId = userInfo.TenantId;
+            demodel.MallBaseId = userInfo.MallBaseId;
+            demodel.UserId = userInfo.UserId;
             demodel.PayState =1;
             var list = userVipModule.GetVipBuyPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
             pagelist.count = Convert.ToInt32(count);

Mall.WebApi/Controllers/User/UserVipController.cs

@@ -120,7 +120,7 @@ namespace Mall.WebApi.Controllers.User
             RB_Vip_Buy_Extend demodel = JsonConvert.DeserializeObject<RB_Vip_Buy_Extend>(parms.msg.ToString());
             demodel.TenantId = parms.TenantId;
             demodel.MallBaseId = parms.MallBaseId;
-            demodel.PayState = -1;
+            demodel.PayState =1;
             var list = userVipModule.GetVipBuyPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
 
             pagelist.count = Convert.ToInt32(count);