1

business/bidding/bidding.go

@@ -145,7 +145,7 @@ func CreateSupermarketSign(supermarket []*model.SupermarketSign, lastOperator st
 	return errors
 }
 
-func QuerySupermarketSign(storeId, storeName, cityName, storeType, signPeople string, start, end, page, size int) (result []*model.SupermarketSign, totalCount int, err error) {
+func QuerySupermarketSign(storeId, storeName, cityName, storeType, signPeople string, start, end, expirationStart, expirationEnd, page, size int) (result []*model.SupermarketSign, totalCount int, err error) {
 	sql := `SELECT SQL_CALC_FOUND_ROWS * FROM supermarket_sign WHERE 1 = 1 `
 	param := make([]interface{}, 0, 0)
 
@@ -156,6 +156,17 @@ func QuerySupermarketSign(storeId, storeName, cityName, storeType, signPeople st
 	}
 	if end != 0 {
 		endTime := time.Unix(int64(end), 0)
+		sql += ` AND sign_start_time <= ?`
+		param = append(param, endTime)
+	}
+
+	if expirationStart != 0 {
+		startTime := time.Unix(int64(expirationStart), 0)
+		sql += ` AND sign_end_time >=  ?`
+		param = append(param, startTime)
+	}
+	if expirationEnd != 0 {
+		endTime := time.Unix(int64(expirationEnd), 0)
 		sql += ` AND sign_end_time < ?`
 		param = append(param, endTime)
 	}

business/model/supermarket_sign.go

@@ -20,6 +20,12 @@ type SupermarketSign struct {
 	CreateCrowd   string    `orm:"column(create_crowd);size(16)" json:"createCrowd"`            // 群状态
 }
 
+func (*SupermarketSign) TableUnique() [][]string {
+	return [][]string{
+		[]string{"StoreID"},
+	}
+}
+
 func (*SupermarketSign) TableIndex() [][]string {
 	return [][]string{
 		[]string{"StoreID", "StoreName", "CodeName"},

controllers/bidding.go

@@ -11,7 +11,6 @@ import (
 	"git.rosy.net.cn/jx-callback/business/jxutils/tasksch"
 	"git.rosy.net.cn/jx-callback/business/model"
 	"git.rosy.net.cn/jx-callback/business/partner"
-	"git.rosy.net.cn/jx-callback/globals"
 	"git.rosy.net.cn/jx-callback/globals/api"
 	"github.com/astaxie/beego/server/web"
 	"strings"
@@ -144,15 +143,11 @@ func (c *BiddingController) JXPrintAfsOrder() {
 func (c *BiddingController) CreateSupermarketSign() {
 	c.callCreateSupermarketSign(func(params *tBindCreateSupermarketSignParams) (retVal interface{}, hint string, err error) {
 		supermarket := make([]*model.SupermarketSign, 0, 0)
-		globals.SugarLogger.Debugf("------params.SignObj := %s", params.SignObj)
 		if err = json.Unmarshal([]byte(params.SignObj), &supermarket); err != nil {
-			globals.SugarLogger.Debugf("------params.SignObj  err:= %v", err)
 			return nil, "", err
 		}
-		globals.SugarLogger.Debugf("------params.supermarket := %s", utils.Format4Output(supermarket, false))
 
-		//retVal = bidding.CreateSupermarketSign(supermarket, params.Ctx.GetUserID())
+		retVal = bidding.CreateSupermarketSign(supermarket, params.Ctx.GetUserName())
-		retVal = bidding.CreateSupermarketSign(supermarket, "liulei")
 		return retVal, "", nil
 	})
 }
@@ -164,6 +159,8 @@ func (c *BiddingController) CreateSupermarketSign() {
 // @Param	storeName 		formData		string		false	"美团门店名称"
 // @Param	startTime 		formData		int64		false	"签约开始时间"
 // @Param	endTime 		formData		int64		false	"签约结束时间"
+// @Param	expirationStart formData		int64		false	"到期开始时间"
+// @Param	expirationEnd 	formData		int64		false	"到期结束时间"
 // @Param	cityName 		formData		string		false	"门店城市"
 // @Param	storeType 		formData		string		false	"门店类型"
 // @Param	signPeople 		formData		string		false	"签约人"
@@ -175,7 +172,7 @@ func (c *BiddingController) CreateSupermarketSign() {
 // @router /GetSupermarketSign [post]
 func (c *BiddingController) GetSupermarketSign() {
 	c.callGetSupermarketSign(func(params *tBindGetSupermarketSignParams) (retVal interface{}, hint string, err error) {
-		retVal, count, err := bidding.QuerySupermarketSign(params.StoreID, params.StoreName, params.CityName, params.StoreType, params.SignPeople, params.StartTime, params.EndTime, params.Page, params.Size)
+		retVal, count, err := bidding.QuerySupermarketSign(params.StoreID, params.StoreName, params.CityName, params.StoreType, params.SignPeople, params.StartTime, params.EndTime, params.ExpirationStart, params.ExpirationEnd, params.Page, params.Size)
 
 		return map[string]interface{}{"data": retVal, "page": count}, "", err
 	})
@@ -188,6 +185,8 @@ func (c *BiddingController) GetSupermarketSign() {
 // @Param	storeName 		formData		string		false	"美团门店名称"
 // @Param	startTime 		formData		int64		false	"签约开始时间"
 // @Param	endTime 		formData		int64		false	"签约结束时间"
+// @Param	expirationStart formData		int64		false	"到期开始时间"
+// @Param	expirationEnd 	formData		int64		false	"到期结束时间"
 // @Param	cityName 		formData		string		false	"门店城市"
 // @Param	storeType 		formData		string		false	"门店类型"
 // @Param	signPeople 		formData		string		false	"签约人"
@@ -205,7 +204,7 @@ func (c *BiddingController) DownSupermarketSign() {
 			func(task *tasksch.SeqTask, step int, params2 ...interface{}) (result interface{}, err error) {
 				switch step {
 				case 0:
-					stores, _, _ = bidding.QuerySupermarketSign(params.StoreID, params.StoreName, params.CityName, params.StoreType, params.SignPeople, params.StartTime, params.EndTime, 1, model.UnlimitedPageSize)
+					stores, _, _ = bidding.QuerySupermarketSign(params.StoreID, params.StoreName, params.CityName, params.StoreType, params.SignPeople, params.StartTime, params.EndTime, params.ExpirationStart, params.ExpirationEnd, 1, model.UnlimitedPageSize)
 				case 1:
 					excelConf := &excel.Obj2ExcelSheetConfig{
 						Title: "签约门店导出",