Merge branch 'feature/v4.9.42'

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

@@ -1068,9 +1068,9 @@ func deleteRepeat(slice []int) []int {
 // @return sql语句 countsql语句
 func getOrderSql(userId, fromPage, typ string) (string, string) {
 	sql := fmt.Sprintf(`select id,order_code,order_channel,signing_subject,filter_publishtime,create_time,data_spec,filter_id,filter_keys,order_money,pay_money,data_count,order_status,pay_way,product_type,filter,pay_time,vip_starttime,vip_endtime,applybill_status,applybill_type,applybill_taxnum,applybill_company,vip_type,course_status,discount_price,d_relation_id,billingMode,is_backstage_order,return_status,expiration_time,buy_subject,buy_count from dataexport_order
-		where del_status=0 and audit_status=3 AND ((is_backstage_order =0 AND user_id ='%s')`, userId)
+		where  del_status=0 and audit_status=3 and (order_channel != 'xdqd04' or (order_channel = 'xdqd04' and order_status=1)) AND ((is_backstage_order =0 AND user_id ='%s')`, userId)
 	sqlC := fmt.Sprintf(`select count(1) from dataexport_order
-		where del_status=0 and audit_status=3 AND ((is_backstage_order =0 AND user_id ='%s')`, userId)
+		where del_status=0 and audit_status=3  and (order_channel != 'xdqd04' or (order_channel = 'xdqd04' and order_status=1)) AND ((is_backstage_order =0 AND user_id ='%s')`, userId)
 
 	if fromPage == "wx" {
 		sql += `AND product_type !="企业商机管理"` //微信暂无企业商机管理

src/jfw/modules/subscribepay/src/util/msgremind.go

@@ -315,11 +315,11 @@ func (m *msgRemind) DocPaySuccess(orderId int, orderCode, userId, createTime str
 				"otherPushId": s_opushid,
 				"jgPushId":    s_jpushid,
 				//"url":         "/jyapp/free/sess/" + Se_Topnet.EncodeString(userId+util.If(IsObjectIdHex(userId), ",_id,", ",positionId,").(string)+strconv.Itoa(int(time.Now().Unix()))+",msgremind") + "__" + hex.EncodeToString([]byte(fmt.Sprintf("type=paid"))),
-				"userId":      userId,
-				"type":        "vipNotice",
-				"descript":    fmt.Sprintf(MessageConfig.App_PaySuccess, orderCode),
-				"title":       "剑鱼提醒",
-				"category":    "服务通知_订单",
+				"userId":   userId,
+				"type":     "vipNotice",
+				"descript": fmt.Sprintf(MessageConfig.App_PaySuccess, orderCode),
+				"title":    "剑鱼提醒",
+				"category": "服务通知_订单",
 			})
 			log.Println("剑鱼文库会员支付成功，app推送", userId, appPushOk)
 		}
@@ -470,7 +470,7 @@ func (m *msgRemind) loadOrder() {
 	log.Println("开始加载72小时内的订单到内存中。。。")
 	startTime := time.Unix(time.Now().Unix()-MsgRemind.getExpireTime(), 0)
 	startTimes := FormatDate(&startTime, Date_Full_Layout)
-	list := Mysql.SelectBySql("select id,order_code,order_money,user_id,create_time,remind_status,vip_type,product_type,is_backstage_order from dataexport_order where order_money>0 and create_time>=? and product_type in ('VIP订阅','大会员') and order_status=0 and del_status=0 and (remind_status<>2 or remind_status is null) and audit_status=3", startTimes)
+	list := Mysql.SelectBySql("select id,order_code,order_money,user_id,create_time,remind_status,vip_type,product_type,is_backstage_order from dataexport_order where order_money>0 and create_time>=? and product_type in ('VIP订阅','大会员') and order_status=0 and del_status=0 and (remind_status<>2 or remind_status is null) and audit_status=3  and order_channel != 'xdqd04'", startTimes)
 	if list == nil {
 		log.Println("加载72小时内的订单到内存中失败")
 	} else {