gazebo
|
b030168e07
|
Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark
|
2019-09-20 15:46:27 +08:00 |
|
gazebo
|
d1d0e576eb
|
- 移除常量字符串'1970-01-01 00:00:00'
|
2019-09-20 15:46:09 +08:00 |
|
xujianhua
|
c5df4f5f5e
|
Accept Merge Request #6: (don -> mark)
Merge Request: 城市商品销量统计
Created By: @zhudan
Accepted By: @xujianhua
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/6
|
2019-09-20 15:25:39 +08:00 |
|
gazebo
|
877ffb2bec
|
- JxBadComments.Createtime添加索引
|
2019-09-20 12:04:42 +08:00 |
|
gazebo
|
2409b4f323
|
- 每晚8点再同步一次平台门店信息
|
2019-09-20 10:30:45 +08:00 |
|
gazebo
|
aa3bfcd4c2
|
- BatchUpdateEntityByKV中panic时，打印调试信息
|
2019-09-20 09:11:41 +08:00 |
|
gazebo
|
72f9852d42
|
- 去掉调试代码（门店状态报警只发老板）
|
2019-09-19 16:31:24 +08:00 |
|
gazebo
|
3d9aefb411
|
- 调整OrderSku的索引
|
2019-09-19 09:57:18 +08:00 |
|
gazebo
|
103ab3c755
|
- DeleteStoreAllCategories中的任务改为可错误继续的
|
2019-09-19 09:28:46 +08:00 |
|
gazebo
|
a2e71189db
|
- up
|
2019-09-18 14:36:21 +08:00 |
|
gazebo
|
6fb485cd6b
|
- 菜谱查询返回创建都名字
|
2019-09-18 14:25:50 +08:00 |
|
gazebo
|
96bb72f87a
|
- dao.GetSkusCategories
|
2019-09-18 08:23:40 +08:00 |
|
gazebo
|
d919b5d9f1
|
- up
|
2019-09-17 21:48:24 +08:00 |
|
gazebo
|
26221afaef
|
- 修复dao.GetSkusCategories没有取全分类的问题
|
2019-09-17 21:44:04 +08:00 |
|
gazebo
|
b140091b33
|
- 菜谱配料列表中，返回sku的名字与图片
|
2019-09-17 17:57:54 +08:00 |
|
gazebo
|
8dbb872f4c
|
- 修改菜谱的几个bug
|
2019-09-17 17:25:24 +08:00 |
|
gazebo
|
8357152344
|
Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark
|
2019-09-17 17:06:21 +08:00 |
|
gazebo
|
d8f684f720
|
- up
|
2019-09-17 17:06:08 +08:00 |
|
zhudan
|
61c52330fd
|
Accept Merge Request #4: (don -> mark)
Merge Request: 门店评分-修改BUG
Created By: @zhudan
Accepted By: @zhudan
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/4
|
2019-09-17 17:03:10 +08:00 |
|
gazebo
|
f4b6516b4d
|
+ 添加数据资源操作相关的API
|
2019-09-17 16:02:44 +08:00 |
|
gazebo
|
bf8fd2f255
|
- 菜谱API基本OK
|
2019-09-17 14:39:15 +08:00 |
|
gazebo
|
daa72b7b7d
|
Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark
|
2019-09-17 11:31:07 +08:00 |
|
gazebo
|
b54f86f00c
|
- IsSyncStatusSec fixed to IsSyncStatusSeq
- 修改（或创建）单平台门店商品时，如果没有平台分类ID，报警
|
2019-09-17 11:30:07 +08:00 |
|
xujianhua
|
9c7ae16186
|
Accept Merge Request #3: (don -> mark)
Merge Request: 门店评分
Created By: @zhudan
Accepted By: @xujianhua
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/3
|
2019-09-17 11:12:33 +08:00 |
|
gazebo
|
6bf8296963
|
+ QueryFoodRecipes
|
2019-09-17 10:17:10 +08:00 |
|
gazebo
|
312ce745cc
|
- 菜谱相关
|
2019-09-16 18:40:43 +08:00 |
|
gazebo
|
ea58ab6f79
|
- 门店报警信息按城市排序
|
2019-09-16 15:33:29 +08:00 |
|
gazebo
|
e789e17714
|
+ getAllUsers4Store
|
2019-09-12 14:54:28 +08:00 |
|
gazebo
|
f3e64ed996
|
- up
|
2019-09-12 10:28:18 +08:00 |
|
gazebo
|
84b4d400e4
|
- BatchUpdateEntityByKV中不用事务
|
2019-09-11 22:59:19 +08:00 |
|
gazebo
|
5baecb3b37
|
- dao.QueryPageStores keyword查询licence_code
|
2019-09-11 17:44:09 +08:00 |
|
gazebo
|
435b4397d6
|
- 门店状态报警提示修改
|
2019-09-11 17:42:26 +08:00 |
|
gazebo
|
569abe56b5
|
- 添加自提假订单处理
|
2019-09-11 17:31:07 +08:00 |
|
gazebo
|
4e52916066
|
- 拉取饿百门店营业执照信息
|
2019-09-11 16:24:42 +08:00 |
|
gazebo
|
f632622b55
|
+ ConfigSysFakeOrderMobiles
|
2019-09-10 18:32:55 +08:00 |
|
gazebo
|
a90941b26e
|
- 京西自营商城
|
2019-09-10 17:21:44 +08:00 |
|
gazebo
|
fb8732c94c
|
- 门店状态变化添加发送微信通知消息
|
2019-09-10 11:23:39 +08:00 |
|
gazebo
|
910e351c00
|
- PruneMissingStoreSkus也会删除本地不存在的远程分类
|
2019-09-09 17:03:01 +08:00 |
|
gazebo
|
f000f44b0d
|
- 添加GoodsOrder.AdjustCount
|
2019-09-09 10:26:43 +08:00 |
|
gazebo
|
b1309e90ff
|
- up
|
2019-09-06 18:49:20 +08:00 |
|
gazebo
|
f3a99cf2cd
|
- GoodsOrder添加DiscountMoney
|
2019-09-06 17:25:36 +08:00 |
|
gazebo
|
f28af0e190
|
- AuthBind.UserID加索引
|
2019-09-06 16:31:56 +08:00 |
|
gazebo
|
47a0a892b6
|
- 重构了dao.GetAuthBind和dao.GetUserBindAuthInfo
- AuthBind的唯一索引调整为"AuthID", "Type", "BindType", "DeletedAt"
|
2019-09-06 16:26:47 +08:00 |
|
gazebo
|
a393869612
|
+ Store.SMSNotify
|
2019-09-06 09:07:27 +08:00 |
|
gazebo
|
522c9082ef
|
- 修复dao.GetUserList的bug
- QueryActs添加参数syncStatus
|
2019-09-05 18:02:53 +08:00 |
|
gazebo
|
f5ec608a1c
|
- 创建或更新京西门店，注册用户时，自动根据门店的tel1,tel2添加门店老板角色
|
2019-09-05 16:57:28 +08:00 |
|
gazebo
|
059e563f08
|
- HandleOrder4Consignee
|
2019-09-05 14:58:31 +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
|
0bdcdde11c
|
- 添加IStoreSkuSorter接口，但当前无实际平台支持
|
2019-09-04 11:42:58 +08:00 |
|