rebuid api 精简order and pay

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

@@ -10,18 +10,10 @@ import (
 	"fohow.com/apps"
 	// "fohow.com/apps/controllers/user_controller"
 	// "fohow.com/apps/models/activity_model"
+	"fohow.com/apps/models/merchant_model"
 	"fohow.com/apps/models/order_model"
 	"fohow.com/apps/models/product_model"
-	// "fohow.com/apps/models/user_model"
-	// "fohow.com/apps/models/vas_model"
-	// "fohow.com/libs/wx_mp"
-	"encoding/csv"
-	"fmt"
-	"fohow.com/apps/helpers"
-	"fohow.com/apps/models/cow_order_model"
-	"fohow.com/apps/models/merchant_model"
 	"fohow.com/apps/models/user_model"
-	"fohow.com/libs/tool"
 	"strings"
 	"sync"
 	"time"
@@ -253,7 +245,6 @@ func (self *OrderController) List() {
 		orderList := order_model.GetAllDetailsOrderId(item.OrderId)
 		for _, orderItem := range orderList {
 			product := product_model.GetProductById(orderItem.ProductId, cache)
-			item.Product = product
 			if product == nil {
 				continue
 			}
@@ -334,125 +325,6 @@ func (self *OrderController) Operate() {
 	self.ServeJSON()
 }
 
-// //确认收货后续动作
-// func afterTakeDelivery(order *order_model.Order) {
-
-// }
-
-// 获取商家的订单列表
-func (self *OrderController) MerchantList() {
-
-	merchantId, _ := self.GetInt64("merchant_id", 0)
-	_queryPaiedStart := self.GetString("query_paied_start")
-	_queryPaiedEnd := self.GetString("query_paied_end")
-	_queryReceiveStart := self.GetString("query_receive_start")
-	_queryReceiveEnd := self.GetString("query_receive_end")
-	status := self.GetString("status")
-	page, _ := self.GetInt("page")
-	perPage, _ := self.GetInt("per_page")
-	contact := self.GetString("contact")
-	tel := self.GetString("tel")
-	orderType := self.GetString("order_type")
-	orderId := self.GetString("order_id")
-	province := self.GetString("province")
-	city := self.GetString("city")
-	district := self.GetString("district")
-
-	queryPaiedStart, queryPaiedEnd := int64(0), int64(0)
-	queryReceiveStart, queryReceiveEnd := int64(0), int64(0)
-	if strings.TrimSpace(_queryPaiedStart) != "" {
-		paiedStart, err := time.ParseInLocation("2006-01-02 15:04:05", fmt.Sprintf("%s 00:00:00", _queryPaiedStart), time.Local)
-		if err != nil {
-			self.ReturnError(403, []string{"paramsError", "查询日期错误"}, "", nil)
-		}
-		queryPaiedStart = paiedStart.Unix()
-	}
-	if strings.TrimSpace(_queryPaiedEnd) != "" {
-		paiedEnd, err := time.ParseInLocation("2006-01-02 15:04:05", fmt.Sprintf("%s 23:59:59", _queryPaiedEnd), time.Local)
-		if err != nil {
-			self.ReturnError(403, []string{"paramsError", "查询日期错误"}, "", nil)
-		}
-		queryPaiedEnd = paiedEnd.Unix()
-	}
-
-	if strings.TrimSpace(_queryReceiveStart) != "" {
-		receiveStart, err := time.ParseInLocation("2006-01-02 15:04:05", fmt.Sprintf("%s 00:00:00", _queryReceiveStart), time.Local)
-		if err != nil {
-			self.ReturnError(403, []string{"paramsError", "查询日期错误"}, "", nil)
-		}
-		queryReceiveStart = receiveStart.Unix()
-	}
-	if strings.TrimSpace(_queryReceiveEnd) != "" {
-		receiveEnd, err := time.ParseInLocation("2006-01-02 15:04:05", fmt.Sprintf("%s 23:59:59", _queryReceiveEnd), time.Local)
-		if err != nil {
-			self.ReturnError(403, []string{"paramsError", "查询日期错误"}, "", nil)
-		}
-		queryReceiveEnd = receiveEnd.Unix()
-	}
-
-	if status != "" && order_model.STATUS_CN_TEXT[status] == "" {
-		self.ReturnError(403, []string{"paramsError", "状态错误"}, "", nil)
-	}
-	if orderType != "" {
-		_orderType, err := strconv.ParseInt(orderType, 10, 64)
-		if order_model.ORDER_TYPE_CN_TEXT[_orderType] == "" || err != nil {
-			self.ReturnError(403, []string{"paramsError", "类型出错"}, "", nil)
-		}
-	}
-
-	if page <= 0 {
-		page = 1
-	}
-	if perPage <= 0 || perPage > 100 {
-		perPage = 10
-	}
-	cache, _ := self.GetBool("cache", false)
-	uId := self.GetCurrentUserId()
-
-	var orders []*order_model.MerchantOrder
-	count := int64(0)
-	merchantUser := merchant_model.GetMerchantUserRelationByUserId(uId, cache)
-	if merchantUser != nil {
-		if merchantUser.MerchantId != merchantId {
-			self.ReturnError(403, apps.ParamsError, "", nil)
-		}
-	} else {
-		self.ReturnError(403, apps.ParamsError, "", nil)
-	}
-
-	orders = order_model.GetMerchantOrders(merchantId, queryPaiedStart, queryPaiedEnd, queryReceiveStart, queryReceiveEnd, status,
-		contact, strings.TrimSpace(merchantUser.ManageProductIds),
-		tel, orderType, orderId, province, city, district, page, perPage)
-	count = order_model.GetMerchantOrdersCount(merchantId, queryPaiedStart, queryPaiedEnd, queryReceiveStart, queryReceiveEnd, status,
-		contact, strings.TrimSpace(merchantUser.ManageProductIds),
-		tel, orderType, orderId, province, city, district)
-
-	for _, item := range orders {
-		product := product_model.GetProductById(item.ProductId, cache)
-		wxUser := user_model.GetWxUserById(item.WxUserId, cache)
-		if wxUser != nil {
-			wxUser.Head = user_model.GetFullImgUrl(wxUser.Head)
-		}
-
-		item.Product = product
-		item.WxUser = wxUser
-		item.OrderTypeCn = order_model.ORDER_TYPE_CN_TEXT[item.OrderType]
-		item.CTime = item.CreatedAt.Unix()
-		item.DTime = item.DispatchTime.Unix()
-		item.RTime = item.ReceiveTime.Unix()
-	}
-	type Ret struct {
-		List      []*order_model.MerchantOrder `json:"list"`
-		ListCount int64                        `json:"list_count"`
-	}
-
-	if orders == nil {
-		orders = make([]*order_model.MerchantOrder, 0, 0)
-	}
-	self.Data["json"] = &Ret{ListCount: count, List: orders}
-	self.ServeJSON()
-}
-
 // 商家处理中订单数量提示
 func (self *OrderController) MerchantListCount() {
 	merchantId, _ := self.GetInt64("merchant_id", 0)
@@ -477,279 +349,3 @@ func (self *OrderController) MerchantListCount() {
 	self.Data["json"] = &Ret{ListCount: count}
 	self.ServeJSON()
 }
-
-// 商家更新物流信息
-// status只接收""或者dispatch两个值
-// 只能处理待发货、待收货的订单物流信息
-// 当status是""、订单状态是已发货：表示更改物流，当status是dispatch、订单状态是处理中表示添加物流信息
-// 不允许status为dispatch、同时订单状态是已发货。避免多个管理员重复发货。
-func (self *OrderController) UpdateExpress() {
-	oId := self.Ctx.Input.Param(":order_id")
-	expressCompany := self.GetString("express_company")
-	expressOrderNo := self.GetString("express_order_no")
-	status := self.GetString("status", "")
-
-	defer updateExpressLock.Unlock()
-	updateExpressLock.Lock()
-
-	o := order_model.GetOrderById(oId)
-	if o == nil {
-		self.ReturnError(404, apps.OrderNotExist, "", nil)
-	}
-
-	uId := self.GetCurrentUserId()
-	merchantUser := merchant_model.GetMerchantUserRelationByUserId(uId, true)
-	if merchantUser == nil {
-		// 不是商户
-		self.ReturnError(403, apps.ParamsError, "", nil)
-	}
-
-	//只能处理待发货、待收货的订单物流信息。
-	if o.Status != order_model.STATUS_PROCESSING && o.Status != order_model.STATUS_DISPATCH {
-		self.ReturnError(403, apps.OrderStatusNotSuit, "", nil)
-	}
-
-	//避免重复发货
-	if o.Status == order_model.STATUS_DISPATCH && status == order_model.STATUS_DISPATCH {
-		self.ReturnError(403, apps.OrderAlreadyDispatch, "", nil)
-	}
-
-	// 校验状态参数，是否合法。
-	if status != "" && status != order_model.STATUS_DISPATCH {
-		// 只支持发货操作
-		self.ReturnError(403, apps.ParamsError, "", nil)
-	} else if status == order_model.STATUS_DISPATCH {
-
-		o.Status = order_model.STATUS_DISPATCH
-		o.DispatchTime = time.Now()
-	} else {
-
-		o.Status = o.Status
-	}
-
-	//校验订单所属商户
-	product := product_model.GetProductById(o.ProductId, true)
-	if product == nil {
-		self.ReturnError(403, apps.ProductNotExist, "", nil)
-	}
-	if product.MerchantId != merchantUser.MerchantId {
-		self.ReturnError(403, apps.OrderNotBelongToCurrentUser, "", nil)
-	}
-
-	//该商家管理员是否负责管理该商品？
-	isManageTheProduct, _ := tool.Contain(fmt.Sprintf("%d", product.Id), strings.Split(merchantUser.ManageProductIds, ","))
-	if merchantUser.ManageProductIds != "0" && !isManageTheProduct {
-		self.ReturnError(403, apps.CurrentMerIsNotManageTheProduct, "", nil)
-	}
-
-	o.ExpressCompany = expressCompany
-	o.ExpressOrderNo = expressOrderNo
-
-	if !o.Save() {
-		beego.BeeLogger.Error("user[%d] complete order[%s] fail", uId, oId)
-	}
-
-	//发送物流信息
-	if status == order_model.STATUS_DISPATCH { //发送发货通知
-
-		buyerWxUser := user_model.GetWxUserById(o.WxUserId, true)
-		if buyerWxUser != nil {
-			helpers.ProductLogisticsChangedNotify(*buyerWxUser, o.DispatchTime, product.Name, o.OrderId, o.ExpressCompany, o.ExpressOrderNo,
-				"您兑换的商品已经发货，请注意查收。", "pages/start/start?url=packageUser/pages/user/order/order&id="+o.OrderId)
-		}
-
-	} else { //发送物流修改信息
-
-		buyerWxUser := user_model.GetWxUserById(o.WxUserId, true)
-		if buyerWxUser != nil {
-			helpers.ProductLogisticsChangedNotify(*buyerWxUser, o.DispatchTime, product.Name, o.OrderId, o.ExpressCompany, o.ExpressOrderNo,
-				"您兑换的商品物流信息有改动，请注意查收。", "pages/start/start?url=packageUser/pages/user/order/order&id="+o.OrderId)
-		}
-
-	}
-	//同步牛就对了订单发货信息
-	if o.OrderType == order_model.ORDER_COW_BUY || o.OrderType == order_model.ORDER_COW_CHANGE {
-		cowOrder := cow_order_model.GetCowOrderByCowOrderId(o.OrderId)
-		if cowOrder != nil {
-			cowOrder.LogisNo = o.ExpressOrderNo
-			cowOrder.LogisComp = o.ExpressCompany
-			cowOrder.ConFlag = int64(1)
-			cowOrder.ConDate = time.Now().Unix()
-			cowOrder.Save()
-		}
-	}
-	type apiRet struct {
-		Status       string `json:"status"`
-		StatusCnText string `json:"status_cn_text"`
-	}
-	self.Data["json"] = &apiRet{
-		Status:       o.Status,
-		StatusCnText: order_model.STATUS_CN_TEXT[o.Status]}
-	self.ServeJSON()
-}
-
-// 商家获取订单详情
-func (self *OrderController) MerchantOrderDetail() {
-
-	oId := self.Ctx.Input.Param(":order_id")
-	o := order_model.GetMerchantOrderById(oId)
-	cache, _ := self.GetBool("cache", false)
-	if o == nil {
-		beego.BeeLogger.Error("order not exist id=[%s]", oId)
-		self.ReturnError(404, apps.OrderNotExist, "", nil)
-	}
-	user := self.GetCurrentUser(cache)
-
-	product := product_model.GetProductById(o.ProductId, cache)
-	if product == nil {
-		self.ReturnError(403, apps.ProductNotExist, "", nil)
-	}
-
-	merchantUser := merchant_model.GetMerchantUserRelationByUserId(user.Id, cache)
-	if merchantUser == nil {
-		self.ReturnError(404, apps.OrderNotExist, "", nil)
-	} else {
-		if product.MerchantId != merchantUser.MerchantId {
-			beego.BeeLogger.Error("order not merchant_owner id=[%s]", oId)
-			self.ReturnError(404, apps.OrderNotExist, "", nil)
-		}
-	}
-
-	wxUser := user_model.GetWxUserByUserId(o.UserId, cache)
-	if wxUser == nil {
-		self.ReturnError(403, apps.UserNotExist, "", nil)
-	} else {
-		wxUser.Head = user_model.GetFullImgUrl(wxUser.Head)
-	}
-
-	o.StatusCn = order_model.STATUS_CN_TEXT[o.Status]
-	o.CTime = o.CreatedAt.Unix()
-	o.DTime = o.DispatchTime.Unix()
-	if o.DTime < 0 {
-		o.DTime = 0
-	}
-	o.Product = product
-	o.WxUser = wxUser
-	o.ExCompanyArray = strings.Split(o.ExpressCompany, "/")
-	o.ExOrderNoArray = strings.Split(o.ExpressOrderNo, "/")
-	self.Data["json"] = o
-	self.ServeJSON()
-}
-
-func (self *OrderController) ExportMerchantOrders() {
-	merchantId, _ := self.GetInt64("merchant_id", 0)
-	_queryPaiedStart := self.GetString("query_paied_start")
-	_queryPaiedEnd := self.GetString("query_paied_end")
-	_queryReceiveStart := self.GetString("query_receive_start")
-	_queryReceiveEnd := self.GetString("query_receive_end")
-	status := self.GetString("status")
-	contact := self.GetString("contact")
-	tel := self.GetString("tel")
-	orderType := self.GetString("order_type")
-	orderId := self.GetString("order_id")
-	province := self.GetString("province")
-	city := self.GetString("city")
-	district := self.GetString("district")
-	cache, _ := self.GetBool("cache", false)
-
-	queryPaiedStart, queryPaiedEnd := int64(0), int64(0)
-	queryReceiveStart, queryReceiveEnd := int64(0), int64(0)
-	if strings.TrimSpace(_queryPaiedStart) != "" {
-		paiedStart, err := time.ParseInLocation("2006-01-02 15:04:05", fmt.Sprintf("%s 00:00:00", _queryPaiedStart), time.Local)
-		if err != nil {
-			self.ReturnError(403, []string{"paramsError", "查询日期错误"}, "", nil)
-		}
-		queryPaiedStart = paiedStart.Unix()
-	}
-	if strings.TrimSpace(_queryPaiedEnd) != "" {
-		paiedEnd, err := time.ParseInLocation("2006-01-02 15:04:05", fmt.Sprintf("%s 23:59:59", _queryPaiedEnd), time.Local)
-		if err != nil {
-			self.ReturnError(403, []string{"paramsError", "查询日期错误"}, "", nil)
-		}
-		queryPaiedEnd = paiedEnd.Unix()
-	}
-	if strings.TrimSpace(_queryReceiveStart) != "" {
-		receiveStart, err := time.ParseInLocation("2006-01-02 15:04:05", fmt.Sprintf("%s 00:00:00", _queryReceiveStart), time.Local)
-		if err != nil {
-			self.ReturnError(403, []string{"paramsError", "查询日期错误"}, "", nil)
-		}
-		queryReceiveStart = receiveStart.Unix()
-	}
-	if strings.TrimSpace(_queryReceiveEnd) != "" {
-		receiveEnd, err := time.ParseInLocation("2006-01-02 15:04:05", fmt.Sprintf("%s 23:59:59", _queryReceiveEnd), time.Local)
-		if err != nil {
-			self.ReturnError(403, []string{"paramsError", "查询日期错误"}, "", nil)
-		}
-		queryReceiveEnd = receiveEnd.Unix()
-	}
-
-	if status != "" && order_model.STATUS_CN_TEXT[status] == "" {
-		self.ReturnError(403, []string{"paramsError", "状态错误"}, "", nil)
-	}
-	if orderType != "" {
-		_orderType, err := strconv.ParseInt(orderType, 10, 64)
-		if order_model.ORDER_TYPE_CN_TEXT[_orderType] == "" || err != nil {
-			self.ReturnError(403, []string{"paramsError", "类型出错"}, "", nil)
-		}
-	}
-
-	uId := self.GetCurrentUserId()
-
-	var orders []*order_model.MerchantOrder
-	merchantUser := merchant_model.GetMerchantUserRelationByUserId(uId, cache)
-	if merchantUser != nil {
-		if merchantUser.MerchantId != merchantId {
-			self.ReturnError(403, apps.ParamsError, "", nil)
-		}
-	} else {
-		self.ReturnError(403, apps.ParamsError, "", nil)
-	}
-
-	orders = order_model.GetMerchantOrders(merchantId, queryPaiedStart, queryPaiedEnd, queryReceiveStart, queryReceiveEnd, status,
-		contact, strings.TrimSpace(merchantUser.ManageProductIds),
-		tel, orderType, orderId, province, city, district, 0, 0)
-
-	fileName := fmt.Sprintf("[%d-%s].csv", merchantUser.UserId, time.Now().Format("2006年01月02日15时04分"))
-	self.Ctx.Output.Header("Content-Type", "text/csv")
-	self.Ctx.Output.Header("Content-Disposition", "attachment; filename="+fileName)
-	writer := csv.NewWriter(self.Controller.Ctx.ResponseWriter)
-	writer.Write([]string{"订单号", "微信昵称", "交易时间", "发货时间", "收货时间",
-		"商品", "类型", "单价/商家获得(元)", "总额/商家获得(元)",
-		"收件号码", "收件人", "收件地址", "物流信息"})
-	for _, order := range orders {
-		orderId := order.OrderId
-		var wxNickname, productName string
-		wxUser := user_model.GetWxUserById(order.WxUserId, true)
-		if wxUser != nil {
-			wxNickname = wxUser.Nickname
-		}
-
-		var paiedAtFormat, dispatchTimeFormat, receiveTimeFormat string
-		if order.PaiedAt > 0 {
-			paiedAtFormat = time.Unix(order.PaiedAt, 0).Format("2006-01-02 15:04")
-		}
-		if order.DispatchTime.Unix() > 0 {
-			dispatchTimeFormat = order.DispatchTime.Format("2006-01-02 15:04")
-		}
-		if order.ReceiveTime.Unix() > 0 {
-			receiveTimeFormat = order.ReceiveTime.Format("2006-01-02 15:04")
-		}
-
-		product := product_model.GetProductById(order.ProductId, true)
-		if product != nil {
-			productName = product.Name
-		}
-		orderTypeCn := order_model.ORDER_TYPE_CN_TEXT[order.OrderType]
-		unitGet := fmt.Sprintf("%0.2f(%0.2f)", float64(order.UnitPrice)/100.0, float64(order.BuyPrice/order.Count)/100.0)
-		totalGet := fmt.Sprintf("%0.2f(%0.2f)", float64(order.UnitPrice*order.Count)/100.0, float64(order.BuyPrice)/100.0)
-		tel := order.Tel
-		contact := order.Contact
-		address := order.Address
-		logistics := fmt.Sprintf("物流公司：%s；物流号：%s", order.ExpressCompany, order.ExpressOrderNo)
-
-		writer.Write([]string{orderId, wxNickname, paiedAtFormat, dispatchTimeFormat, receiveTimeFormat,
-			productName, orderTypeCn, unitGet, totalGet, tel, contact, address, logistics})
-	}
-	writer.Flush()
-	return
-}

go/gopath/src/fohow.com/apps/controllers/pay_controller/after_pay_controller.go

@@ -13,7 +13,6 @@ import (
 	"fohow.com/apps/models/balance_model"
 	"fohow.com/apps/models/order_model"
 	"fohow.com/apps/models/pay_model"
-	"fohow.com/apps/models/project_model"
 	"fohow.com/libs/wx_mp"
 	"github.com/astaxie/beego"
 	"strconv"
@@ -21,30 +20,10 @@ import (
 	"time"
 	//"fohow.com/apps/models/product_model"
 	"fmt"
-	"fohow.com/apps/helpers"
-	"fohow.com/apps/models/copartner_model"
-	"fohow.com/apps/models/dollar_win_model"
 	"fohow.com/apps/models/product_model"
-	"fohow.com/apps/models/reserve_act_model"
-	"fohow.com/apps/models/subject_model"
 	"fohow.com/apps/models/user_model"
-	"fohow.com/libs/tool"
 )
 
-// // 支付同步回调
-// func (self *PayController) PaySync() {
-// 	target := self.Ctx.Input.Param(":target")
-
-// 	switch target {
-// 	// case "balance": // 余额充值
-// 	// 	self.payBalanceSync()
-// 	case "exchange": // 兑换
-// 		self.payExchangeSync()
-// 	default:
-// 		self.ReturnError(403, apps.ParamsError, "", nil)
-// 	}
-// }
-
 // 支付异步回调
 func (self *PayController) PayAsync() {
 	target := self.Ctx.Input.Param(":target")
@@ -62,16 +41,6 @@ func (self *PayController) PayAsync() {
 			self.ReturnError(403, apps.ParamsError, "", nil)
 		}
 
-	case "invest": //投资记录支付
-
-		switch payWay { //支付方式
-
-		case project_model.PAY_WAY_TYPE_PROJECT_JOIN:
-			self.wxPayInvestAsync()
-		default:
-			self.ReturnError(403, apps.ParamsError, "", nil)
-		}
-
 	case "exchange":
 
 		switch payWay {
@@ -82,15 +51,6 @@ func (self *PayController) PayAsync() {
 			self.ReturnError(403, apps.ParamsError, "", nil)
 		}
 
-	case "reserve":
-
-		switch payWay {
-		case reserve_act_model.ORDER_PAY_WAY_WEIXINPAY:
-			self.wxPayReserveAsync()
-		default:
-			self.ReturnError(403, apps.ParamsError, "", nil)
-		}
-
 	case CASH_TARGET:
 
 		switch payWay {
@@ -99,41 +59,12 @@ func (self *PayController) PayAsync() {
 		default:
 			self.ReturnError(403, apps.ParamsError, "", nil)
 		}
-	case COURSE_TARGET:
-		switch payWay {
-		case pay_model.PAYWAY_WEIXINPAY:
-			self.wxPayCourseAsync()
-		default:
-			self.ReturnError(403, apps.ParamsError, "", nil)
-		}
-	case DOLLAR_WIN_TARGET:
-		switch payWay {
-		case dollar_win_model.PAY_WAY_TYPE_DOLLAR_WIN_WX:
-			self.wxPayDollarWinAsync()
-		default:
-			self.ReturnError(403, apps.ParamsError, "", nil)
-		}
+
 	default:
 		self.ReturnError(403, apps.ParamsError, "", nil)
 	}
 }
 
-// // 回调后跳转页面
-// func GetUrlAfterPay(oId string) string {
-// 	var url string
-// 	s := strings.Split(oId, "")
-// 	oIdPrefix := fmt.Sprintf("%s%s", s[0], s[1])
-// 	switch oIdPrefix {
-// 	// case balance_model.ORDER_ID_PREFIX_CZ: // 余额充值
-// 	// 	url = fmt.Sprintf("%s/user/balance", beego.AppConfig.String("WWWHost"))
-// 	case order_model.ORDER_ID_PREFIX_EX: // 兑换
-// 		url = fmt.Sprintf("%s/user/exchanges", beego.AppConfig.String("WWWHost"))
-// 	default:
-// 		url = fmt.Sprintf("%s", beego.AppConfig.String("WWWHost"))
-// 	}
-// 	return url
-// }
-
 //微信购买代金券
 func (self *PayController) wxPayBalanceAsync() {
 
@@ -209,8 +140,6 @@ func UpdateIntroUser(wxUser *user_model.WxUser) {
 		return
 	}
 	//升级群主,打开推广模块
-	wxUser.ProductBenefitRate = 15
-	wxUser.SecondProductBenefitRate = 8
 	wxUser.ShowInviteMode = int64(1)
 	wxUser.Save()
 	//更改下级群主关系
@@ -230,198 +159,6 @@ func FindInviter(wxUser *user_model.WxUser) *user_model.WxUser {
 	}
 }
 
-//微信助农项目
-func (self *PayController) wxPayInvestAsync() {
-	var notifyResponse = map[string]string{
-		"return_code": wx_mp.PAY_FAIL,
-		"return_msg":  "",
-	}
-	body := self.Ctx.Input.CopyBody(102400)
-	params, err := wx_mp.ParsePayResult(body)
-	beego.BeeLogger.Warn("after_pay_controller.wxPayInvestAsync(%v)", params)
-
-	if err != nil {
-		beego.BeeLogger.Error("parsePayResult=[%s] err=[%s]", string(body), err)
-		self.Ctx.WriteString(wx_mp.MapToXmlString(notifyResponse))
-		return
-	}
-
-	// 签名校验参数
-	if !wx_mp.VerifyPayResult(params) {
-		beego.BeeLogger.Error("VerifyPayResult not pass")
-		self.Ctx.WriteString(wx_mp.MapToXmlString(notifyResponse))
-		return
-	}
-
-	orderId := strings.Split(params.OutTradeNO, "_")[0]
-	order := project_model.GetInvestByOrderId(orderId)
-	totalFee, _ := strconv.ParseInt(params.TotalFee, 10, 64)
-	settlementTotalFee, _ := strconv.ParseInt(params.SettlementTotalFee, 10, 64)
-	beego.BeeLogger.Warn("after_pay_controller.wxPayInvestAsync.settlementTotalFee(%d)", settlementTotalFee)
-	if order == nil || order.TotalPrice != totalFee {
-		beego.BeeLogger.Error("order err: %v", order)
-		self.Ctx.WriteString(wx_mp.MapToXmlString(notifyResponse))
-		return
-	}
-
-	//重复回调通知时，判断订单状态是否处理过了
-	beego.BeeLogger.Warn("小程序项目集助微信支付回调通知，订单编号=%s", order.OrderId)
-	if order.State == 1 {
-		notifyResponse["return_code"] = wx_mp.PAY_SUCCESS
-		self.Ctx.WriteString(wx_mp.MapToXmlString(notifyResponse))
-		return
-	}
-
-	order.State = 1
-	order.TradeNo = params.TransactionId
-	order.PayWay = project_model.PAY_WAY_TYPE_PROJECT_JOIN
-	order.PaiedAt = time.Now().UnixNano() //支付时间存储纳秒级别
-	if err := order.Save(); err != nil {
-		beego.BeeLogger.Error("weixinpay async return. save oId=%s fail", order.OrderId)
-		self.Ctx.WriteString(wx_mp.MapToXmlString(notifyResponse))
-		return
-	}
-	//go notice()
-	go projectStateCheck(order)
-	go self.DistributeBonusAsync(order.ProjectId, order.ProjectInvestWayId)
-	notifyResponse["return_code"] = wx_mp.PAY_SUCCESS
-	beego.BeeLogger.Warn("小程序项目集助微信支付回调通知，订单编号=%s  订单状态=%d", order.OrderId, order.State)
-	self.Ctx.WriteString(wx_mp.MapToXmlString(notifyResponse))
-	return
-}
-
-//投资记录支付后，检查项目是否融资成功。
-func projectStateCheck(order *project_model.ProjectJoin) {
-	project := project_model.GetProjectById(order.ProjectId, false)
-	if project != nil {
-		if project.State == project_model.STATE_UNDERWAY {
-			currentInvestment := project_model.GetValidTotalFundingByPId(project.Id, false)
-			beego.BeeLogger.Warn("project.state:%s, %d,%d, %d.", project.State, project.MinFunding, project.MaxFunding, currentInvestment)
-
-			//成功时间：某用户支付后，满最小融资额，订单的支付时间
-			if currentInvestment >= project.MinFunding && project.SuccessTime == 0 {
-				project.SuccessTime = int64(order.PaiedAt / 1e9)
-				project.Save()
-			}
-			if project.MinFunding == project.MaxFunding && currentInvestment >= project.MinFunding {
-				project.State = project_model.STATE_SUCCESS
-				project.Save()
-				if project.IsSendBenefit {
-					helpers.SendProjectBenefit(project)
-				}
-			}
-
-			if project.MinFunding < project.MaxFunding && currentInvestment >= project.MaxFunding {
-				project.State = project_model.STATE_SUCCESS
-				project.Save()
-				if project.IsSendBenefit {
-					helpers.SendProjectBenefit(project)
-				}
-			}
-		}
-	}
-}
-
-func sendInviterBenefit(wxUser *user_model.WxUser, orderId, source string) {
-	//if wxUser == nil {
-	return
-	//}
-	/*	var benefitWxUser *user_model.WxUser
-		if wxUser.ShowInviteMode == int64(1) && source == user_model.SOURCE_PRODUCT_BENEFIT {
-			benefitWxUser = wxUser
-		} else {
-			benefitWxUser = FindInviter(wxUser)
-		}
-		if benefitWxUser == nil || benefitWxUser.Id == int64(1) {
-			return
-		}
-		SecondBenifitWxUser := FindInviter(benefitWxUser)
-		beego.BeeLogger.Warn("benefitWxUser: %s", benefitWxUser)
-		beego.BeeLogger.Warn("SecondBenifitWxUser: %s", SecondBenifitWxUser)
-		//beego.BeeLogger.Warn("sendInviterBenefit:%v,%v,%s", wxUser, benefitWxUser, orderId)
-		if source == user_model.SOURCE_PRODUCT_BENEFIT {
-			//群主购物，15%返给本人，8%返给上级群主，如果顾客购物，15%返给上级群主，8%返给再上级群主
-			productOrder := order_model.GetOrderById(orderId)
-			if productOrder == nil {
-				return
-			}
-
-			if benefitWxUser != nil {
-				//发放一级收益
-				count := int64(tool.RoundFloat64(float64(productOrder.PaiedPrice)*float64(benefitWxUser.ProductBenefitRate)/100, 0))
-				if count > 0 {
-					inviteOrder := new(user_model.InviteOrder).Create(benefitWxUser.Id, wxUser.Id, wxUser.Id, count, productOrder.TotalPrice, user_model.SOURCE_PRODUCT_BENEFIT, productOrder.OrderId)
-					//发放现金佣金
-					s := balance_model.CASH_SOURCE_PRODUCT_BENEFIT
-					remark := fmt.Sprintf("%s%s", wxUser.Nickname, "购物")
-					b := balance_model.GetCashBalanceByWxUIdAndRIdAndSource(benefitWxUser.Id, productOrder.OrderId, s)
-					if b == nil {
-						b = new(balance_model.CashBalance).Create(inviteOrder.BenefitWxUId, count, s, productOrder.OrderId, remark)
-						if b != nil {
-							//标志进账
-							inviteOrder.IsEnterBalance = true
-							inviteOrder.EnterTime = b.CreatedAt
-							inviteOrder.Save()
-						}
-					}
-				}
-			}
-
-			//发放二级收益
-			if SecondBenifitWxUser != nil && SecondBenifitWxUser.Id > int64(1) {
-				count := int64(tool.RoundFloat64(float64(productOrder.PaiedPrice)*float64(SecondBenifitWxUser.SecondProductBenefitRate)/100, 0))
-				if count > 0 {
-					inviteOrder := new(user_model.InviteOrder).Create(SecondBenifitWxUser.Id, wxUser.Id, wxUser.Id, count, productOrder.TotalPrice, user_model.FX_SOURCE_PRODUCT_BENEFIT, productOrder.OrderId)
-					//发放现金佣金
-					s := balance_model.FX_CASH_SOURCE_PRODUCT_BENEFIT
-					remark := fmt.Sprintf("%s%s", wxUser.Nickname, "购物")
-					b := balance_model.GetCashBalanceByWxUIdAndRIdAndSource(SecondBenifitWxUser.Id, productOrder.OrderId, s)
-					if b == nil {
-						b = new(balance_model.CashBalance).Create(inviteOrder.BenefitWxUId, count, s, productOrder.OrderId, remark)
-						if b != nil {
-							//标志进账
-							inviteOrder.IsEnterBalance = true
-							inviteOrder.EnterTime = b.CreatedAt
-							inviteOrder.Save()
-						}
-					}
-				}
-			}
-		} else if source == user_model.BALANCE_BENEFIT {
-			balanceOrder := balance_model.GetBalanceOrderByOId(orderId, false)
-			if balanceOrder == nil {
-				return
-			}
-			//下线充值，上线获得8%返利，下线自动升级群主
-			if benefitWxUser != nil {
-				count := int64(0)
-				//发放一级收益, 升级群主返利540，其他情况返8%
-				if wxUser.ShowInviteMode != int64(1) && balanceOrder.PaiedPrice == balance_model.BALANCE_PAIED {
-					//count := int64(tool.RoundFloat64(float64(balanceOrder.PaiedPrice)*float64(balance_model.BALANCE_BL)/100, 0))
-					count = balance_model.AWARD_UPGRADE
-				} else {
-					count = int64(tool.RoundFloat64(float64(balanceOrder.TotalPrice)*float64(balance_model.BALANCE_BL)/100, 0))
-				}
-				if count > 0 {
-					inviteOrder := new(user_model.InviteOrder).Create(benefitWxUser.Id, wxUser.Id, wxUser.Id, count, balanceOrder.TotalPrice, user_model.BALANCE_BENEFIT, balanceOrder.OrderId)
-					//发放现金佣金
-					s := balance_model.BALANCE_SOURCE_BENEFIT
-					remark := fmt.Sprintf("%s%s", wxUser.Nickname, "充值代金券")
-					b := balance_model.GetCashBalanceByWxUIdAndRIdAndSource(benefitWxUser.Id, balanceOrder.OrderId, s)
-					if b == nil {
-						b = new(balance_model.CashBalance).Create(inviteOrder.BenefitWxUId, count, s, balanceOrder.OrderId, remark)
-						if b != nil {
-							//标志进账
-							inviteOrder.IsEnterBalance = true
-							inviteOrder.EnterTime = b.CreatedAt
-							inviteOrder.Save()
-						}
-					}
-				}
-			}
-		}*/
-}
-
 func newSendInviterBenefit(wxUser *user_model.WxUser, orderId, source string) {
 	if wxUser == nil {
 		return
@@ -507,27 +244,6 @@ func newSendInviterBenefit(wxUser *user_model.WxUser, orderId, source string) {
 	}
 }
 
-//邀请人的合伙人贡献值计算和邀请人的邀请人是合伙人是享有二级佣金
-func DoRecover(benefitWxUser, wxUser *user_model.WxUser, inviteOrder *user_model.InviteOrder, count, totalPrice int64, source, orderId string) {
-
-	if benefitWxUser == nil || wxUser == nil || inviteOrder == nil {
-		return
-	}
-
-	//邀请人曾经是合伙人则恢复
-	if benefitWxUser.CopartnerState == user_model.COPARTNER_STATE_ONCE {
-		config := copartner_model.GetLastCopartnerRecruitConfig(false) //合伙人配置
-		if config != nil {
-			partnerCount := user_model.GetCountByWxUserCopartnerState(user_model.COPARTNER_STATE_YES, false) //合伙人人数
-			if partnerCount < config.CopartnerCount {
-				benefitWxUser.CopartnerState = user_model.COPARTNER_STATE_YES
-				benefitWxUser.BeCopartnerTime = time.Now()
-				benefitWxUser.Save()
-			}
-		}
-	}
-}
-
 //微信购买商品
 func (self *PayController) wxPayExchangeAsync() {
 	var notifyResponse = map[string]string{
@@ -626,99 +342,6 @@ func UpdatePdSaleNums(order *order_model.Order) {
 	go order_model.UpdateSaleNums(SaleNumsMap)
 }
 
-//模板消息推送
-func TmplMsgNotice(order *order_model.Order) {
-	if order == nil {
-		return
-	}
-
-	wxUserGzh := user_model.GetWxUserGzhByWxUIdAndAppId(order.WxUserId, beego.AppConfig.String("WxMPAppId"), true)
-	product := product_model.GetProductById(order.ProductId, true)
-	codeList := subject_model.GetSaleDrawCodesBySubjectIdAndWxUidAndOrderId(order.ProductSaleSubjectId, order.WxUserId, order.OrderId, false)
-
-	if wxUserGzh == nil || product == nil || len(codeList) == 0 {
-		return
-	}
-
-	var codes []string
-	for _, item := range codeList {
-		codes = append(codes, tool.GetAssignLengthStr(item.Code, 6))
-	}
-
-	/*	if wxUserGzh != nil {
-		openId := wxUserGzh.GzhOpenId
-		url := fmt.Sprintf("%s/activity/project/%d", beego.AppConfig.String("WxHost"), order.ProductSaleSubjectId)
-		title := fmt.Sprintf("购买成功！获取抽奖码：%s", strings.Join(codes, "，"))
-		pName := product.Name
-		orderId := order.OrderId
-		paiedPrice := fmt.Sprintf("%d份共%0.2f元", order.Count, tool.RoundFloat64(float64(order.TotalPrice)/100, 2))
-		if order.PayWay == pay_model.PAYWAY_BALANCE {
-			paiedPrice = fmt.Sprintf("%d份共%d代金券", order.Count, order.TotalPrice)
-		}
-		paiedAt := order.PaiedAt
-		remark := "备注：回复“我的抽奖号码”,可以看到您在当前活动的全部抽奖号码。\n了解更多内容请点击详情"
-		//wx_mp.TmplmsgGetDrawCodeAfterPay(openId, url, title, pName, orderId, paiedPrice, paiedAt.Format("2016-05-04"), remark)
-	}*/
-}
-
-//微信支付预定优惠
-func (self *PayController) wxPayReserveAsync() {
-	var notifyResponse = map[string]string{
-		"return_code": wx_mp.PAY_FAIL,
-		"return_msg":  "",
-	}
-	body := self.Ctx.Input.CopyBody(102400)
-	params, err := wx_mp.ParsePayResult(body)
-	beego.BeeLogger.Warn("after_pay_controller.wxPayReserveAsync(%v)", params)
-
-	if err != nil {
-		beego.BeeLogger.Error("parsePayResult=[%s] err=[%s]", string(body), err)
-		self.Ctx.WriteString(wx_mp.MapToXmlString(notifyResponse))
-		return
-	}
-
-	// 签名校验参数
-	if !wx_mp.VerifyGzhPayResult(params) {
-		beego.BeeLogger.Error("VerifyPayResult not pass")
-		self.Ctx.WriteString(wx_mp.MapToXmlString(notifyResponse))
-		return
-	}
-
-	orderId := strings.Split(params.OutTradeNO, "_")[0]
-	order := reserve_act_model.GetOrderById(orderId)
-	totalFee, _ := strconv.ParseInt(params.TotalFee, 10, 64)
-	settlementTotalFee, _ := strconv.ParseInt(params.SettlementTotalFee, 10, 64)
-	beego.BeeLogger.Warn("after_pay_controller.wxPayReserveAsync.settlementTotalFee(%d)", settlementTotalFee)
-	if order == nil || order.TotalPrice != totalFee {
-		beego.BeeLogger.Error("order err: %v", order)
-		self.Ctx.WriteString(wx_mp.MapToXmlString(notifyResponse))
-		return
-	}
-
-	//重复回调通知时，判断订单状态是否已经支付
-	beego.BeeLogger.Warn("公众号优惠预定微信支付回调通知，订单编号=%s", order.OrderId)
-	if order.State == 1 {
-		notifyResponse["return_code"] = wx_mp.PAY_SUCCESS
-		self.Ctx.WriteString(wx_mp.MapToXmlString(notifyResponse))
-		return
-	}
-
-	order.State = 1
-	order.TradeNo = params.TransactionId
-	order.PayWay = reserve_act_model.ORDER_PAY_WAY_WEIXINPAY
-	order.PaiedAt = time.Now().UnixNano() //支付时间存储纳秒级别
-	order.PaiedPrice = order.TotalPrice
-	if err := order.Save(); err != nil {
-		beego.BeeLogger.Error("payreserve weixinpay async return. save oId=%s fail", order.OrderId)
-		self.Ctx.WriteString(wx_mp.MapToXmlString(notifyResponse))
-		return
-	}
-	notifyResponse["return_code"] = wx_mp.PAY_SUCCESS
-	beego.BeeLogger.Warn("公众号优惠预定微信支付回调通知，订单编号=%s  订单状态=%d", order.OrderId, order.State)
-	self.Ctx.WriteString(wx_mp.MapToXmlString(notifyResponse))
-	return
-}
-
 //微信余额充值
 func (self *PayController) wxPayCashczAsync() {
 

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

@@ -28,8 +28,8 @@ import (
 
 var (
 	//不需要校验用户登录的Action
-	exceptCheckUserLoginAction   = []string{"Pay", "PayAsync", "CheckBalanceBeforePayExchange"}
-	exceptCheckWxUserLoginAction = []string{"Pay", "PayAsync", "CheckBalanceBeforePayExchange"}
+	exceptCheckUserLoginAction   = []string{"Pay", "PayAsync"}
+	exceptCheckWxUserLoginAction = []string{"Pay", "PayAsync"}
 )
 
 type PayController struct {

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

@@ -2,27 +2,17 @@ package pay_controller
 
 import (
 	"fmt"
-	"strings"
-
-	"github.com/astaxie/beego"
-
 	"fohow.com/apps"
 	"fohow.com/apps/models/balance_model"
-	"fohow.com/apps/models/course_model"
-	"fohow.com/apps/models/dollar_win_model"
 	"fohow.com/apps/models/order_model"
-	"fohow.com/apps/models/project_model"
-	"fohow.com/apps/models/reserve_act_model"
+	"github.com/astaxie/beego"
+	"strings"
 )
 
 const (
-	BALANCE_TARGET    = "balance"
-	INVEST_TARGET     = "invest"
-	EXCHANGE_TARGET   = "exchange"
-	RESERVE_TARGET    = "reserve"
-	CASH_TARGET       = "cashcz"
-	COURSE_TARGET     = "course"
-	DOLLAR_WIN_TARGET = "dollar"
+	BALANCE_TARGET  = "balance"
+	EXCHANGE_TARGET = "exchange"
+	CASH_TARGET     = "cashcz"
 )
 
 type PayUrl struct {
@@ -47,16 +37,6 @@ func (self *PayController) Pay() {
 
 	switch target {
 
-	case DOLLAR_WIN_TARGET: // 第五创活动夺宝付费
-
-		switch payWay {
-		case dollar_win_model.PAY_WAY_TYPE_DOLLAR_WIN_WX:
-			self.wxPayDollarWinAct(oId)
-		case dollar_win_model.PAY_WAY_TYPE_DOLLAR_WIN_CASH_BALANCE:
-			self.cashBalancePayDollarWinAct(oId)
-		default:
-			self.ReturnError(403, apps.ParamsError, "", nil)
-		}
 	case BALANCE_TARGET: // 代金券余额充值
 
 		switch payWay {
@@ -98,21 +78,5 @@ func getTargetByOId(oId string) string {
 	if strings.HasPrefix(oId, order_model.ORDER_ID_PREFIX_EX) {
 		return EXCHANGE_TARGET
 	}
-	// 认购...
-	if strings.HasPrefix(oId, project_model.ORDER_ID_PREFIX_RG) {
-		return INVEST_TARGET
-	}
-	// 预定活动
-	if strings.HasPrefix(oId, reserve_act_model.ORDER_ID_PREFIX_RAO) {
-		return RESERVE_TARGET
-	}
-	// 付费课程
-	if strings.HasPrefix(oId, course_model.ORDER_ID_PREFIX_COURSE) {
-		return COURSE_TARGET
-	}
-
-	if strings.HasPrefix(oId, dollar_win_model.ORDER_ID_PREFIX_DW) {
-		return DOLLAR_WIN_TARGET
-	}
 	return ""
 }

go/gopath/src/fohow.com/apps/controllers/pay_controller/pay_exchange_controller.go

@@ -21,9 +21,6 @@ import (
 	"fohow.com/libs/tool"
 	"fohow.com/libs/wx_mp"
 	"strings"
-	// "fohow.com/apps/models/wx_gongzhonghao_model"
-	"fohow.com/apps/models/exchange_model"
-	"fohow.com/apps/models/subject_model"
 	"sync"
 )
 
@@ -228,88 +225,3 @@ func CreateOrderNotify(order *order_model.Order, product *product_model.Product)
 		}
 	}
 }
-
-func (self *PayController) CheckBalanceBeforePayExchange() {
-	oId := self.GetString("order_id")
-
-	//user := self.GetCurrentUser(false)
-	//if user == nil {
-	//	self.ReturnError(403, apps.UserNeedLogin, "", nil)
-	//}
-	wxUser := self.GetCurrentWxUser(false)
-	if wxUser == nil {
-		self.ReturnError(403, apps.UserNeedLogin, "", nil)
-	}
-
-	order := order_model.GetOrderById(oId)
-	if order == nil || order.WxUserId != wxUser.Id {
-		self.ReturnError(404, apps.OrderNotExist, "", nil)
-	}
-	if order.Status != order_model.STATUS_UNPAY {
-		self.ReturnError(403, apps.NotUnPay, "", nil)
-	}
-
-	type Ret struct {
-		LackLuoboCount int64 `json:"lack_luobo_count"`
-		RechargeMoney  int64 `json:"need_recharge_money"`
-	}
-
-	userLeftBalanceCount := balance_model.GetUserTotalBalance(wxUser.Id)
-	tp := order.UnitRoboBalancePrice * order.Count
-	lackCount := tp - userLeftBalanceCount //(订单金额-用户剩余代金券1000-500=500,1000-2000=-1000,1000-1000=0)
-	if lackCount < 0 {
-		lackCount = 0
-	}
-
-	self.Data["json"] = &Ret{LackLuoboCount: lackCount, RechargeMoney: lackCount}
-	self.ServeJSON()
-}
-
-//处理生成抽奖码
-func CreateDrawCode(order *order_model.Order) {
-
-	createDrawCode.Lock()
-	defer createDrawCode.Unlock()
-
-	subject := subject_model.GetProductSaleSubjectById(order.ProductSaleSubjectId, true)
-	if subject == nil {
-		return
-	}
-	for i := int64(1); i <= order.Count; i++ {
-		drawCode := subject_model.GetLastSaleDrawCodeBySubjectId(order.ProductSaleSubjectId)
-		if drawCode == nil {
-			new(subject_model.SaleDrawCode).Create(int64(1), order.WxUserId, order.ProductSaleSubjectId, order.OrderId)
-		} else {
-			new(subject_model.SaleDrawCode).Create(drawCode.Code+1, order.WxUserId, order.ProductSaleSubjectId, order.OrderId)
-		}
-	}
-	go TmplMsgNotice(order)
-}
-
-func AnalyseMallBalance(user *user_model.User, platform *exchange_model.Platform, order *order_model.Order) bool {
-
-	if user != nil {
-		//查询是否在通用白名单上
-		if user.IsUnlimitPayProduct {
-			return true
-		}
-		//第五创查询
-		resultAnalyse := helpers.AnalysePlatformMallBalance(platform.Secret, user.Tel, helpers.ANALYSE_URL)
-		beego.BeeLogger.Warn("pay_controller.AnalyseMallBalance().Platform analyse retMsg:%v", resultAnalyse)
-		//查询错误，则提示用户错误请稍后重试
-		if resultAnalyse == nil || resultAnalyse.Normal == helpers.UNNORMAL {
-			return false
-		} else if resultAnalyse.Normal == helpers.UNNORMAL_POINT_TASK {
-			//非正常的代金券任务刷子，不能继续支付，关闭订单，且更新为黑名单用户
-			order.Status = order_model.STATUS_CLOSED
-			order.Save()
-			user.IsBlackUser = 1
-			user.Save()
-			return false
-		} else if resultAnalyse.Normal == helpers.NORMAL {
-			user.IsUnlimitPayProduct = true
-			user.Save()
-		}
-	}
-	return true
-}

go/gopath/src/fohow.com/apps/models/order_model/order.go

@@ -35,9 +35,6 @@ const (
 	SOURCE_XCX     = "xcx"
 	SOURCE_GZH     = "gzh"
 	SOURCE_D5C_SYS = "d5c_sys"
-	//PAY_WAY_GZH_WEIXINPAY = "gzhwxpay"   //公众号微信支付
-	//PAY_WAY_GZH_BALANCE   = "gzhbalance" //公众号代金券支付
-	//PAY_WAY_MALL_BALANCE = "mallbalance" //第五创代金券
 
 	OPERATE_CONFIRM = "confirm" //确认收货
 	OPERATE_CANCEL  = "cancel"  //取消订单
@@ -73,90 +70,38 @@ var ORDER_TYPE_CN_TEXT = map[int64]string{
 }
 
 type Order struct {
-	Id                   int64                    `orm:"column(id);pk"                                       json:"id"`       // int(11)
-	OrderId              string                   `orm:"column(order_id)"                                    json:"order_id"` // varchar(255)
-	OrderType            int64                    `orm:"column(order_type)"                                  json:"order_type"`
-	WxUserId             int64                    `orm:"column(wx_user_id)"                                  json:"wx_user_id"`
-	UserId               int64                    `orm:"column(user_id)"                                     json:"user_id"`    // int(11)
-	ProductId            int64                    `orm:"column(product_id)"                                  json:"product_id"` // int(11)
-	GranaryId            int64                    `orm:"column(granary_id)"                                  json:"granary_id"` // int(11)
-	UnitPrice            int64                    `orm:"column(unit_price)"                                  json:"unit_price"`
-	UnitUserSalePrice    int64                    `orm:"column(unit_user_sale_price)"                        json:"-"`
-	UnitRoboBalancePrice int64                    `orm:"column(unit_robo_balance_price)"                     json:"unit_robo_balance_price"`
-	TotalPrice           int64                    `orm:"column(total_price)"                                 json:"total_price"`      // int(11)
-	PaiedPrice           int64                    `orm:"column(paied_price);null"                            json:"paied_price"`      // int(11)
-	BuyPrice             int64                    `orm:"column(buy_price);null"                              json:"-"`                // int(11)
-	Count                int64                    `orm:"column(count);null"                                  json:"count"`            // int(11)
-	PaiedAt              int64                    `orm:"column(paied_at);null"                               json:"paied_at"`         // int(11)
-	TradeNo              string                   `orm:"column(trade_no);null"                               json:"trade_no"`         // varchar(255)
-	Status               string                   `orm:"column(status);null"                                 json:"status"`           // varchar(255)
-	StatusCn             string                   `orm:"-"                                                   json:"status_cn"`        // varchar(255)
-	PayWay               string                   `orm:"column(pay_way);null"                                json:"pay_way"`          // varchar(255)
-	Source               string                   `orm:"column(source);null"                                 json:"source"`           // varchar(255)
-	Tel                  string                   `orm:"column(tel);null"                                    json:"tel"`              // varchar(255)
-	Address              string                   `orm:"column(address);null"                                json:"address"`          // varchar(255)
-	Contact              string                   `orm:"column(contact);null"                                json:"contact"`          // varchar(255)
-	ExpressCompany       string                   `orm:"column(express_company);null"                        json:"express_company"`  // varchar(255)
-	ExpressOrderNo       string                   `orm:"column(express_order_no);null"                       json:"express_order_no"` // varchar(255)
-	Remark               string                   `orm:"column(remark);null"                                 json:"remark"`           // varchar(255)
-	OrderRemark          string                   `orm:"column(order_remark);null"                           json:"-"`                // varchar(255)
-	Product              *product_model.Product   `orm:"-"                                 json:"product"`                            // varchar(255)
-	CTime                int64                    `orm:"-"                                 json:"ctime"`                              // int(11)
-	DTime                int64                    `orm:"-"                                 json:"dtime"`                              // int(11)
-	Freight              int64                    `orm:"column(freight);null"                            json:"freight"`              // int(11)
-	DispatchTime         time.Time                `orm:"column(dispatch_time);null;type(datetime)"           json:"dispatch_time"`
-	ReceiveTime          time.Time                `orm:"column(receive_time);null;type(datetime)"            json:"receive_time"`
-	IsPartRefund         int64                    `orm:"column(is_part_refund);null"                         json:"-"`          // int(11)
-	PlatformRefundAmount int64                    `orm:"column(platform_refund_amount);null"                 json:"-"`          // int(11)
-	MerchantRefundAmount int64                    `orm:"column(merchant_refund_amount);null"                 json:"-"`          // int(11)
-	PaiedTime            time.Time                `orm:"column(paied_time);null;type(datetime)"              json:"paied_time"` // int(11)
-	CreatedAt            time.Time                `orm:"column(created_at);null;auto_now_add;type(datetime)" json:"-"`          // datetime
-	UpdatedAt            time.Time                `orm:"column(updated_at);null;auto_now;type(datetime)"     json:"-"`          // datetime
-	WxUser               *user_model.WxUser       `orm:"-"                                 json:"wx_user"`
-	ProductList          []*product_model.Product `orm:"-"                                 json:"product_list"` // varchar(255)
-	IsJoinSubjectPrize   bool                     `orm:"column(is_join_subject_prize)"     json:"-"`            // int(11)
-	ProductSaleSubjectId int64                    `orm:"column(product_sale_subject_id)"   json:"-"`            // int(11)
-}
-
-type MerchantOrder struct {
-	Id                   int64                  `orm:"column(id)"                                          json:"id"`       // int(11)
-	OrderId              string                 `orm:"column(order_id)"                                    json:"order_id"` // varchar(255)
-	OrderType            int64                  `orm:"column(order_type)"                                  json:"order_type"`
-	OrderTypeCn          string                 `orm:"-"                                                   json:"order_type_cn"`
-	WxUserId             int64                  `orm:"column(wx_user_id)"                                  json:"wx_user_id"`
-	UserId               int64                  `orm:"column(user_id)"                                     json:"user_id"`    // int(11)
-	ProductId            int64                  `orm:"column(product_id)"                                  json:"product_id"` // int(11)
-	GranaryId            int64                  `orm:"column(granary_id)"                                  json:"granary_id"` // int(11)
-	UnitPrice            int64                  `orm:"column(unit_price)"                                  json:"unit_price"`
-	UnitRoboBalancePrice int64                  `orm:"column(unit_robo_balance_price)"                     json:"unit_robo_balance_price"`
-	BuyPrice             int64                  `orm:"column(buy_price);null"                              json:"buy_price"`        // int(11)
-	Count                int64                  `orm:"column(count);null"                                  json:"count"`            // int(11)
-	PaiedAt              int64                  `orm:"column(paied_at);null"                               json:"paied_at"`         // int(11)
-	TradeNo              string                 `orm:"column(trade_no);null"                               json:"trade_no"`         // varchar(255)
-	Status               string                 `orm:"column(status);null"                                 json:"status"`           // varchar(255)
-	StatusCn             string                 `orm:"-"                                                   json:"status_cn"`        // varchar(255)
-	PayWay               string                 `orm:"column(pay_way);null"                                json:"pay_way"`          // varchar(255)
-	Source               string                 `orm:"column(source);null"                                 json:"source"`           // varchar(255)
-	Tel                  string                 `orm:"column(tel);null"                                    json:"tel"`              // varchar(255)
-	Address              string                 `orm:"column(address);null"                                json:"address"`          // varchar(255)
-	Contact              string                 `orm:"column(contact);null"                                json:"contact"`          // varchar(255)
-	ExpressCompany       string                 `orm:"column(express_company);null"                        json:"express_company"`  // varchar(255)
-	ExpressOrderNo       string                 `orm:"column(express_order_no);null"                       json:"express_order_no"` // varchar(255)
-	Remark               string                 `orm:"column(remark);null"                                 json:"remark"`           // varchar(255)
-	Product              *product_model.Product `orm:"-"                                 json:"product"`                            // varchar(255)
-	CTime                int64                  `orm:"-"                               json:"ctime"`                                // int(11)
-	DTime                int64                  `orm:"-"                               json:"dtime"`                                // int(11)
-	RTime                int64                  `orm:"-"                               json:"rtime"`
-	DispatchTime         time.Time              `orm:"column(dispatch_time);null;type(datetime)"           json:"-"`
-	ReceiveTime          time.Time              `orm:"column(receive_time);null;type(datetime)"            json:"-"`
-	IsPartRefund         int64                  `orm:"column(is_part_refund);null"                         json:"-"` // int(11)
-	PlatformRefundAmount int64                  `orm:"column(platform_refund_amount);null"                 json:"-"` // int(11)
-	MerchantRefundAmount int64                  `orm:"column(merchant_refund_amount);null"                 json:"-"` // int(11)
-	WxUser               *user_model.WxUser     `orm:"-"                                                   json:"wx_user"`
-	CreatedAt            time.Time              `orm:"column(created_at);null;auto_now_add;type(datetime)" json:"-"` // datetime
-
-	ExCompanyArray []string `orm:"-"                                                   json:"ex_company_array"`
-	ExOrderNoArray []string `orm:"-"                                                   json:"ex_order_no_array"`
+	Id             int64                    `orm:"column(id);pk"                                       json:"id"`       // int(11)
+	OrderId        string                   `orm:"column(order_id)"                                    json:"order_id"` // varchar(255)
+	OrderType      int64                    `orm:"column(order_type)"                                  json:"order_type"`
+	WxUserId       int64                    `orm:"column(wx_user_id)"                                  json:"wx_user_id"`
+	UserId         int64                    `orm:"column(user_id)"                                     json:"user_id"`          // int(11)
+	TotalPrice     int64                    `orm:"column(total_price)"                                 json:"total_price"`      // int(11)
+	PaiedPrice     int64                    `orm:"column(paied_price);null"                            json:"paied_price"`      // int(11)
+	BuyPrice       int64                    `orm:"column(buy_price);null"                              json:"-"`                // int(11)
+	Count          int64                    `orm:"column(count);null"                                  json:"count"`            // int(11)
+	PaiedAt        int64                    `orm:"column(paied_at);null"                               json:"paied_at"`         // int(11)
+	TradeNo        string                   `orm:"column(trade_no);null"                               json:"trade_no"`         // varchar(255)
+	Status         string                   `orm:"column(status);null"                                 json:"status"`           // varchar(255)
+	StatusCn       string                   `orm:"-"                                                   json:"status_cn"`        // varchar(255)
+	PayWay         string                   `orm:"column(pay_way);null"                                json:"pay_way"`          // varchar(255)
+	Source         string                   `orm:"column(source);null"                                 json:"source"`           // varchar(255)
+	Tel            string                   `orm:"column(tel);null"                                    json:"tel"`              // varchar(255)
+	Address        string                   `orm:"column(address);null"                                json:"address"`          // varchar(255)
+	Contact        string                   `orm:"column(contact);null"                                json:"contact"`          // varchar(255)
+	ExpressCompany string                   `orm:"column(express_company);null"                        json:"express_company"`  // varchar(255)
+	ExpressOrderNo string                   `orm:"column(express_order_no);null"                       json:"express_order_no"` // varchar(255)
+	Remark         string                   `orm:"column(remark);null"                                 json:"remark"`           // varchar(255)
+	OrderRemark    string                   `orm:"column(order_remark);null"                           json:"-"`                // varchar(255)
+	CTime          int64                    `orm:"-"                                 json:"ctime"`                              // int(11)
+	DTime          int64                    `orm:"-"                                 json:"dtime"`                              // int(11)
+	Freight        int64                    `orm:"column(freight);null"                            json:"freight"`              // int(11)
+	DispatchTime   time.Time                `orm:"column(dispatch_time);null;type(datetime)"           json:"dispatch_time"`
+	ReceiveTime    time.Time                `orm:"column(receive_time);null;type(datetime)"            json:"receive_time"`
+	PaiedTime      time.Time                `orm:"column(paied_time);null;type(datetime)"              json:"paied_time"` // int(11)
+	CreatedAt      time.Time                `orm:"column(created_at);null;auto_now_add;type(datetime)" json:"-"`          // datetime
+	UpdatedAt      time.Time                `orm:"column(updated_at);null;auto_now;type(datetime)"     json:"-"`          // datetime
+	WxUser         *user_model.WxUser       `orm:"-"                                 json:"wx_user"`
+	ProductList    []*product_model.Product `orm:"-"                                 json:"product_list"` // varchar(255)
 }
 
 func (self *Order) TableName() string {
@@ -164,22 +109,19 @@ func (self *Order) TableName() string {
 }
 
 //创建订单
-func (self *Order) Create(wxUserId, uId, pId, count, totalPrice, buyPrice, unit_price, unitRoboBalancePrice int64, source string) *Order {
+func (self *Order) Create(wxUserId, uId, count, totalPrice, buyPrice int64, source string) *Order {
 	var oId string
 	oId = createOrderId(ORDER_ID_PREFIX_EX)
 	order := &Order{
-		OrderId:              oId,
-		ProductId:            pId,
-		UserId:               uId,
-		WxUserId:             wxUserId,
-		Count:                count,
-		TotalPrice:           totalPrice,
-		BuyPrice:             buyPrice,
-		PayWay:               PAY_WAY_BALANCE,
-		Status:               STATUS_UNPAY,
-		Source:               source,
-		UnitPrice:            unit_price,
-		UnitRoboBalancePrice: unitRoboBalancePrice,
+		OrderId:    oId,
+		UserId:     uId,
+		WxUserId:   wxUserId,
+		Count:      count,
+		TotalPrice: totalPrice,
+		BuyPrice:   buyPrice,
+		PayWay:     PAY_WAY_BALANCE,
+		Status:     STATUS_UNPAY,
+		Source:     source,
 	}
 	id, err := orm.NewOrm().Insert(order)
 	if err != nil {
@@ -235,15 +177,6 @@ func GetOrderByIntId(id int64) (order *Order) {
 	return order
 }
 
-func GetMerchantOrderById(oId string) (morder *MerchantOrder) {
-	morder = &MerchantOrder{}
-	if err := orm.NewOrm().Raw("select * from orders where order_id = ? limit 1", oId).QueryRow(morder); err != nil {
-		beego.BeeLogger.Error("get morder by id=%s err=%s", oId, err)
-		morder = nil
-	}
-	return morder
-}
-
 // 获取订单号前缀
 func (self *Order) GetOrderIdPrefix() string {
 	s := strings.Split(self.OrderId, "")
@@ -416,106 +349,6 @@ func GetSoldCountByPId(pId int64, useCache bool) int64 {
 	return ret.Count
 }
 
-//获取用户订单列表
-func GetMerchantOrders(merchantId, queryPaiedStart, queryPaiedEnd int64, receiveStart, receiveEnd int64,
-	status, contact, productIds, tel, orderType, orderId, province, city, district string, page, perPage int) (orders []*MerchantOrder) {
-
-	productIdsSql := fmt.Sprintf(" ( SELECT id FROM products WHERE merchant_id = %d ) ", merchantId)
-	if productIds != "0" && productIds != "" {
-		var productIdArray []string
-		productIdArrayTmp := strings.Split(productIds, ",")
-		for _, item := range productIdArrayTmp {
-			_, err := strconv.ParseInt(item, 10, 64)
-			if err == nil {
-				productIdArray = append(productIdArray, item)
-			}
-		}
-		productIds = strings.Join(productIdArray, ",")
-		productIdsSql = fmt.Sprintf(" ( %s ) ", productIds)
-	}
-	queryPaiedStartSql := fmt.Sprintf(" and paied_at >= %d ", queryPaiedStart)
-	if queryPaiedStart <= 0 {
-		queryPaiedStartSql = ""
-	}
-	queryPaiedEndSql := fmt.Sprintf(" and paied_at < %d ", queryPaiedEnd)
-	if queryPaiedEnd <= 0 {
-		queryPaiedEndSql = ""
-	}
-
-	queryReceiveStartSql := fmt.Sprintf(" and UNIX_TIMESTAMP(receive_time) >= %d ", receiveStart)
-	if receiveStart <= 0 {
-		queryReceiveStartSql = ""
-	}
-	queryReceiveEndSql := fmt.Sprintf(" and UNIX_TIMESTAMP(receive_time) < %d ", receiveEnd)
-	if receiveEnd <= 0 {
-		queryReceiveEndSql = ""
-	}
-
-	statusSql := fmt.Sprintf(" and `status` = '%s' ", strings.TrimSpace(status))
-	if strings.TrimSpace(status) == "" {
-		statusSql = " and `status` in ('processing','dispatch','complete','refunded') "
-	}
-	contactSql := fmt.Sprintf(" and contact like '%%%s%%'", strings.TrimSpace(contact))
-	if strings.TrimSpace(contact) == "" {
-		contactSql = ""
-	}
-	telSql := fmt.Sprintf(" and tel like '%s%%'", strings.TrimSpace(tel))
-	if strings.TrimSpace(tel) == "" {
-		telSql = ""
-	}
-	orderTypeSql := fmt.Sprintf(" and order_type = %s ", strings.TrimSpace(orderType))
-	if strings.TrimSpace(orderType) == "" {
-		orderTypeSql = ""
-	}
-	orderIdSql := fmt.Sprintf(" and order_id like '%s%%'", strings.TrimSpace(orderId))
-	if strings.TrimSpace(orderId) == "" {
-		orderIdSql = ""
-	}
-	provinceSql := fmt.Sprintf(" and address like '%s%%' ", strings.TrimSpace(province))
-	if strings.TrimSpace(province) == "" {
-		provinceSql = ""
-	}
-	citySql := fmt.Sprintf(" and address like '%%%s%%' ", strings.TrimSpace(city))
-	if strings.TrimSpace(city) == "" {
-		citySql = ""
-	}
-	districtSql := fmt.Sprintf(" and address like '%%%s%%' ", strings.TrimSpace(district))
-	if strings.TrimSpace(district) == "" {
-		districtSql = ""
-	}
-	limitSql := fmt.Sprintf(" LIMIT %d,%d", (page-1)*perPage, perPage)
-	if page == 0 && perPage == 0 {
-		limitSql = ""
-	}
-	sql := `
-		SELECT
-			*
-		FROM
-			orders
-		WHERE
-			product_id IN %s %s %s
-		%s %s %s %s %s %s %s %s %s %s
-		ORDER BY
-			paied_at
-		%s;
-	`
-	sql = fmt.Sprintf(sql, productIdsSql, queryPaiedStartSql, queryPaiedEndSql, queryReceiveStartSql, queryReceiveEndSql,
-		statusSql, contactSql, telSql, orderTypeSql, orderIdSql, provinceSql, citySql, districtSql, limitSql)
-
-	_, err := orm.NewOrm().Raw(sql).QueryRows(&orders)
-
-	if err != nil {
-		beego.BeeLogger.Debug("get GetMerchantOrders.merchantId[%d].paiedStart[%d].paiedEnd[%d].receiveStart[%d].receiveEnd[%d].status[%s]."+
-			"contact[%s].tel[%s].orderType[%s].orderId[%s].province[%s].city[%s].limit[%d, %d] order list err=[%s]",
-			merchantId, queryPaiedStart, queryPaiedEnd, receiveStart, receiveEnd, status, contact, tel, orderType, orderId, province, city, page, perPage, err)
-		return nil
-	}
-	for _, order := range orders {
-		order.StatusCn = STATUS_CN_TEXT[order.Status]
-	}
-	return orders
-}
-
 //获取用户订单列表-总数
 func GetMerchantOrdersCount(merchantId, queryPaiedStart, queryPaiedEnd int64, receiveStart, receiveEnd int64,
 	status, contact, productIds, tel, orderType, orderId, province, city, district string) int64 {
@@ -611,88 +444,6 @@ func GetMerchantOrdersCount(merchantId, queryPaiedStart, queryPaiedEnd int64, re
 	return ret.Count
 }
 
-//获取所有商家订单列表
-func GetAllMerchantOrders(status, contact string, page, perPage int) (orders []*MerchantOrder) {
-
-	statusSql := fmt.Sprintf(" and `status` = '%s' ", status)
-	if status == "" {
-		statusSql = ""
-	}
-	contactSql := fmt.Sprintf(" and contact like '%%%s%%'", contact)
-	if contact == "" {
-		contactSql = ""
-	}
-	sql := `
-		SELECT
-			*
-		FROM
-			orders
-		WHERE
-			product_id IN (
-				SELECT
-					id
-				FROM
-					products
-			) %s %s
-		ORDER BY
-			paied_at 
-		LIMIT %d,%d;
-	`
-	sql = fmt.Sprintf(sql, statusSql, contactSql, (page-1)*perPage, perPage)
-
-	_, err := orm.NewOrm().Raw(sql).QueryRows(&orders)
-
-	if err != nil {
-		beego.BeeLogger.Debug("get GetAllMerchantOrders[%s,%d,%d] order list err=[%s]", status, page, perPage, err)
-		return nil
-	}
-	for _, order := range orders {
-		order.StatusCn = STATUS_CN_TEXT[order.Status]
-	}
-	return orders
-}
-
-//获取所有商家订单列表-总数
-func GetAllMerchantOrdersCount(status, contact string) int64 {
-
-	statusSql := fmt.Sprintf(" and `status` = '%s' ", status)
-	if status == "" {
-		statusSql = ""
-	}
-	contactSql := fmt.Sprintf(" and contact like '%%%s%%'", contact)
-	if contact == "" {
-		contactSql = ""
-	}
-	sql := `
-		SELECT
-			count(*) as count
-		FROM
-			orders
-		WHERE
-			product_id IN (
-				SELECT
-					id
-				FROM
-					products
-			) %s %s;
-	`
-
-	type Ret struct {
-		Count int64 `json:"count"`
-	}
-
-	var ret Ret
-	sql = fmt.Sprintf(sql, statusSql, contactSql)
-	err := orm.NewOrm().Raw(sql).QueryRow(&ret)
-
-	if err != nil {
-		beego.BeeLogger.Warn("order_models.GetAllMerchantOrdersCount(%s) err[%s]", status, err)
-		return 0
-	}
-
-	return ret.Count
-}
-
 //查找已发货但发货时间为空的订单
 func GetOrdersByDispatchStatusAndDispatchTimeIsNull() (orders []*Order) {
 

go/gopath/src/fohow.com/apps/models/order_model/refund.go

@@ -1,88 +0,0 @@
-package order_model
-
-import (
-	// "fmt"
-	"github.com/astaxie/beego"
-	// "strconv"
-	// "strings"
-	"time"
-
-	"github.com/astaxie/beego/orm"
-	// "github.com/uuid"
-	// "fohow.com/apps/models/shop_model"
-	// "fohow.com/apps/models/user_model"
-)
-
-const (
-	order_refunds_tablename = "order_refunds"
-)
-
-type OrderRefund struct {
-	Id        int64     `orm:"column(id);pk"                                  json:"id,omitempty"`         // int(11)
-	OrderId   string    `orm:"column(order_id);null"                          json:"order_id,omitempty"`   // varchar(255)
-	TradeNo   string    `orm:"column(trade_no);null"                          json:"trade_no,omitempty"`   // varchar(255)
-	PayNo     string    `orm:"column(pay_no);null"                            json:"pay_no,omitempty"`     // varchar(255)
-	State     int64     `orm:"column(state);null"                             json:"state,omitempty"`      // tinyint(1)
-	CreatedAt time.Time `orm:"column(created_at);auto_now_add;type(datetime)" json:"created_at,omitempty"` // datetime
-	UpdatedAt time.Time `orm:"column(updated_at);auto_now;type(datetime)"     json:"updated_at,omitempty"` // datetime
-	Des       string    `orm:"column(des);null"                               json:"des,omitempty"`        // varchar(255)
-	UserId    int64     `orm:"column(user_id)"                                json:"user_id,omitempty"`    // int(11)
-	Price     float64   `orm:"column(price);null;digits(10);decimals(2)"      json:"price,omitempty"`      // decimal(10,2)
-}
-
-func (self *OrderRefund) TableName() string {
-	return order_refunds_tablename
-}
-
-func (self *OrderRefund) Save() bool {
-	if _, err := orm.NewOrm().Update(self); err != nil {
-		beego.BeeLogger.Error("SaveOrder order=[%s] .err=[%s]", self.OrderId, err)
-		return false
-	}
-	return true
-}
-
-func GetOrderRefunds() (items []*OrderRefund) {
-	item := new(OrderRefund)
-	if _, err := orm.NewOrm().QueryTable(item).
-		Filter("state", 0).All(&items); err != nil {
-		beego.BeeLogger.Debug("GetOrderRefunds err=[%s]", err)
-		return nil
-	}
-	return items
-}
-
-func GetOrderRefundByOrderId(oId string) (order *OrderRefund) {
-	order = &OrderRefund{}
-	if err := orm.NewOrm().QueryTable(order).Filter("order_id", oId).Limit(1).
-		One(order); err != nil {
-		beego.BeeLogger.Debug("GetOrderRefund('%s') err=[%s]", oId, err)
-		order = nil
-	}
-	return order
-}
-
-// //根据订单Id，获取所有订单项
-// func GetAllItemByOrderId(oId string) (items []*OrderItem) {
-// 	item := new(OrderItem)
-// 	if _, err := orm.NewOrm().QueryTable(item).
-// 		Filter("dianshi_order_id", oId).All(&items); err != nil {
-// 		beego.BeeLogger.Debug("get order[%s] items err=[%s]", oId, err)
-// 		return nil
-// 	}
-// 	return items
-// }
-
-//创建汇款订单
-func (self *OrderRefund) Create(oId, des string, uId int64, price float64) *OrderRefund {
-	order := &OrderRefund{
-		OrderId: oId,
-		Des:     des,
-		UserId:  uId,
-		Price:   price}
-	if _, err := orm.NewOrm().Insert(order); err != nil {
-		beego.BeeLogger.Error("insert OrderRefund err=[%s]", err)
-		return nil
-	}
-	return order
-}

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

@@ -15,7 +15,4 @@ const (
 	PAYWAY_WEIXINPAY = "weixinpay" //微信支付
 	PAYWAY_BALANCE   = "balance"   //我的代金券
 	PAY_WAY_INTEGRAL = "integral"  //代金券
-	//PAYWAY_GZH_WEIXINPAY = "gzhwxpay" //公众号微信支付
-	//PAY_WAY_GZH_BALANCE   = "gzhbalance"//公众号代金券支付
-	//PAY_WAY_MALL_BALANCE = "mallbalance" //第五创代金券
 )

go/gopath/src/fohow.com/apps/models/product_model/product.go

@@ -14,9 +14,6 @@ const (
 	products_tablename = "products"
 	STATUS_APPROVED    = "approved"
 
-	// DEFUALT_BK_DURATION = 12 //BK订单过期时间 单位小时
-	// DEFUALT_DS_DURATION = 48 //DS订单过期时间 单位小时，会被移走到closed表
-
 	PRODUCT_STATUS_UP   = 1
 	PRODUCT_STATUS_DOWN = 0
 
@@ -46,15 +43,14 @@ type Product struct {
 	Detail           string     `orm:"column(detail);null"                                 json:"detail"` // text
 	Price            int64      `orm:"column(price)"                                       json:"price"`  // int(11)
 	RoboBalancePrice int64      `orm:"column(robo_balance_price)"                          json:"robo_balance_price"`
-	MallBalancePrice int64      `orm:"column(mall_balance_price)"                          json:"mall_balance_price"` // int(11)
-	BuyPrice         int64      `orm:"column(buy_price)"                                   json:"-"`                  // int(11)
-	UserSalePrice    int64      `orm:"column(user_sale_price)"                             json:"user_sale_price"`    // int(11)
-	Count            int64      `orm:"column(count)"                                   json:"-"`                      // int(11)
-	SaleNums         int64      `orm:"column(sale_nums)"                                   json:"-"`                  // int(11)
-	LeftCount        int64      `orm:"-"                                   json:"left_count"`                         // int(11)
-	Recommend        int64      `orm:"column(recommend);null"                              json:"-"`                  // int(11)
-	Status           int64      `orm:"column(status);null"                                 json:"-"`                  // tinyint(1)
-	IsSupportPoor    int64      `orm:"column(is_support_poor);null"                        json:"is_support_poor"`    // tinyint(1)
+	BuyPrice         int64      `orm:"column(buy_price)"                                   json:"-"`               // int(11)
+	UserSalePrice    int64      `orm:"column(user_sale_price)"                             json:"user_sale_price"` // int(11)
+	Count            int64      `orm:"column(count)"                                   json:"-"`                   // int(11)
+	SaleNums         int64      `orm:"column(sale_nums)"                                   json:"-"`               // int(11)
+	LeftCount        int64      `orm:"-"                                   json:"left_count"`                      // int(11)
+	Recommend        int64      `orm:"column(recommend);null"                              json:"-"`               // int(11)
+	Status           int64      `orm:"column(status);null"                                 json:"-"`               // tinyint(1)
+	IsSupportPoor    int64      `orm:"column(is_support_poor);null"                        json:"is_support_poor"` // tinyint(1)
 	Album            []*Picture `orm:"-"                                       json:"pics"`
 	//DetailPics []*Picture `orm:"-"                                       json:"detail_pics"`
 	SoldCount          int64     `orm:"-"                                       json:"sold_count"`

go/gopath/src/fohow.com/routers/routes.go

@@ -98,8 +98,6 @@ func init() {
 	//----------- 支付相关 -----------
 	beego.Router("/v1/pay", &pay_controller.PayController{}, "post,get:Pay")
 	beego.Router("/v1/pay/:target:string/async/:payway:string", &pay_controller.PayController{}, "post,get:PayAsync")
-	//在余额支付订单时查询欠缺金额(之前考虑写到订单模块)
-	beego.Router("/v1/before_pay/check_balance", &pay_controller.PayController{}, "get:CheckBalanceBeforePayExchange")
 	//生成充值代金券订单
 	beego.Router("/v1/balance_order/generate", &pay_controller.PayController{}, "post:CreateBalanceOrder")
 	//生成充值余额订单
@@ -195,13 +193,6 @@ func init() {
 	beego.Router("/v1/formid", &form_id_controller.FromIdController{}, "post:Create")
 	beego.Router("/v1/formid", &form_id_controller.FromIdController{}, "delete:TestSendingTemplatemsg")
 
-	//	--------------商家订单--------------
-	beego.Router("/v1/merchant/orders", &order_controller.OrderController{}, "get:MerchantList")
-	beego.Router("/v1/merchant/orders/export", &order_controller.OrderController{}, "get:ExportMerchantOrders")
-	beego.Router("/v1/merchant/orders/count", &order_controller.OrderController{}, "get:MerchantListCount")
-	beego.Router("/v1/merchant/order/:order_id", &order_controller.OrderController{}, "put:UpdateExpress")
-	beego.Router("/v1/merchant/order/detail/:order_id", &order_controller.OrderController{}, "get:MerchantOrderDetail")
-
 	//---------------railsadmin后台请求相关----------------
 	beego.InsertFilter("/railsadmin/*", beego.BeforeExec, apps.CheckIsInvokeFromRailsAdmin, true)
 	beego.Router("/railsadmin/clean_cache/:type:string/:id([0-9]+)", &railsadmin_controller.RailsadminController{}, "get:CleanCache")