Merge branch 'master' into develop

* master:
  shop area cant be pay

go/gopath/src/fohow.com/apps/controllers/order_controller/cart_controller.go

@@ -30,7 +30,10 @@ func (self *OrderController) CreateCart() {
 	}
 	uId := self.GetCurrentUserId()
 	wxUId := self.GetCurrentWxUserId()
-
+	//店铺专区商品区分
+	if product.Ptype != product_model.TYPE_DIRECT_SALE {
+		self.ReturnError(403, apps.ProductErrorType, "", nil)
+	}
 	//限新逻辑： 微信支付完成购买过商品的用户
 	if product.IsOnlyNew {
 		paiedOrder := order_model.GetPaiedOrderByWxUIdAndPayWayLimitOne(wxUId, order_model.PAY_WAY_WEIXIN, false)

go/gopath/src/fohow.com/apps/controllers/order_controller/order_controller.go

@@ -52,11 +52,16 @@ func (self *OrderController) Create() {
 	//if user.IsBlackUser == 1 {
 	//	self.ReturnError(403, apps.AccountError, "", nil)
 	//}
+	//店铺专区下单
+	if product.Ptype != product_model.TYPE_DIRECT_SALE {
+		self.ReturnError(403, apps.ProductErrorType, "", nil)
+	}
 	if product.SinglePurchLimit > 0 {
 		if product.SinglePurchLimit < count {
 			self.ReturnError(403, []string{apps.SingleOverLimitCount[0], fmt.Sprintf("该商品单次限购%d件", product.SinglePurchLimit)}, "", nil)
 		}
 	}
+
 	if product.PurchaseLimitCount > 0 {
 		if product.PurchaseLimitCount < count {
 			self.ReturnError(403, []string{apps.OverLimitCount[0], fmt.Sprintf("该商品限购%d件", product.PurchaseLimitCount)}, "", nil)
@@ -189,6 +194,10 @@ func (self *OrderController) MultipleCreate() {
 		if product == nil {
 			self.ReturnError(403, apps.NoExist, "", nil)
 		}
+		//专区下单判断
+		if product.Ptype != product_model.TYPE_DIRECT_SALE {
+			self.ReturnError(403, apps.ProductErrorType, "", nil)
+		}
 		if product.SinglePurchLimit > 0 {
 			if product.SinglePurchLimit < cNums {
 				self.ReturnError(403, []string{apps.SingleOverLimitCount[0], fmt.Sprintf("%s商品单次限购%d件", product.Name, product.SinglePurchLimit)}, "", nil)

go/gopath/src/fohow.com/apps/init.go

@@ -68,6 +68,8 @@ var (
 	WxUserNeedLogin     = []string{"wxUserNeedLogin", "需要微信用户登录"}
 	NotWeixinClient     = []string{"notWeixinClient", "不是微信客户端"}
 	SignupNotOpen       = []string{"signupNotOpen", "注册暂未开放，敬请期待"}
+	ProductErrorType    = []string{"productErrorType", "请您前往店铺专区下单"}
+
 	// 支付相关
 	PayWayNoMatch = []string{"payWayNoMatch", "请选择正确的支付方式"}
 	//请输入充值数额