xiugai

yamls/goods.yaml

@@ -12,8 +12,91 @@
   limit: -1
   props:
     - prop_id: 15
-      amount: 300000
-
+      amount: 30000
+- tag: goods332
+  name: 1元豆豆
+  vip_level:
+    min: -1
+    max: -1
+  ext: -1
+  price: 100
+  ori_price: 100
+  limit: -1
+  props:
+    - prop_id: 15
+      amount: 10000
+- tag: goods333
+  name: 10元豆豆
+  vip_level:
+    min: -1
+    max: -1
+  ext: -1
+  price: 1000
+  ori_price: 1000
+  limit: -1
+  props:
+    - prop_id: 15
+      amount: 100000
+- tag: goods334
+  name: 60元豆豆
+  vip_level:
+    min: -1
+    max: -1
+  ext: -1
+  price: 6000
+  ori_price: 6000
+  limit: -1
+  props:
+    - prop_id: 15
+      amount: 600000
+- tag: goods335
+  name: 90元豆豆
+  vip_level:
+    min: -1
+    max: -1
+  ext: -1
+  price: 9000
+  ori_price: 9000
+  limit: -1
+  props:
+    - prop_id: 15
+      amount: 900000
+- tag: goods336
+  name: 150元豆豆
+  vip_level:
+    min: -1
+    max: -1
+  ext: -1
+  price: 15000
+  ori_price: 15000
+  limit: -1
+  props:
+    - prop_id: 15
+      amount: 1500000
+- tag: goods337
+  name: 300元豆豆
+  vip_level:
+    min: -1
+    max: -1
+  ext: -1
+  price: 30000
+  ori_price: 30000
+  limit: -1
+  props:
+    - prop_id: 15
+      amount: 3000000
+- tag: goods338
+  name: 600元豆豆
+  vip_level:
+    min: -1
+    max: -1
+  ext: -1
+  price: 60000
+  ori_price: 60000
+  limit: -1
+  props:
+    - prop_id: 15
+      amount: 6000000
 #【ID1020851】【大厅+web】返还礼包调整
 - tag: goods_fh_3
   name: 30钻返还豆豆
@@ -542,25 +625,23 @@
     - prop_id: 351
       amount: 30
 - tag: goods_everyday_1_60
-  name: 60钻石(每日限购)
+  name: 60豆豆(每日限购)
   vip_level:
     min: -1
     max: -1
   ext: -1
   price: 600
-  ori_price: 4100
+  ori_price: 1620
   limit: 1
   props:
     - prop_id: 15
-      amount: 3800000
-    - prop_id: 280
-      amount: 5
-    - prop_id: 281
-      amount: 5
-    - prop_id: 275
-      amount: 5
-    - prop_id: 278
-      amount: 5
+      amount: 15000000000
+    - prop_id: 362
+      amount: 10
+    - prop_id: 361
+      amount: 10
+    - prop_id: 360
+      amount: 10
     - prop_id: 274
       amount: 10
     - prop_id: 273
@@ -583,26 +664,30 @@
       amount: 6
     - prop_id: 351
       amount: 6
-- tag: goods_everyweek_1_980
-  name: 980钻石(每周限购)
+- tag: goods_everyweek_1_680
+  name: 680豆豆(每周限购)
   vip_level:
     min: -1
     max: -1
   ext: -1
-  price: 9800
-  ori_price: 109600
+  price: 6800
+  ori_price: 2698000
   limit: 1
   props:
     - prop_id: 15
-      amount: 110000000
-    - prop_id: 280
-      amount: 100
-    - prop_id: 281
-      amount: 100
-    - prop_id: 275
-      amount: 100
-    - prop_id: 278
-      amount: 100
+      amount: 2500000000000
+    - prop_id: 362
+      amount: 330
+    - prop_id: 361
+      amount: 330
+    - prop_id: 360
+      amount: 330
+    - prop_id: 274
+      amount: 330
+    - prop_id: 273
+      amount: 330
+    - prop_id: 272
+      amount: 330
 
 #钻石分页，首购加倍
 - tag: goods_diamond_first_6
@@ -966,8 +1051,8 @@
     min: -1
     max: -1
   ext: -1
-  price: 600
-  ori_price: 600
+  price: 300
+  ori_price: 300
   limit: 1
   props:
     - prop_id: 360
@@ -982,8 +1067,8 @@
     min: -1
     max: -1
   ext: -1
-  price: 600
-  ori_price: 600
+  price: 300
+  ori_price: 300
   limit: 1
   props:
     - prop_id: 274
@@ -998,8 +1083,8 @@
     min: -1
     max: -1
   ext: -1
-  price: 800
-  ori_price: 800
+  price: 400
+  ori_price: 400
   limit: 1
   props:
     - prop_id: 280
@@ -1058,6 +1143,18 @@
 #摇摇乐end
 
 #新增普通砖石计费点begin
+- tag: goods_diamond_normal_1
+  name: 1元钻石
+  vip_level:
+    min: -1
+    max: -1
+  ext: -1
+  price: 100
+  ori_price: 100
+  limit: -1
+  props:
+   - prop_id: 17
+     amount: 10
 - tag: goods_diamond_normal_3
   name: 3元钻石
   vip_level:
@@ -1070,6 +1167,36 @@
   props:
    - prop_id: 17
      amount: 30
+- tag: goods_diamond_normal_68
+  name: 3元钻石
+  vip_level:
+    min: -1
+    max: -1
+  ext: -1
+  price: 300
+  ori_price: 300
+  limit: -1
+  props:
+   - prop_id: 17
+     amount: 680
+  give_prop: 
+   - prop_id: 17
+     amount: 227
+- tag: goods_diamond_normal_128
+  name: 3元钻石
+  vip_level:
+    min: -1
+    max: -1
+  ext: -1
+  price: 300
+  ori_price: 300
+  limit: -1
+  props:
+   - prop_id: 17
+     amount: 1280
+  give_prop: 
+   - prop_id: 17
+     amount: 689
 - tag: goods_diamond_normal_1200
   name: 1200元钻石
   vip_level:
@@ -1193,6 +1320,9 @@
   props: 
    - prop_id: 17
      amount: 60
+  give_prop: 
+   - prop_id: 17
+     amount: 7
 - tag: goods141
   name: 120钻石
   vip_level: 
@@ -1205,6 +1335,9 @@
   props: 
    - prop_id: 17
      amount: 120
+  give_prop: 
+   - prop_id: 17
+     amount: 21
 - tag: goods142
   name: 300钻石
   vip_level: 
@@ -1217,6 +1350,9 @@
   props: 
    - prop_id: 17
      amount: 300
+  give_prop: 
+   - prop_id: 17
+     amount: 75
 - tag: goods143
   name: 500钻石
   vip_level: 
@@ -1241,6 +1377,9 @@
   props: 
    - prop_id: 17
      amount: 980
+  give_prop: 
+   - prop_id: 17
+     amount: 420
 - tag: goods145
   name: 1980钻石
   vip_level: 
@@ -1253,6 +1392,9 @@
   props: 
    - prop_id: 17
      amount: 1980
+  give_prop: 
+   - prop_id: 17
+     amount: 1320
 - tag: goods146
   name: 4880钻石
   vip_level: 
@@ -1582,6 +1724,9 @@
   props:
    - prop_id: 17
      amount: 3280
+  give_prop:
+    - prop_id: 17
+      amount: 3280
 - tag: goods848
   name: 648元钻石
   vip_level:
@@ -1594,6 +1739,9 @@
   props:
    - prop_id: 17
      amount: 6480
+  give_prop:
+    - prop_id: 17
+      amount: 13156
 - tag: goods849
   name: 10钻石
   vip_level:
@@ -3078,7 +3226,7 @@
   limit: -1
   props:
     - prop_id: 15
-      amount: 600000
+      amount: 60000
 - tag: goods298
   name: 12元豆豆 
   vip_level:

yamls/param.yaml

@@ -2225,4 +2225,6 @@ fanhuan_gift:
       fh_beans: 600000000  # 最高返还 
 #单独计费的 is_wechat_pay_replace_pass_go
 is_wechat_pay_replace_pass_go:
-  "goods310": true     
+  "goods310": true     
+#### 复活礼包改成rmb直接购买涉及到的相关计费点 20230627 ####
+fhlb_cny_goods: ["fhlb_cny_goods_1","fhlb_cny_goods_3","fhlb_cny_goods_6","fhlb_cny_goods_12","fhlb_cny_goods_30","fhlb_cny_goods_50","fhlb_cny_goods_98","fhlb_cny_goods_198","fhlb_cny_goods_328","fhlb_cny_goods_648"]

yamls/payment.yaml

@@ -38,37 +38,6 @@ alipayh5_pay_1002:
   gatewayUrl:
   alipay_public_key: "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhdocwR3+CcHdlEXyx9SyjIhnr+LENgJ4vFl2zmKg45Q9vBqOUY1Ir22ziD/TfB38v4+ClNA3OqedO87zsntjIMtnO+Qisew6BweJ8pN4oH7IMXgZzGleofqexWSla9nW60anGbc7TbTUgNXWJDRkRQTBeK8cO98k9Js6V26kx0FirO68TlSCRARKNSCsVIUd4DkTfp4qS8v8j+FitHRTGMqq8CpRcqYo1PC4OIVYG4+LidUtftZwjgwFAaLZfZjYQfWC0k7fPa177qPYKvLhFvcXoitSodFXJY+qOJSdi1DbSpV0V9WwYWwHf4TFTkqxDrbnciObls9iafhdEFWAPwIDAQAB"
 appstore_pay_1002: {}
-wechat_pay_99991:
-  app_id: wx294e4b87449777b3
-  app_key: "kelegames566577588599kelegames66"
-  mch_id: "1491171352"
-wechat_pay_99992:
-  app_id: wx294e4b87449777b3
-  app_key: "kelegames566577588599kelegames66"
-  mch_id: "1489897302"
-wechat_pay_99993:
-  app_id: wx294e4b87449777b3
-  app_key: "kelegames566577588599kelegames66"
-  mch_id: "1493069722"
-wechat_pay_99994:
-  app_id: wx294e4b87449777b3
-  app_key: "kelegames566577588599kelegames66"
-  mch_id: "1518362921"
-wechat_pay_99995:
-  app_id: wx294e4b87449777b3
-  app_key: "kelegames566577588599kelegames66"
-  mch_id: "1486538032"
-wechat_pay_99996:
-  app_id: wx294e4b87449777b3
-  app_key: "kelegames566577588599kelegames66"
-  mch_id: "1491176722"
-wechat_pay_99990:
-  app_id: wx294e4b87449777b3
-  app_key: "kelegames566577588599kelegames66"
-  mch_id: "1482417512"
-wechat_h5_pay_100001:
-  appid: wx96f149ee9e63cff1
-  key: kelegames566577588599kelegames66
-  mchid: "1642805571"
-  secret: e577f0e2f7166c67a08186fa7e34479a
-  referer: http://xpaytest.yukehulian.com
+minigame_pay_1002:
+  formal: '{"app_secret":"dB0CaD6A4b1ffdAdB3326d6A7860c01B","appid":"wx3492746bc62997c7","offer_id":"1653460569","secret":"xinyuexinyuexinyuexinyuexinyue15"}'
+  test: '{"app_secret":"ZQmsJ9aaslTB9C8FKKdRzgXr3UYrZzuv","appid":"wxa27ca98aa5ed1a87","offer_id":"1653460569","secret":"20e35489248ce2dc5aa286500373d458"}'