Rosy-zhudan
|
e64e0cc4fb
|
给数据加锁
|
2019-08-07 15:18:10 +08:00 |
|
Rosy-zhudan
|
f5208eea28
|
Merge remote-tracking branch 'origin/mark' into don
|
2019-08-07 09:06:50 +08:00 |
|
gazebo
|
e3e900cd10
|
- 门店网络打印机设置修改，只有在成功绑定后才执行可能的解绑（之前是先解绑，可能有问题）
- 所有网络打印机适配层写入性API添加EnableStoreWrite控制
|
2019-08-06 21:58:06 +08:00 |
|
gazebo
|
447237f252
|
- fix bug in GetUsers
|
2019-08-06 17:01:51 +08:00 |
|
gazebo
|
a0c74cf02a
|
- GetUsers接口改变
|
2019-08-06 16:40:38 +08:00 |
|
gazebo
|
d5d35274dd
|
- updateActPrice4StoreSkuNameNew中对于活动与结算价，准确处理
|
2019-08-06 16:10:00 +08:00 |
|
gazebo
|
7ad7a7be44
|
- GetEffectiveActStoreSkuInfo中的BUG，对于非结算活动类型，要判断同步状态
|
2019-08-06 15:55:46 +08:00 |
|
gazebo
|
c020130819
|
- tasksch.NewParallelTask2，支持部分失败时得到准备的成功，失败个数信息
|
2019-08-06 14:20:32 +08:00 |
|
gazebo
|
baa9157949
|
- User添加Remark
|
2019-08-06 11:49:42 +08:00 |
|
gazebo
|
438879ac4f
|
- 开始添加casbin做角色，权限管理
|
2019-08-06 11:26:08 +08:00 |
|
gazebo
|
407844aa81
|
- auth2.AddAuthBind的第一个参数从*AuthInfo改为IUser
|
2019-08-06 11:18:38 +08:00 |
|
gazebo
|
88ebbbf9e7
|
- GetUsers添加userID参数
|
2019-08-06 11:15:32 +08:00 |
|
gazebo
|
d0821c05b0
|
- up
|
2019-08-06 11:09:04 +08:00 |
|
gazebo
|
96a160e3b5
|
- 已接单改为待拣货，已拣货改为待配送
|
2019-08-06 10:50:47 +08:00 |
|
gazebo
|
cce39024e1
|
- StoreSkuExt中厂商的SKUID全部换成字符串以免JSON.parse函数在整数大于53位后丢失精度
|
2019-08-06 10:33:38 +08:00 |
|
Rosy-zhudan
|
1d30cad9c2
|
Merge remote-tracking branch 'origin/mark' into don
|
2019-08-06 10:25:11 +08:00 |
|
gazebo
|
dab32bbe0e
|
- SelfDeliveringAndUpdateStatus中添加订单日志
|
2019-08-06 10:22:05 +08:00 |
|
gazebo
|
539cfb31fe
|
- 修复UpdateActStatusByTime中的BUG
|
2019-08-05 16:59:30 +08:00 |
|
Rosy-zhudan
|
58b33c8e77
|
Merge remote-tracking branch 'origin/mark' into don
|
2019-08-05 16:32:51 +08:00 |
|
Rosy-zhudan
|
9afb12ced7
|
修正比较数据的BUG，添加SkuID字段到DiffData结构体
|
2019-08-05 16:32:20 +08:00 |
|
gazebo
|
4b6ed5200f
|
- fk
|
2019-08-05 16:28:53 +08:00 |
|
gazebo
|
044f5860b1
|
- 修复DeleteConfig中删除银行的BUG
|
2019-08-05 15:22:17 +08:00 |
|
Rosy-zhudan
|
dd76433a5d
|
Merge remote-tracking branch 'origin/mark' into don
|
2019-08-05 15:13:44 +08:00 |
|
gazebo
|
a6ef8e4427
|
- ren StoreSkuExt.BindStatus to StoreSkuExt.StoreSkuStatus
|
2019-08-05 15:10:13 +08:00 |
|
gazebo
|
e820abf686
|
- checkConfig添加参数key
|
2019-08-05 14:55:34 +08:00 |
|
gazebo
|
b0b4e67e21
|
- up
|
2019-08-05 12:52:23 +08:00 |
|
gazebo
|
f9b578f0ae
|
- 门店商品可售时更新库存
|
2019-08-05 12:25:29 +08:00 |
|
gazebo
|
c20f7bb360
|
- buildCacheKey to buildCacheKey4Verify
|
2019-08-05 10:49:17 +08:00 |
|
gazebo
|
73169746c9
|
+ user2/GetUsers
|
2019-08-05 09:38:48 +08:00 |
|
Rosy-zhudan
|
9f1fd17d96
|
Merge remote-tracking branch 'origin/mark' into don
|
2019-08-05 08:43:33 +08:00 |
|
gazebo
|
be9f2408f4
|
- LoopMultiStoresVendors添加参数isManagedIt
|
2019-08-04 16:04:43 +08:00 |
|
gazebo
|
48b1d61194
|
- GetStoresVendorSnapshot排除微商城
|
2019-08-04 11:52:52 +08:00 |
|
gazebo
|
582f11521c
|
- 处理设置假营业时间的逻辑BUG（之前逻辑在10点以后重启后，可能导致库存不能恢复）
|
2019-08-04 09:57:18 +08:00 |
|
Rosy-zhudan
|
c9ce8a5b26
|
Merge remote-tracking branch 'origin/mark' into don
|
2019-08-04 09:28:46 +08:00 |
|
gazebo
|
972636e434
|
- AutoSaleStoreSku添加参数isNeedSync控制是否主动同步，定时任务不需要，因为马上就是每晚的定时同步
|
2019-08-03 22:26:03 +08:00 |
|
gazebo
|
c088b793e8
|
- fk
|
2019-08-03 16:06:08 +08:00 |
|
gazebo
|
7a3bd58e63
|
- updateActPrice4StoreSkuNameNew中skuIDs为空直接返回
|
2019-08-03 16:04:27 +08:00 |
|
gazebo
|
71d91bb102
|
- 启用新同步逻辑
|
2019-08-03 08:40:41 +08:00 |
|
gazebo
|
b85e88bef1
|
- doDailyWork.SyncStoresSkus改为同步
|
2019-08-02 21:11:36 +08:00 |
|
Rosy-zhudan
|
876af999c3
|
京西平台和其他平台商品的对比
|
2019-08-02 17:38:07 +08:00 |
|
gazebo
|
1d036d919b
|
- 调价包改为按SKU的价格来使用（GetPricePercentage）
|
2019-08-02 17:21:13 +08:00 |
|
gazebo
|
8343061c5f
|
- 修复BaseTask.run中消息提醒的BUG
|
2019-08-02 16:53:27 +08:00 |
|
gazebo
|
87d78777af
|
- 设置门店假营业时间放在每晚例行同步任务之后
|
2019-08-02 16:23:36 +08:00 |
|
Rosy-zhudan
|
e3e57204f6
|
关闭本地写文件开关
|
2019-08-02 15:39:56 +08:00 |
|
Rosy-zhudan
|
6a8b2023dc
|
Merge remote-tracking branch 'origin/mark' into don
|
2019-08-02 15:36:57 +08:00 |
|
gazebo
|
8518248080
|
- 饿百平台运单取消后，以快递费最高10元直接发三方运单
|
2019-08-02 15:35:07 +08:00 |
|
Rosy-zhudan
|
06d564331e
|
京西和平台商品差异
|
2019-08-02 15:33:28 +08:00 |
|
gazebo
|
7f40ee9963
|
- autoSaleAt set to 20:45:00
|
2019-08-02 14:46:52 +08:00 |
|
gazebo
|
37b894e112
|
+ 添加cms.autoSaleAt
|
2019-08-02 14:40:58 +08:00 |
|
gazebo
|
00e0106e9b
|
+ cms.printerStatusName
|
2019-08-02 14:29:48 +08:00 |
|