blsm-vd-core 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a115c91cf7c5e6a5ba4c64b73b167fe21b0cfdd0
-  data.tar.gz: 9b28f4df1fd5c1fe19eee72902f07c5aba3a562b
+  metadata.gz: a0346a798cf2f0d295e570dd4099c2eac0b951f4
+  data.tar.gz: f94a3792ed6841bc0e722f39389f743f330efed0
 SHA512:
-  metadata.gz: ebd2c12cb6cb54af370ef8049807bc0ecec7bef5f10c37fa3c911478691f12bcaf9c19b94b1ac8d4af8b932d3239ef70bc7e9a10131105b75b6142ca0d7c2aa9
-  data.tar.gz: 205d34055b0690dc7a0925526a8533e5ed39369a12ea22123dfdce76e31005a1dde4343215c223cec0c38fb15c5b5940bff7c6e91564904048f58f596ad57059
+  metadata.gz: 066ecd2929cb29151ea1ffb55e94811d055f0481fe43b701ecc807eef54dd1f4e0e2166a39704f3405139bc69b93e07f7665819c879a9497423a651f440363a1
+  data.tar.gz: 39442582e7c031749b8e42c6fc6290eb4aa5541f7d0673e3cf863726c5f988745250c77743104658979faf60520bd0c41ecec6b30e4157053c9002ee254d2b2b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    blsm-vd-core (0.8.9)
+    blsm-vd-core (0.9.1)
 
 GEM
   remote: https://ruby.taobao.org/

data/lib/blsm-vd-core/model/vd_free_post.rb

@@ -18,7 +18,8 @@ module BlsmVdCore
     private
     def gen_expire_at
       unless self.expire_at
-        self.expire_at = VdFreePost::DEFAULT_EXPIRE_AT
+        default_time = Setting.where(name: 'vd_free_post_default_expire').pluck(:value)[0]
+        self.expire_at = default_time || VdFreePost::DEFAULT_EXPIRE_AT
       end
     end
   end

data/lib/blsm-vd-core/version.rb

@@ -1,3 +1,3 @@
 module BlsmVdCore
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end

data/lib/blsm-vd-core.rb

@@ -153,7 +153,7 @@ module BlsmVdCore
     product_count.times do
       VdFreePost.create({user_id: seller.id})
     end
-    content = "您获取到#{product_count}张顺丰免费券，点击查看 http://w.url.cn/s/AQsuRun"
+    content = "恭喜您获得#{product_count}次免补差价发顺丰资格，点击查看 http://w.url.cn/s/AQsuRun\n有效期限：2月28日23:59:59到期"
     VdMpMsg.create!({
                         app_id: BlsmMpWx.APP_ID,
                         openid: seller.openid,
@@ -482,17 +482,17 @@ module BlsmVdCore
       VdRcMsgNotify.create_order_finish_notify(seller.username)
     end
 
-    # 包邮券返款
-    if order.vd_free_post
-      ClearingItem.create({
-                              state: 'CASH_BACK',
-                              pay_type: "ZXZF",
-                              user_id: seller.id,
-                              order_id: -14,
-                              rate_of_profit: 1,
-                              earn_amount: order.shipping_charge
-                          })
-    end
+    # # 包邮券返款
+    # if order.vd_free_post
+    #   ClearingItem.create({
+    #                           state: 'CASH_BACK',
+    #                           pay_type: "ZXZF",
+    #                           user_id: seller.id,
+    #                           order_id: -14,
+    #                           rate_of_profit: 1,
+    #                           earn_amount: order.shipping_charge
+    #                       })
+    # end
 
     #供货全返还
     if order.line_items && seller_info.purchase_fee > 0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blsm-vd-core
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - saxer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-06 00:00:00.000000000 Z
+date: 2017-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec