xg

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

@@ -4,13 +4,14 @@ import (
 	"config"
 	"entity"
 	"fmt"
-	"github.com/go-xweb/xweb"
 	"log"
 	"net/url"
 	"pay"
 	qutil "qfw/util"
 	"qfw/util/redis"
 	"strings"
+
+	"github.com/go-xweb/xweb"
 )
 
 type PayCallBackAction struct {
@@ -79,7 +80,7 @@ func (p *PayCallBackAction) WxPayCallback() {
 	}
 
 	ok := func() bool {
-		if ret["return_code"] != "SUCCESS" || !(ret["appid"] == pay.WxStruct.Appid ||ret["appid"] == pay.WxStruct.Appid_app)|| ret["mch_id"] != pay.WxStruct.Mchid {
+		if ret["return_code"] != "SUCCESS" || !(ret["appid"] == pay.WxStruct.Appid || ret["appid"] == pay.WxStruct.Appid_app) || ret["mch_id"] != pay.WxStruct.Mchid {
 			return false
 		}
 		if thisParam.Openid != "" {
@@ -88,7 +89,7 @@ func (p *PayCallBackAction) WxPayCallback() {
 		if ret["sign"] != qutil.CreateWxSign(fmt.Sprintf("&key=%s", pay.WxStruct.Key), ret) {
 			return false
 		}
-		update, insert := false, false;
+		update, insert := false, false
 		if strings.HasPrefix(thisParam.OutTradeno, pay.WX_REWARD_JSAPI) { //打赏
 			if update = entity.JyReWardStruct.PayCallBack(thisParam); !update {
 				log.Printf("微信打赏更新执行出错 %+v\n", thisParam)
@@ -102,7 +103,7 @@ func (p *PayCallBackAction) WxPayCallback() {
 				log.Printf("微信数据报告更新执行出错 %+v\n", thisParam)
 			}
 		} else if strings.HasPrefix(thisParam.OutTradeno, pay.WX_SUBVIP_APP) || strings.HasPrefix(thisParam.OutTradeno, pay.WX_SUBVIP_JSAPI) { //vip订阅
-			if update=entity.JyVipSubStruct.PayCallBack(thisParam);!update{
+			if update = entity.JyVipSubStruct.PayCallBack(thisParam); !update {
 				log.Printf("微信vip订阅更新执行出错 %+v\n", thisParam)
 			}
 		}

src/web/templates/weixin/vipsubscribe/vip_order_detail.html

@@ -213,7 +213,6 @@ try{
     $(".orderCode").text(orderCode);
     $DoPost("/subscribepay/orderListDetails/getOrderPayAllMsg",{"orderCode":orderCode},function(r){
       if(r.success){
-      	
         //下单时间
         if(r.data.order.prepay_time) {
         	$(".prepayTime").text(r.data.order.prepay_time.replace("-",".").replace("-","."));