Commit Graph

112 Commits

Author SHA1 Message Date
gazebo
1df08e9360 - 平台取消申请审核时限参数
- 一些订单操作标记
- LockStatusTime
2019-04-28 12:14:24 +08:00
gazebo
beb6482a1a - WaybillStatusFailed也会重新创建三方运单
- dadaapi.OrderStatusExpired映射为WaybillStatusCanceled(之前为WaybillStatusFailed)
- 达达重新创建运单时,判断之前的运单状态,如果是WaybillStatusFailed,则为新增订单
- 去掉dao. WrapDB
2019-04-27 10:58:19 +08:00
gazebo
976e1b26e4 - GetStoreOrderAfterTime修改条件为小于OrderStatusEndBegin 2019-04-23 10:12:58 +08:00
gazebo
a29eee3d06 - GetStoreOrderAfterTime ORDER BY t1.order_created_at DESC, t1.id DESC 2019-04-23 09:55:08 +08:00
gazebo
d93906c5e9 - fk 2019-04-18 19:17:38 +08:00
gazebo
2b4e036619 - 绑定达达时,刷新门店信息 2019-04-18 19:01:12 +08:00
gazebo
65790a6395 - 饿百与美团外卖,全部同步时,删除sku或skuname下架的商品 2019-04-17 14:39:54 +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
844cc70c1e - 将Dao.DB中db改为Db 2019-04-16 16:14:08 +08:00
gazebo
16725bf8f8 - 修改Rollback调用时机
- 创建三方运单判断EnableStoreWrite
2019-04-13 11:30:24 +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
gazebo
ca8d0b362b - 单门店同步商品时,只同步SKUNAME和SKU可售的 2019-04-12 11:16:39 +08:00
gazebo
e2f728889b - dao.GetStoreSkus 与 dao.GetFullStoreSkus 智能取sku name的img 2019-04-11 17:06:46 +08:00
gazebo
6e3b9a8215 - 将微信的备注改为店名相关的信息 2019-04-11 11:59:04 +08:00
gazebo
aeca8901d8 - 同步门店商品时,以门店价格排序 2019-04-10 13:56:54 +08:00
gazebo
96fb2d9535 - 重构createWaybillOn3rdProviders 2019-03-30 17:11:23 +08:00
gazebo
c1df1f8ca6 - 使用utils.Struct2MapByJson替代直接使用structs.Map 2019-03-27 22:45:00 +08:00
gazebo
e11d4c5e29 - fk 2019-03-27 18:53:24 +08:00
gazebo
33fc2ac460 - fk 2019-03-27 18:50:55 +08:00
gazebo
8c20002ef8 - GetSkusCategories要求sku_category是未删除的 2019-03-27 18:44:35 +08:00
gazebo
344b17d8ca - 去掉dao对于jxutils的依赖 2019-03-25 18:28:00 +08:00
gazebo
8e213c2392 - 数据库事务支持嵌套 2019-03-25 18:11:34 +08:00
gazebo
25ac631c5c - refactor jxcontent and tasksch (remove dependency from jxcontent to tasksch)
- send dingding msg to user when async task finished
2019-03-22 15:04:28 +08:00
gazebo
15c703b469 - refactor test init flow 2019-03-20 22:28:51 +08:00
gazebo
120e0dde6c - 将微商场当成一个单一商场,不再根据lbs来派单 2019-03-20 22:02:30 +08:00
gazebo
add27be617 - set id to 0 when syncStatus is new in dao.SetStoreSkuSyncStatus 2019-03-20 10:48:15 +08:00
gazebo
6266315684 - create dada store when after jx store created. 2019-03-18 16:26:11 +08:00
gazebo
1e53e4edae - improve jxutils.SplitStoreName 2019-03-18 15:04:42 +08:00
gazebo
2e65154206 - v2 token format changed
- DisableUser
- clear all tokens when disable user
- handle ding ding user leave event
2019-03-09 20:59:18 +08:00
gazebo
4b362baea9 - fix bug in UnionFindAuthBind 2019-03-09 14:20:21 +08:00
gazebo
fae11a80ff - change SetStoreSkuSyncStatus, clear syncStatus for deleted store sku 2019-03-08 18:14:01 +08:00
gazebo
acc3cd5731 - new field GoodsOrder.Flag
- SetOrderPrintStatus
2019-03-06 12:22:41 +08:00
gazebo
ccf9a4d6b9 - first edition of long pulling 2019-03-05 22:35:20 +08:00
gazebo
8a1425c4d0 - authType userID2 to userid2 2019-03-05 12:06:24 +08:00
gazebo
f925049983 - fk 2019-03-05 11:43:40 +08:00
gazebo
4e13b0a42d - nil compare 2019-03-04 18:10:19 +08:00
gazebo
97b23b2a09 - fk 2019-03-04 18:01:46 +08:00
gazebo
38526471aa - fix bug in GetUserByID 2019-03-04 16:48:51 +08:00
gazebo
d67f09007d - add GetBindAuthInfo 2019-03-04 12:01:59 +08:00
gazebo
6793e7443d - user2 2019-03-03 22:20:07 +08:00
gazebo
421240ac54 - first edition of auth2 2019-03-01 17:43:17 +08:00
gazebo
2817786cea - use RefreshMissingDadaStores in AddStoreVendorMap 2019-02-18 17:10:33 +08:00
gazebo
80a38f6790 - delete then add in TransformJdSpu2Sku 2019-02-14 17:08:25 +08:00
gazebo
375e857e33 - don't use Unmarshal2Map
- recaculate sku price in updateSku
2019-01-31 15:52:16 +08:00
gazebo
7a5326a1dc - fix bug when not use Unmarshal2Map correctly 2019-01-31 11:58:15 +08:00
gazebo
d420aa68fe - add param valueMask to UpdateEntityLogicallyAndUpdateSyncStatus
- judge change content in UpdateSku
- support change sku spec
2019-01-31 09:46:23 +08:00
gazebo
a61d047f5e - add dao.SetWeiXinsEmpty2Null
- call SetWeiXinsEmpty2Null in BindMobile2Store and AddMobile2Mobile
2019-01-30 14:13:58 +08:00
gazebo
600d66568c - add created_at, updated_at, last_operator to WeiXins 2019-01-26 16:53:14 +08:00