Commit Graph

4285 Commits

Author SHA1 Message Date
gazebo
e89af0849e CaculateSkuEarningPrice中调用ConstrainPayPercentage
+RefreshOrdersPriceInfo
2020-01-03 15:56:02 +08:00
gazebo
d7aa244528 jd act 2020-01-03 15:47:41 +08:00
gazebo
516c9c5f85 fk 2020-01-03 14:30:33 +08:00
gazebo
7db6047c43 fk 2020-01-03 13:51:52 +08:00
gazebo
5dfb9aa2e3 SetSkuSyncStatus添加对于IsUseThingMap的处理 2020-01-03 11:09:54 +08:00
gazebo
8edf8897dc up 2020-01-03 11:01:11 +08:00
gazebo
8cfbf4fcf9 warning当GetStoreSkuPriceAndWeight返回错误时在updateOrderSkuOtherInfo与updateAfsOrderSkuOtherInfo中 2020-01-03 10:56:43 +08:00
gazebo
9c5f5956e1 用GetStoreSkuPriceAndWeight替换之前订单中更新订单商品信息逻辑 2020-01-03 10:36:54 +08:00
gazebo
2f6a983dcd checkActUpdate 2020-01-03 09:00:43 +08:00
gazebo
11eed26443 删除旧的活动规则校验 2020-01-02 18:38:06 +08:00
gazebo
22959ce4ad 修改活动校验规则 2020-01-02 18:28:01 +08:00
gazebo
6251228b6c 订单导出payPercentage 2020-01-02 17:39:03 +08:00
gazebo
df927137da 去掉Sku,SkuName和SkuCategory中的JdID与JdSyncStatus 2020-01-02 16:56:06 +08:00
gazebo
c444202330 store_sku.go中去掉对于JdID的引用 2020-01-02 14:41:45 +08:00
gazebo
dcd4dd683d UpdateStoreSkuNamePrice 2020-01-02 14:00:44 +08:00
gazebo
ccfb852b58 up 2020-01-02 13:52:04 +08:00
gazebo
8c5c0bb83b 限制京东门名长度 2020-01-02 10:55:20 +08:00
gazebo
44bfc4a6ca up 2020-01-02 10:22:47 +08:00
gazebo
929370a7b1 +RefreshPageShops 2020-01-01 11:17:24 +08:00
gazebo
08f2c440f5 预售 2019-12-31 17:55:17 +08:00
gazebo
e00d73b06c doDailyWork, AmendMissingOrders改为72小时 2019-12-31 17:40:42 +08:00
gazebo
c6760a6bcc SyncStores 2019-12-31 11:50:45 +08:00
gazebo
229601c11e +onSysConfigChanged 2019-12-31 10:28:52 +08:00
gazebo
174727bafc comment 2019-12-31 09:42:55 +08:00
gazebo
d01efb378c 处理饿百订单有时取不到一些字段的情况 2019-12-31 09:42:06 +08:00
gazebo
d3a02ef958 打包费参数有效性检查 2019-12-30 18:35:49 +08:00
gazebo
3ee2e72a5e 美团饿百打包费改为统一系统参数 2019-12-30 18:07:26 +08:00
gazebo
f1d025eb15 +StoreMap.BoxFee
美团外卖支持打包袋费,美团商品统一添加1角打包费
2019-12-30 16:50:32 +08:00
gazebo
cee131b197 SetThingMapSyncStatus中的bug修复 2019-12-30 15:32:46 +08:00
gazebo
a56ebdf5dd sku2Update中去掉sku.SkuID == 0的判断(只要sku.NameID == 0判断就够了) 2019-12-30 09:45:02 +08:00
gazebo
f5f3aef933 GetOrderWaybillInfo中当isGetPos为true时,暂时忽略状态检查 2019-12-30 09:42:14 +08:00
gazebo
384daa4819 fk 2019-12-28 20:34:36 +08:00
gazebo
9bd240a22f 处理美团AppFood中可能没有sku的情况 2019-12-27 23:02:36 +08:00
gazebo
1ea84798f3 up 2019-12-27 18:02:05 +08:00
gazebo
3547ee4f5e 美团活动支持秒杀 2019-12-27 17:47:06 +08:00
gazebo
1093ae8829 up 2019-12-27 11:31:55 +08:00
gazebo
1a150754f8 自提核销只处理京东平台 2019-12-26 17:50:59 +08:00
gazebo
4aa2984048 comment 2019-12-26 17:43:17 +08:00
gazebo
447e6c2409 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark 2019-12-26 17:29:03 +08:00
gazebo
5361c0cabb Waybill添加TipFee,在订单完成时也会更新,ActualFee肯定会有值,当成总费用 2019-12-26 17:28:28 +08:00
苏尹岚
fad75b7937 Accept Merge Request #118: (yonghui -> mark)
Merge Request: 投诉骑手
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/118
2019-12-26 17:10:48 +08:00
苏尹岚
c22581636d 投诉骑手 2019-12-26 17:10:20 +08:00
苏尹岚
c6a28afa4a Accept Merge Request #117: (yonghui -> mark)
Merge Request: 投诉骑手
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/117
2019-12-26 17:03:11 +08:00
苏尹岚
e95a37789e 投诉骑手 2019-12-26 17:02:49 +08:00
苏尹岚
2f3514d901 投诉骑手 2019-12-26 17:00:36 +08:00
苏尹岚
edbe3a92f7 Accept Merge Request #116: (yonghui -> mark)
Merge Request: 根据skuid 批量关注可售
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/116
2019-12-26 16:24:13 +08:00
苏尹岚
0f4ed3f31e 投诉原因 2019-12-26 16:23:28 +08:00
gazebo
381d1b2f21 调整加订单配送小费逻辑,添加美团外卖平台支持 2019-12-26 16:19:04 +08:00
gazebo
f13a8bbea2 OrderStatusWaybillTipChanged描述 2019-12-26 14:33:58 +08:00
gazebo
deadc8f563 UpdateOrderWaybillTip 2019-12-26 14:18:16 +08:00