支付邮件

src/config.json

@@ -19,7 +19,7 @@
     ],
     "cassandrasize": 5,
     "agreement": "http",
-    "webdomain": "http://webzxl.qmx.top",
+    "webdomain": "http://webws.qmx.top",
     "redirect": {
         "searchinfo": "/jylab/mainSearch",
         "rssset": "/swordfish/historypush",

src/dataexport.json

@@ -1,8 +1,8 @@
 {
     "unitPrice_normal": 1,
     "unitPrice_senior": 2,
-    "discount": 0.8,
-    "orderMinPrice": 100,
+    "discount": 0.01,
+    "orderMinPrice": 0.001,
     "msgMaxCount": 20000,
     "auditPersons": [
         "wangchuanjin@topnet.net.cn",

src/jfw/front/dataExport.go

@@ -658,7 +658,7 @@ func (d *DataExport) SendMailVerify() {
 	d.ServeJson(&d.T)
 }
 func isPhone(value string) bool {
-	var phonePattern = regexp.MustCompile("^(13[0-9]|14[57]|15[0-35-9]|18[07-9])\\d{8}$")
+	var phonePattern = regexp.MustCompile("^[1][3-9][0-9]{9}$")
 	return phonePattern.MatchString(value)
 }
 
@@ -705,13 +705,8 @@ func (d *DataExport) Paysuccess() error {
 			"order_code":   code,
 			"user_openid":  openid,
 			"order_status": 1,
-		}, "pay_way,user_mail,pay_time,pay_money,filter,user_phone,product_type,data_spec,filter_id,order_code,data_count,order_status,order_money,out_trade_no", "")
-		go func() {
-			orderdata := data_
-			tt := time.Now()
-			pay_time := util.FormatDate(&tt, util.Date_Full_Layout)
-			public.SendMailToBJFinance(orderdata, pay_time, 1, config.GmailAuth)
-		}()
+		}, "pay_way,user_mail,pay_time,pay_money", "")
+
 		if data_ != nil {
 			data = *data_
 			data["pay_money"] = util.Float64All(data["pay_money"]) / 100

src/jfw/pay/weixin.go

@@ -204,7 +204,7 @@ func (p *WxPayAction) PayCallback() {
 				orderdata := public.Mysql.FindOne("dataexport_order", map[string]interface{}{
 					"out_trade_no": ret["out_trade_no"],
 					"order_money":  util.IntAll(ret["total_fee"]),
-				}, "id,filter,user_mail,product_type,data_spec,filter_id,order_code,data_count,order_status", "")
+				}, "id,filter,user_mail,product_type,data_spec,user_phone,filter_id,order_code,data_count,order_status,order_money,out_trade_no", "")
 				order_money := util.IntAll(ret["total_fee"])
 				pay_time := util.FormatDate(&now, util.Date_Full_Layout)
 				filename := fmt.Sprintf("%s.xlsx", fmt.Sprintf("%s_%s_%s", time.Now().Format("20060102150405"), util.ObjToString((*orderdata)["order_code"]), util.GetLetterRandom(5)))
@@ -229,6 +229,7 @@ func (p *WxPayAction) PayCallback() {
 							ordermoney := float64(order_money) / 100
 							go public.SendNotice(orderdata, ordermoney, pay_time, download_url, config.GmailAuth)
 							go public.SendMailToPayUser(orderdata, ordermoney, pay_time, filename, download_url, config.GmailAuth)
+							go public.SendMailToBJFinance(orderdata, pay_time, 1, config.GmailAuth)
 						}
 					} else {
 						flag_1 = true

src/jfw/public/dataexport.go

@@ -214,12 +214,9 @@ func SendMailToBJFinance(order *map[string]interface{}, pay_time string, mailTyp
 	product_type := util.ObjToString((*order)["product_type"])
 	//
 	order_money := float64(util.IntAll((*order)["order_money"])) / 100
-	//prepay_id := util.ObjToString((*order)["prepay_id"])
 	out_trade_no := util.ObjToString((*order)["out_trade_no"])
-	user_openid := util.ObjToString((*order)["user_openid"])
 	wxpaydata := Mysql.FindOne("weixin_pay", map[string]interface{}{
 		"out_trade_no": out_trade_no,
-		"user_openid":  user_openid,
 	}, "transaction_id", "")
 	transaction_id := ""
 	if wxpaydata != nil && len(*wxpaydata) > 0 {
@@ -297,7 +294,7 @@ func SendMailToBJFinance(order *map[string]interface{}, pay_time string, mailTyp
 		}
 		if finance_mail != "" {
 			finance_remark := "剑鱼历史数据订单支付邮件"
-			if mailType == 1 {
+			if mailType == 2 {
 				finance_remark = "剑鱼历史数据订单发票申请邮件"
 			}
 			if SendRetryMail(ExConf.Mail_retry, finance_mail, mail_title, mailcontent, "", nil, auth) {
@@ -309,16 +306,6 @@ func SendMailToBJFinance(order *map[string]interface{}, pay_time string, mailTyp
 			log.Println(finance_mail, "北京财务：邮件地址为空")
 		}
 	}
-	//	for _, audit := range ExConf.AuditPersons {
-	//		if regexp.MustCompile("^\\d+$").MatchString(audit) {
-	//			continue
-	//		}
-	//		if SendRetryMail(ExConf.Mail_retry, audit, "历史数据", mailcontent, "", nil, auth) {
-	//			log.Println(audit, "管理员：数据导出附件邮件发送成功！")
-	//		} else {
-	//			log.Println(audit, "管理员：数据导出邮件发送失败！")
-	//		}
-	//	}
 }
 
 //给已经付费的用户发邮件

src/web/templates/pc/paysuccess.html

@@ -99,7 +99,8 @@
 		line-height: 20px;
 	    color: #888888;
 	    font-size: 14px;
-	    margin-top: 100px;
+	    margin-top: 60px;
+		visibility: hidden;
 	}
 	</style>
 </head>