Merge branch 'dev4.6.3.4' of http://192.168.3.207:8080/qmx/jy into dev4.6.3.4

src/jfw/modules/subscribepay/src/entity/order.go

@@ -140,6 +140,15 @@ func (this *commonOrderStruct) InserMap(product, productId, userid, lotteryId, d
 			}
 		}
 	} //获取满赠
+	//绑定卡券
+	if (userLotteryId != "" && lotteryId != "") || (discountId != "") {
+		go func() {
+			phone, nickname := util.GetMyPhoneAndName(userid)
+			if !util.UpdateCouponState(userid, userLotteryId, nickname, phone, orderinfo.OrderCode, product, discountId, 3, 0) {
+				log.Println(fmt.Sprintf("单号%s-绑定失败-卡卷%s", orderinfo.OrderCode, userLotteryId))
+			}
+		}()
+	}
 	return
 }
 

src/jfw/modules/subscribepay/src/service/commonAction.go

@@ -504,7 +504,7 @@ func (this *CommonAction) Createorder() {
 		//获取卡券相关
 		lotteryId := qutil.ObjToString(data["lotteryId"])   //卡卷信息的id
 		discountId := qutil.ObjToString(data["discountId"]) //赠品相关
-		//i_discountId, _ := strconv.Atoi(discountId)
+		i_discountId, _ := strconv.Atoi(discountId)
 		inserMap, msg := entity.JyCommonOrderStruct.InserMap(product, productId, userid, lotteryId, discountId, data, this.Session())
 		//错误信息
 		if msg != "" {
@@ -537,17 +537,19 @@ func (this *CommonAction) Createorder() {
 			insertM["vip_starttime"] = inserMap.VipStartTime
 			insertM["vip_endtime"] = inserMap.VipEndTime
 		}
-		// filterStr, _ := json.Marshal(filterStruct.Filter)
-		// insertM["filter"] = string(filterStr)
 		orderid := util.Mysql.Insert("dataexport_order", insertM)
 		if orderid <= 0 {
 			return nil, fmt.Errorf("创建订单异常")
 		}
+		if i_discountId > 0 {
+			go util.FindUserLotteryId(userid, orderid, i_discountId)
+		}
 		rdata := map[string]interface{}{"order_code": inserMap.OrderCode, "needPay": !inserMap.UnNeedPay}
 		return rdata, nil
 	}()
 	if errMsg != nil {
 		log.Printf("%s CreateOrder 异常:%s\n", userid, errMsg.Error())
 	}
+	//创建完订单后更新卡券信息
 	this.ServeJson(NewResult(rData, errMsg))
 }

src/web/staticres/js/monitor/new_monitor.js

@@ -0,0 +1,34 @@
+MITO.init({
+  async beforeDataReport(event){
+    var filterList = [
+      window.location.pathname,
+      "huiju",
+      "thirdwx.qlogo.cn",
+      "baidu",
+      "cnzz"
+    ]
+    var msg = event.data.message;
+    for (k of filterList) {
+      if (msg.indexOf(k)>=0){
+        console.log(msg)
+        return false;
+      }
+    }
+		return event
+   },
+    // 服务器地址  线上改成线上地址
+    dsn: '/monitor/report',
+    // 项目对应apikey
+    apikey: 'jy-front',
+    debug: false,
+    maxDuplicateCount: 1,
+    silentXhr: true,
+    silentFetch: true,
+    silentConsole: true,
+    silentDom: true,
+    silentHistory: true,
+    silentUnhandledrejection: false,
+    silentHashchange: true,
+    silentVue: false,
+    maxBreadcrumbs:1,
+});

src/web/templates/active/yearEndReport/index.html

@@ -548,6 +548,9 @@
 <link rel="prefetch" as="html" href="./yearEndReportResult"/>
 <link rel="prefetch" as="script" href="https://cdn-common.jianyu360.com/cdn/lib/html2canvas/1.1.2/dist/html2canvas.min.js"/>
 <script src='{{Msg "seo" "cdn"}}/common-module/track/j-track.min.js?v={{Msg "seo" "version"}}'></script>
+<!--监控-->
+<script src='{{Msg "seo" "cdn"}}/js/monitor/web.min.js?v={{Msg "seo" "version"}}'></script>
+<script src='{{Msg "seo" "cdn"}}/js/monitor/new_monitor.js?v={{Msg "seo" "version"}}'></script>
 <!--E-提前需要预加载的资源-->
 {{include "/common/baiducc.html"}}
 </body>

src/web/templates/active/yearEndReport/result.html

@@ -155,6 +155,9 @@
   <script src='{{Msg "seo" "cdn"}}/common-module/yearEndReport/js/result.js?v={{Msg "seo" "version"}}'></script>
   <!-- 使用html2canvas 生成图片dom层不能使用背景图 否则生成的图片会模糊 且无法修复 -->
   <script src='{{Msg "seo" "cdn"}}/common-module/track/j-track.min.js?v={{Msg "seo" "version"}}'></script>
+  <!--监控-->
+  <script src='{{Msg "seo" "cdn"}}/js/monitor/web.min.js?v={{Msg "seo" "version"}}'></script>
+  <script src='{{Msg "seo" "cdn"}}/js/monitor/new_monitor.js?v={{Msg "seo" "version"}}'></script>
   {{include "/common/baiducc.html"}}
 </body>
 

src/web/templates/big-member/wx/meta.html

@@ -21,6 +21,9 @@
 </script>
 <script src='{{Msg "seo" "cdn"}}/common-module/track/j-track.min.js?v={{Msg "seo" "version"}}'></script>
 <!--E-meta-->
+<!--监控-->
+<script src='{{Msg "seo" "cdn"}}/js/monitor/monitor.js?v={{Msg "seo" "version"}}'></script>
+<script src='{{Msg "seo" "cdn"}}/js/monitor/new_monitor.js?v={{Msg "seo" "version"}}'></script>
 
 <!--S-必定会使用的资源-->
 <link rel="stylesheet" href='{{Msg "seo" "cdn"}}/big-member/css/public.css?v={{Msg "seo" "version"}}'/>

src/web/templates/big-member/wx/page_unit_portrayal.html

@@ -23,6 +23,10 @@
     if (typeof window._jyGlobal !== 'object') { window._jyGlobal = {} }
     try { window._jyGlobal.baseURL = {{Msg "seo" "buryingPointUrl"}} } catch (e) { window._jyGlobal.baseURL = '' }
     </script>
+    <!--监控-->
+    <script src='{{Msg "seo" "cdn"}}/js/monitor/monitor.js?v={{Msg "seo" "version"}}'></script>
+    <script src='{{Msg "seo" "cdn"}}/js/monitor/new_monitor.js?v={{Msg "seo" "version"}}'></script>
+    
     <script src='{{Msg "seo" "cdn"}}/common-module/track/j-track.min.js?v={{Msg "seo" "version"}}'></script>
     <script src="/big-member/js/rem.js"></script>
     <!--S-当前页面的css资源-->

src/web/templates/common/pnc.html

@@ -62,4 +62,8 @@
 <script src="{{Msg "seo" "cdn"}}/js/jy.js?v={{Msg "seo" "version"}}"></script>
 <script src="{{Msg "seo" "cdn"}}/js/login.js?v={{Msg "seo" "version"}}"></script>
 <script src="{{Msg "seo" "cdn"}}/js/common.js?v={{Msg "seo" "version"}}"></script>
+<!--监控-->
+<script src='{{Msg "seo" "cdn"}}/js/monitor/web.min.js?v={{Msg "seo" "version"}}'></script>
+<script src='{{Msg "seo" "cdn"}}/js/monitor/new_monitor.js?v={{Msg "seo" "version"}}'></script>
+
 {{Html `<!--[if lt IE 9]><script src="{{Msg "seo" "cdn"}}/js/html5shiv.min.js"></script><script src="{{Msg "seo" "cdn"}}/js/respond.min.js"></script><![endif]-->`}}

src/web/templates/common/weixin.html

@@ -4,4 +4,8 @@
   if (typeof window._jyGlobal !== 'object') { window._jyGlobal = {} }
   try { window._jyGlobal.baseURL = {{Msg "seo" "buryingPointUrl"}} } catch (e) { window._jyGlobal.baseURL = '' }
 </script>
+<!--监控-->
+<script src='{{Msg "seo" "cdn"}}/js/monitor/web.min.js?v={{Msg "seo" "version"}}'></script>
+<script src='{{Msg "seo" "cdn"}}/js/monitor/new_monitor.js?v={{Msg "seo" "version"}}'></script>
+
 <script src='{{Msg "seo" "cdn"}}/common-module/track/j-track.min.js?v={{Msg "seo" "version"}}'></script>