Commit Graph

1653 Commits

Author SHA1 Message Date
gazebo
ebe0fcb15c - mtwm与ebai在删除门店分类或商品信息时,如果是没有创建的,直接忽略 2019-04-17 12:32:55 +08:00
gazebo
36e117f313 - 修复tasksch中任务panic导致的BUG 2019-04-17 12:26:51 +08:00
gazebo
ab6e30d630 - mtwm.SyncLocalStoreCategory中,如果发现store_sku_category_map有记录,但还没有同步,要计算num 2019-04-16 19:39:37 +08:00
gazebo
ba3872327a - mtwm.SyncStoreSkus中SyncStoreCategory必然调用 2019-04-16 19:15:20 +08:00
gazebo
eb174c4d2a - fk 2019-04-16 18:03:31 +08:00
gazebo
be0ab44158 - 美团同步商品时添加sequence 2019-04-16 17:36:07 +08:00
gazebo
0f871847e9 - remove mtwmapi.MsgTypeOrderModified 2019-04-16 17:20:40 +08:00
gazebo
8083f2f638 ! orderman中尽量使用事务
! orderman中全换成dao.DaoDB
2019-04-16 16:33:53 +08:00
gazebo
3b8209906f - PrintOrderByOrder只有在prod下才生效 2019-04-16 16:15:10 +08:00
gazebo
844cc70c1e - 将Dao.DB中db改为Db 2019-04-16 16:14:08 +08:00
gazebo
fc5cb88d8b - 京东订单SkuID的容错处理 2019-04-16 16:10:49 +08:00
gazebo
96a29cdcf5 - StoreSkuNameExt中的json 2019-04-16 11:51:21 +08:00
gazebo
4e7ff8ff1f - 关注之后再关注不操作 2019-04-16 11:41:02 +08:00
gazebo
cb35d92feb - 一些同步的任务名添加关键信息 2019-04-16 09:42:36 +08:00
gazebo
98e873f0b2 - AgreeOrRefuseRefund renmae to AgreeOrRefuseCancel
- 修改饿百门店状态判断的错误
2019-04-16 09:28:02 +08:00
gazebo
ba85c710b5 - GetSkuNames keyword可搜索upc 2019-04-15 15:04:57 +08:00
gazebo
a6dfc8dbda - 创建与修改SkuName时,防止UPC重复 2019-04-15 15:02:45 +08:00
gazebo
5e3bd659c9 - cms.GetStoresSkus 2019-04-15 14:33:22 +08:00
gazebo
2747e6f1c5 - remove agentId from dingapi.Sign 2019-04-15 13:31:11 +08:00
gazebo
b6468297a1 - ddapi.Sign 2019-04-15 12:42:43 +08:00
gazebo
ba463210b3 - 修改IsMobileFake,13位及以上为非真实号 2019-04-14 22:48:57 +08:00
gazebo
b91fe783f6 - ebai.CmdOrderPartRefund的业务流程处理 2019-04-14 17:54:47 +08:00
gazebo
99f675fcb4 - fix StoreOrderFinishedPickup to OrderFinishedPickup for mtwm 2019-04-14 17:03:31 +08:00
gazebo
bb02e6fe9e - AdjustOrder
- CancelOrder
2019-04-14 17:01:29 +08:00
gazebo
89e076343d - test mtwm.MsgTypeOrderFinishedPickup 2019-04-14 16:28:20 +08:00
gazebo
c3d272d0d3 - up 2019-04-14 13:27:35 +08:00
gazebo
e33ab1d62a - add shop_close in ebai.onShopMsgPush 2019-04-14 12:43:38 +08:00
gazebo
06c54755b0 - up 2019-04-14 12:38:11 +08:00
gazebo
caabbb4a66 - IPurchasePlatformHandler中添加
AgreeOrRefuseRefund
CancelOrder
AdjustOrder
2019-04-13 18:35:58 +08:00
gazebo
16725bf8f8 - 修改Rollback调用时机
- 创建三方运单判断EnableStoreWrite
2019-04-13 11:30:24 +08:00
gazebo
0055892cb2 - 修复financial中的事务问题,某些情况上return nil需要回滚 2019-04-13 11:08:24 +08:00
gazebo
a12889d133 Merge branch 'mark' of git.coding.net:XJH-Rosy/jx-callback into mark 2019-04-13 09:34:17 +08:00
gazebo
53cc491a04 - order_Financial to order_financial 2019-04-13 09:33:46 +08:00
XJH-Rosy
d9785939cd Accept Merge Request #12: (lcw -> mark)
Merge Request: 修复一些报警
Created By: @XJH-Rosy
Accepted By: @XJH-Rosy
URL: https://coding.net/u/XJH-Rosy/p/jx-callback/git/merge/12
2019-04-12 17:55:47 +08:00
gazebo
cc627da2a4 - 修复FormalizeStoreStatus中的死锁问题 2019-04-12 17:26:28 +08:00
gazebo
47ec846c36 - dao.FormalizeStoreStatus 2019-04-12 17:10:35 +08:00
renyutian
211a9928e0 结账信息收到重复订单推送处理 2019-04-12 16:30:59 +08:00
gazebo
c968cfe109 - fk 2019-04-12 16:29:52 +08:00
renyutian
70876759a1 Merge remote-tracking branch 'origin/mark' into lcw 2019-04-12 16:26:16 +08:00
gazebo
77c5a16c08 - 接收门店状态消息,本地同步状态,京东暂时无效 2019-04-12 16:22:22 +08:00
renyutian
b342af3e7e 美团正向账单bug优化 skuid-->vendorskuid 2019-04-12 13:48:22 +08:00
gazebo
ca8d0b362b - 单门店同步商品时,只同步SKUNAME和SKU可售的 2019-04-12 11:16:39 +08:00
gazebo
06f92d952c - 处理美团外卖shipping/list返回的配送范围(area)有时是整数,有时是字符串的情况 2019-04-12 09:08:02 +08:00
gazebo
f3939687ed - ebai.OnCallbackMsg中要判断事件后才会调用GetOrderIDFromMsg 2019-04-11 19:46:05 +08:00
gazebo
e2f728889b - dao.GetStoreSkus 与 dao.GetFullStoreSkus 智能取sku name的img 2019-04-11 17:06:46 +08:00
gazebo
1c77d18e23 - 由于微盟微商城TOKEN的原因,在ALPHA禁用 2019-04-11 16:27:24 +08:00
gazebo
5f9b2a08bb - 重构UploadImg 2019-04-11 16:19:28 +08:00
gazebo
660ff1e34c - 去掉ebai.GetAllRemoteSkus中一个冗长的调度输出
- BaseTask marshal时忽略Result
2019-04-11 15:49:41 +08:00
gazebo
911c6d83ce - 只在prod时做手机号与差评刷新 2019-04-11 14:54:01 +08:00
gazebo
53fa68d3ba - 饿百图片库管理 2019-04-11 14:39:45 +08:00