gazebo
|
fa3d022750
|
Merge branch 'mark' of git.coding.net:XJH-Rosy/jx-callback into mark
|
2019-08-20 11:06:09 +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 |
|
Rosy-zhudan
|
10da91668f
|
增加打印大字体的功能
|
2019-08-19 18:09:03 +08:00 |
|
gazebo
|
9c825058c8
|
- up
|
2019-08-19 17:43:35 +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 |
|
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
|
a1397d11f9
|
+ feie_test.go
|
2019-08-19 11:00:25 +08:00 |
|
Rosy-zhudan
|
5c124f5c8f
|
Merge remote-tracking branch 'origin/mark' into don
|
2019-08-19 10:36:25 +08:00 |
|
Rosy-zhudan
|
dee9eea64a
|
修改敏感词过滤代码结构
|
2019-08-19 10:27:04 +08:00 |
|
gazebo
|
d7b38e196e
|
+ AddStoreBossByMoble
|
2019-08-19 10:04:25 +08:00 |
|
Rosy-zhudan
|
9425f3c07a
|
Merge remote-tracking branch 'origin/mark' into don
|
2019-08-19 08:33:05 +08:00 |
|
gazebo
|
e7acd75c25
|
- SyncQualify中错误添加门店信息
|
2019-08-16 21:08:18 +08:00 |
|
Rosy-zhudan
|
9b09fc9cae
|
Merge remote-tracking branch 'origin/mark' into don
|
2019-08-16 14:29:07 +08:00 |
|
Rosy-zhudan
|
4636ea7fd5
|
敏感词过滤
|
2019-08-16 14:26:22 +08:00 |
|
gazebo
|
c27d610fbb
|
- 整理sync.go
|
2019-08-16 14:12:11 +08:00 |
|
gazebo
|
5e6c087ba2
|
- jd.SyncQualify调整
|
2019-08-15 17:14:23 +08:00 |
|
gazebo
|
89ee6b5006
|
- SyncQualify中根据Store.LicenceType来判断是否是个人
|
2019-08-15 16:41:05 +08:00 |
|
gazebo
|
7aa548e1dc
|
- 京东到家资质相关的日期格式修复
|
2019-08-15 16:29:26 +08:00 |
|
gazebo
|
26484d45e3
|
- jd.SyncQualify改为提交
|
2019-08-15 15:38:59 +08:00 |
|
gazebo
|
3c5f25b839
|
+ SyncStoresQualify
|
2019-08-15 12:40:14 +08:00 |
|
gazebo
|
c607fa931c
|
+ JdPageAPI
|
2019-08-15 08:56:02 +08:00 |
|
gazebo
|
d3ed741016
|
- up
|
2019-08-14 13:57:12 +08:00 |
|
gazebo
|
667e27d62e
|
- up
|
2019-08-14 10:32:15 +08:00 |
|
gazebo
|
03e23ca0fd
|
- 修复之前将老平台同步逻辑注释掉引入的BUG
|
2019-08-14 00:20:35 +08:00 |
|
gazebo
|
1829156fba
|
- 将老平台同步逻辑注释掉
|
2019-08-13 18:09:12 +08:00 |
|
gazebo
|
37b931abe5
|
+ OrderSkuFinancial.StoreSubID, StoreSubName
|
2019-08-13 10:27:29 +08:00 |
|
gazebo
|
fb2d8734f9
|
- 尝试处理京东售后SKU是非正品的情况
|
2019-08-11 18:21:40 +08:00 |
|
gazebo
|
1111a70277
|
- 不过滤饿百目录名
|
2019-08-09 18:17:57 +08:00 |
|
gazebo
|
8768fe8236
|
- FreeBatchStoreSkuInfo与FreeBatchStoreSkuSyncInfo添加任务名
|
2019-08-07 14:15:30 +08:00 |
|
gazebo
|
638d851872
|
- 避免在美团分类别没有实际变化时修改报错
|
2019-08-07 10:04:42 +08:00 |
|
gazebo
|
b1209a954b
|
- 修改门店状态同步逻辑，只有在京西本地修改过门店状态相关的信息后才同步
|
2019-08-07 09:52:35 +08:00 |
|
gazebo
|
e3e900cd10
|
- 门店网络打印机设置修改，只有在成功绑定后才执行可能的解绑（之前是先解绑，可能有问题）
- 所有网络打印机适配层写入性API添加EnableStoreWrite控制
|
2019-08-06 21:58:06 +08:00 |
|
gazebo
|
c020130819
|
- tasksch.NewParallelTask2，支持部分失败时得到准备的成功，失败个数信息
|
2019-08-06 14:20:32 +08:00 |
|
gazebo
|
1d036d919b
|
- 调价包改为按SKU的价格来使用（GetPricePercentage）
|
2019-08-02 17:21:13 +08:00 |
|
gazebo
|
00e0106e9b
|
+ cms.printerStatusName
|
2019-08-02 14:29:48 +08:00 |
|
gazebo
|
c0b6ae7de7
|
- 在修改美团外卖门店营业时间由于配送时间限制出错后，尝试根据限制时间调整后修改
|
2019-08-02 13:40:05 +08:00 |
|
gazebo
|
e2a620b305
|
- jd.setSkuNameListPic
|
2019-08-02 11:01:57 +08:00 |
|
gazebo
|
92daec3d93
|
- 在jd.getStoreSkusBareInfoLimitSize设置Stock
|
2019-08-02 10:25:26 +08:00 |
|
gazebo
|
a5f4f054b2
|
+ purchase/jd/store_sku2_test.go
|
2019-08-01 20:12:33 +08:00 |
|
gazebo
|
8af8c4e0e2
|
- 去掉ebai.market_price
|
2019-08-01 20:11:07 +08:00 |
|
gazebo
|
1d0aa132f9
|
- GoodsOrder.WaybillTipMoney的含义改为京西主动加的小费
- partner.IUpdateWaybillTip改为IAddWaybillTip
|
2019-08-01 18:09:23 +08:00 |
|
gazebo
|
0337cd6c91
|
- 漏了一个文件
|
2019-08-01 17:18:08 +08:00 |
|
gazebo
|
046c8beef9
|
- FreeBatchStoreSkuInfo及FreeBatchStoreSkuSyncInfo,FreeBatchCategoryIDOp并行数改为1
- FreeBatchStoreSkuInfo及FreeBatchStoreSkuSyncInfo任务handler添加task参数
|
2019-08-01 17:16:01 +08:00 |
|
gazebo
|
ccfebdb7ac
|
- UpdateStore中只有在需要时才调用updateCourierStores
- 修复jd.GetSkus的BUG
|
2019-08-01 13:50:54 +08:00 |
|
gazebo
|
84c0b93ec4
|
+ partner.GetSkus, jd.GetSkus
|
2019-08-01 10:16:26 +08:00 |
|
gazebo
|
48132e3155
|
- 因应jdapi.QuerySkuInfos和QueryListBySkuIds接口改变
|
2019-07-31 18:14:16 +08:00 |
|
gazebo
|
adc570ee2e
|
+ GoodsOrder.WaybillTipMoney
|
2019-07-31 15:23:35 +08:00 |
|