新接口，得到我的守价订单

business/jxcallback/orderman/order.go

@@ -410,7 +410,7 @@ func checkPriceDefendOrderByStock(db *dao.DaoDB, storeID, skuID, stock, jxPrice
 	var (
 		sumStock = 0
 	)
-	priceDefends, _ := dao.GetPriceDefendOrder(db, []int{storeID}, []int{skuID}, []int{jxutils.GetDefendPriceIssue()}, 0, 1, 0)
+	priceDefends, _ := dao.GetPriceDefendOrder(db, []int{storeID}, []int{skuID}, []int{jxutils.GetDefendPriceIssue()}, 0, 1, 0, "", utils.ZeroTimeValue, utils.ZeroTimeValue, false)
 	if len(priceDefends) == 0 {
 		return -1
 	}

business/jxstore/act/act.go

@@ -1658,7 +1658,7 @@ func ChangeJxPriceByDiscountAct(ctx *jxcontext.Context) {
 }
 
 func checkPriceDefendOrderByPrice(db *dao.DaoDB, storeID, skuID, stock, jxPrice int) (realStock int) {
-	priceDefends, _ := dao.GetPriceDefendOrder(db, []int{storeID}, []int{skuID}, []int{jxutils.GetDefendPriceIssue()}, 0, 0, 0)
+	priceDefends, _ := dao.GetPriceDefendOrder(db, []int{storeID}, []int{skuID}, []int{jxutils.GetDefendPriceIssue()}, 0, 0, 0, "",utils.ZeroTimeValue, utils.ZeroTimeValue, false)
 	if len(priceDefends) == 0 {
 		return -1
 	}

business/model/dao/dao_order.go

@@ -1412,38 +1412,59 @@ func GetSupplySupportStoreSkus(db *DaoDB, fromDate, toDate time.Time, fromStoreI
 	return getSupplySupportStoreSkusResult, err
 }
 
-func GetPriceDefendOrder(db *DaoDB, storeIDs, skuIDs, issues []int, defendPrice, isBuyNowPrice, isSuccess int) (priceDefendOrders []*model.PriceDefendOrder, err error) {
+func GetPriceDefendOrder(db *DaoDB, storeIDs, skuIDs, issues []int, defendPrice, isBuyNowPrice, isSuccess int, userID string, beginAt, EndAt time.Time, isDesc bool) (priceDefendOrders []*model.PriceDefendOrder, err error) {
 	sql := ` 
-		SELECT *
+		SELECT a.*
-		  FROM price_defend_order
+		  FROM price_defend_order a
+		  JOIN user_delivery_address b ON a.address_id = b.id AND b.deleted_at = ?
 		 WHERE 1 = 1 
+		   AND a.deleted_at = ?
 	`
-	sqlParams := []interface{}{}
+	sqlParams := []interface{}{
+		utils.DefaultTimeValue,
+		utils.DefaultTimeValue,
+	}
 	if len(storeIDs) > 0 {
-		sql += " AND store_id IN (" + GenQuestionMarks(len(storeIDs)) + ")"
+		sql += " AND a.store_id IN (" + GenQuestionMarks(len(storeIDs)) + ")"
 		sqlParams = append(sqlParams, storeIDs)
 	}
 	if len(skuIDs) > 0 {
-		sql += " AND sku_id IN (" + GenQuestionMarks(len(skuIDs)) + ")"
+		sql += " AND a.sku_id IN (" + GenQuestionMarks(len(skuIDs)) + ")"
 		sqlParams = append(sqlParams, skuIDs)
 	}
 	if len(issues) > 0 {
-		sql += " AND issue IN (" + GenQuestionMarks(len(issues)) + ")"
+		sql += " AND a.issue IN (" + GenQuestionMarks(len(issues)) + ")"
 		sqlParams = append(sqlParams, issues)
 	}
 	if defendPrice != 0 {
-		sql += " AND defend_price = ?"
+		sql += " AND a.defend_price = ?"
 		sqlParams = append(sqlParams, defendPrice)
 	}
 	if isBuyNowPrice != -1 {
-		sql += " AND is_buy_now_price = ?"
+		sql += " AND a.is_buy_now_price = ?"
 		sqlParams = append(sqlParams, isBuyNowPrice)
 	}
 	if isSuccess != -1 {
-		sql += " AND is_success = ?"
+		sql += " AND a.is_success = ?"
 		sqlParams = append(sqlParams, isSuccess)
 	}
-	sql += " ORDER BY created_at"
+	if userID != "" {
+		sql += " AND b.user_id = ?"
+		sqlParams = append(sqlParams, userID)
+	}
+	if beginAt != utils.ZeroTimeValue {
+		sql += " AND a.created_at >= ?"
+		sqlParams = append(sqlParams, beginAt)
+	}
+	if EndAt != utils.ZeroTimeValue {
+		sql += " AND a.created_at <= ?"
+		sqlParams = append(sqlParams, EndAt)
+	}
+	if isDesc {
+		sql += " ORDER BY a.created_at DESC"
+	} else {
+		sql += " ORDER BY a.created_at"
+	}
 	err = GetRows(db, &priceDefendOrders, sql, sqlParams)
 	return priceDefendOrders, err
 }

business/partner/purchase/jx/localjx/order.go

@@ -1904,7 +1904,7 @@ func CreateOrderByPriceDefend(ctx *jxcontext.Context) {
 	var (
 		db = dao.GetDB()
 	)
-	priceDefends, _ := dao.GetPriceDefendOrder(db, nil, nil, []int{jxutils.GetDefendPriceIssue()}, 0, -1, 1)
+	priceDefends, _ := dao.GetPriceDefendOrder(db, nil, nil, []int{jxutils.GetDefendPriceIssue()}, 0, -1, 1, "", utils.ZeroTimeValue, utils.ZeroTimeValue, false)
 	if len(priceDefends) == 0 {
 		return
 	}
@@ -1949,3 +1949,12 @@ func SettleDiscountActByPriceDefend(ctx *jxcontext.Context, order *model.PriceDe
 	}
 	return err
 }
+
+func GetMyPriceDefendOrders(ctx *jxcontext.Context, fromTime, toTime string) (priceDefendOrders []*model.PriceDefendOrder, err error) {
+	var (
+		db     = dao.GetDB()
+		userID = ctx.GetUserID()
+	)
+	priceDefendOrders, err = dao.GetPriceDefendOrder(db, nil, nil, nil, 0, -1, -1, userID, utils.Str2Time(fromTime), utils.Str2Time(toTime), true)
+	return priceDefendOrders, err
+}

controllers/jx_order2.go

@@ -255,3 +255,18 @@ func (c *JxOrderController) GetSupplySupportStoreSkus() {
 		return retVal, "", err
 	})
 }
+
+// @Title 得到自己的守价订单列表
+// @Description 得到自己的守价订单列表
+// @Param	token		header	string	true	"认证token"
+// @Param	fromTime	query	string	false	"开始日期（包含），格式（2006-01-02 00:00:00）"
+// @Param	toTime		query	string	false	"结束日期（包含），格式（2006-01-02 00:00:00）"
+// @Success 200 {object} controllers.CallResult
+// @Failure 200 {object} controllers.CallResult
+// @router /GetMyPriceDefendOrders [get]
+func (c *JxOrderController) GetMyPriceDefendOrders() {
+	c.callGetMyPriceDefendOrders(func(params *tJxorderGetMyPriceDefendOrdersParams) (retVal interface{}, errCode string, err error) {
+
+		return retVal, "", err
+	})
+}

routers/commentsRouter_controllers.go

@@ -727,6 +727,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:JxOrderController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:JxOrderController"],
+        beego.ControllerComments{
+            Method: "GetMyPriceDefendOrders",
+            Router: `/GetMyPriceDefendOrders`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:JxOrderController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:JxOrderController"],
         beego.ControllerComments{
             Method: "GetOrderPay",
@@ -754,6 +763,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:JxOrderController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:JxOrderController"],
+        beego.ControllerComments{
+            Method: "Pay4User",
+            Router: `/Pay4User`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:JxOrderController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:JxOrderController"],
         beego.ControllerComments{
             Method: "PayForPopluarMan",