gazebo
|
ec612b807b
|
- fk
|
2019-08-26 17:31:56 +08:00 |
|
gazebo
|
a39a4b7917
|
- UpdateStore中调用updateCourierStores时的判断逻辑修改
|
2019-08-26 16:58:08 +08:00 |
|
gazebo
|
7bd415c21f
|
- up
|
2019-08-26 16:01:12 +08:00 |
|
gazebo
|
20c63e7f59
|
- auth1与auth2以为是兼容
|
2019-08-26 15:17:42 +08:00 |
|
gazebo
|
fcc87c34af
|
- TransferLegacyWeixins中采用增量式
|
2019-08-26 11:44:47 +08:00 |
|
Nathan drake
|
ea97ad1a6c
|
Accept Merge Request #38: (don -> mark)
Merge Request: 重构-开启或结束所有平台商店的额外时间
Created By: @Nathan drake
Accepted By: @Nathan drake
URL: https://dev.tencent.com/u/XJH-Rosy/p/jx-callback/git/merge/38
|
2019-08-25 10:12:19 +08:00 |
|
Rosy-zhudan
|
949d4e7c8d
|
重构-开启或结束所有平台商店的额外时间
|
2019-08-25 10:05:37 +08:00 |
|
gazebo
|
881198d0f1
|
- GetStores添加provinceCode
|
2019-08-22 19:19:01 +08:00 |
|
gazebo
|
6b06041140
|
- 将每晚定时刷的任务拆分成京东与非京东
|
2019-08-21 22:09:44 +08:00 |
|
gazebo
|
966646f953
|
- 去掉GetStores的坐标转（转换至百度坐标要百度API，高德不行）
|
2019-08-21 21:28:23 +08:00 |
|
gazebo
|
2be1c7b71d
|
- GetStores添加参数:startStoreID, coordinateType。返回值添加provinceName省名
|
2019-08-21 18:21:07 +08:00 |
|
gazebo
|
2769f18ab4
|
+ OperationTime2StrWithSecond
|
2019-08-21 17:38:06 +08:00 |
|
gazebo
|
cdc5ec75b3
|
+ ScheduleTimerFuncOnce
|
2019-08-21 17:22:02 +08:00 |
|
gazebo
|
5e94bf4dbd
|
- fk
|
2019-08-21 16:42:36 +08:00 |
|
gazebo
|
e626d4242f
|
- fk
|
2019-08-21 16:34:49 +08:00 |
|
gazebo
|
8e284beba0
|
+ StoreMap添加FakeOpenStart和FakeOpenStop
|
2019-08-21 16:28:57 +08:00 |
|
gazebo
|
c35df3a5a4
|
- 同步门店商品时，修改商品信息时不改价（以免活动引起的失败），而用单独的改价来改
|
2019-08-21 15:35:13 +08:00 |
|
gazebo
|
9b8173d0f7
|
- 修改getGetStoresSkusBaseSQL中查询导常商品的逻辑
|
2019-08-21 14:17:02 +08:00 |
|
gazebo
|
c0339d245a
|
- 修复GetSingleStoreVendorIDs的bug
|
2019-08-21 11:53:41 +08:00 |
|
gazebo
|
2ca7e5accc
|
- 处理微商城订单中的SKU没有商家自编码的情况
|
2019-08-21 11:24:42 +08:00 |
|
gazebo
|
c5f859c92e
|
- auth2添加固定TOKEN
|
2019-08-21 09:17:28 +08:00 |
|
gazebo
|
bf3e825f11
|
- SyncStoresSkus2中，当setSyncStatus不为0时，在要处理相应门店时，才设置相应标志（之前是一开始全部设置标志）
|
2019-08-21 08:34:32 +08:00 |
|
XJH-Rosy
|
360844863c
|
Accept Merge Request #37: (don -> mark)
Merge Request: 把京西有，平台无且没有待创建标记的商品加上待创建标记
Created By: @Nathan drake
Accepted By: @XJH-Rosy
URL: https://coding.net/u/XJH-Rosy/p/jx-callback/git/merge/37
|
2019-08-20 17:20:28 +08:00 |
|
Rosy-zhudan
|
55a1ec6ff5
|
得到敏感词列表
|
2019-08-20 17:16:47 +08:00 |
|
Rosy-zhudan
|
faef402cbb
|
修改-把京西有，平台无且没有待创建标记的商品加上待创建标记
|
2019-08-20 16:50:09 +08:00 |
|
Rosy-zhudan
|
212800934f
|
把京西有，平台无且没有待创建标记的商品加上待创建标记
|
2019-08-20 15:56:24 +08:00 |
|
gazebo
|
3780f5c62e
|
- 用户添加角色时，判断用户类型
|
2019-08-20 15:36:49 +08:00 |
|
gazebo
|
73a26e0d36
|
- GetStoresOrderSaleInfoNew
|
2019-08-20 15:00:29 +08:00 |
|
gazebo
|
71dec1ed4c
|
- up
|
2019-08-20 14:53:52 +08:00 |
|
gazebo
|
927a5059ed
|
- fk
|
2019-08-20 14:42:24 +08:00 |
|
gazebo
|
1a54bdd91d
|
- up
|
2019-08-20 14:28:00 +08:00 |
|
gazebo
|
6bd473839c
|
- 修复GetStoresOrderSaleInfoNew中的bug
|
2019-08-20 14:07:31 +08:00 |
|
gazebo
|
bcd8eba95e
|
- fix bug in GetStoresOrderSaleInfoNew
|
2019-08-20 12:09:02 +08:00 |
|
gazebo
|
467bb42e13
|
- UpdatStore时，如果是外卖管理，忽略printerKey
|
2019-08-20 11:43:09 +08:00 |
|
gazebo
|
fa3d022750
|
Merge branch 'mark' of git.coding.net:XJH-Rosy/jx-callback into mark
|
2019-08-20 11:06:09 +08:00 |
|
gazebo
|
7a91faec5b
|
+ GetStoresOrderSaleInfoNew
|
2019-08-20 10:59:47 +08:00 |
|
gazebo
|
73b62ca1a9
|
- comment
|
2019-08-20 08:40:58 +08:00 |
|
XJH-Rosy
|
81845d2ed6
|
Accept Merge Request #36: (don -> mark)
Merge Request: 增加打印大字体的功能
Created By: @Nathan drake
Accepted By: @XJH-Rosy
URL: https://coding.net/u/XJH-Rosy/p/jx-callback/git/merge/36
|
2019-08-20 08:26:30 +08:00 |
|
gazebo
|
3b38645c71
|
- act.SyncAct中，当前逻辑要求传入活动的全部SKU信息（以便低层做一些判断，比如全部删除时要取消，所以暂时删除storeIDs与skuIDs这两个参数
|
2019-08-19 19:00:43 +08:00 |
|
Rosy-zhudan
|
10da91668f
|
增加打印大字体的功能
|
2019-08-19 18:09:03 +08:00 |
|
gazebo
|
9c825058c8
|
- up
|
2019-08-19 17:43:35 +08:00 |
|
gazebo
|
59f07b567a
|
- fk
|
2019-08-19 16:57:21 +08:00 |
|
gazebo
|
7317b5660c
|
- 添加30888到每晚同步忽略列表
|
2019-08-19 16:41:58 +08:00 |
|
gazebo
|
80ba7c9759
|
- 修复ebai.getVendorCategories中的bug
|
2019-08-19 15:36:35 +08:00 |
|
gazebo
|
6801e17fc9
|
- 避免饿百网页上拉下来的活动重名
|
2019-08-19 14:12:25 +08:00 |
|
XJH-Rosy
|
7653f5ff5a
|
Accept Merge Request #35: (don -> mark)
Merge Request: 敏感词过滤
Created By: @Nathan drake
Accepted By: @XJH-Rosy
URL: https://coding.net/u/XJH-Rosy/p/jx-callback/git/merge/35
|
2019-08-19 11:27:08 +08:00 |
|
Rosy-zhudan
|
9773900d34
|
敏感词修改代码结构
|
2019-08-19 11:22:30 +08:00 |
|
Rosy-zhudan
|
793a9a135a
|
Merge remote-tracking branch 'origin/mark' into don
|
2019-08-19 11:13:57 +08:00 |
|
gazebo
|
e52718ca2d
|
- 更新beta京东的token
|
2019-08-19 11:02:02 +08:00 |
|
gazebo
|
a1397d11f9
|
+ feie_test.go
|
2019-08-19 11:00:25 +08:00 |
|