Merge branch 'feature/v4.9.8' of https://jygit.jydev.jianyu360.cn/qmx/jy into feature/v4.9.8

src/jfw/modules/app/src/web/templates/big-member/page_orderdetail_subAccount.html

@@ -205,7 +205,7 @@
             var level_value = filterObj.areaCount?r.data.combo:level_map.get(filterObj.level).get("level");
             $(".level_value").text(level_value);
             //
-            if(r.data.buy_count) {
+            if(r.data.isNewOrder == '1' && r.data.buy_count) {
               $('.has_buy_count').show()
               $('.buy_num').text(r.data.buy_count + '个')
             } else {

src/jfw/modules/bigmember/src/entity/analysisEntName.go

@@ -122,11 +122,18 @@ func GetEntInfo(entName []string, p string) (entName_r []*EnterQYXYInfo) {
 				"$in": entName,
 			}
 		}
+		var isExist = map[string]bool{}
 		sess := db.Mgo_Ent.GetMgoConn()
 		defer db.Mgo_Ent.DestoryMongoConn(sess)
 		it := sess.DB(db.Mgo_Ent.DbName).C("qyxy_std").Find(query).Select(map[string]interface{}{"company_name": 1, "_id": 1, "company_area": 1, "company_city": 1}).Iter()
 		for m := make(map[string]interface{}); it.Next(&m); {
 			if m["company_name"] != nil && m["company_name"].(string) != "" {
+				if p == "C" {
+					if isExist[qutil.ObjToString(m["company_name"])] {
+						continue
+					}
+					isExist[qutil.ObjToString(m["company_name"])] = true
+				}
 				entName_r = append(entName_r, &EnterQYXYInfo{
 					Id:   m["_id"].(string),
 					Name: qutil.ObjToString(m["company_name"]),

src/web/staticres/common-module/order-list/js/order-list.js

@@ -2580,7 +2580,7 @@ var vm = new Vue({
         split: '：',
         text: '-'
       }
-      if(order.buy_count) {
+      if(order.isNewOrder == '1' && order.buy_count) {
         var buyCount = {
           label: '购买数量',
           split: '：',

src/web/templates/pc/subAccount_orderDetail.html

@@ -176,9 +176,9 @@
                     $(".real_cycle").text(member_endtime);
                     $(".free_num").text(filterObj.free_sub_num+"个");
                     $(".pay_num").text(filterObj.pay_sub_num+"个");
-                    if(r.data.buy_count) {
+                    if(r.data.isNewOrder == '1' && r.data.buy_count) {
                       $('.has_buy_count').show()
-                      $('.buy_count').text(r.data.buy_count)
+                      $('.buy_count').text(r.data.buy_count + '个')
                     } else {
                       $('.has_no_count').show()
                     }

src/web/templates/weixin/member/subAccountDetail.html

@@ -212,7 +212,7 @@
             $(".cycle_value").text(r.data.cycle + " 年");
             //
             $(".date_value").text(member_endtime+ " 到期");
-            if(r.data.buy_count) {
+            if(r.data.isNewOrder == '1' && r.data.buy_count) {
               $('.has_buy_count').show()
               $('.buy_num').text(r.data.buy_count + '个')
             } else {