微信我的订单缺陷修改

src/jfw/front/ws_dataExport.go

@@ -91,13 +91,12 @@ func (w *WsDataExport) PaySuccessPage() error {
 	defer util.Catch()
 	orderCode := w.GetString("orderCode")
 	userId := util.ObjToString(w.GetSession("userId"))
-	res := public.Mysql.FindOne("dataexport_order", map[string]interface{}{"user_id": userId, "order_code": orderCode, "order_status": 1}, "user_mail,pay_time", "")
-	if res == nil || len(*res) == 0 {
-		return errors.New("未支付完成")
+	res := public.Mysql.FindOne("dataexport_order", map[string]interface{}{"user_id": userId, "order_code": orderCode}, "user_mail,pay_time", "")
+	if res != nil || len(*res) == 0 {
+		w.T["email"] = (*res)["user_mail"]
+		w.T["payTime"] = (*res)["pay_time"]
 	}
 	w.T["orderCode"] = orderCode
-	w.T["email"] = (*res)["user_mail"]
-	w.T["payTime"] = (*res)["pay_time"]
 	return w.Render("/weixin/dataExport/dataExport_paySuccess.html", &w.T)
 }
 

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

@@ -257,6 +257,7 @@ func (this *CommonAction) GetWxjsPayParam() {
 	orderCode := this.GetString("orderCode")
 	userId := qutil.ObjToString(this.GetSession("userId"))
 	r := func() *entity.FuncResult {
+
 		//根据订单号获取订单数据
 		query := map[string]interface{}{
 			"user_id":      userId,
@@ -268,7 +269,7 @@ func (this *CommonAction) GetWxjsPayParam() {
 			return &entity.FuncResult{false, errors.New("未知订单"), nil}
 		}
 		//判断订单是否超过两小时
-		prepayTime, _ := time.ParseInLocation(qutil.Date_Full_Layout, qutil.ObjToString((*oData)["prepay_time"]), time.Local)
+		prepayTime, err := time.ParseInLocation(qutil.Date_Full_Layout, qutil.ObjToString((*oData)["prepay_time"]), time.Local)
 		jsPayParam := qutil.ObjToString((*oData)["code_url"])
 		payway := qutil.ObjToString((*oData)["pay_way"])
 		if time.Now().Before(prepayTime.Add(time.Hour*2)) && jsPayParam != "" && payway == "wx_js" {
@@ -278,9 +279,19 @@ func (this *CommonAction) GetWxjsPayParam() {
 		//重新生成订单
 		totalfee := qutil.IntAll((*oData)["order_money"])
 		tradeno, prepayid := "", ""
-
+		dotype := this.GetString("dotype")
+		productFlag := ""
+		if dotype == "vip" {
+			productFlag = pay.WX_SUBVIP_JSAPI
+		} else if dotype == "dataexport" {
+			productFlag = pay.WX_DATAEXPORT_JSAPI
+		} else if dotype == "onlineCourse" {
+			productFlag = pay.WX_COURSEONLINE_JSAPI
+		} else {
+			return &entity.FuncResult{false, errors.New("未知订单类型"), nil}
+		}
 		var ret *map[string]string
-		tradeno, ret = pay.WxStruct.CreatePrepayOrder("e", this.IP(), qutil.ObjToString(this.GetSession("s_m_openid")), "", totalfee)
+		tradeno, ret = pay.WxStruct.CreatePrepayOrder(productFlag, this.IP(), qutil.ObjToString(this.GetSession("s_m_openid")), "", totalfee)
 		if ret == nil || (*ret)["status"] != "1" {
 			errMsg := "创建微信订单出错"
 			if (*ret)["errcodedes"] != "" {

src/web/templates/weixin/dataExport/dataExport_paySuccess.html

@@ -28,8 +28,14 @@
 			$(function(){
 				$(".email").text(email);
 				$(".orderCode").text(orderCode);
-        payTime =  payTime.split(" ")[0]
-				payTime =  payTime.split("-")[0]+"年"+payTime.split("-")[1]+"月"+payTime.split("-")[2]+"日";
+        if(payTime){
+          payTime =  payTime.split(" ")[0]
+				  payTime =  payTime.split("-")[0]+"年"+payTime.split("-")[1]+"月"+payTime.split("-")[2]+"日";
+        }else{
+          var now =new Date();
+          payTime = now.getFullYear()+"年"+now.getMonth()+"月"+now.getDate()+"日";
+        }
+       
 				$(".payTime").text(payTime);
 			})
 			function detail(){

src/web/templates/weixin/dataExport/dataExport_toMyOrder.html

@@ -116,7 +116,7 @@
             return
         }
         canpay = false;
-        $.post("/jypay/wx/getWxjsPayParam", {"orderCode": ordercode}, function (res) {
+        $.post("/jypay/wx/getWxjsPayParam", {"orderCode": ordercode,"dotype":dotype}, function (res) {
             gopayIndex = $(e).parent().parent().index();
             if (res.success) {
               res.data["orderCode"]=ordercode;
@@ -340,13 +340,13 @@
                                     if (isVipOrder != "true") {
                                         if (courseOrder !== "true") {
                                             if (courseOnlineOrder == "true") {
-                                                self.text("已取消");
                                                 $(obj).parent(".card-footer").remove();
+                                                self.children().remove()
+                                                self.append(`<span class="status cancel_text"><span class="status-text">已取消</span><a class="delete_icon" title="删除订单" onclick="deleteOrder(${id},this)"></a></span>`);
                                             } else {
                                                 self.text("已取消");
                                                 $(obj).parent(".card-footer").html('<a  onclick="onceMore(this)" class="btn cancle">再次购买</a>')
                                             }
-
                                         } else {
                                             $(obj).parent(".card-footer").html(`<a href="/swordfish/course/detail/${courseId}" class="btn cancle">再次购买</a>`)
                                             self.children().remove()
@@ -657,7 +657,7 @@
                     + orderHtml
                     + '</div>'
                     + '<div class="card-content">'
-                    + '<a onclick="setSessionStorage()" href="/weixin/pay/wxToOrderDetail?orderCode=' + orderCode + '" class="media">'
+                    + '<a onclick="setSessionStorage()" eid='+orderCode+' href="/weixin/pay/wxToOrderDetail?orderCode=' + orderCode + '" class="media">'
                     + '<div class="media-img">'
                     + '<img src="/dataExport/image/dataOutput.png">'
                     + '</div>'
@@ -1153,7 +1153,7 @@
                         + orderHtml
                         + '</div>'
                         + '<div class="card-content">'
-                        + '<a onclick="setSessionStorage()" href="/weixin/pay/toOrderDetailPage?orderCode=' + orderCode_vip + '" class="media" isvipOrder="true">'
+                        + '<a onclick="setSessionStorage()" eid='+orderCode_vip+' href="/weixin/pay/toOrderDetailPage?orderCode=' + orderCode_vip + '" class="media" isvipOrder="true">'
                         + '<div class="media-img">'
                         + '<img src="/vipsubscribe/image/vipBook.png">'
                         + '</div>'
@@ -1184,7 +1184,7 @@
                         + orderHtml
                         + '</div>'
                         + '<div class="card-content">'
-                        + '<a  onclick="setSessionStorage()" href="/weixin/pay/toOrderDetailPage?orderCode=' + orderCode_vip + '" class="media" isvipOrder="true">'
+                        + '<a  onclick="setSessionStorage()" eid='+orderCode_vip+' href="/weixin/pay/toOrderDetailPage?orderCode=' + orderCode_vip + '" class="media" isvipOrder="true">'
                         + '<div class="media-img">'
                         + '<img src="/vipsubscribe/image/vipBook.png">'
                         + '</div>'
@@ -1534,7 +1534,22 @@
     function phoneHide() {
         $('.jy-alert').hide();
     }
-
+    //开发票
+  	function invoiceAdd(e){
+  		var orderCode = $(e).parent(".card-footer").prev(".card-content").find("a").attr("eid");
+  		$.post("/subscribepay/orderListDetails/isOver", {"order_code":orderCode}, function(data) {
+  			if(data.status==1){
+  				window.location.href = "/front/invoice/showpage?order_code="+orderCode;
+  			}else{
+  				window.location.href = "/front/invoice/cantInvoice";
+  			};
+  		})
+  	}
+  	//查看发票
+  	function checkinvoice(e) {
+  		var orderCode = $(e).parent(".card-footer").prev(".card-content").find("a").attr("eid");
+  		window.location.href = "/front/invoice/check_invoice.html?order_code="+orderCode
+  	}
 </script>
 {{include "/common/baiducc.html"}}
 </body>