Merge pull request JeffreySu#1566 from LGinC/liguo-new-feature

修复会员卡创建时supply_balance字段和supply_bonus字段为false不序列化
michaeljxf · Jan 8, 2019 · acbad6b · acbad6b
2 parents 81b4b4d + 471ac6b
commit acbad6b
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 7 deletions.
diff --git a/src/Senparc.Weixin.MP/Senparc.Weixin.MP.Test/AdvancedAPIs/Card/CardAPITest.cs b/src/Senparc.Weixin.MP/Senparc.Weixin.MP.Test/AdvancedAPIs/Card/CardAPITest.cs
@@ -208,6 +208,23 @@ public void EnumStringTest()
 
         }
 
+        /// <summary>
+        /// 测试值为false时也序列化出来
+        /// </summary>
+        [TestMethod]
+        public void FalseValueSerializeTest()
+        {
+            var obj = new Card_MemberCardData()
+            {
+                supply_balance = false,
+                supply_bonus = false,
+            };
+            var str = obj.ToJson();
+            Console.WriteLine(str);
+            Assert.IsTrue(str.Contains("supply_balance"));
+            Assert.IsTrue(str.Contains("supply_bonus"));
+        }
+
         //protected Store_Location _StoreLocation = new Store_Location()
         //{
         //    business_name = "TIT 创意园1 号店",

diff --git a/src/Senparc.Weixin.MP/Senparc.Weixin.MP/AdvancedAPIs/Card/CardCreate/CardCreateData.cs b/src/Senparc.Weixin.MP/Senparc.Weixin.MP/AdvancedAPIs/Card/CardCreate/CardCreateData.cs
@@ -152,16 +152,14 @@ public Card_DisCountData()
     public class Card_MemberCardData : BaseCardInfo
     {
         /// <summary>
-        /// 是否支持积分，填写true 或false，如填写true，积分相关字段均为必填。填写false，积分字段无需填写。储值字段处理方式相同。
+        /// 是否支持积分，填写true 或false，如填写true，积分相关字段均为必填。
         /// 必填
         /// </summary>
-        [JsonSetting.IgnoreValueAttribute(false)]
         public bool supply_bonus { get; set; }
         /// <summary>
         /// 是否支持储值，填写true 或false。
         /// 必填
         /// </summary>
-        [JsonSetting.IgnoreValueAttribute(false)]
         public bool supply_balance { get; set; }
         /// <summary>
         /// 设置为true时用户领取会员卡后系统自动将其激活，无需调用激活接口。

diff --git a/src/Senparc.Weixin.MP/Senparc.Weixin.MP/AdvancedAPIs/Poi/PoiApi.cs b/src/Senparc.Weixin.MP/Senparc.Weixin.MP/AdvancedAPIs/Poi/PoiApi.cs
@@ -114,14 +114,14 @@ public static UploadImageResultJson UploadImage(string accessTokenOrAppId, strin
         /// <param name="timeOut"></param>
         /// <returns></returns>
         [ApiBind(NeuChar.PlatformType.WeChat_OfficialAccount, "PoiApi.AddPoi", true)]
-        public static WxJsonResult AddPoi(string accessTokenOrAppId, CreateStoreData createStoreData,
+        public static CreateStoreJsonResult AddPoi(string accessTokenOrAppId, CreateStoreData createStoreData,
             int timeOut = Config.TIME_OUT)
         {
             return ApiHandlerWapper.TryCommonApi(accessToken =>
             {
                 var url = string.Format(Config.ApiMpHost + "/cgi-bin/poi/addpoi?access_token={0}", accessToken.AsUrlData());
 
-                return CommonJsonSend.Send<WxJsonResult>(null, url, createStoreData, CommonJsonSendType.POST, timeOut);
+                return CommonJsonSend.Send<CreateStoreJsonResult>(null, url, createStoreData, CommonJsonSendType.POST, timeOut);
 
             }, accessTokenOrAppId);
         }
@@ -271,14 +271,14 @@ public static async Task<UploadImageResultJson> UploadImageAsync(string accessTo
         /// <param name="timeOut"></param>
         /// <returns></returns>
         [ApiBind(NeuChar.PlatformType.WeChat_OfficialAccount, "PoiApi.AddPoiAsync", true)]
-        public static async Task<WxJsonResult> AddPoiAsync(string accessTokenOrAppId, CreateStoreData createStoreData,
+        public static async Task<CreateStoreJsonResult> AddPoiAsync(string accessTokenOrAppId, CreateStoreData createStoreData,
             int timeOut = Config.TIME_OUT)
         {
             return await ApiHandlerWapper.TryCommonApiAsync(async accessToken =>
             {
                 var url = string.Format(Config.ApiMpHost + "/cgi-bin/poi/addpoi?access_token={0}", accessToken.AsUrlData());
 
-                return await Senparc.Weixin.CommonAPIs.CommonJsonSend.SendAsync<WxJsonResult>(null, url, createStoreData, CommonJsonSendType.POST, timeOut);
+                return await Senparc.Weixin.CommonAPIs.CommonJsonSend.SendAsync<CreateStoreJsonResult>(null, url, createStoreData, CommonJsonSendType.POST, timeOut);
 
             }, accessTokenOrAppId);
         }

diff --git a/src/Senparc.Weixin.MP/Senparc.Weixin.MP/AdvancedAPIs/Poi/StoreJson/CreateStoreData.cs b/src/Senparc.Weixin.MP/Senparc.Weixin.MP/AdvancedAPIs/Poi/StoreJson/CreateStoreData.cs
@@ -28,6 +28,8 @@
     创建标识：Senparc - 20150513
 ----------------------------------------------------------------*/
 
+using Senparc.Weixin.Entities;
+
 namespace Senparc.Weixin.MP.AdvancedAPIs.Poi
 {
     /// <summary>
@@ -66,4 +68,12 @@ public class UpdateStore_BaseInfo : StoreBaseInfoCanBeUpdate
         /// </summary>
         public string poi_id { get; set; }
     }
+
+    public class CreateStoreJsonResult : WxJsonResult
+    {
+        /// <summary>
+        /// 微信门店ID, 微信内门店唯一标示ID
+        /// </summary>
+        public string poi_id { get; set; }
+    }
 }