gazebo
|
d01da6020a
|
整理京西自有PHP商城相关的代码
|
2019-11-06 18:20:34 +08:00 |
|
苏尹岚
|
9fb7c86594
|
Accept Merge Request #21: (su -> mark)
Merge Request: 刷新历史订单结算价
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/21
|
2019-11-06 17:21:15 +08:00 |
|
苏尹岚
|
29b3dc637e
|
刷新历史订单结算价
|
2019-11-06 17:19:20 +08:00 |
|
gazebo
|
5cc9787403
|
QueryFoodRecipes添加skuIDs参数
|
2019-11-06 17:16:35 +08:00 |
|
苏尹岚
|
87a8697242
|
刷新历史订单结算价
|
2019-11-06 17:11:19 +08:00 |
|
gazebo
|
5015620015
|
+IsVendorRemote
|
2019-11-06 16:57:22 +08:00 |
|
苏尹岚
|
8018cc7709
|
刷新历史订单结算价
|
2019-11-06 16:52:41 +08:00 |
|
gazebo
|
86c4ba802d
|
Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark
|
2019-11-06 16:28:56 +08:00 |
|
gazebo
|
34c2b2c866
|
up
|
2019-11-06 16:26:01 +08:00 |
|
苏尹岚
|
3bf3f7ab5d
|
刷新历史订单结算价
|
2019-11-06 15:29:42 +08:00 |
|
苏尹岚
|
365cad0bfb
|
刷新历史订单结算价
|
2019-11-06 15:16:41 +08:00 |
|
苏尹岚
|
a1aaacc312
|
Merge remote-tracking branch 'origin/mark' into su
|
2019-11-06 14:36:08 +08:00 |
|
gazebo
|
f5e2b711fb
|
SendMsg2Somebody不强制要求手机号
|
2019-11-06 14:32:44 +08:00 |
|
苏尹岚
|
89a5c2ac9f
|
Merge remote-tracking branch 'origin/mark' into su
|
2019-11-06 14:32:40 +08:00 |
|
苏尹岚
|
186f19e81b
|
刷新历史订单结算价
|
2019-11-06 14:32:18 +08:00 |
|
gazebo
|
208e836f40
|
整理订单调整中对于DeliveryType相关的流程
|
2019-11-06 14:29:13 +08:00 |
|
苏尹岚
|
bec26311fb
|
刷新历史订单结算价
|
2019-11-06 10:20:17 +08:00 |
|
苏尹岚
|
89740b5451
|
刷新历史订单
|
2019-11-06 10:12:34 +08:00 |
|
gazebo
|
dc7d712ff6
|
up
|
2019-11-06 10:10:37 +08:00 |
|
gazebo
|
49a4b7b069
|
添加user2/GetSelfInfo
|
2019-11-06 10:00:36 +08:00 |
|
苏尹岚
|
0a9ec20006
|
刷新历史订单结算价修改
|
2019-11-06 09:40:19 +08:00 |
|
gazebo
|
8d7671f34d
|
微商城订单会自动上架商品
|
2019-11-06 09:38:37 +08:00 |
|
苏尹岚
|
42db76c4ea
|
订单结算价刷新
|
2019-11-06 09:19:33 +08:00 |
|
gazebo
|
c2393c17be
|
变更运营时，发送钉钉消息
|
2019-11-05 18:50:48 +08:00 |
|
苏尹岚
|
5c94299f6c
|
订单查询修改
|
2019-11-05 18:35:45 +08:00 |
|
苏尹岚
|
cf85ed0dd2
|
刷新订单历史结算价修改
|
2019-11-05 18:17:08 +08:00 |
|
gazebo
|
5512efaaf5
|
up
|
2019-11-05 18:08:40 +08:00 |
|
gazebo
|
444e3dadd9
|
尽量去除VendorIDWSC与VendorIDJX相关的无用代码
|
2019-11-05 17:21:21 +08:00 |
|
苏尹岚
|
53a194a135
|
新增按订单刷新历史订单结算价
|
2019-11-05 16:47:43 +08:00 |
|
gazebo
|
00431b701d
|
没有在本地找到的商品，也要设置EarningPrice
|
2019-11-05 15:20:07 +08:00 |
|
gazebo
|
9cbfa6f6ef
|
修复今天改结算引入的bug
|
2019-11-04 20:55:49 +08:00 |
|
gazebo
|
6f23e9087b
|
Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark
|
2019-11-04 18:41:16 +08:00 |
|
gazebo
|
af32f1f7bd
|
syncStoreSkuNew中，因为京东平台以是否有库存表示是否关注，所以不论是否可售，都要设置库存
|
2019-11-04 18:40:49 +08:00 |
|
苏尹岚
|
094f774a8e
|
Merge remote-tracking branch 'origin/mark' into su
|
2019-11-04 17:52:56 +08:00 |
|
苏尹岚
|
6302e38463
|
差异对比程序修改
|
2019-11-04 17:52:34 +08:00 |
|
gazebo
|
0034be1bef
|
结算活动不设置待创建同步标识
|
2019-11-04 17:14:38 +08:00 |
|
gazebo
|
99868cd068
|
优化修改价格包时，更新门店商品同步状态的速度
|
2019-11-04 17:06:31 +08:00 |
|
gazebo
|
a09e3379f3
|
SendMsg2Somebod支持建议y
|
2019-11-04 16:03:31 +08:00 |
|
gazebo
|
ff4f636105
|
Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark
|
2019-11-04 15:42:41 +08:00 |
|
gazebo
|
163087857a
|
对商品名进行trim
|
2019-11-04 15:41:41 +08:00 |
|
苏尹岚
|
44784b8a1d
|
Merge remote-tracking branch 'origin/mark' into su
|
2019-11-04 15:23:42 +08:00 |
|
苏尹岚
|
003b3ee814
|
Merge branch 'su' of e.coding.net:rosydev/jx-callback into su
|
2019-11-04 15:22:11 +08:00 |
|
苏尹岚
|
e1b7f82be3
|
对比差异文件修改
|
2019-11-04 15:21:05 +08:00 |
|
gazebo
|
a186ea33bd
|
up
|
2019-11-04 14:49:35 +08:00 |
|
gazebo
|
d2b387949f
|
ActStoreSkuParam2Model中没有关注的ActSkuFake时被零除的问题
|
2019-11-04 14:45:01 +08:00 |
|
gazebo
|
ff525293a5
|
结算活动不要求门店关注商品
不自动过滤没有关注的商品，会报错
|
2019-11-04 14:30:19 +08:00 |
|
gazebo
|
4e277d854b
|
美团活动不设置sequence（避免重复后报错）
|
2019-11-04 11:41:20 +08:00 |
|
苏尹岚
|
a7aee90c62
|
对比程序差异修改
|
2019-11-04 10:54:16 +08:00 |
|
苏尹岚
|
3c0017c338
|
Merge remote-tracking branch 'origin/mark' into su
|
2019-11-04 09:48:55 +08:00 |
|
苏尹岚
|
f344d711bf
|
对比差异程序修改
|
2019-11-04 09:48:21 +08:00 |
|