Merge branch 'dev_v1.5.24_wh' of jianyu/datatools into feature/v1.5.24

clueSync/kc.go

@@ -644,7 +644,7 @@ func refundAuto() {
 			}
 			isFull := FindUpperLimit(gconv.String(saleId), "", false)
 			isAllRefund := false
-			myOrders := TiDb.SelectBySql(`select refund_status from dwd_f_userbase_order_info where uid=? and (product_type = "企业商机管理" or product_type = "大会员") and order_status = 1  and vip_endtime < ?`, uid, findNowTime)
+			myOrders := TiDb.SelectBySql(`select refund_status from dwd_f_userbase_order_info where uid=? and (product_type = "企业商机管理" or product_type = "大会员") and order_status = 1 `, uid)
 			if myOrders != nil {
 				refundCount := 0
 				for _, v := range *myOrders {
@@ -1109,6 +1109,7 @@ func KcSend(orderCode, personName string) {
 			tableAppend += fmt.Sprintf(db.KeCheng.Mail.ReturnMoney, orderInfo.ReturnMoney)
 		}
 		table := ""
+		orderInfo.DisKcName = personName
 		deptData := Mysql.SelectBySql(`select  b.mail  as  mail from jianyu.entniche_department_user a inner join jianyu.entniche_user b on a.dept_id=? and a.user_id=b.id `, db.KeCheng.DeptId)
 		table += fmt.Sprintf(db.KeCheng.Mail.Table, orderInfo.ProductType, orderInfo.CompanyName, orderInfo.UserPhone, orderInfo.UserName, orderInfo.OrderCode, orderInfo.PayMoney, orderInfo.StartEnd, orderInfo.DisKcName, orderInfo.SaleName, tableAppend)
 		//发送邮件