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

..

act_test.go

- GetEffectiveActStoreSkuInfo中的BUG，对于非结算活动类型，要判断同步状态

2019-08-06 15:55:46 +08:00

act.go

- 修复dao.GetUserList的bug

2019-09-05 18:02:53 +08:00

common.go

+ 添加数据资源操作相关的API

2019-09-17 16:02:44 +08:00

dao_auth2.go

- 门店状态变化添加发送微信通知消息

2019-09-10 11:23:39 +08:00

dao_bz.go

- BatchUpdateEntityByKV中panic时，打印调试信息

2019-09-20 09:11:41 +08:00

dao_err.go

- IsDuplicateError

2018-11-06 22:12:18 +08:00

dao_order_test.go

+ GetStoresOrderSaleInfoNew

2019-08-20 10:59:47 +08:00

dao_order.go

Accept Merge Request #4: (don -> mark)

2019-09-17 17:03:10 +08:00

dao_test.go

- refactor test init flow

2019-03-20 22:28:51 +08:00

dao_user2.go

- RegisterUser-->RegisterUserWithMobile

2019-09-04 17:44:20 +08:00

dao_user_test.go

- 将微信的备注改为店名相关的信息

2019-04-11 11:59:04 +08:00

dao_user.go

+ Store添加OperatorRole2，Store.PrinterFontSize

2019-08-19 09:48:59 +08:00

dao_utils.go

- 优化dao.GenQuestionMarks

2019-08-30 09:54:23 +08:00

dao.go

- WaybillStatusFailed也会重新创建三方运单

2019-04-27 10:58:19 +08:00

food_recipe_test.go

- 每晚8点再同步一次平台门店信息

2019-09-20 10:30:45 +08:00

food_recipe.go

- up

2019-09-18 14:36:21 +08:00

new_config.go

- 重构authz结构

2019-08-08 17:06:58 +08:00

page_store.go

- dao.QueryPageStores keyword查询licence_code

2019-09-11 17:44:09 +08:00

place.go

- up

2019-09-12 10:28:18 +08:00

sensitive_words.go

修改敏感词过滤代码结构

2019-08-19 10:27:04 +08:00

sku.go

- dao.GetSkuByCats中，要判断sku_name是否被删除了

2019-08-30 15:56:43 +08:00

store_score.go

Accept Merge Request #3: (don -> mark)

2019-09-17 11:12:33 +08:00

store_sku_sales.go

Accept Merge Request #6: (don -> mark)

2019-09-20 15:25:39 +08:00

store_sku.go

- dao.GetSkusCategories

2019-09-18 08:23:40 +08:00

store_test.go

- 每晚8点再同步一次平台门店信息

2019-09-20 10:30:45 +08:00

store.go

- 门店报警信息按城市排序

2019-09-16 15:33:29 +08:00