Merge branch 'jdshop' of e.coding.net:rosydev/jx-callback into jdshop

business/jxutils/weixinmsg/weixinmsg.go

@@ -35,10 +35,12 @@ const (
 	WX_TO_SHOW_COMMENTS_DETAIL_URL = "/#/assess-list?jxStoreId=" //展示差评详情的页面
 	WX_TO_SHOW_MSG                 = "/#/message-detail?msgID=%d&msgStatusID=%d"
 
-	WX_MINI_TO_ORDER_PAGE_URL           = "pages/order-manager/main"
+	WX_MINI_TO_ORDER_PAGE_URL     = "pages/order-manager/main"
-	WX_MINI_TO_STORE_SKU_PAGE_URL       = "pages/goods-manager/main"
+	WX_MINI_TO_STORE_SKU_PAGE_URL = "pages/goods-manager/main"
-	WX_MINI_TO_SHOW_COMMENTS_DETAIL_URL = "pages/pagesStore/store-comment/main"
+	//WX_MINI_TO_SHOW_COMMENTS_DETAIL_URL = "pages/pagesStore/store-comment/main"
-	WX_MINI_TO_SHOW_MSG                 = "pages/pagesStore/msg-page/main?msgID=%d&msgStatusID=%d"
+	WX_MINI_TO_SHOW_COMMENTS_DETAIL_URL = "subPages/merchantChild/evaluateM/evaluateM"
+	//WX_MINI_TO_SHOW_MSG                 = "pages/pagesStore/msg-page/main?msgID=%d&msgStatusID=%d"
+	WX_MINI_TO_SHOW_MSG = "subPages/merchantChild/messageDetail/messageDetail?messageID=%d&id=%d"
 
 	//新订单模板消息文字颜色
 	WX_NEW_ORDER_TEMPLATE_COLOR          = "#173177"
@@ -757,7 +759,7 @@ func NotifyAfsOrderStatus(afsOrder *model.AfsOrder) (err error) {
 			"color": WX_HIGHLEVEL_TEMPLATE_COLOR2,
 		},
 		"keyword1": map[string]interface{}{
-			"value": afsOrder.AfsOrderID,
+			"value": fmt.Sprintf("%s 第%d号订单：", model.VendorChineseNames[afsOrder.VendorID], order.OrderSeq) + afsOrder.AfsOrderID,
 			"color": WX_TEMPLATE_VENDERCOLOR_JDDJ,
 		},
 		"keyword2": map[string]interface{}{

business/partner/im/im.go

@@ -6,6 +6,7 @@ import (
 	"errors"
 	"fmt"
 	"strings"
+	"time"
 
 	"git.rosy.net.cn/jx-callback/business/partner"
 
@@ -276,14 +277,24 @@ func GetImUserList(req []RelInfo) (map[string][]interface{}, error) {
 	for _, j := range keys {
 		temp := rdb.LRange(j)
 		for _, v := range temp {
-			retVal[j] = append(retVal[j], v)
+			//过滤过期信息
-			//暂时写死
+			if FilterUserList(v) {
-			//retVal["userList"] = append(retVal["userList"], v)
+				retVal[j] = append(retVal[j], v)
+			}
 		}
 	}
 	return retVal, nil
 }
 
+func FilterUserList(val string) bool {
+	retVal := UserMessageList{}
+	err := json.Unmarshal([]byte(val), &retVal)
+	if err != nil || time.Now().Unix()-int64(retVal.LatestTime) >= 3600*6 {
+		return false
+	}
+	return true
+}
+
 // GetImChatDetail 获取门店用户聊天详情
 func GetImChatDetail(req []UserRelInfo) (map[string][]interface{}, error) {
 	retVal := make(map[string][]interface{}, 0)

controllers/cms_store.go

@@ -5,6 +5,9 @@ import (
 	"encoding/json"
 	"errors"
 
+	"git.rosy.net.cn/baseapi/platformapi/mtwmapi"
+	"git.rosy.net.cn/jx-callback/business/partner"
+
 	"git.rosy.net.cn/jx-callback/business/partner/purchase/tao_vegetable"
 
 	"git.rosy.net.cn/baseapi/utils"
@@ -1698,6 +1701,24 @@ func (c *StoreController) UpdateTxdStore() {
 	})
 }
 
+// @Title 查询美团门店logo审核状态
+// @Description 远查询美团门店logo审核状态
+// @Param	token			header		string	true	"认证token"
+// @Param	appPoiCodes	    query		string	true	"门店ID列表"
+// @Param	vendorOrgCode	query		string	true	"厂商内组织代码"
+// @Success 200 {object} controllers.CallResult
+// @Failure 200 {object} controllers.CallResult
+// @router /GetMtAuditList [get]
+func (c *StoreController) GetMtAuditList() {
+	c.callGetMtAuditList(func(params *tStoreGetMtAuditListParams) (interface{}, string, error) {
+		if len(params.AppPoiCodes) > 0 && len(params.VendorOrgCode) > 0 {
+			retVal, err := partner.CurAPIManager.GetAPI(model.VendorIDMTWM, params.VendorOrgCode).(*mtwmapi.API).GetSettleAuditList(params.AppPoiCodes)
+			return retVal, "", err
+		}
+		return nil, "", nil
+	})
+}
+
 // @Title 测试操作freight_template
 // @Description 测试操作freight_template
 // @Param	token			header		string	    true	"认证token"

routers/commentsRouter_controllers.go

@@ -3181,6 +3181,15 @@ func init() {
 			MethodParams:     param.Make(),
 			Filters:          nil,
 			Params:           nil})
+	web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreController"],
+		web.ControllerComments{
+			Method:           "GetMtAuditList",
+			Router:           `/GetMtAuditList`,
+			AllowHTTPMethods: []string{"get"},
+			MethodParams:     param.Make(),
+			Filters:          nil,
+			Params:           nil})
+
 	//测试用-ysq
 	web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreController"],
 		web.ControllerComments{