Rosy-zhudan
|
f208fea6a1
|
门店配送范围-修改多边形计算公式
|
2019-09-17 09:26:35 +08:00 |
|
Rosy-zhudan
|
299444ddd5
|
提交
|
2019-09-17 08:31:04 +08:00 |
|
gazebo
|
44810b2957
|
+ CalcPolygonAreaAutonavi
|
2019-09-16 20:54:55 +08:00 |
|
Rosy-zhudan
|
e35d86f690
|
修改门店评分细节
|
2019-09-16 16:20:46 +08:00 |
|
Rosy-zhudan
|
91b05593e4
|
Merge remote-tracking branch 'origin/mark' into don
|
2019-09-12 17:58:31 +08:00 |
|
gazebo
|
3de6498de4
|
+ NewSeqTask2
|
2019-09-12 17:35:43 +08:00 |
|
Rosy-zhudan
|
8378b832a3
|
Merge remote-tracking branch 'origin/mark' into don
|
2019-09-11 17:38:54 +08:00 |
|
Rosy-zhudan
|
f62268821e
|
门店配送面积计算(根据经纬度计算多边形球面积-凸多边形和凹多边形)
|
2019-09-11 10:15:28 +08:00 |
|
gazebo
|
690b4c2e69
|
- up
|
2019-09-10 18:09:08 +08:00 |
|
gazebo
|
a90941b26e
|
- 京西自营商城
|
2019-09-10 17:21:44 +08:00 |
|
gazebo
|
fb8732c94c
|
- 门店状态变化添加发送微信通知消息
|
2019-09-10 11:23:39 +08:00 |
|
gazebo
|
f4e97af0e1
|
+ 添加autils.NewStoreBossRole
|
2019-09-09 12:03:07 +08:00 |
|
gazebo
|
937cfe187c
|
- up
|
2019-09-07 10:47:13 +08:00 |
|
gazebo
|
47a0a892b6
|
- 重构了dao.GetAuthBind和dao.GetUserBindAuthInfo
- AuthBind的唯一索引调整为"AuthID", "Type", "BindType", "DeletedAt"
|
2019-09-06 16:26:47 +08:00 |
|
gazebo
|
a89928a366
|
- remove fuck
|
2019-09-06 15:11:36 +08:00 |
|
gazebo
|
898955729e
|
- SendSMSMsg中处理重复号码的情况
|
2019-09-06 13:37:47 +08:00 |
|
gazebo
|
5bc792f337
|
- 修改NotifyNewOrder
|
2019-09-06 10:45:44 +08:00 |
|
gazebo
|
e52f0e260a
|
- 发送短信时判断EnableStoreWrite
|
2019-09-06 10:18:09 +08:00 |
|
gazebo
|
0fbe4d7024
|
- 新订单时，发送短信消息
|
2019-09-06 10:16:09 +08:00 |
|
gazebo
|
522c9082ef
|
- 修复dao.GetUserList的bug
- QueryActs添加参数syncStatus
|
2019-09-05 18:02:53 +08:00 |
|
gazebo
|
a0bb7d37f0
|
- 将IsMobileFake用IsStringLikeMobile替换
- 添加HandleOrder4Consignee, GetRealMobile4Order和GetAuthType4Vendor
- 添加GoodsOrder.VendorUserID
|
2019-09-04 18:50:25 +08:00 |
|
gazebo
|
5105a00075
|
- RegisterUser-->RegisterUserWithMobile
|
2019-09-04 17:44:20 +08:00 |
|
gazebo
|
dad8adc4bf
|
+ AuthBind中添加BindType
- 合并函数GetAuthBindsByAuthID2
- User中的mobile与email改为可为null
|
2019-09-03 15:35:54 +08:00 |
|
gazebo
|
51727df4de
|
- RebindAllPrinters中改用NewParallelTask
|
2019-09-01 10:06:28 +08:00 |
|
gazebo
|
bb69051742
|
- 修复将易联云token中的ExpireIn处理错误（没有当成秒）
|
2019-08-31 11:26:50 +08:00 |
|
gazebo
|
27adff6add
|
- ParallelTask结束后，清除subFinishChan与taskChan
|
2019-08-30 08:50:07 +08:00 |
|
gazebo
|
bfa6ca2b9e
|
- CaculateSkuEarningPrice支持四舍五入
|
2019-08-29 17:47:50 +08:00 |
|
Rosy-zhudan
|
1ea9c5aca2
|
修正和重构代码
|
2019-08-29 16:05:29 +08:00 |
|
Rosy-zhudan
|
511a0b02e9
|
Merge remote-tracking branch 'origin/mark' into don
|
2019-08-29 14:49:09 +08:00 |
|
Rosy-zhudan
|
ebfc3c3a9a
|
生成Base64格式的二维码/条形码
|
2019-08-29 14:48:13 +08:00 |
|
Rosy-zhudan
|
71f918568c
|
二维码/条形码的生成
|
2019-08-29 11:54:21 +08:00 |
|
gazebo
|
701da73a6e
|
- BaseTask.GetResult中成功返回结果后，结果在任务中会被删除（以免被管理的任务不必要的HOLD住对象）
|
2019-08-29 11:23:17 +08:00 |
|
gazebo
|
6c805edf92
|
- tasksch中，任务完成后要将worker置空，否则被管理的任务的worker会hold住大量对象
|
2019-08-29 11:19:54 +08:00 |
|
gazebo
|
07edb6a495
|
- GetMobileAndUserID中对于V1的TOKEN，也尝试返回user2的ID
|
2019-08-28 16:23:59 +08:00 |
|
gazebo
|
4a54ea1ec2
|
+ UnmanageTasks
|
2019-08-28 09:19:43 +08:00 |
|
gazebo
|
7dfa59e6e0
|
- 区分菜市与果园的调试端口
|
2019-08-27 10:00:40 +08:00 |
|
gazebo
|
20c63e7f59
|
- auth1与auth2以为是兼容
|
2019-08-26 15:17:42 +08:00 |
|
gazebo
|
2769f18ab4
|
+ OperationTime2StrWithSecond
|
2019-08-21 17:38:06 +08:00 |
|
gazebo
|
59f07b567a
|
- fk
|
2019-08-19 16:57:21 +08:00 |
|
gazebo
|
14e3594455
|
- GetStoresOrderSaleInfo添加售后单信息
|
2019-08-16 11:08:09 +08:00 |
|
gazebo
|
97fe760ac5
|
- 同步平台商品时，如果修复一个不存在的SKU，要报错。删除成功后清除平台SKUID
|
2019-08-14 16:58:15 +08:00 |
|
gazebo
|
f788eec5c1
|
- GetUsers支持分页
|
2019-08-14 11:32:20 +08:00 |
|
gazebo
|
339b60c374
|
+ EnableWXAuth2
|
2019-08-12 17:54:00 +08:00 |
|
gazebo
|
d8f3b7f467
|
- 活动商品后台分页,GetActStoreSkuInfo分页，添加keyword
|
2019-08-09 11:19:43 +08:00 |
|
Rosy-zhudan
|
4facbdbbfd
|
Merge remote-tracking branch 'origin/mark' into don
|
2019-08-08 09:14:21 +08:00 |
|
gazebo
|
3639a1c7cb
|
- 角色管理初版
|
2019-08-07 18:16:44 +08:00 |
|
Rosy-zhudan
|
fdd6d0f462
|
解决冲突，合并提交
|
2019-08-07 15:24:35 +08:00 |
|
gazebo
|
f06456cec1
|
- 用SyncMapWithTimeout管理tasksch任务
|
2019-08-07 14:55:54 +08:00 |
|
gazebo
|
8768fe8236
|
- FreeBatchStoreSkuInfo与FreeBatchStoreSkuSyncInfo添加任务名
|
2019-08-07 14:15:30 +08:00 |
|
Rosy-zhudan
|
f5208eea28
|
Merge remote-tracking branch 'origin/mark' into don
|
2019-08-07 09:06:50 +08:00 |
|