liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into jxstore

Browse Source
This commit is contained in:
gazebo
2018-09-07 11:51:21 +08:00
parent cf26f57b6c 6a4a84826e
commit 07006742cc
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/jxcallback/orderman/order.go
View File

@@ -196,7 +196,7 @@ func (c *OrderManager) updateOrderSkuOtherInfo(order *model.GoodsOrder, db orm.O
} }
} }
opNum := "2" opNum := "2"
if order.VendorStoreID == "166875411" || order.VendorStoreID == "166875412" || jxStoreID == 100928 || jxStoreID == 100929 { if order.VendorStoreID == "163183405" || jxStoreID == 100961 {
opNum = "" opNum = ""
} }

4
controllers/jd_order.go
View File

@@ -62,6 +62,10 @@ func (c *DjswController) LockOrder() {
c.orderStatus(false) c.orderStatus(false)
} }
func (c *DjswController) UnlockOrder() {
c.orderStatus(false)
}
func (c *DjswController) UserCancelOrder() { func (c *DjswController) UserCancelOrder() {
c.orderStatus(false) c.orderStatus(false)
} }