Merge branch 'master' of https://git.yidian-inc.com:8021/bp/yaconf

idgen.ini

@@ -16,7 +16,7 @@ trans.apcu.prefix       = trans_
 order.bits.date         = 12
 order.bits.uid          = 2
 order.bits.machine      = 1
-order.bits.autoincrement= 2
+order.bits.autoincrement= 3
 order.bits.app          = 2
 
 ;订单号 - apcu
@@ -34,6 +34,102 @@ snow.type.goods = 3
 datetime.type.order = 1
 datetime.type.merchant_shop_id = 2
 datetime.type.goods = 3
+datetime.type.55c768 = 4
+datetime.type.af3abf = 5
+datetime.type.193bd1 = 6
+datetime.type.98842c = 7
+datetime.type.33c212 = 8
+datetime.type.c0d82e = 9
+datetime.type.f8b5d7 = 10
+datetime.type.c538bc = 11
+datetime.type.7cec8d = 12
+datetime.type.86260b = 13
+datetime.type.977d89 = 14
+datetime.type.a00ebd = 15
+datetime.type.794290 = 16
+datetime.type.a556a6 = 17
+datetime.type.d1e63f = 18
+datetime.type.716e47 = 19
+datetime.type.4a3c69 = 20
+datetime.type.622324 = 21
+datetime.type.0e0f4f = 22
+datetime.type.4505d5 = 23
+datetime.type.2fb8c8 = 24
+datetime.type.dc45d9 = 25
+datetime.type.250e56 = 26
+datetime.type.f029aa = 27
+datetime.type.41ebe3 = 28
+datetime.type.8cf737 = 29
+datetime.type.716c8f = 30
+datetime.type.57df5d = 31
+datetime.type.fe41e7 = 32
+datetime.type.1d8bc1 = 33
+datetime.type.95ac50 = 34
+datetime.type.4e099e = 35
+datetime.type.e6abb3 = 36
+datetime.type.2d4dbd = 37
+datetime.type.5367fb = 38
+datetime.type.f81bed = 39
+datetime.type.b816df = 40
+datetime.type.c0e099 = 41
+datetime.type.7a258c = 42
+datetime.type.961959 = 43
+datetime.type.3ff1ec = 44
+datetime.type.2f1bd6 = 45
+datetime.type.be1cd7 = 46
+datetime.type.754b80 = 47
+datetime.type.0f0c3e = 48
+datetime.type.3d94b4 = 49
+datetime.type.6a0d57 = 50
+datetime.type.bf5dd8 = 51
+datetime.type.8f4465 = 52
+datetime.type.7cc8d6 = 53
+datetime.type.f2c8c1 = 54
+datetime.type.cdca5f = 55
+datetime.type.5b6849 = 56
+datetime.type.aa212b = 57
+datetime.type.76ee81 = 58
+datetime.type.0ce46c = 59
+datetime.type.c66f6c = 60
+datetime.type.0d5b82 = 61
+datetime.type.dbc1a1 = 62
+datetime.type.f121ba = 63
+datetime.type.14c993 = 64
+datetime.type.8d039d = 65
+datetime.type.2aaf35 = 66
+datetime.type.ced696 = 67
+datetime.type.fb6226 = 68
+datetime.type.3a96a3 = 69
+datetime.type.9f8fd0 = 70
+datetime.type.86a571 = 71
+datetime.type.258dc5 = 72
+datetime.type.e11992 = 73
+datetime.type.3d852b = 74
+datetime.type.5c6600 = 75
+datetime.type.cd99ae = 76
+datetime.type.1a9ea0 = 77
+datetime.type.f9946a = 78
+datetime.type.a29d04 = 79
+datetime.type.17681d = 80
+datetime.type.7c1917 = 81
+datetime.type.255df0 = 82
+datetime.type.d28ac2 = 83
+datetime.type.818716 = 84
+datetime.type.02582f = 85
+datetime.type.872caf = 86
+datetime.type.fd4713 = 87
+datetime.type.6cf4bb = 88
+datetime.type.9bdbff = 89
+datetime.type.88b101 = 90
+datetime.type.b8ffc5 = 91
+datetime.type.e47b69 = 92
+datetime.type.b27ace = 93
+datetime.type.63f18f = 94
+datetime.type.1165f9 = 95
+datetime.type.86d940 = 96
+datetime.type.b6f22e = 97
+datetime.type.99f362 = 98
+datetime.type.c53a9e = 99
 
 [idgen : common]
 

interface.ini

@@ -251,12 +251,15 @@ goods.marketing.marketing_goods_rate = "http://goods.test.int.yidian-inc.com/mar
 
 
 ;团长
-goods.marketing.second_distributor_list = "http://goods.test.int.yidian-inc.com/marketing/distributor/second_distributor_list"
-goods.marketing.apply_distributor = "http://goods.test.int.yidian-inc.com/marketing/distributor/apply_distributor"
-goods.marketing.apply_second_distributor = "http://goods.test.int.yidian-inc.com/marketing/distributor/apply_second_distributor"
-goods.marketing.send_sms_code = "http://goods.test.int.yidian-inc.com/marketing/distributor/send_sms_code"
-goods.marketing.distributor = "http://goods.test.int.yidian-inc.com/marketing/distributor/distributor"
-goods.marketing.distributor_list = "http://goods.test.int.yidian-inc.com/marketing/distributor/distributor_list"
+goods.marketing.second_distributor_list = "http://goods.test.yidian-inc.com/marketing/distributor/second_distributor_list"
+goods.marketing.apply_distributor = "http://goods.test.yidian-inc.com/marketing/distributor/apply_distributor"
+goods.marketing.apply_second_distributor = "http://goods.test.yidian-inc.com/marketing/distributor/apply_second_distributor"
+goods.marketing.send_sms_code = "http://goods.test.yidian-inc.com/marketing/distributor/send_sms_code"
+goods.marketing.distributor = "http://goods.test.yidian-inc.com/marketing/distributor/distributor"
+goods.marketing.distributor_list = "http://goods.test.yidian-inc.com/marketing/distributor/distributor_list"
+goods.marketing.distributor_code_url = "http://goods.test.yidian-inc.com/marketing/distributor/distributor_code_url"
+
+ 
 
 ;商品
 goods.public.get_goods_category_list = "http://goods.test.int.yidian-inc.com/goods/goods/get_goods_category_list"
@@ -277,7 +280,7 @@ goods.consumer.goods_add = "http://goods.test.int.yidian-inc.com/goods/goods/add
 ;订单
 order.order.user_order_list = "http://order.test.yidian-inc.com/order/order/user_order_list"
 order.order.merchant_order_list = "http://order.test.yidian-inc.com/order/order/merchant_order_list"
-
+order.order.create_order = "http://order.test.yidian-inc.com/order/order/create_order"
 
 
 
@@ -395,7 +398,7 @@ goods.marketing.apply_second_distributor = "http://goods.dev.yidian-inc.com/mark
 goods.marketing.send_sms_code = "http://goods.dev.yidian-inc.com/marketing/distributor/send_sms_code"
 goods.marketing.distributor = "http://goods.dev.yidian-inc.com/marketing/distributor/distributor"
 goods.marketing.distributor_list = "http://goods.dev.yidian-inc.com/marketing/distributor/distributor_list"
-
+goods.marketing.distributor_code_url = "http://goods.dev.yidian-inc.com/marketing/distributor/distributor_code_url"
 
 
 ;商品
@@ -418,6 +421,7 @@ goods.consumer.goods_add = "http://goods.dev.yidian-inc.com/goods/goods/add"
 ;订单
 order.order.user_order_list = "http://order.dev.yidian-inc.com/order/order/user_order_list"
 order.order.merchant_order_list = "http://order.dev.yidian-inc.com/order/order/merchant_order_list"
+order.order.create_order = "http://order.dev.yidian-inc.com/order/order/create_order"
 
 
 ; =======================  merchant ==================================================================================