Merge branch 'master' into jxstore

business/jxcallback/orderman/order.go

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

controllers/jd_order.go

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