|
@@ -63,6 +63,8 @@ func ProductList(c *gin.Context, apictx *ApiSession) (interface{}, error) {
|
|
|
|
|
|
|
|
// selectTime
|
|
// selectTime
|
|
|
selectTime := time.Now().Format("2006-01")
|
|
selectTime := time.Now().Format("2006-01")
|
|
|
|
|
+
|
|
|
|
|
+ // now.AddDate(0, int(-now.Month()) + month + 1, -now.Day()).Format("200612")
|
|
|
if _, ok := query["selectTime"]; ok {
|
|
if _, ok := query["selectTime"]; ok {
|
|
|
timeSlice := strings.Split(query["selectTime"].(string), ".")
|
|
timeSlice := strings.Split(query["selectTime"].(string), ".")
|
|
|
selectTime = strings.Join(timeSlice, "-")
|
|
selectTime = strings.Join(timeSlice, "-")
|
|
@@ -70,7 +72,9 @@ func ProductList(c *gin.Context, apictx *ApiSession) (interface{}, error) {
|
|
|
}
|
|
}
|
|
|
timeStr := fmt.Sprintf("%s%s", selectTime, "-01 00:00:00")
|
|
timeStr := fmt.Sprintf("%s%s", selectTime, "-01 00:00:00")
|
|
|
formatTime, _ := time.ParseInLocation("2006-01-02 15:04:05", timeStr, time.Local)
|
|
formatTime, _ := time.ParseInLocation("2006-01-02 15:04:05", timeStr, time.Local)
|
|
|
- query["onsaleTime"] = bson.M{"$lte": formatTime}
|
|
|
|
|
|
|
+ // 下个月第一天之前的数据
|
|
|
|
|
+ addOneMothTime := formatTime.AddDate(0, 1, 0)
|
|
|
|
|
+ query["onsaleTime"] = bson.M{"$lte": addOneMothTime}
|
|
|
|
|
|
|
|
// 查询数据
|
|
// 查询数据
|
|
|
if _, ok := query["supplyId"]; !ok {
|
|
if _, ok := query["supplyId"]; !ok {
|
