|
|
@@ -121,7 +121,8 @@ func (d *DataExport) SieveData() error {
|
|
|
winnerArr = strings.Split(winner, ",")
|
|
|
log.Println("winnerArr", winnerArr)
|
|
|
}
|
|
|
-
|
|
|
+ now := time.Now()
|
|
|
+ nowTime, _ := strconv.ParseInt(util.FormatDate(&now, util.Date_Full_Layout), 10, 64)
|
|
|
sieveCondition := map[string]interface{}{
|
|
|
"publishtime": publishtime,
|
|
|
"area": areaArr,
|
|
|
@@ -129,6 +130,10 @@ func (d *DataExport) SieveData() error {
|
|
|
"keywords": keywordList,
|
|
|
"buyer": buyerArr,
|
|
|
"winner": winnerArr,
|
|
|
+ "comein_time": nowTime,
|
|
|
+ }
|
|
|
+ if d.GetSession("s_m_openid") != nil {
|
|
|
+ sieveCondition["openid"] = d.GetSession("s_m_openid").(string)
|
|
|
}
|
|
|
_id := mongodb.Save(ExportTable, sieveCondition)
|
|
|
if _id != "" {
|
|
|
@@ -140,7 +145,8 @@ func (d *DataExport) SieveData() error {
|
|
|
d.ServeJson(&d.T)
|
|
|
return nil
|
|
|
}
|
|
|
-/*筛选条件-关键词*/
|
|
|
+
|
|
|
+/*筛选条件--关键词*/
|
|
|
type KeyWord struct {
|
|
|
Keyword string `json:"keyword"` //关键词
|
|
|
Appended []string `json:"appended"` //附加词
|
|
|
@@ -149,12 +155,15 @@ type KeyWord struct {
|
|
|
|
|
|
/*筛选条件*/
|
|
|
type SieveCondition struct {
|
|
|
- PublishTime string `json:"publishtime"`
|
|
|
- Area []string `json:"area"`
|
|
|
- Industry []string `json:"industry"`
|
|
|
- Keyword []KeyWord `json:"keyword"`
|
|
|
- Buyer []string `json:"buyer"`
|
|
|
- Winner []string `json:"winner"`
|
|
|
+ Id string `json:"id"`
|
|
|
+ PublishTime string `json:"publishtime"` //发布时间
|
|
|
+ Area []string `json:"area"` //地区
|
|
|
+ Industry []string `json:"industry"` //行业
|
|
|
+ Keyword []KeyWord `json:"keyword"` //关键词
|
|
|
+ Buyer []string `json:"buyer"` //招标单位(采购单位)
|
|
|
+ Winner []string `json:"winner"` //中标单位
|
|
|
+ ComeInTime int64 `json:"comein_time"` //入库时间(秒)
|
|
|
+ OpenId string `json:"openid"` //用户openid
|
|
|
}
|
|
|
|
|
|
func (d *DataExport) ToMyOrder() error {
|
|
|
@@ -199,20 +208,42 @@ func (d *DataExport) QueryOrder() error {
|
|
|
return nil
|
|
|
}
|
|
|
|
|
|
+/**
|
|
|
+
|
|
|
+ 根据 id+openid 删除
|
|
|
+ */
|
|
|
func (d *DataExport) DeleteOrder() error {
|
|
|
- id := d.GetString("id")
|
|
|
- boo := tools.Mysql.Update(tableName_order, map[string]interface{}{"id": id}, map[string]interface{}{"order_status": -1})
|
|
|
- d.ServeJson(map[string]interface{}{"success": boo})
|
|
|
+ if openid := d.GetSession("s_m_openid"); openid != nil {
|
|
|
+ queryMap := map[string]interface{}{
|
|
|
+ "id": d.GetString("id"),
|
|
|
+ "user_openid": openid.(string),
|
|
|
+ }
|
|
|
+ boo := tools.Mysql.Update(tableName_order, queryMap, map[string]interface{}{"order_status": -1})
|
|
|
+ d.ServeJson(map[string]interface{}{"success": boo})
|
|
|
+ }
|
|
|
return nil
|
|
|
}
|
|
|
|
|
|
-func (d *DataExport) ToOrderDetail(id string) error {
|
|
|
+/**
|
|
|
+ 根据 订单编号+openid 查询
|
|
|
+ */
|
|
|
+func (d *DataExport) ToOrderDetail(orderCode string) error {
|
|
|
+ myOpenid := ""
|
|
|
+ if openid := d.GetSession("s_m_openid"); openid != nil {
|
|
|
+ myOpenid = openid.(string)
|
|
|
+ } else {
|
|
|
+ return nil
|
|
|
+ }
|
|
|
orderDetail := map[string]interface{}{}
|
|
|
filter := SieveCondition{}
|
|
|
- if id != "" {
|
|
|
- orderDetail = *tools.Mysql.FindOne(tableName_order, map[string]interface{}{"id": id}, "", "")
|
|
|
+ queryMap := map[string]interface{}{
|
|
|
+ "order_code": orderCode,
|
|
|
+ "user_openid": myOpenid,
|
|
|
+ }
|
|
|
+ if orderCode != "" {
|
|
|
+ orderDetail = *tools.Mysql.FindOne(tableName_order, queryMap, "", "")
|
|
|
}
|
|
|
- log.Println("ToOrderDetail", id, orderDetail)
|
|
|
+ log.Println("ToOrderDetail", orderCode, orderDetail)
|
|
|
if orderDetail["pay_money"] != nil {
|
|
|
orderDetail["pay_money"] = orderDetail["pay_money"].(int64) / 100
|
|
|
}
|
|
|
@@ -229,8 +260,8 @@ func (d *DataExport) ToOrderDetail(id string) error {
|
|
|
}
|
|
|
}
|
|
|
orderDetail["filter"] = filter
|
|
|
- }else{
|
|
|
- log.Println("筛选条件-关键词-结构体反序列化-错误",err)
|
|
|
+ } else {
|
|
|
+ log.Println("筛选条件-关键词-结构体反序列化-错误", err)
|
|
|
}
|
|
|
}
|
|
|
d.T["o"] = orderDetail
|
liuxiaolu