Commit Graph

179 Commits

Author SHA1 Message Date
Rosy-zhudan
fdd6d0f462 解决冲突,合并提交 2019-08-07 15:24:35 +08:00
gazebo
f06456cec1 - 用SyncMapWithTimeout管理tasksch任务 2019-08-07 14:55:54 +08:00
Rosy-zhudan
6f105a7598 对比京西和平台商品差异 2019-08-01 16:00:43 +08:00
gazebo
b7de9d4004 - 平台层自己设置OrderCreatedAt 2019-07-18 23:09:23 +08:00
gazebo
da882a7cf5 - 导出订单时(ExportOrders),将售后单的商品去除 2019-07-03 17:29:16 +08:00
gazebo
df95de82e6 - 打印饿百取货码 2019-07-01 11:03:12 +08:00
gazebo
e41bc3b47b * 修复SendAlarmVendorSnapshot中prevSnapshot为nil的bug 2019-06-27 10:26:48 +08:00
gazebo
0adf3e7d31 - 添加对于监控平台门店状态初始版本 2019-06-26 19:29:58 +08:00
gazebo
68e569d885 - GetMissingStoreSkuFromOrder 2019-06-16 11:30:38 +08:00
gazebo
caf7bcc946 - orderman.SaveOrder中使用CreateMultiEntities替代raw sql 2019-06-13 22:19:16 +08:00
gazebo
ca62926d3f - SyncJdStoreProducts 2019-06-13 15:22:32 +08:00
gazebo
c71a9bf40d - 调整单修正实际支付价 2019-06-12 11:24:34 +08:00
gazebo
7f939333df ! GoodsOrder与OrderSku添加VendorPrice表示平台价,而SalePrice表示单品优惠之后的价格 2019-06-11 23:49:21 +08:00
gazebo
d0df80ac1e - ExportShopsHealthInfo 2019-06-11 16:42:23 +08:00
gazebo
083bc279ec - fk 2019-06-10 16:42:46 +08:00
gazebo
0a945bab46 - 处理美团外卖售后多次时,得到的SKU信息重复的情况 2019-05-29 16:57:02 +08:00
gazebo
e161e6f48c - ComposeSkuName中使用utils.LimitUTF8StringLen限制长度 2019-05-25 18:23:28 +08:00
gazebo
5c436326bf + GetAfsOrders
+ GetAfsOrderSkuInfo
2019-05-15 14:55:02 +08:00
gazebo
5af086fe25 - 京东售后单基本处理完成 2019-05-10 12:09:35 +08:00
gazebo
c43750f2f4 + RemoveSkuFromOrder
+ 美团配送调整消息正确更新订单信息
2019-05-01 13:38:41 +08:00
gazebo
fa97e0b038 - 修复饿百调整单消息没有正确更新订单信息的BUG 2019-05-01 10:13:45 +08:00
gazebo
caabbb4a66 - IPurchasePlatformHandler中添加
AgreeOrRefuseRefund
CancelOrder
AdjustOrder
2019-04-13 18:35:58 +08:00
gazebo
6e3b9a8215 - 将微信的备注改为店名相关的信息 2019-04-11 11:59:04 +08:00
gazebo
3203201bc6 - 修复GetPossibleVendorIDFromVendorOrderID中的错误 2019-04-09 17:49:39 +08:00
gazebo
3900e71265 - 将人民币符号换成全角,半角飞鹅打印机打不出来 2019-04-09 14:46:42 +08:00
gazebo
590024e534 - 人民币符号用半角 2019-04-02 15:07:54 +08:00
gazebo
22f9ba419d - 调整网络打印机的打印格式 2019-04-02 09:35:49 +08:00
gazebo
60de9f64bd + PrintOrder
+ GetPrinterStatus
2019-04-01 23:29:47 +08:00
gazebo
d1d056077d - 飞鹅打印机支持 2019-04-01 21:00:15 +08:00
gazebo
ef05d85fc2 - 梳理TIMER,去除TimerTypeBaseExpectedDeliveredTime 2019-03-31 15:46:41 +08:00
gazebo
d2fafe5ec0 - LimitUTF8StringLen 2019-03-31 12:13:47 +08:00
gazebo
344b17d8ca - 去掉dao对于jxutils的依赖 2019-03-25 18:28:00 +08:00
gazebo
2a6f8b9120 - 饿百零售开放平台订单接口中订单ID“order_id”字段长度将调整为19位,和饿了么订单ID“eleme_order_id”字段格式保持一致。改动GetPossibleVendorIDFromVendorOrderID 2019-03-25 18:12:01 +08:00
gazebo
d8b7b41b01 - SplitSkuName don't use comment as name
- add DownloadFileByURL
- refactor UploadWeimobImg4SkuName
- ignore RefreshMissingDadaStores error
- add BuildSkuFromEbaiStore
2019-03-20 09:31:33 +08:00
gazebo
dec14126a7 - replace all goroutine and AfterFunc with recover version 2019-03-15 10:26:30 +08:00
gazebo
796567c364 - in GetOrders, if keyword looks like a orderID, then ignore other conditions. 2019-02-27 10:31:04 +08:00
gazebo
375e857e33 - don't use Unmarshal2Map
- recaculate sku price in updateSku
2019-01-31 15:52:16 +08:00
gazebo
f3b7a0e84e ! format func EarthDistance params from lat, lng1... to lng1, lat1... 2019-01-25 11:41:33 +08:00
gazebo
d0bed4f40a - refactor GetJxStoreIDFromOrder
- add IsOrderPlatformWaybill
2019-01-22 10:19:37 +08:00
gazebo
f096b1da8e - test test miniprogram
- support WSC vendor order id
2019-01-21 16:16:11 +08:00
gazebo
368ac2c931 - specify spu.sku.name 2019-01-12 14:41:40 +08:00
gazebo
6116a5694b - GetStores add range limit. 2019-01-09 10:41:54 +08:00
gazebo
ae9bc84921 - add PendingUnitPrice and PendingOpType in GetStoreSkus result, when param isGetOpRequest is true
- fix some API result to lower camel case
2018-12-20 21:35:27 +08:00
gazebo
f7c5e089ff - jd spu support 2018-12-11 12:44:41 +08:00
gazebo
d9d10c1755 - GetStoresSkusSaleInfo 2018-11-29 13:14:02 +08:00
gazebo
ffae5e8434 - mtwm callback 2018-11-28 20:02:21 +08:00
gazebo
fe01f60e2d - fix bug in jxutils.ComposeSkuName
- mtwm SyncStoreSkus almost ok
2018-11-27 19:26:36 +08:00
gazebo
fc1e2ded61 - refactor DeleteSkuName
- fix bug in FlatMap(should recursively)
2018-11-23 09:43:34 +08:00
gazebo
bc9f801d2d - mark store sku bind as modified when change storevendor price percentage 2018-11-19 20:49:18 +08:00
gazebo
49b9d07153 - ebai prod key added.
- TrimDecorationChar
2018-11-13 09:29:06 +08:00