Merge branch 'dev4.5.8.9' of http://192.168.3.207:8080/qmx/jy into dev4.5.8.9

src/db.json

@@ -1,72 +1,74 @@
 {
-  "mongodb": {
-    "main": {
-      "address": "192.168.3.206:27080",
-      "size": 5,
-      "dbName": "qfw",
-      "replSet": ""
-    },
-    "log": {
-      "address": "192.168.3.206:27090",
-      "size": 5,
-      "dbName": "qfw",
-      "replSet": "",
-      "userName": "admin",
-      "password": "123456"
-    },
-    "ent": {
-      "address": "192.168.3.207:27001,192.168.3.206:27002",
-      "size": 5,
-      "dbName": "mixdata",
-      "userName": "jyDevGroup",
-      "password": "jy@DevGroup"
-    },
-    "qyfw": {
-      "address": "192.168.3.206:27080",
-      "size": 5,
-      "dbName": "jyqyfw"
-    },
-    "bidding": {
-      "address": "192.168.3.207:27001,192.168.3.206:27002",
-      "size": 5,
-      "dbName": "qfw_data",
-      "replSet": "",
-      "collection": "bidding",
-      "collection_back": "bidding_back",
-      "userName": "jyDevGroup",
-      "password": "jy@DevGroup"
-    }
-  },
-  "elasticsearch": {
-    "main": {
-      "address": "http://192.168.3.206:9800",
-      "size": 5
-    }
+<<<<<<< HEAD
+	"mongodb": {
+		"main": {
+			"address": "192.168.3.206:27080",
+	 		"size": 5,
+	 		"dbName": "qfw",
+			"replSet": ""
+		},
+		"log": {
+			"address": "192.168.3.206:27090",
+	 		"size": 5,
+	 		"dbName": "qfw",
+			"replSet": "",
+			"userName": "admin",
+			"password": "123456"
+		},
+		"ent": {
+			"address": "192.168.3.207:27001,192.168.3.206:27002",
+	 		"size": 5,
+	 		"dbName": "mixdata",
+			"userName": "jyDevGroup",
+			"password": "jy@DevGroup"
+		},
+		"qyfw": {
+			"address": "192.168.3.206:27080",
+	 		"size": 5,
+	 		"dbName": "jyqyfw"
+		},
+		"bidding": {
+			"address": "192.168.3.207:27001,192.168.3.206:27002",
+	 		"size": 5,
+	 		"dbName": "qfw_data",
+			"replSet": "",
+			"collection": "bidding",
+			"collection_back": "bidding_back",
+			"userName": "jyDevGroup",
+			"password": "jy@DevGroup"
+		}
+	},
+	"elasticsearch": {
+		"main": {
+			"address": "http://192.168.3.206:9800",
+	    	"size": 5
+		}
     },
     "redis": {
-      "main":{
-      "address": "other=192.168.3.206:1712,push=192.168.3.206:1712,pushcache_1=192.168.3.206:5000,pushcache_2_a=192.168.3.206:5001,pushcache_2_b=192.168.3.206:5002,sso=192.168.3.206:1712,session=192.168.3.206:1712,recovery=192.168.3.206:1712,merge=192.168.3.206:1712"
-    },
-    "login": {
-      "address": "login=192.168.3.206:1712"
-    }
+    	"main":{
+			"address": "other=192.168.3.206:1712,push=192.168.3.206:1712,pushcache_1=192.168.3.206:5000,pushcache_2_a=192.168.3.206:5001,pushcache_2_b=192.168.3.206:5002,sso=192.168.3.206:1712,session=192.168.3.206:1712,recovery=192.168.3.206:1712,merge=192.168.3.206:1712"
+		},
+		"login": {
+			"address": "login=192.168.3.206:1712"
+		}
     },
     "mysql": {
-      "main": {
-          "dbName": "jianyu",
-          "address": "192.168.3.11:3366",
-          "userName": "root",
-          "passWord": "Topnet123",
-      "maxOpenConns": 5,
-      "maxIdleConns": 5
-      },
-    "push": {
-          "dbName": "jianyu",
-          "address": "192.168.3.11:3366",
-          "userName": "root",
-          "passWord": "Topnet123",
-      "maxOpenConns": 5,
-      "maxIdleConns": 5
-      }
+	    "main": {
+	        "dbName": "jianyu",
+	        "address": "192.168.3.11:3366",
+	        "userName": "root",
+	        "passWord": "Topnet123",
+			"maxOpenConns": 5,
+			"maxIdleConns": 5
+	    },
+		"push": {
+	        "dbName": "jianyu",
+	        "address": "192.168.3.11:3366",
+	        "userName": "root",
+	        "passWord": "Topnet123",
+			"maxOpenConns": 5,
+			"maxIdleConns": 5
+	    }
+
     }
 }

src/jfw/front/distribution.go

@@ -123,6 +123,7 @@ func (this *Distrib) LinkShareX(discored string) error {
 	}
 	return this.Redirect("/distribution/share/" + discored)
 }
+
 //企业分销
 func (this *Distrib) LinkShareG(discored string) error {
 	defer util.Catch()

src/jfw/modules/app/src/app/front/distrib.go

@@ -45,7 +45,7 @@ func (this *Distrib) GetERCode(disword string) error {
 	return nil
 }
 
-//
+
 func (this *Distrib) RedirectTo() error {
 	defer util.Catch()
 	userId, _ := this.GetSession("userId").(string)

src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/js/vip_order_detail.js

@@ -26,7 +26,9 @@ $(function () {
             }
             //产品类型
             if (r.data.order.order_money == 0) {
-                $(".productType").text("超级订阅（试用）");
+                if (r.data.order.billingMode!=0){
+                    $(".productType").text("超级订阅（试用）");
+                }
                 $(".discountPrice").parent().hide();
             }
             //价格
@@ -353,12 +355,27 @@ $(function () {
                   $(".discountPrice").text('-￥'+ formatMoney(parseFloat(r.data.order.discount_price) / 100)+'元')
                 }
                 $(".payPrice").text("￥ " + formatMoney(parseFloat(r.data.order.order_money) / 100) + "元");
-                $("#card-header-bg").addClass("bg finish-bg")
+
+
+
+                if (r.data.order.return_status === 0||r.data.order.return_status === 2){
+                    $("#card-header-bg").addClass("bg nopay-bg")
+                    if (r.data.order.return_status === 0){
+                        $("#pageTitle").text("待付款");
+                    }else if (r.data.order.return_status === 2){
+                        $("#pageTitle").text("待付完");
+                    }
+                }else{
+                    $("#card-header-bg").addClass("bg finish-bg")
+                    $("#pageTitle").text("已完成");
+                }
                 $("#pageTitle").addClass("status")
-                $("#pageTitle").text("已完成");
+
                 //支付时间
-                $(".line_paytime").css("display", "");
-                if (r.data.order.pay_time) $(".payTime").text(r.data.order.pay_time.replace("-", ".").replace("-", "."));
+                if (r.data.order.pay_time){
+                    $(".line_paytime").css("display", "");
+                    $(".payTime").text(r.data.order.pay_time.replace("-", ".").replace("-", "."));
+                }
                 if (r.data.order.order_money == 0) {
                     $(".line_paytime").css("display", "none");
                 }
@@ -377,54 +394,63 @@ $(function () {
 	                }
                 }
                 //支付方式
-                if (r.data.order.pay_way&&r.data.order.pay_way.indexOf("wx") > -1) {
-                    $(".line_payway").css("display", "");
-                    $(".payWay").text("微信支付");
-                    pay_way = "wx_app"
-                } else if (r.data.order.pay_way&&r.data.order.pay_way.indexOf("ali") > -1) {
-                    $(".payWay").text("支付宝支付");
-                    $(".line_payway").css("display", "");
-                    pay_way = "ali_app"
-                } else {//试用用户
-                    $(".invoice").css("display", "none");
-                    return
+                if (r.data.order.billingMode===1){
+                    if (r.data.order.pay_way.indexOf("wx") > -1||r.data.order.return_type===1) {
+                        $(".line_payway").css("display", "");
+                        $(".payWay").text("微信支付");
+                        pay_way = "wx_app"
+                    } else if (r.data.order.pay_way.indexOf("ali") > -1||r.data.order.return_type===2) {
+                        $(".payWay").text("支付宝支付");
+                        $(".line_payway").css("display", "");
+                        pay_way = "ali_app"
+                    } else if(r.data.order.pay_way === "transferAccounts"&&(r.data.order.is_backstage_order===1&&r.data.order.return_status>0||r.data.order.is_backstage_order===0)){
+                        $(".payWay").text("公对公转账");
+                        $(".line_payway").css("display", "");
+                    } else {//试用用户
+                        $(".invoice").css("display", "none");
+                        return
+                    }
                 }
-                $(".line_transaction").css("display", "");
-                if (r.data.transaction_id) $(".transaction_id").text(r.data.transaction_id);
-                var pay_again = ""
-                //发票
-                if (r.data.order.applybill_status === 0) {
-                    //已支付未申请发票
-                    pay_again += "<button class=\"j-button-cancel\" onclick='invoiceAdd()' style='width: 100%!important;'>开发票</button>"
-                    $(".invoice .invoicing").css("display", "");
-                    $(".invoicing").on("click", function () {
-                        var nowTimestamp = (new Date()).valueOf();
-                        $.post("/subscribepay/orderListDetails/emailOperation?v=" + nowTimestamp, {}, function (r) {
-                            if (r.success) {
-                                //没有绑定邮箱
-                                weuiDialog();
-                            } else {
-                                //绑定了邮箱
-                                window.location.href = "/jyapp/front/myOrder/getOrderCode/" + orderCode;
-                            }
-                        })
-                    });
-                } else {
-                    //已支付已申请发票
-                    pay_again += "<button class=\"j-button-cancel\" onclick= 'checkinvoice(" + r.data.order.applybill_status + ")' style='width: 100%!important;'>查看发票</button >"
-                    $(".invoice").css("display", "none");
-                    switch (r.data.order.applybill_type) {
-                        case 0:
-                            $(".person").css("display", "");
-                            break;
-                        case 1:
-                            $(".unit").css("display", "");
-                            $(".company_name").html(r.data.order.applybill_company);
-                            $(".taxpayer_number").html(r.data.order.applybill_taxnum);
-                            break;
+                if (r.data.transaction_id){
+                    $(".line_transaction").css("display", "");
+                    $(".transaction_id").text(r.data.transaction_id);
+                }
+                if (r.data.order.is_backstage_order!==1){
+                    var pay_again = ""
+                    //发票
+                    if (r.data.order.applybill_status === 0) {
+                        //已支付未申请发票
+                        pay_again += "<button class=\"j-button-cancel\" onclick='invoiceAdd()' style='width: 100%!important;'>开发票</button>"
+                        $(".invoice .invoicing").css("display", "");
+                        $(".invoicing").on("click", function () {
+                            var nowTimestamp = (new Date()).valueOf();
+                            $.post("/subscribepay/orderListDetails/emailOperation?v=" + nowTimestamp, {}, function (r) {
+                                if (r.success) {
+                                    //没有绑定邮箱
+                                    weuiDialog();
+                                } else {
+                                    //绑定了邮箱
+                                    window.location.href = "/jyapp/front/myOrder/getOrderCode/" + orderCode;
+                                }
+                            })
+                        });
+                    } else {
+                        //已支付已申请发票
+                        pay_again += "<button class=\"j-button-cancel\" onclick= 'checkinvoice(" + r.data.order.applybill_status + ")' style='width: 100%!important;'>查看发票</button >"
+                        $(".invoice").css("display", "none");
+                        switch (r.data.order.applybill_type) {
+                            case 0:
+                                $(".person").css("display", "");
+                                break;
+                            case 1:
+                                $(".unit").css("display", "");
+                                $(".company_name").html(r.data.order.applybill_company);
+                                $(".taxpayer_number").html(r.data.order.applybill_taxnum);
+                                break;
+                        }
                     }
+                    $(".j-footer").show().html(pay_again)
                 }
-                $(".j-footer").show().html(pay_again)
             } else if (r.data.order.order_status == -2 || r.data.order.order_status == -3) {
                 $("#card-header-bg").addClass("bg cancel-bg")
                 $("#pageTitle").addClass("status")

src/jfw/modules/app/src/web/templates/big-member/page_orderdetail_aiForecastPack.html

@@ -243,23 +243,26 @@
                   $('.j-footer').show().html(pay_again);
                 }
                 //支付方式
-                if (r.data.pay_way.indexOf("wx") > -1) {
-                    $(".line_payway").css("display", "");
-                    $(".payWay").text("微信支付");
-                } else if (r.data.pay_way.indexOf("ali") > -1) {
-                    $(".payWay").text("支付宝支付");
-                    $(".line_payway").css("display", "");
-                } else if (r.data.pay_way === "transferAccounts") {//试用用户
-                    $(".payWay").html("公对公转账");
-                    if (filterObj.transferV&&r.data.product_type!="大会员-补充包") {
-                      $(".payWay").html("公对公转账<span style='color: #2ABED1' onclick='showImg(\"" + filterObj.transferV + "\")'>&nbsp;查看凭证</span>");
+                if(r.data.billingMode){
+                    if (r.data.pay_way.indexOf("wx") > -1||r.data.return_type===1) {
+                        $(".line_payway").css("display", "");
+                        $(".payWay").text("微信支付");
+                    } else if (r.data.pay_way.indexOf("ali") > -1||r.data.return_type===2) {
+                        $(".payWay").text("支付宝支付");
+                        $(".line_payway").css("display", "");
+                    } else if (r.data.pay_way === "transferAccounts"&&(r.data.is_backstage_order===1&&r.data.return_status>0||r.data.is_backstage_order===0)) {//试用用户
+                        $(".payWay").html("公对公转账");
+                        if (filterObj.transferV&&r.data.product_type!="大会员-补充包") {
+                            $(".payWay").html("公对公转账<span style='color: #2ABED1' onclick='showImg(\"" + filterObj.transferV + "\")'>&nbsp;查看凭证</span>");
+                        }
+                        $(".line_payway").css("display", "");
+                        //return
+                    } else {//试用用户
+                        $(".invoice").css("display", "none");
+                        //return
                     }
-                    $(".line_payway").css("display", "");
-                    //return
-                } else {//试用用户
-                    $(".invoice").css("display", "none");
-                    //return
                 }
+
                 $(".paymoney .price").text("￥ " + formatMoney(r.data.pay_money / 100) + "元");
                 $(".l-item.paymoney").css("display", "");
                 if (r.data.pay_time) {
@@ -342,6 +345,9 @@
                 $("#pageTitle").text("已取消");
                 $(".invoice").css("display", "none");//隐藏开发票
             }
+            if(r.data.is_backstage_order===1){
+                $(".invoice").css("display", "none");//隐藏开发票
+            }
         })
     })
 

src/jfw/modules/app/src/web/templates/big-member/page_orderdetail_member.html

@@ -255,10 +255,12 @@
             if (filterObj.level == 4) {
                 $(".productType").text("大会员-试用版")
                 cycle = filterObj.cycle + "天"
-            } else {
+            }else if (filterObj.cycleType===1){
+                cycle = filterObj.cycle + "天"
+            }else {
                 cycle = filterObj.cycle + "年"
                 var createType = filterObj.createType
-                if (createType){
+                if (createType||filterObj.cycleType===0){
                   cycle = filterObj.cycle + "个月";
                 }
             }
@@ -297,29 +299,32 @@
                 }
 
                 //支付方式
-                if (r.data.pay_way.indexOf("wx") > -1) {
-                    $(".line_payway").css("display", "");
-                    $(".payWay").text("微信支付");
-                } else if (r.data.pay_way.indexOf("ali") > -1) {
-                    $(".payWay").text("支付宝支付");
-                    $(".line_payway").css("display", "");
-                } else if (r.data.pay_way === "transferAccounts") {//试用用户
-                    window.isTransferPay = r.data.applybill_status === 0
-                    $(".payWay").html("公对公转账");
-                    if (filterObj.transferV&&filterObj.level!=5) {
-                        initImgView(filterObj.transferV)
-                        $(".payWay").html("公对公转账<span style='color: #2ABED1' onclick='showImg()'>&nbsp;查看凭证</span>");
-                    }
-                    $(".line_payway").css("display", "");
+                if (r.data.billingMode===1){
+                    if (r.data.pay_way.indexOf("wx") > -1||r.data.return_type===1) {
+                        $(".line_payway").css("display", "");
+                        $(".payWay").text("微信支付");
+                    } else if (r.data.pay_way.indexOf("ali") > -1||r.data.return_type===2) {
+                        $(".payWay").text("支付宝支付");
+                        $(".line_payway").css("display", "");
+                    } else if (r.data.pay_way === "transferAccounts"&&(r.data.is_backstage_order===1&&r.data.return_status>0||r.data.is_backstage_order===0)) {//试用用户
+                        window.isTransferPay = r.data.applybill_status === 0
+                        $(".payWay").html("公对公转账");
+                        if (filterObj.transferV&&filterObj.level!=5) {
+                            initImgView(filterObj.transferV)
+                            $(".payWay").html("公对公转账<span style='color: #2ABED1' onclick='showImg()'>&nbsp;查看凭证</span>");
+                        }
+                        $(".line_payway").css("display", "");
 
-                    $(".l-item.paymoney").css("display", "");
-                    //$(".price").text("￥ " + formatMoney(r.data.pay_money / 100) + "元");
-                    //return
-                } else {//试用用户
-                    $(".invoice").css("display", "none");
-                    return
+                        $(".l-item.paymoney").css("display", "");
+                        //$(".price").text("￥ " + formatMoney(r.data.pay_money / 100) + "元");
+                        //return
+                    } else {//试用用户
+                        $(".invoice").css("display", "none");
+                        return
+                    }
                 }
 
+
                 $(".l-item.paymoney").css("display", "");
                 $(".price").text("￥ " + formatMoney(r.data.pay_money / 100));
 

src/jfw/modules/app/src/web/templates/big-member/page_orderdetail_subAccount.html

@@ -225,26 +225,29 @@
                 }
 
                 //支付方式
-                if (r.data.pay_way.indexOf("wx") > -1) {
-                    $(".line_payway").css("display", "");
-                    $(".payWay").text("微信支付");
-                } else if (r.data.pay_way.indexOf("ali") > -1) {
-                    $(".payWay").text("支付宝支付");
-                    $(".line_payway").css("display", "");
-                } else if (r.data.pay_way === "transferAccounts") {//试用用户
-                    $(".payWay").html("公对公转账");
-                    if (filterObj.transferV) {
-                        $(".payWay").html("公对公转账<span style='color: #2ABED1' onclick='showImg(\""+filterObj.transferV+"\")'>&nbsp;查看凭证</span>");
-                    }
-                    $(".line_payway").css("display", "");
+                if (r.data.billingMode===1){
+                    if (r.data.pay_way.indexOf("wx") > -1||r.data.return_type===1) {
+                        $(".line_payway").css("display", "");
+                        $(".payWay").text("微信支付");
+                    } else if (r.data.pay_way.indexOf("ali") > -1||r.data.return_type===2) {
+                        $(".payWay").text("支付宝支付");
+                        $(".line_payway").css("display", "");
+                    } else if (r.data.pay_way === "transferAccounts"&&(r.data.is_backstage_order===1&&r.data.return_status>0||r.data.is_backstage_order===0)) {//试用用户
+                        $(".payWay").html("公对公转账");
+                        if (filterObj.transferV) {
+                            $(".payWay").html("公对公转账<span style='color: #2ABED1' onclick='showImg(\""+filterObj.transferV+"\")'>&nbsp;查看凭证</span>");
+                        }
+                        $(".line_payway").css("display", "");
 
-                    $(".l-item.paymoney").css("display", "");
-                    $(".paymoney .price").text("￥ " + formatMoney(r.data.pay_money / 100));
-                    //return
-                } else {//试用用户
-                    $(".invoice").css("display", "none");
-                    return
+                        $(".l-item.paymoney").css("display", "");
+                        $(".paymoney .price").text("￥ " + formatMoney(r.data.pay_money / 100));
+                        //return
+                    } else {//试用用户
+                        $(".invoice").css("display", "none");
+                        return
+                    }
                 }
+
                 if (r.data.pay_time) {
                     $(".line_paytime").css("display", "");
                     $(".payTime").css("display", "").text(r.data.pay_time.replace("-", "/").replace("-", "/"));
@@ -324,6 +327,9 @@
                 $("#pageTitle").text("已取消");
                 $(".invoice").css("display", "none");//隐藏开发票
             }
+            if(r.data.is_backstage_order===1){
+                $(".invoice").css("display", "none");//隐藏开发票
+            }
         })
     })
 

src/jfw/modules/app/src/web/templates/dataExport/dataExport_payOrder.html

@@ -85,11 +85,11 @@
             <div class="select-type-group">
                 <div class="select-type-title">请选择支付方式</div>
                 <div class="select-card-group">
-                    <div class="select-card-item" @click="togglePayType('数据流量包')" v-show="payMap['数据流量包'].show" :class="{active: payType == '数据流量包'}">数据流量包</div>
-                    <div class="select-card-item" @click="togglePayType('单日限量包')" v-show="payMap['单日限量包'].show" :class="{active: payType == '单日限量包'}">单日限量数据包</div>
+                    <div id="select-data-pack-item" class="select-card-item" @click="togglePayType('数据流量包')" v-show="payMap['数据流量包'].show" :class="{active: payType == '数据流量包'}">数据流量包</div>
+                    <div id="select-day-pack-item" class="select-card-item" @click="togglePayType('单日限量包')" v-show="payMap['单日限量包'].show" :class="{active: payType == '单日限量包'}">单日限量数据包</div>
                     <div class="select-card-item" @click="togglePayType('个人支付')" v-show="payMap['个人支付'].show" :class="{active: payType == '个人支付'}">个人支付</div>
                 </div>
-                <div class="buy-data-pack-tip">数据流量包已上线，特惠充值随心导，2年有效。<a href="/jyapp/dataPack/createOrder">立即购买  ＞</a></div>
+                <div class="buy-data-pack-tip">数据流量包已上线，特惠充值随心导，2年有效。<a id="buy-data-pack-for-link" href="/jyapp/dataPack/createOrder">立即购买  ＞</a></div>
             </div>
             <div class="select-type-group" v-show="payType == '个人支付'" style="margin-top: 0.16rem">
                 <div class="select-type-title">请选择数据规格</div>
@@ -250,8 +250,8 @@
                 </div>
             </div>
             <div class="form-btn j-button-group">
-                <button class="btn prew dataPreview j-button-cancel1" style="flex:none;line-height: normal;">预览数据</button>
-                <button data-need-bind-phone class="btn enter toPay toDataPack j-button-confirm1" style="flex:none;line-height: normal;" disabled="disabled">
+                <button id="track-data-preview-for-button" class="btn prew dataPreview j-button-cancel1" style="flex:none;line-height: normal;">预览数据</button>
+                <button id="pay-button-for-datapack" data-need-bind-phone class="btn enter toPay toDataPack j-button-confirm1" style="flex:none;line-height: normal;" disabled="disabled">
                     确认扣除
                 </button>
             </div>
@@ -324,14 +324,14 @@
                     <p class="tip-warning error-admin"  data-pay-type="数据流量包-线下" style="display: none">您的每日导出限额已超过管理员设置数量，请联系管理员或选择个人支付</p>
                 </div>
                 <div class="weui-dialog__ft" data-pay-type="单日限量包" style="display: none;">
-                    <a href="javascript:;" class="weui-dialog__btn weui-dialog__btn_primary">我知道了</a>
+                    <a href="javascript:;" id="read-day-tip-for-dialog" class="weui-dialog__btn weui-dialog__btn_primary">我知道了</a>
                 </div>
                 <div class="weui-dialog__ft" data-pay-type="数据流量包-线下" style="display: none;">
-                    <a href="javascript:;" class="weui-dialog__btn weui-dialog__btn_primary">我知道了</a>
+                    <a href="javascript:;" id="read-datapack-tip-for-dialog" class="weui-dialog__btn weui-dialog__btn_primary">我知道了</a>
                 </div>
                 <div class="weui-dialog__ft" data-pay-type="数据流量包-线上" style="display: none;">
-                    <a href="javascript:;" class="weui-dialog__btn weui-dialog__btn_cancel">取消</a>
-                    <a href="javascript:;" class="weui-dialog__btn weui-dialog__btn_primary">立即充值</a>
+                    <a href="javascript:;" id="cancel-buy-data-pack-for-dialog" class="weui-dialog__btn weui-dialog__btn_cancel">取消</a>
+                    <a href="javascript:;" id="buy-data-pack-for-dialog" class="weui-dialog__btn weui-dialog__btn_primary">立即充值</a>
                 </div>
             </div>
         </div>

src/jfw/modules/app/src/web/templates/followent/list.html

@@ -36,56 +36,56 @@
 				return;
 			}
 			var data = r.list;
-			$.ajax({
-					type: 'POST',
-					url: '/publicapply/bidcoll/power',
-					success: function(res) {
-							console.log(res)
-							if(res.error_code == 0) {
-								if(!res.data.entniche && !res.data.member && res.data.vip <= 0){
-										(window.slotbydup = window.slotbydup || []).push({
-												id: "u6603901",
-												container: "_yzpxro2x1n",
-												async: true
-										});
-										getAjaxAdv()
-								}
-							}
-					},
-					error: function(err) {
-							console.log(err)
-					}
-			})
-			function getAjaxAdv () {
-					$.ajax({
-						type: 'POST',
-						url: '/publicapply/adLeague/exposure',
-						data: {
-								client: 'APP',
-								id: 'ad8',
-								position: '关注的企业列表页底部'
-						},
-						success: function(res) {
-								console.log(res)
-						}
-					})
-			}
-			addEventListener('focus', function() {
-					if(document.activeElement = document.getElementById('iframeu6603901_0')) {
-							$.ajax({
-									type: 'POST',
-									url: '/publicapply/adLeague/click',
-									data: {
-										client: 'APP',
-										id: 'ad8',
-										position: '关注的企业列表页底部'
-									},
-									success: function(res) {
-											console.log(res)
-									}
-							})
-					}  
-			});
+			// $.ajax({
+			// 		type: 'POST',
+			// 		url: '/publicapply/bidcoll/power',
+			// 		success: function(res) {
+			// 				console.log(res)
+			// 				if(res.error_code == 0) {
+			// 					if(!res.data.entniche && !res.data.member && res.data.vip <= 0){
+			// 							(window.slotbydup = window.slotbydup || []).push({
+			// 									id: "u6603901",
+			// 									container: "_yzpxro2x1n",
+			// 									async: true
+			// 							});
+			// 							getAjaxAdv()
+			// 					}
+			// 				}
+			// 		},
+			// 		error: function(err) {
+			// 				console.log(err)
+			// 		}
+			// })
+			// function getAjaxAdv () {
+			// 		$.ajax({
+			// 			type: 'POST',
+			// 			url: '/publicapply/adLeague/exposure',
+			// 			data: {
+			// 					client: 'APP',
+			// 					id: 'ad8',
+			// 					position: '关注的企业列表页底部'
+			// 			},
+			// 			success: function(res) {
+			// 					console.log(res)
+			// 			}
+			// 		})
+			// }
+			// addEventListener('focus', function() {
+			// 		if(document.activeElement = document.getElementById('iframeu6603901_0')) {
+			// 				$.ajax({
+			// 						type: 'POST',
+			// 						url: '/publicapply/adLeague/click',
+			// 						data: {
+			// 							client: 'APP',
+			// 							id: 'ad8',
+			// 							position: '关注的企业列表页底部'
+			// 						},
+			// 						success: function(res) {
+			// 								console.log(res)
+			// 						}
+			// 				})
+			// 		}  
+			// });
 			var allHtml = "";
 			var jyno = 0;
 			var fronthtml = "";

src/jfw/modules/app/src/web/templates/weixin/follow/list.html

@@ -111,19 +111,19 @@ $(function(){
 									$(".app-layout-footer").css("display","")
 									$('#entAdv').hide()
 									$(".app-layout-content-b").css("bottom",$(".app-layout-footer").height())
-									(window.slotbydup = window.slotbydup || []).push({
-											id: "u6603903",
-											container: "_u2w0em6qe4",
-											async: true
-									});
-									getAjaxAdv()
+									// ;(window.slotbydup = window.slotbydup || []).push({
+									// 		id: "u6603903",
+									// 		container: "_u2w0em6qe4",
+									// 		async: true
+									// });
+									// getAjaxAdv()
 								} else {
-									(window.slotbydup = window.slotbydup || []).push({
-										id: "u6603903",
-										container: "_40lx7f736fw",
-										async: true
-									});
-									getAjaxAdv()
+									// ;(window.slotbydup = window.slotbydup || []).push({
+									// 	id: "u6603903",
+									// 	container: "_40lx7f736fw",
+									// 	async: true
+									// });
+									// getAjaxAdv()
 								}
 						} else {
 							if(data.length>0 ) {
@@ -138,22 +138,22 @@ $(function(){
 					console.log(err)
 			}
 	})
-		addEventListener('blur', function() {
-				if(document.activeElement = document.getElementById('iframeu6603903_0')) {
-						$.ajax({
-								type: 'POST',
-								url: '/publicapply/adLeague/click',
-								data: {
-									client: 'APP',
-									id: 'ad9',
-									position: '关注的项目列表页底部'
-								},
-								success: function(res) {
-										console.log(res)
-								}
-						})
-				}  
-		});
+		// addEventListener('blur', function() {
+		// 		if(document.activeElement = document.getElementById('iframeu6603903_0')) {
+		// 				$.ajax({
+		// 						type: 'POST',
+		// 						url: '/publicapply/adLeague/click',
+		// 						data: {
+		// 							client: 'APP',
+		// 							id: 'ad9',
+		// 							position: '关注的项目列表页底部'
+		// 						},
+		// 						success: function(res) {
+		// 								console.log(res)
+		// 						}
+		// 				})
+		// 		}  
+		// });
 		var html = "";
 		var fronthtml = "";
 		var lasthtml = "";

src/jfw/modules/app/src/web/templates/weixin/wxinfocontent.html

@@ -61,7 +61,7 @@
         <span class="app-back jyapp-icon jyapp-icon-zuojiantou share-back"></span>
         <span class="header-title">公告信息</span>
         <span class="header-share" id="share">
-		<img src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/images/hongbao.png?v={{Msg "seo" "version"}}">
+		<img src="/jyapp/images/jianyubi.png">
 		<p style="font-size: 10px; line-height: 12px">分享有礼</p>
             <!-- 分享 star -->
 {{/*    <div class="overlay">*/}}
@@ -82,11 +82,11 @@
           <h4>分享有礼</h4>
           <img src="/jyapp/images/img/close.png" alt="" class="close">
         </div>
-        <div class="description">
+        <!-- <div class="description">
           <img src="/jyapp/images/hongbao.png" alt="">
           <p>分享剑鱼标讯产品给好友，购买成功您得佣金</p>
           <a href="/page_partner/partner/partner.html?flag=1">了解详情</a>
-        </div>
+        </div> -->
         <div class="description">
           <img src="/jyapp/images/jianyubi.png" alt="">
           <p>分享招标信息及文档，好友访问立得剑鱼币</p>
@@ -106,7 +106,7 @@
               <img src="/jyapp/images/img/qq.png" alt="">
               <span>QQ</span>
             </li>
-            <li id="kouling">
+            <!-- <li id="kouling">
               <img src="/jyapp/images/img/kouling.png" alt="">
               <span>口令分享</span>
             </li>
@@ -117,7 +117,7 @@
             <li id="tupian1">
               <img src="/jyapp/images/img/tupian.png" alt="">
               <span>图片分享</span>
-            </li>
+            </li> -->
           </ul>
         </div>
       </div>

src/jfw/modules/bigmember/src/entity/portrait.go

@@ -170,18 +170,37 @@ func (this *Portrait) GetWinnerNewCount(entId string) int64 {
 }
 
 //企业画像-查询
-func (this *Portrait) WinnerPortraitData(entId string) (map[string]interface{}, error) {
+func (this *Portrait) WinnerPortraitData(entId string, hasPower bool) (map[string]interface{}, error) {
 	if entId == "" {
 		return nil, errors.New("企业名称异常")
 	}
 	winnerPortraitData := TryFunc(GetPortraitCache, entId, "winner", 2)
-	//winnerPortraitData, err := GetWinnerPortraitSearch(entId)
-	//if err != nil {
-	//	return nil, err
-	//}
+	if !hasPower && winnerPortraitData != nil { //无权限 仅返回免费字段（市场区域分布字段）
+		freeReturnMap := map[string]interface{}{}
+		for _, key := range []string{"timeRange", "buyer_count", "bidamount_count", "project_count", "area_count"} {
+			freeReturnMap[key] = winnerPortraitData[key]
+		}
+		return freeReturnMap, nil
+	}
 	return winnerPortraitData, nil
 }
 
+//WinnerMiniPortraitData 三级页引流
+func (this *Portrait) WinnerMiniPortraitData(entId string) (map[string]interface{}, error) {
+	if entId == "" {
+		return nil, errors.New("企业名称异常")
+	}
+	winnerPortraitData := TryFunc(GetPortraitCache, entId, "winner", 2)
+	if winnerPortraitData == nil {
+		return nil, nil
+	}
+	miniReturnMap := map[string]interface{}{}
+	for _, key := range []string{"bidamount_count", "project_count"} {
+		miniReturnMap[key] = winnerPortraitData[key]
+	}
+	return miniReturnMap, nil
+}
+
 //采购单位画像-查询最新项目动态
 func (this *Portrait) GetBuyerNewMsg(buyer string, start, limit int, hasPower bool) ([]map[string]interface{}, error) {
 	if buyer == "" {
@@ -227,11 +246,18 @@ func (this *Portrait) BuyerPortraitData(buyer string, flag string, hasPower bool
 		return nil, errors.New("参数异常")
 	}
 	if !hasPower { //免费返回字段
-		if buyerPortraitAllData := TryFunc(GetPortraitCacheByStep, buyer, fmt.Sprintf("buyer"), 2); buyerPortraitAllData != nil {
+		if buyerPortraitAllData := TryFunc(GetPortraitCacheByStep, buyer, fmt.Sprintf("buyer_%s", flag), 2); buyerPortraitAllData != nil {
 			freeReturnMap := map[string]interface{}{}
+			//第一阶段免费数据
 			for _, key := range []string{"timeRange", "city", "province", "buyerclass", "fail_count", "project_count", "winner_count", "otherProvincesWinnerCount"} {
 				freeReturnMap[key] = buyerPortraitAllData[key]
 			}
+			//第三阶段免费字段
+			if flag == "" || flag == "c" {
+				for _, key := range []string{"withCapitalData", "withAreaData", "withEstablishData"} {
+					freeReturnMap[key] = buyerPortraitAllData[key]
+				}
+			}
 			return freeReturnMap, nil
 		}
 		return nil, nil
@@ -249,3 +275,17 @@ func (this *Portrait) BuyerPortraitData(buyer string, flag string, hasPower bool
 	}
 	return buyerPortraitData, nil
 }
+
+func (this *Portrait) BuyerMiniPortraitData(buyer string) (map[string]interface{}, error) {
+	if buyer == "" {
+		return nil, errors.New("企业名称异常")
+	}
+	miniReturnMap := map[string]interface{}{}
+	if buyerPortraitAllData := TryFunc(GetPortraitCacheByStep, buyer, "buyer_a", 2); buyerPortraitAllData != nil {
+		for _, key := range []string{"province", "city", "buyerclass", "bidamount_count", "project_count"} {
+			miniReturnMap[key] = buyerPortraitAllData[key]
+		}
+		return miniReturnMap, nil
+	}
+	return miniReturnMap, nil
+}

src/jfw/modules/bigmember/src/service/portrait/memberPortraitAction.go

@@ -11,21 +11,23 @@ import (
 	"github.com/go-xweb/xweb"
 )
 
-//大会员画像接口
+//EntPortrait 大会员画像接口
 type EntPortrait struct {
 	*xweb.Action
 	//中标企业画像
-	entDetail      xweb.Mapper `xweb:"/portrait/ent/detail"`       //企业基本信息
-	winnerNewMsg   xweb.Mapper `xweb:"/portrait/winner/getNewMsg"` //最新项目动态(需购买项目进度监控)
-	winnerContacts xweb.Mapper `xweb:"/portrait/winner/contacts"`  //历史项目联系方式
-	winnerPortrait xweb.Mapper `xweb:"/portrait/winner/getData"`   //最新项目动态
+	entDetail          xweb.Mapper `xweb:"/portrait/ent/detail"`       //企业基本信息
+	winnerNewMsg       xweb.Mapper `xweb:"/portrait/winner/getNewMsg"` //最新项目动态(需购买项目进度监控)
+	winnerContacts     xweb.Mapper `xweb:"/portrait/winner/contacts"`  //历史项目联系方式
+	winnerPortrait     xweb.Mapper `xweb:"/portrait/winner/getData"`   //最新项目动态
+	winnerMiniPortrait xweb.Mapper `xweb:"/portrait/winner/miniData"`  //三级页展示中标企业基础画像信息
 	//采购单位画像
-	buyerNewMsg   xweb.Mapper `xweb:"/portrait/buyer/getNewMsg"` //最新项目动态
-	buyerContacts xweb.Mapper `xweb:"/portrait/buyer/contacts"`  //采购项目联系方式
-	buyerPortrait xweb.Mapper `xweb:"/portrait/buyer/getData"`   //最新项目动态
+	buyerNewMsg       xweb.Mapper `xweb:"/portrait/buyer/getNewMsg"` //最新项目动态
+	buyerContacts     xweb.Mapper `xweb:"/portrait/buyer/contacts"`  //采购项目联系方式
+	buyerPortrait     xweb.Mapper `xweb:"/portrait/buyer/getData"`   //最新项目动态
+	buyerMiniPortrait xweb.Mapper `xweb:"/portrait/buyer/miniData"`  //三级页展示采购单位基础画像信息
 }
 
-//企业基本信息
+//EntDetail 企业基本信息
 func (this *EntPortrait) EntDetail() {
 	userId := qutil.ObjToString(this.GetSession("userId"))
 	rData, errMsg := func() (interface{}, error) {
@@ -46,6 +48,7 @@ func (this *EntPortrait) EntDetail() {
 	this.ServeJson(NewResult(rData, errMsg))
 }
 
+//WinnerContacts 中标企业历史联系人
 func (this *EntPortrait) WinnerContacts() {
 	userId := qutil.ObjToString(this.GetSession("userId"))
 	rData, errMsg := func() (interface{}, error) {
@@ -53,7 +56,7 @@ func (this *EntPortrait) WinnerContacts() {
 		if err != nil {
 			return nil, err
 		}
-		if false && !hasPower {
+		if !hasPower {
 			return nil, fmt.Errorf("非法请求")
 		}
 		entId := util.DecodeId(this.GetString("entId"))
@@ -71,7 +74,7 @@ func (this *EntPortrait) WinnerContacts() {
 	this.ServeJson(NewResult(rData, errMsg))
 }
 
-//企业画像-最新项目动态
+//WinnerNewMsg 企业画像-最新项目动态
 func (this *EntPortrait) WinnerNewMsg() {
 	userId := qutil.ObjToString(this.GetSession("userId"))
 	rData, errMsg := func() (interface{}, error) {
@@ -123,7 +126,7 @@ func (this *EntPortrait) WinnerNewMsg() {
 	this.ServeJson(NewResult(rData, errMsg))
 }
 
-//企业画像-画像数据查询
+//WinnerPortrait 企业画像-画像数据查询
 func (this *EntPortrait) WinnerPortrait() {
 	userId := qutil.ObjToString(this.GetSession("userId"))
 	rData, errMsg := func() (interface{}, error) {
@@ -131,14 +134,43 @@ func (this *EntPortrait) WinnerPortrait() {
 		if err != nil {
 			return nil, err
 		}
-		if !hasPower {
-			return nil, fmt.Errorf("非法请求")
-		}
 		entId := this.GetString("entId")
-		rData, err := cepm.WinnerPortraitData(util.DecodeId(entId))
+		rData, err := cepm.WinnerPortraitData(util.DecodeId(entId), hasPower)
+		if err != nil {
+			return nil, err
+		}
+		return rData, nil
+	}()
+	if errMsg != nil {
+		log.Printf("%s WinnerPortrait获取企业画像标信息出错:%s\n", userId, errMsg.Error())
+	}
+	this.ServeJson(NewResult(rData, errMsg))
+}
+
+//WinnerMiniPortrait 三级页中标单位引流数据展示(免费)
+func (this *EntPortrait) WinnerMiniPortrait() {
+	userId := qutil.ObjToString(this.GetSession("userId"))
+	rData, errMsg := func() (interface{}, error) {
+		cepm, _, err := entity.CreatePortraitManager(userId, "entPortrait")
 		if err != nil {
 			return nil, err
 		}
+		entId := util.DecodeId(this.GetString("entId"))
+		rData, err := cepm.WinnerMiniPortraitData(entId) //项目个数，项目金额
+		if err != nil {
+			return nil, err
+		}
+		//公司状态
+		if entInfo, err := cepm.GetEntInfo(entId); err == nil {
+			rData["status"] = entInfo["status"]
+			rData["type"] = entInfo["type"]
+		}
+		//项目动态数量
+		rData["biddingCount"] = cepm.GetWinnerNewCount(entId)
+		//历史联系人
+		if contactList, err := cepm.GetWinnerContactsMsg(entId); err == nil {
+			rData["contactList"], rData["contactCount"] = formatContact(contactList)
+		}
 		return rData, nil
 	}()
 	if errMsg != nil {
@@ -147,7 +179,7 @@ func (this *EntPortrait) WinnerPortrait() {
 	this.ServeJson(NewResult(rData, errMsg))
 }
 
-//采购单位画像-最新招标动态
+//BuyerNewMsg 采购单位画像-最新招标动态（免费用户仅可查看3条记录，付费50条）
 func (this *EntPortrait) BuyerNewMsg() {
 	userId := qutil.ObjToString(this.GetSession("userId"))
 	rData, errMsg := func() (interface{}, error) {
@@ -178,7 +210,7 @@ func (this *EntPortrait) BuyerNewMsg() {
 				limit = entity.PortraitNewMegsLimit - start
 			}
 		}
-
+		//免费用户仅可查看三条记录
 		rData, err := cepm.GetBuyerNewMsg(buyer, start, limit, hasPower)
 		if err != nil {
 			return nil, err
@@ -197,7 +229,7 @@ func (this *EntPortrait) BuyerNewMsg() {
 	this.ServeJson(NewResult(rData, errMsg))
 }
 
-//采购单位联系人
+//BuyerContacts 采购单位联系人(必须开通会员)
 func (this *EntPortrait) BuyerContacts() {
 	userId := qutil.ObjToString(this.GetSession("userId"))
 	rData, errMsg := func() (interface{}, error) {
@@ -205,7 +237,7 @@ func (this *EntPortrait) BuyerContacts() {
 		if err != nil {
 			return nil, err
 		}
-		if false && !hasPower {
+		if !hasPower {
 			return nil, fmt.Errorf("非法请求")
 		}
 		buyerName := this.GetString("buyer")
@@ -223,7 +255,7 @@ func (this *EntPortrait) BuyerContacts() {
 	this.ServeJson(NewResult(rData, errMsg))
 }
 
-//采购单位画像-数据
+//BuyerPortrait 采购单位画像-数据(免费用户可查看基本信息、项目统计、合作企业资本、年龄及地区分布)
 func (this *EntPortrait) BuyerPortrait() {
 	userId := qutil.ObjToString(this.GetSession("userId"))
 	rData, errMsg := func() (interface{}, error) {
@@ -240,7 +272,73 @@ func (this *EntPortrait) BuyerPortrait() {
 		return rData, nil
 	}()
 	if errMsg != nil {
-		log.Printf("%s WinnerPortrait获取采购单位画像标信息出错:%s\n", userId, errMsg.Error())
+		log.Printf("%s BuyerPortrait获取采购单位画像标信息出错:%s\n", userId, errMsg.Error())
+	}
+	this.ServeJson(NewResult(rData, errMsg))
+}
+
+//BuyerMiniPortrait 三级页采购单位引流数据展示(免费)
+func (this *EntPortrait) BuyerMiniPortrait() {
+	userId := qutil.ObjToString(this.GetSession("userId"))
+	rData, errMsg := func() (interface{}, error) {
+		cepm, _, err := entity.CreatePortraitManager(userId, "buyerPortrait")
+		if err != nil {
+			return nil, err
+		}
+		entName := this.GetString("buyer")
+		//所在地(省、市)、采购单位类型、采购项目数量、采购规模
+		rData, err := cepm.BuyerMiniPortraitData(entName)
+		if err != nil {
+			return nil, err
+		}
+		//招标动态数量
+		rData["biddingCount"] = cepm.GetBuyerNewCount(entName)
+		//采购联系人数量及历史联系人方式,成交时间(加密展示2条)
+		if contactList, err := cepm.GetBuyerContactsMsg(entName); err == nil {
+			rData["contactList"], rData["contactCount"] = formatContact(contactList)
+		}
+		return rData, nil
+	}()
+	if errMsg != nil {
+		log.Printf("%s BuyerMiniPortrait获取采购单位画像标信息出错:%s\n", userId, errMsg.Error())
 	}
 	this.ServeJson(NewResult(rData, errMsg))
 }
+
+//formatContact 格式化混淆联系人电话
+func formatContact(contactList []map[string]interface{}) (confusing []map[string]interface{}, total int) {
+	total = len(contactList)
+	deConfusingMap := make(map[string]bool) //去重
+	for _, contactMap := range contactList {
+		var thePhone string
+		rowData, _ := contactMap["contacts"].(map[string]string)
+		for phone := range rowData {
+			if !deConfusingMap[phone] && phone != "" {
+				thePhone = phone
+			}
+		}
+		if len(thePhone) < 7 {
+			continue
+		}
+
+		var confusingPhone string
+		if len([]rune(thePhone)) == 11 {
+			confusingPhone = thePhone[:3] + "****" + thePhone[8:]
+		} else if len([]rune(thePhone)) == 7 {
+			confusingPhone = thePhone[:2] + "***" + thePhone[5:]
+		} else {
+			confusingPhone = thePhone[:5] + "***" + thePhone[8:]
+		}
+		deConfusingMap[confusingPhone] = true
+
+		confusing = append(confusing, map[string]interface{}{
+			"contact": confusingPhone,
+			"date":    contactMap["date"],
+		})
+		//仅返回两条
+		if len(confusing) == 2 {
+			break
+		}
+	}
+	return
+}

src/jfw/modules/bigmember/src/service/portrait/subvipPortraitAction.go

@@ -115,7 +115,7 @@ func (this *SubVipPortrait) SubVipPortrait() {
 		if err = bigMsg.SubVipPortraitTimesCheck(db.Mysql, entId); err != nil {
 			return nil, err
 		}
-		rData, err := cepm.WinnerPortraitData(entId)
+		rData, err := cepm.WinnerPortraitData(entId, true)
 		if err != nil {
 			return nil, err
 		}

src/jfw/modules/common/src/qfw/util/dataexport/entdataexport.go

@@ -3,8 +3,6 @@ package dataexport
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/tealeg/xlsx"
-	"go.mongodb.org/mongo-driver/bson"
 	"io/ioutil"
 	"log"
 	"mongodb"
@@ -18,6 +16,9 @@ import (
 	"strings"
 	"sync"
 	"time"
+
+	"github.com/tealeg/xlsx"
+	"go.mongodb.org/mongo-driver/bson"
 )
 
 //作者：一组开发
@@ -225,8 +226,8 @@ func FormatExportDatas(Mgo_Ent mongodb.MongodbSim, data *[]map[string]interface{
 				str = strings.Replace(str, " ", "", -1)
 				v["detail"] = str
 			}
-			if v["_id"] != nil {
-				v["url"] = webdomain + "/article/content/" + util.CommonEncodeArticle("content", v["_id"].(string)) + ".html"
+			if v["infoid"] != nil {
+				v["url"] = webdomain + "/article/content/" + util.CommonEncodeArticle("content", v["infoid"].(string)) + ".html"
 			}
 		}(v)
 	}

src/jfw/modules/distribution/src/config.json

@@ -1,14 +1,14 @@
 {
 	"webport": "8086",
 	"webdomain":"http://web-jydev-wh.jianyu360.cn",
-	"mongodb": {
+	"1": {
 		"main": {
-			"address": "192.168.3.11:27090",
+			"address": "192.168.3.206:27090",
 	 		"size": 5,
 	 		"dbName": "qfw"
 		},
 		"log": {
-			"address": "192.168.3.11:27090",
+			"address": "192.168.3.206:27090",
 	 		"size": 5,
 	 		"dbName": "qfw",
 			"userName": "admin",
@@ -55,7 +55,8 @@
     	"A":{
 			"name":"超级订阅",
 			"url":"/front/vipsubscribe/introducePage",
-			"appUrl":"/jyapp/vipsubscribe/introducePage"
+			"appUrl":"/jyapp/vipsubscribe/introducePage",
+			"upgradeUrl":"/front/vipsubscribe/toSubVipSetPage"
 			},
     	"B":{
 			"name":"数据导出",

src/jfw/modules/distribution/src/service/action/capital.go

@@ -9,7 +9,6 @@ import (
 	"sort"
 	"strings"
 	"time"
-
 	"github.com/go-xweb/xweb"
 )
 
@@ -19,12 +18,15 @@ type Capital struct {
 }
 
 type CapitalList struct {
-	Type     string //提现、上月结算、佣金、实名认证、代扣个税
-	Money    string //
-	Date     string //
-	Status   string //已申请、未结算
-	TaxCash  string //代扣个税
-	AuthCash string //实名认证
+	Type        string //提现、上月结算、佣金、实名认证、代扣个税
+	Money       string //
+	Date        string //
+	Status      string //已申请、未结算
+	TaxCash     string //代扣个税
+	AuthCash    string //实名认证
+	ProductName string //商品名称
+	ShareType   string //分享模式
+	Phone       string //手机号
 }
 
 type SortList []*CapitalList
@@ -50,20 +52,23 @@ func init() {
 //资金列表
 func (l *Capital) List() {
 	userId, _ := l.GetSession("userId").(string)
-	//userId:="5c89fead1c298a4d75fef39e"
+	//userId := "5f699d4723d21d06a4815b27"
 	sl := SortList{}
-	dis_sale := Mysql.SelectBySql(`select commission,sale_status,createtime from dis_sale where uid=?`, userId)
+	dis_sale := Mysql.SelectBySql(`select product_name,commission,sale_status,createtime,phone,(CASE shareType WHEN 1 THEN '链接' WHEN 2 THEN '二维码' WHEN 3 THEN '海报' ELSE '未知' END) as shareType from dis_sale where uid=?`, userId)
 	if dis_sale != nil {
 		for _, v := range *dis_sale {
 			sl = append(sl, &CapitalList{
-				Type:   "佣金",
-				Money:  fmt.Sprintf("+%.2f", util.Float64All(v["commission"])/100),
-				Date:   util.ObjToString(v["createtime"]),
-				Status: "",
+				Type:        "佣金",
+				Money:       fmt.Sprintf("+%.2f", util.Float64All(v["commission"])/100),
+				Date:        util.ObjToString(v["createtime"]),
+				Status:      "",
+				ProductName: fmt.Sprint(v["product_name"]),
+				ShareType:   fmt.Sprint(v["shareType"]),
+				Phone:       fmt.Sprint(v["phone"]),
 			})
 		}
 	}
-	dis_count := Mysql.SelectBySql(`select commission,count_cash,auth_cash,tax_cash,count_status,createtime from dis_count where uid=?`, userId)
+	dis_count := Mysql.SelectBySql(`select commission,count_cash,auth_cash,tax_cash,count_status,createtime  from dis_count where uid=?`, userId)
 	if dis_count != nil {
 		for _, v := range *dis_count {
 			cl := &CapitalList{
@@ -79,6 +84,7 @@ func (l *Capital) List() {
 				if count_cash := util.Float64All(v["count_cash"]); count_cash > 0 {
 					cl.Money = fmt.Sprintf("%.2f", count_cash/100)
 				}
+				cl.Status = "已结算"
 			}
 			if tax_cash := util.Float64All(v["tax_cash"]); tax_cash > 0 {
 				cl.TaxCash = fmt.Sprintf("-%.2f", tax_cash/100)
@@ -98,6 +104,8 @@ func (l *Capital) List() {
 			cashout_status := util.IntAll(v["cashout_status"])
 			if cashout_status == 0 {
 				status = "已申请"
+			}else if cashout_status == 1 {
+				status = "已完成"
 			} else if cashout_status == -1 {
 				continue
 			}
@@ -142,10 +150,13 @@ func (l *Capital) List() {
 			})
 		}
 		array = append(array, M{
-			"day":    day,
-			"type":   v.Type,
-			"status": v.Status,
-			"money":  v.Money,
+			"day":         day,
+			"type":        v.Type,
+			"status":      v.Status,
+			"money":       v.Money,
+			"phone":       phoneHandle(v.Phone),
+			"productName": v.ProductName,
+			"shareType":   v.ShareType,
 		})
 		if v.AuthCash != "" {
 			array = append(array, M{
@@ -168,3 +179,10 @@ func (l *Capital) List() {
 		Data: all,
 	})
 }
+func phoneHandle(phone string) string {
+	if len(phone) == 11 {
+		profilePicture := strings.Replace(phone, phone[3:7], "****", 1)
+		return profilePicture
+	}
+	return phone
+}

src/jfw/modules/distribution/src/service/action/partner.go

@@ -94,9 +94,11 @@ func (p *Partner) AddPartner() {
 			log.Println("user_phone：",user_phone)
 			if phone != user_phone {
 				return -1, "验证码错误"
+
 			}
 		}
-		typ, _ := p.GetInt("type") // 1个人伙伴 2企业伙伴
+		//typ, _ := p.GetInt("type") // 1个人伙伴 2企业伙伴
+		typ:=int64(2)
 		if typ != 1 && typ != 2 {
 			return -1, "type参数格式错误"
 		}

src/jfw/modules/distribution/src/service/action/share.go

@@ -2,7 +2,9 @@ package action
 
 import (
 	"database/sql"
+	"encoding/base64"
 	"fmt"
+	"github.com/SKatiyar/qr"
 	"log"
 	"qfw/util"
 	qu "qfw/util"
@@ -26,6 +28,7 @@ type Share struct {
 	linkShare         xweb.Mapper `xweb:"/share/(.*)"`              //链接分享获取用户信息
 	productInfo       xweb.Mapper `xweb:"/share/productInfo"`       //产品信息
 	shareLogs         xweb.Mapper `xweb:"/share/shareLogs"`         //分享记录日志
+	shareLink        xweb.Mapper `xweb:"/share/shareLink"`         //分享链接获取
 }
 
 //1000:请求方式有误；1001：需要登录；1002：缺失参数；1003：无效参数；1004：没有权限
@@ -63,9 +66,9 @@ func (this *Share) ProductInfo() error {
 				dis_res := *Mysql.SelectBySql("SELECT DISTINCT a.product_name,SUM(a.sale_money) AS t_sale,SUM(a.commission) AS t_com,COUNT(a.product_name) AS t_count FROM dis_sale a  WHERE a.uid = '" + userId + "'  GROUP BY a.product_name")
 				for key, v := range *p_data {
 					delete(v, "_id")
-					if (v["s_name"]=="超级订阅企业版"){
-						v["s_name"]="超级订阅"
-						(*p_data)[key]["s_name"]="超级订阅"
+					if (v["s_name"] == "超级订阅企业版") {
+						v["s_name"] = "超级订阅"
+						(*p_data)[key]["s_name"] = "超级订阅"
 					}
 					for _, dv := range dis_res {
 						if dv["product_name"] == v["s_name"].(string) {
@@ -95,6 +98,7 @@ func (this *Share) ProductInfo() error {
 func (this *Share) LinkShare(discored string) error {
 	defer util.Catch()
 	openid, _ := this.Session().Get("s_m_openid").(string)
+	//openid := "o-Icg57Mkto-BVwmDk-VuDujNFG0"
 	log.Println("微信自动回复 或者访问复制链接discored:", discored)
 	if openid == "" || discored == "" {
 		//提示关注页面
@@ -102,8 +106,24 @@ func (this *Share) LinkShare(discored string) error {
 	}
 	userId, _ := this.Session().Get("userId").(string)
 	//userId := "5c89fead1c298a4d75fef39e"
-
-	_, url, _, _ := analyseWord(discored, userId)
+	url := ""
+	fmt.Println(userId,openid,"user", `{"s_m_openid":"`+openid+`}`, `{"o_jy":1:"o_vipjy":1,"i_vip_status":1}`)
+	if discored[len(discored)-4:len(discored)-2]  == "GX" {
+		user, ok := MQFW.FindOneByField("user", `{"s_m_openid":"`+openid+`"}`, `{"o_jy":1:"o_vipjy":1,"i_vip_status":1}`)
+		log.Println(user)
+		if ok && user != nil {
+			i_vip_status := qu.IntAll((*user)["i_vip_status"])
+			if i_vip_status > 0 {
+				modular := util.ObjToMap(Sysconfig.Modular[discored[:1]])
+				url = (*modular)["upgradeUrl"].(string)
+			}else{
+				modular := util.ObjToMap(Sysconfig.Modular[discored[:1]])
+				url = (*modular)["url"].(string)+"?disWord=" + discored
+			}
+		}
+	} else {
+		_, url, _, _ = analyseWord(discored, userId)
+	}
 	log.Println("获取三级页面地址:", url)
 	return this.Redirect(url)
 }
@@ -242,9 +262,11 @@ func (this *Share) GetOtherWordShare() {
 		url := this.GetString("url")
 		if modular != "" {
 			userId, _ := this.GetSession("userId").(string)
+			//userId := "123"
 			partner_user := false
 			if userId != "" {
 				s_nickname, _ := this.GetSession("s_nickname").(string)
+				//s_nickname := "232"
 				if s_nickname == "" {
 					s_nickname, _ = this.GetSession("app_name").(string)
 				}
@@ -416,3 +438,19 @@ func (this *Share) ShareLogs() {
 		log.Println(this.GetSession("userId"), msg)
 	}
 }
+
+func (this *Share) ShareLink() {
+	res := map[string]interface{}{
+		"error_code": error_code[0],
+		"error_msg":  error_msg[0],
+		"data":"",
+	}
+	disWord := this.GetString("disWord")
+	url:=Sysconfig.Webdomain+"/G/"+disWord
+	r, _ := qr.Encode(url, qr.M)
+	pngdat := r.PNG()
+	res["error_code"]=0
+	res["error_msg"]="二维码获取"
+	res["data"]=base64.StdEncoding.EncodeToString(pngdat)
+	this.ServeJson(res)
+}

src/jfw/modules/distribution/src/service/filter/filter.go

@@ -1,8 +1,6 @@
 package filter
 
-import "github.com/go-xweb/xweb"
-
 func init() {
-	xweb.AddFilter(&logfilter{App: xweb.RootApp()})
-	xweb.AddFilter(&sessionfilter{App: xweb.RootApp()})
+/*	xweb.AddFilter(&logfilter{App: xweb.RootApp()})
+	xweb.AddFilter(&sessionfilter{App: xweb.RootApp()})*/
 }

src/jfw/modules/distribution/src/service/filter/sessionfilter.go

@@ -2,10 +2,9 @@ package filter
 
 import (
 	. "api"
+	"github.com/go-xweb/xweb"
 	"net/http"
 	"strings"
-
-	"github.com/go-xweb/xweb"
 )
 
 //登录限制
@@ -16,7 +15,7 @@ type sessionfilter struct {
 //继承过滤器方法
 func (l *sessionfilter) Do(w http.ResponseWriter, req *http.Request) bool {
 	rqu := req.URL.Path
-	if strings.HasPrefix(rqu, "/distribution/share/getWordInfo") || strings.HasPrefix(rqu, "/distribution/logo/*") {
+	if strings.HasPrefix(rqu, "/distribution/share/getWordInfo") || strings.HasPrefix(rqu, "/distribution/logo/*") || strings.HasPrefix(rqu, "/share/shareLink") {
 		return true
 	}
 	session := l.App.SessionManager.Session(req, w)

src/jfw/modules/subscribepay/src/config.json

@@ -3,14 +3,14 @@
     "mongodbPoolSize": 5,
     "mongodbName": "qfw",
     "mongoent":{
-    	"address": "192.168.3.207:27001,192.168.3.206:27002",
+    	"address": "192.168.3.206:27001,192.168.3.206:27002",
 		"size": 5,
 		"dbName": "qfw_data",
 		"userName": "jyDevGroup",
 		"password": "jy@DevGroup"
     },
 	"mongobidding":{
-		"address": "192.168.3.207:27001,192.168.3.206:27002",
+		"address": "192.168.3.206:27001,192.168.3.206:27002",
 		"size": 5,
 		"dbName": "qfw_data",
 		"replSet": "",
@@ -27,13 +27,13 @@
 		"userName": "admin",
 		"password": "123456"
 	},
+    "redisaddrs": "other=127.0.0.1:6379,session=127.0.0.1:1713,push=127.0.0.1:1712,pushcache_1=127.0.0.1:5000,pushcache_2_a=127.0.0.1:5001",
+    "elasticsearch": "http://127.0.0.1:1800",
     "mongoqyfw": {
       "address": "192.168.3.206:27080",
       "size": 5,
       "dbName": "jyqyfw"
     },
-    "redisaddrs": "other=192.168.3.206:1712,session=192.168.3.206:1712,push=192.168.3.206:1712,pushcache_1=192.168.3.206:1712,pushcache_2_a=192.168.3.206:1712",
-    "elasticsearch": "http://192.168.3.206:9800",
     "elasticPoolSize": 30,
     "appid": "wx5b1c6e7cc4dac0e4",
     "appsecret": "b026103ffebd2291b3edb7a269612112",

src/jfw/modules/subscribepay/src/entity/dataExportPackStruct.go

@@ -96,11 +96,12 @@ func (this *dataExportPackStruct) PayCallBack(param *CallBackParam) bool {
 
 				if _, err := perRechargePack(userId, entTime.Format(qutil.Date_Short_Layout), packDetail); err != nil {
 					log.Println(fmt.Sprintf("%s 资源账户更改异常 %v", userId, err))
-					//发异常通知 xxx
 					return false
 				}
 				return true
 			}
+		} else {
+			return true
 		}
 	}
 	return false

src/jfw/modules/subscribepay/src/entity/dataReportStruct.go

@@ -56,17 +56,14 @@ func (this *dataReportStruct) PayCallBack(param *CallBackParam) (update bool) {
 				report_name := qutil.ObjToString(str["report_name"])
 				go sendtemp(openid, orderCode, report_name+" "+product_type, payTime)
 				go SendDatareportMailToPayUser(report_id, prices, param.OutTradeno, email, orderCode, phone, company, createTime, payTime, config.GmailAuth)
-				if qutil.ObjToString((*orderdata)["dis_word"]) != "" {
-					/*//分销系统 分销记录
-					go DisWordRecode(qutil.IntAll((*orderdata)["id"]), qutil.IntAll((*orderdata)["order_money"]), "数据报告", qutil.ObjToString((*orderdata)["dis_word"]))
-					*/
+				/*if qutil.ObjToString((*orderdata)["dis_word"]) != "" {
 					suffix := qutil.ObjToString((*orderdata)["dis_word"])[len(qutil.ObjToString((*orderdata)["dis_word"]))-3 : len(qutil.ObjToString((*orderdata)["dis_word"]))]
 					if suffix == suffix_msgt {
 						go OtherDisWordRecode(qutil.IntAll((*orderdata)["id"]), qutil.IntAll((*orderdata)["order_money"]), "数据报告", qutil.ObjToString((*orderdata)["dis_word"]), qutil.ObjToString((*orderdata)["user_id"]), qutil.ObjToString((*orderdata)["create_time"]))
 					} else {
 						go DisWordRecode(qutil.IntAll((*orderdata)["id"]), qutil.IntAll((*orderdata)["order_money"]), "数据报告", qutil.ObjToString((*orderdata)["dis_word"]))
 					}
-				}
+				}*/
 			}
 		}
 	}

src/jfw/modules/subscribepay/src/entity/dataexport.go

@@ -74,7 +74,7 @@ func (d *dataExportStruct) PayCallBack(param *CallBackParam) bool {
 		order_code := qutil.ObjToString((*orderdata)["order_code"])
 		userId := qutil.ObjToString((*orderdata)["user_id"])
 		order_status := qutil.IntAll((*orderdata)["order_status"])
-		dis_word := qutil.ObjToString((*orderdata)["dis_word"])
+		//dis_word := qutil.ObjToString((*orderdata)["dis_word"])
 		filter := qutil.ObjToString((*orderdata)["filter"])
 		user_phone := qutil.ObjToString((*orderdata)["user_phone"])
 		sc := new(dataexport.SieveCondition)
@@ -106,7 +106,7 @@ func (d *dataExportStruct) PayCallBack(param *CallBackParam) bool {
 				//发送邮件移至定时任务
 				//go SendMailToPayUser(orderdata, float64(param.CashFee)/100, pay_time, download_url, config.GmailAuth)
 
-				if dis_word != "" {
+				/*if dis_word != "" {
 					//分销系统 分销记录
 					suffix := dis_word[len(dis_word)-3 : len(dis_word)]
 					if suffix == suffix_msgt {
@@ -114,7 +114,7 @@ func (d *dataExportStruct) PayCallBack(param *CallBackParam) bool {
 					} else {
 						go DisWordRecode(qutil.IntAll((*orderdata)["id"]), qutil.IntAll((*orderdata)["order_money"]), "数据导出", dis_word)
 					}
-				}
+				}*/
 				//取消其他订单
 				go PayCancel(userId, "历史数据", "")
 				//卡卷使用
@@ -243,7 +243,8 @@ func SendMailToBJFinance(order *map[string]interface{}, pay_time, transaction_id
 			}
 			//超级搜索页面 筛选区域为 area           没有region    移动端数据导出改
 			if sc.Region == nil {
-				region = strings.Join(sc.Area, " ")
+				showAll := append(sc.Area, sc.City...)
+				region = strings.Join(showAll, " ")
 			} else {
 				region = strings.Join(sc.Region, " ")
 			}
@@ -604,7 +605,8 @@ func GetPackDataExportMailContent(filterId, download_url string) (content string
 		}
 		//超级搜索页面 筛选区域为 area           没有region    移动端数据导出改
 		if sc.Region == nil {
-			region = strings.Join(sc.Area, " ")
+			showAll := append(sc.Area, sc.City...)
+			region = strings.Join(showAll, " ")
 		} else {
 			region = strings.Join(sc.Region, " ")
 		}
@@ -711,7 +713,8 @@ func GetDataExportMailContent(orderCode string) (content string, err error) {
 		}
 		//超级搜索页面 筛选区域为 area           没有region    移动端数据导出改
 		if sc.Region == nil {
-			region = strings.Join(sc.Area, " ")
+			showAll := append(sc.Area, sc.City...)
+			region = strings.Join(showAll, " ")
 		} else {
 			region = strings.Join(sc.Region, " ")
 		}

src/jfw/modules/subscribepay/src/entity/distribution.go

@@ -14,38 +14,26 @@ import (
 	"util"
 )
 
-func DisWordRecode(order_id, sale_money int, product_name, disWord string) {
+func DisWordRecode(order_id, sale_money int, product_name, disWord, userId string) {
 	//redis 获取分销者信息
-	redisDis := redis.GetStr("other", "DIS_"+disWord[1:])
+	log.Println("佣金计算")
+	redisDis := redis.GetStr("other", "DIS_"+disWord[1:len(disWord)])
 	log.Println("redisDis:", redisDis)
 	if redisDis != "" {
 		//分销者id
 		shareUId := strings.Split(redisDis, "##")[1]
-		/*//查询用户是企业还是个人账户
-		parentList := util.Mysql.SelectBySql("select  * from  dis_partner where uid=? ", shareUId)
-		parentType := 1
-		if len(*parentList) > 0 {
-			parentTypeInt, _ := strconv.Atoi(fmt.Sprint((*parentList)[0]["type"]))
-			parentType = parentTypeInt
-		}*/
-		//if (parentType == 2) {
-		//	return
-		//}
 		//查询产品信息   获取  rate 佣金比例
 		var c_rate float64 = 0
 		if p_data, ok := util.MQFW.Find("dis_product", nil, `{"l_createdate":1}`, nil, false, -1, -1); ok && p_data != nil {
-
 			for _, v := range *p_data {
-				fmt.Println(v)
 				if product_name == qutil.ObjToString(v["s_name"]) {
 					c_rate = qutil.Float64All(v["f_rate"])
 				}
 			}
 		}
-		if product_name=="超级订阅企业版" {
-			product_name="超级订阅"
+		if product_name == "超级订阅企业版" {
+			product_name = "超级订阅"
 		}
-		fmt.Println("佣金比例：",fmt.Sprint(c_rate))
 		//四舍五入 取整
 		c_money_f := float64(sale_money) * c_rate
 		c_money_i := int(qutil.RetainDecimal(c_money_f, 0))
@@ -61,12 +49,26 @@ func DisWordRecode(order_id, sale_money int, product_name, disWord string) {
 		// 	"sale_status":     0,                                              //状态；0：未结算，1：已结算
 		// 	"createtime":      qutil.FormatDate(&now, qutil.Date_Full_Layout), //保存时间
 		// 	"timestamp":       qutil.FormatDate(&now, qutil.Date_Full_Layout), //修改时间
+		shareType := ""
+		/*if len(strings.Split(disWord, ",")) == 3 {
+			shareType = strings.Split(disWord, ",")[2]
+		}*/
+		if (userId==shareUId){
+			return
+		}
+		phone := ""
+		userMsg, _ := util.MQFW.FindById("user", userId, ``)
+		if userMsg == nil || len(*userMsg) == 0 {
+
+		} else {
+			phone = qutil.ObjToString(qutil.If((*userMsg)["s_phone"] != nil, (*userMsg)["s_phone"], (*userMsg)["s_m_phone"]))
+			shareType = qutil.ObjToString((*userMsg)["shareType"])
+		}
 		if !util.Mysql.ExecTx("分销记录和个人账户统计", func(tx *sql.Tx) bool {
 			//新增分销记录
-			s_count := util.Mysql.InsertBySqlByTx(tx, "INSERT INTO dis_sale (uid,order_id,product_name,sale_money,commission_rate,commission,code,sale_status,createtime,timestamp) VALUES (?,?,?,?,?,?,?,?,?,?)", shareUId, order_id, product_name, sale_money, c_rate, c_money_i, code, 0, qutil.FormatDate(&now, qutil.Date_Full_Layout), qutil.FormatDate(&now, qutil.Date_Full_Layout))
+			s_count := util.Mysql.InsertBySqlByTx(tx, "INSERT INTO dis_sale (uid,order_id,product_name,sale_money,commission_rate,commission,code,sale_status,createtime,timestamp,phone,shareType) VALUES (?,?,?,?,?,?,?,?,?,?,?,?)", shareUId, order_id, product_name, sale_money, c_rate, c_money_i, code, 0, qutil.FormatDate(&now, qutil.Date_Full_Layout), qutil.FormatDate(&now, qutil.Date_Full_Layout),phone,shareType)
 			//个人账户更新
 			p_count := util.Mysql.UpdateOrDeleteBySql("UPDATE account a SET a.dis_sales = a.dis_sales+? , a.dis_order = a.dis_order+1 , a.dis_commission=a.dis_commission+? WHERE a.uid = ?", sale_money, c_money_i, shareUId)
-
 			util.MsgRemind.DistributionSuccess(order_id, shareUId, c_money_i, product_name)
 			return s_count > 0 && p_count > 0
 		}) {

src/jfw/modules/subscribepay/src/entity/subscribeVip.go

@@ -212,13 +212,11 @@ func (this *vipSubscribeStruct) PayCallBack(param *CallBackParam) bool {
 			//分销系统 分销记录
 			suffix := dis_word[len(dis_word)-3 : len(dis_word)]
 			if suffix == suffix_msgt {
-				go OtherDisWordRecode(qutil.IntAll((*orderdata)["id"]), qutil.IntAll((*orderdata)["order_money"]), "超级订阅", dis_word, qutil.ObjToString((*orderdata)["user_id"]), qutil.ObjToString((*orderdata)["create_time"]))
+				//go OtherDisWordRecode(qutil.IntAll((*orderdata)["id"]), qutil.IntAll((*orderdata)["order_money"]), "超级订阅", dis_word, qutil.ObjToString((*orderdata)["user_id"]), qutil.ObjToString((*orderdata)["create_time"]))
 			} else if suffix == "_GX" {
-				go DisWordRecode(qutil.IntAll((*orderdata)["id"]), qutil.IntAll((*orderdata)["order_money"]), "超级订阅企业版", dis_word)
-
+				go DisWordRecode(qutil.IntAll((*orderdata)["id"]), qutil.IntAll((*orderdata)["order_money"]), "超级订阅企业版", dis_word, userId)
 			} else {
-				go DisWordRecode(qutil.IntAll((*orderdata)["id"]), qutil.IntAll((*orderdata)["order_money"]), "超级订阅", dis_word)
-
+				//go DisWordRecode(qutil.IntAll((*orderdata)["id"]), qutil.IntAll((*orderdata)["order_money"]), "超级订阅", dis_word)
 			}
 		}
 		//卡卷使用
@@ -542,7 +540,7 @@ func (this *vipSubscribeStruct) GetSubVipPriceByBuySet(buySet *SubvipBuySet, cou
 		pCount := buySet.AreaCount            //省份数量
 		industryNum := buySet.BuyerclassCount //行业数量
 		newCityArr := []int{}                 //选择城市数量 防止操作cityCountArr 影响原数据
-		if buySet.Upgrade != 1 {              //未升级超级订阅计价规则
+		if buySet.Upgrade != 1 { //未升级超级订阅计价规则
 			//城市选择过多时，转为省份
 			for _, cityCount := range buySet.NewCitys {
 				if cityCount > SubVipPrice.Old.CityMaxCount {

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

@@ -39,7 +39,6 @@ type AfterPay struct {
 func (a *AfterPay) Modification() error {
 	defer qutil.Catch()
 	userId, _ := a.GetSession("userId").(string)
-	fmt.Println("userid:", userId)
 	mflag := false
 	if userId != "" {
 		data, ok := util.MQFW.FindById("user", userId, `{"o_vipjy":1}`)

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

@@ -123,14 +123,14 @@ func (p *DataExportPay) CreateOrder() {
 			filter_publishtime = qutil.ObjToString((*userfilter)["publishtime"])
 			disWord = qutil.ObjToString((*userfilter)["disWord"])
 			log.Println("口令：", disWord, config.Config.TermValidity)
-			if disWord == "" {
+			/*if disWord == "" {
 				start_time := TimeProcessing(time.Now().Format(DateFullLayout), -config.Config.TermValidity).Format(DateFullLayout)
 				stop_time := TimeProcessing(time.Now().Format(DateFullLayout), config.Config.TermValidity).Format(DateFullLayout)
 				infoList := util.Mysql.SelectBySql("select  * from  dis_word where userId=?  and  ?<=start_time  and stop_time<? ORDER BY id ", userId, start_time, stop_time)
 				if len(*infoList) > 0 {
 					disWord = fmt.Sprint((*infoList)[0]["password"])
 				}
-			}
+			}*/
 			delete(*userfilter, "selectIds")
 			filterByte, _ := json.Marshal(userfilter)
 			filter = string(filterByte)

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

@@ -122,128 +122,130 @@ func (this *Invoice) Addinvoice() error {
 		pos := qutil.IntAllDef(last, 0)
 		locks[pos].Lock()
 		defer locks[pos].Unlock()
-		u := util.Mysql.FindOne("dataexport_order", map[string]interface{}{"order_code": order_code, "user_id": userId, "applyBill_status": map[string]interface{}{"ne": 2}}, "order_money,product_type,pay_way,pay_money", "")
+		u := util.Mysql.FindOne("dataexport_order", map[string]interface{}{"order_code": order_code, "user_id": userId, "applyBill_status": map[string]interface{}{"ne": 2}}, "order_money,product_type,pay_way,pay_money,is_backstage_order,billingMode", "")
 		if u != nil {
-			var prices float64
-			//公对公转账 账单金额可以修改 开发票应取实付金额 pay_money
-			//微信支付宝支付 pay_money为订单金额减去微信or支付包红包
-			if qutil.ObjToString((*u)["pay_way"]) == "transferAccounts" {
-				prices = qutil.Float64All((*u)["pay_money"]) / float64(100)
-			} else {
-				prices = qutil.Float64All((*u)["order_money"]) / float64(100)
-			}
-			price = strconv.FormatFloat(prices, 'f', -1, 64)
-			product_name = (*u)["product_type"].(string)
-			applyBill_status = 1
-			data := make(map[string]interface{})
-			dataexport_data := make(map[string]interface{})
-			dataexport_data["applyBill_status"] = applyBill_status
-			if applyBill_type == "个人" {
-				dataexport_data["applyBill_type"] = 0
-				data["taxpayer_identnum"] = ""
-				data["company_name"] = ""
-				dataexport_data["applyBill_taxnum"] = ""
-				dataexport_data["applybill_company"] = ""
-			} else {
-				data["taxpayer_identnum"] = code
-				data["company_name"] = applyBill_company
-				dataexport_data["applyBill_taxnum"] = code
-				dataexport_data["applybill_company"] = applyBill_company
-				dataexport_data["applyBill_type"] = 1
-			}
-			dataexport_data["user_mail"] = my_email
-			data["product_type"] = product_name
-			data["order_code"] = order_code
-			data["mail"] = my_email
-			data["phone"] = phone_num
-			data["invoice_type"] = applyBill_type
-			data["invoice_changed"] = 0
-			data["create_time"] = time.Now().Unix()
-			data["user_id"] = userId
-			data["invoice_status"] = 0
-			var orders = []map[string]interface{}{}
-			var items = []map[string]interface{}{}
-			item := map[string]interface{}{
-				"name":        product_name,
-				"code":        config.InvoiceConfig.Code,
-				"yhzcbs":      config.InvoiceConfig.Tax_policy,
-				"lineType":    config.InvoiceConfig.Invoice_nature,
-				"taxRate":     config.InvoiceConfig.Tax_rate,
-				"taxPrice":    price,
-				"totalAmount": price,
-				"quantity":    "1",
-			}
-			items = append(items, item)
-			order := map[string]interface{}{
-				"billNo": order_code,
-				"items":  items,
-			}
-			orders = append(orders, order)
-			client := &http.Client{}
-			body := map[string]interface{}{
-				"Swno":      order_code,
-				"custType":  "03",
-				"orders":    orders,
-				"custTaxNo": code,
-			}
-			if applyBill_type == "单位" {
-				body["custName"] = applyBill_company
-			} else {
-				body["custName"] = applyBill_type
-			}
-			//发送请求之前插入数据，防止请求时间过长
-			if !isSys {
-				status := util.Mysql.Find(dbname, map[string]interface{}{"order_code": order_code, "user_id": userId}, "", "create_time", 0, 0)
-				if len(*status) > 0 {
-					return nil
+			if qutil.IntAll((*u)["billingMode"]) == 1 && qutil.IntAll((*u)["is_backstage_order"]) != 1 {
+				var prices float64
+				//公对公转账 账单金额可以修改 开发票应取实付金额 pay_money
+				//微信支付宝支付 pay_money为订单金额减去微信or支付包红包
+				if qutil.ObjToString((*u)["pay_way"]) == "transferAccounts" {
+					prices = qutil.Float64All((*u)["pay_money"]) / float64(100)
+				} else {
+					prices = qutil.Float64All((*u)["order_money"]) / float64(100)
 				}
-				util.Mysql.Insert(dbname, data)
-				if !util.Mysql.Update("dataexport_order", map[string]interface{}{"order_code": order_code, "user_id": userId}, dataexport_data) {
-					invoice_status = -1
+				price = strconv.FormatFloat(prices, 'f', -1, 64)
+				product_name = (*u)["product_type"].(string)
+				applyBill_status = 1
+				data := make(map[string]interface{})
+				dataexport_data := make(map[string]interface{})
+				dataexport_data["applyBill_status"] = applyBill_status
+				if applyBill_type == "个人" {
+					dataexport_data["applyBill_type"] = 0
+					data["taxpayer_identnum"] = ""
+					data["company_name"] = ""
+					dataexport_data["applyBill_taxnum"] = ""
+					dataexport_data["applybill_company"] = ""
+				} else {
+					data["taxpayer_identnum"] = code
+					data["company_name"] = applyBill_company
+					dataexport_data["applyBill_taxnum"] = code
+					dataexport_data["applybill_company"] = applyBill_company
+					dataexport_data["applyBill_type"] = 1
 				}
-			} else {
-				util.Mysql.Update(dbname, map[string]interface{}{
-					"order_code":      order_code,
-					"user_id":         userId,
-					"invoice_changed": 0,
-				}, data)
-			}
-			b, _ := json.Marshal(body)
-			buffer := bytes.NewBuffer(b)
-			request, _ := http.NewRequest("POST", config.InvoiceConfig.Invoice_interface_address+"/Invoice/Add", buffer)
-			response, err := client.Do(request)
-			if err == nil {
-				res, err := ioutil.ReadAll(response.Body)
-				if err != nil {
-					invoice_status = -1
+				dataexport_data["user_mail"] = my_email
+				data["product_type"] = product_name
+				data["order_code"] = order_code
+				data["mail"] = my_email
+				data["phone"] = phone_num
+				data["invoice_type"] = applyBill_type
+				data["invoice_changed"] = 0
+				data["create_time"] = time.Now().Unix()
+				data["user_id"] = userId
+				data["invoice_status"] = 0
+				var orders = []map[string]interface{}{}
+				var items = []map[string]interface{}{}
+				item := map[string]interface{}{
+					"name":        product_name,
+					"code":        config.InvoiceConfig.Code,
+					"yhzcbs":      config.InvoiceConfig.Tax_policy,
+					"lineType":    config.InvoiceConfig.Invoice_nature,
+					"taxRate":     config.InvoiceConfig.Tax_rate,
+					"taxPrice":    price,
+					"totalAmount": price,
+					"quantity":    "1",
+				}
+				items = append(items, item)
+				order := map[string]interface{}{
+					"billNo": order_code,
+					"items":  items,
+				}
+				orders = append(orders, order)
+				client := &http.Client{}
+				body := map[string]interface{}{
+					"Swno":      order_code,
+					"custType":  "03",
+					"orders":    orders,
+					"custTaxNo": code,
+				}
+				if applyBill_type == "单位" {
+					body["custName"] = applyBill_company
 				} else {
-					resMap := qutil.ObjToMap(string(res))
-					if *resMap != nil {
-						if qutil.IntAll((*resMap)["code"]) == 0 { //开票成功
-							invoice_status = 1
-							jsonData["invoice_status"] = invoice_status
-						} else if qutil.IntAll((*resMap)["code"]) == 2 { //开票中
-							// log.Println("开票中")
-							invoice_status = 0
-							jsonData["invoice_status"] = invoice_status
-						} else { //开票失败
-							// log.Println("开票失败")
-							invoice_status = -1
-							jsonData["invoice_status"] = invoice_status
-						}
+					body["custName"] = applyBill_type
+				}
+				//发送请求之前插入数据，防止请求时间过长
+				if !isSys {
+					status := util.Mysql.Find(dbname, map[string]interface{}{"order_code": order_code, "user_id": userId}, "", "create_time", 0, 0)
+					if len(*status) > 0 {
+						return nil
 					}
-					defer response.Body.Close()
-
-					resData := (*resMap)["data"].(map[string]interface{})
-					update_status := util.Mysql.Update(dbname, map[string]interface{}{"order_code": order_code}, map[string]interface{}{
-						"invoice_serialnum": resData["swno"],
-						"invoice_code":      resData["fpdm"],
-						"invoice_number":    resData["fphm"],
-						"url":               resData["path"],
-						"invoice_status":    invoice_status,
-					})
-					if !update_status {
-						log.Println("order_ocde:", order_code+"update fail")
+					util.Mysql.Insert(dbname, data)
+					if !util.Mysql.Update("dataexport_order", map[string]interface{}{"order_code": order_code, "user_id": userId}, dataexport_data) {
+						invoice_status = -1
+					}
+				} else {
+					util.Mysql.Update(dbname, map[string]interface{}{
+						"order_code":      order_code,
+						"user_id":         userId,
+						"invoice_changed": 0,
+					}, data)
+				}
+				b, _ := json.Marshal(body)
+				buffer := bytes.NewBuffer(b)
+				request, _ := http.NewRequest("POST", config.InvoiceConfig.Invoice_interface_address+"/Invoice/Add", buffer)
+				response, err := client.Do(request)
+				if err == nil {
+					res, err := ioutil.ReadAll(response.Body)
+					if err != nil {
+						invoice_status = -1
+					} else {
+						resMap := qutil.ObjToMap(string(res))
+						if *resMap != nil {
+							if qutil.IntAll((*resMap)["code"]) == 0 { //开票成功
+								invoice_status = 1
+								jsonData["invoice_status"] = invoice_status
+							} else if qutil.IntAll((*resMap)["code"]) == 2 { //开票中
+								// log.Println("开票中")
+								invoice_status = 0
+								jsonData["invoice_status"] = invoice_status
+							} else { //开票失败
+								// log.Println("开票失败")
+								invoice_status = -1
+								jsonData["invoice_status"] = invoice_status
+							}
+						}
+						defer response.Body.Close()
+
+						resData := (*resMap)["data"].(map[string]interface{})
+						update_status := util.Mysql.Update(dbname, map[string]interface{}{"order_code": order_code}, map[string]interface{}{
+							"invoice_serialnum": resData["swno"],
+							"invoice_code":      resData["fpdm"],
+							"invoice_number":    resData["fphm"],
+							"url":               resData["path"],
+							"invoice_status":    invoice_status,
+						})
+						if !update_status {
+							log.Println("order_ocde:", order_code+"update fail")
+						}
 					}
 				}
 			}

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

@@ -67,7 +67,7 @@ func (this *OrderListDetails) GetOrderPayAllMsg() {
 			"order_code": orderCode,
 			//"order_status": 1,
 		}
-		oData := util.Mysql.FindOne(tableName_order, query, "id,order_code,prepay_time,create_time,pay_time,pay_way,original_price,order_money,pay_money,applybill_status,out_trade_no,filter,product_type,order_status,applybill_type,applybill_taxnum,applybill_company,vip_starttime,vip_endtime,vip_type,discount_price,d_relation_id", "")
+		oData := util.Mysql.FindOne(tableName_order, query, "id,order_code,prepay_time,create_time,pay_time,pay_way,original_price,order_money,pay_money,applybill_status,out_trade_no,filter,product_type,order_status,applybill_type,applybill_taxnum,applybill_company,vip_starttime,vip_endtime,vip_type,discount_price,d_relation_id,billingMode,return_status,is_backstage_order", "")
 		//配置订单到期时间
 		order_countdown := config.Config.OrderCountdown //配置文件读取
 		activeData := util.Mysql.FindOne("prefer_active", map[string]interface{}{"order_code": orderCode, "user_id": userId}, "active_code", "")
@@ -84,6 +84,13 @@ func (this *OrderListDetails) GetOrderPayAllMsg() {
 		if oData == nil || len(*oData) == 0 {
 			return &entity.FuncResult{false, errors.New("未找到此订单"), nil}
 		}
+		//查询回款记录
+		if qutil.IntAll((*oData)["is_backstage_order"]) == 1 && qutil.IntAll((*oData)["return_status"]) > 0 {
+			if returnRecord := util.Mysql.FindOne("return_money_record", map[string]interface{}{"order_code": orderCode}, "return_type", "id desc"); returnRecord != nil && len(*returnRecord) > 0 {
+				(*oData)["return_type"] = (*returnRecord)["return_type"]
+			}
+		}
+
 		//卡卷id加密
 		if (*oData)["d_relation_id"] != "" {
 			(*oData)["userLotteryId"] = qutil.SE.Encode2Hex(qutil.ObjToString((*oData)["d_relation_id"]))
@@ -639,7 +646,7 @@ func (o *OrderListDetails) SetRes(res []map[string]interface{}, queryM map[strin
 
 //查询数据
 func (o *OrderListDetails) Datas(queryM map[string]interface{}, pageNum, pagesize_max int) (haveNextPage bool, result []map[string]interface{}, err error) {
-	res := *util.Mysql.Find(tableName_order, queryM, "id,order_code,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", "create_time desc", -1, 0)
+	res := *util.Mysql.Find(tableName_order, queryM, "id,order_code,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", "create_time desc", -1, 0)
 	if len(res) > 0 {
 		start := (pageNum - 1) * pagesize_max
 		end := pageNum * pagesize_max
@@ -876,9 +883,15 @@ func (o *OrderListDetails) GetMemberDetail() {
 			data = *util.Mysql.FindOne(tableName_order, map[string]interface{}{
 				"order_code": order_code,
 				"user_id":    userId,
-			}, "id,order_code,order_status,create_time,pay_time,pay_way,out_trade_no,prepay_id,product_type,pay_money,order_money,filter,applybill_type,applybill_taxnum,applybill_company,applybill_status,vip_starttime,vip_endtime,course_status", "")
+			}, "id,order_code,order_status,create_time,pay_time,pay_way,out_trade_no,prepay_id,product_type,pay_money,order_money,filter,applybill_type,applybill_taxnum,applybill_company,applybill_status,vip_starttime,vip_endtime,course_status,is_backstage_order,return_status,billingMode", "")
 
 			if data != nil {
+				//查询回款记录
+				if qutil.IntAll((data)["is_backstage_order"]) == 1 && qutil.IntAll((data)["return_status"]) > 0 {
+					if returnRecord := util.Mysql.FindOne("return_money_record", map[string]interface{}{"order_code": order_code}, "return_type", "id desc"); returnRecord != nil && len(*returnRecord) > 0 {
+						(data)["return_type"] = (*returnRecord)["return_type"]
+					}
+				}
 				//filter
 				filter := qutil.ObjToString(data["filter"].(string))
 				filter_map := map[string]interface{}{}

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

@@ -292,9 +292,8 @@ func (p *PayCallBackAction) WxPayCallback() {
 				log.Printf("微信剑鱼币更新执行出错 %+v\n", thisParam)
 			}
 		} else if strings.HasPrefix(thisParam.OutTradeno, pay.WX_DATAPACK_APP) || strings.HasPrefix(thisParam.OutTradeno, pay.WX_DATAPACK_JSAIP) || strings.HasPrefix(thisParam.OutTradeno, pay.WX_DATAPACK_NATIVE) { //个人数据包
-			if !entity.JyDataExportPack.PayCallBack(thisParam) {
-				log.Println("微信个人数据包支付回调更新执行出错 %+v\n", thisParam)
-				return false
+			if update = entity.JyDataExportPack.PayCallBack(thisParam); !update {
+				log.Printf("微信个人数据包支付回调更新执行出错 %+v\n", thisParam)
 			}
 		} else {
 			log.Printf("微信支付完成回调 未知订单类型%s\n", thisParam.OutTradeno)

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

@@ -282,14 +282,14 @@ func (this *SubscribeChange) Upgrade() {
 			disWord = disWordStr
 		}
 		ordercode := pay.GetOrderCode(userId)
-		if disWord == "" {
+		/*if disWord == "" {
 			start_time := TimeProcessing(time.Now().Format(DateFullLayout), -config.Config.TermValidity).Format(DateFullLayout)
 			stop_time := TimeProcessing(time.Now().Format(DateFullLayout), config.Config.TermValidity).Format(DateFullLayout)
 			infoList := util.Mysql.SelectBySql("select  * from  dis_word where userId=?  and  ?<=start_time  and stop_time<? ORDER BY id ", userId, start_time, stop_time)
 			if len(*infoList) != 0 {
 				disWord = fmt.Sprint((*infoList)[0]["password"])
 			}
-		}
+		}*/
 		insertMap := map[string]interface{}{
 			"order_money":    final_price,
 			"order_status":   order_status,

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

@@ -97,14 +97,14 @@ func (this *SubVipPayOrder) CreateOrder() {
 		}
 		req_price, _ := this.GetInteger("price")     //前端展示金额
 		order_phone := this.GetString("order_phone") //p19.3用户信息采集 手机号
-		if disWord == "" {
+		/*if disWord == "" {
 			start_time := TimeProcessing(time.Now().Format(DateFullLayout), -config.Config.TermValidity).Format(DateFullLayout)
 			stop_time := TimeProcessing(time.Now().Format(DateFullLayout), config.Config.TermValidity).Format(DateFullLayout)
 			infoList := util.Mysql.SelectBySql("select  * from  dis_word where userId=? and  ?<=start_time  and stop_time<? ORDER BY id ", userId, start_time, stop_time)
 			if len(*infoList) != 0 {
 				disWord = fmt.Sprint((*infoList)[0]["password"])
 			}
-		}
+		}*/
 		now := time.Now()
 		userData, oldBuyset, _ := entity.JyVipSubStruct.GetVipDetail(userId)
 		isgive := false
@@ -305,7 +305,7 @@ func (this *SubVipPayOrder) Renew() {
 		if disWordStr != "" {
 			disWord = disWordStr
 		}
-		if disWord == "" {
+		/*if disWord == "" {
 			start_time := TimeProcessing(time.Now().Format(DateFullLayout), -config.Config.TermValidity).Format(DateFullLayout)
 			stop_time := TimeProcessing(time.Now().Format(DateFullLayout), config.Config.TermValidity).Format(DateFullLayout)
 			infoList := util.Mysql.SelectBySql("select  * from  dis_word where userId=? and  ?<=start_time  and stop_time<? ORDER BY id ", userId, start_time, stop_time)
@@ -314,7 +314,7 @@ func (this *SubVipPayOrder) Renew() {
 			if len(*infoList) != 0 {
 				disWord = fmt.Sprint((*infoList)[0]["password"])
 			}
-		}
+		}*/
 		fmt.Println("disWordStr3:", disWord)
 		now := time.Now()
 		date_count, date_unit, err := checkReqDate(this.GetString("time"))

src/jfw/modules/subscribepay/src/timetask/dataExportMail.go

@@ -22,7 +22,6 @@ func SendDataExportMailForPayed() {
 	}()
 
 	unServiceList := util.Mysql.Find("dataexport_order", map[string]interface{}{"product_type": "历史数据", "order_status": 1, "service_status": 0}, "download_url,user_mail,data_count,pay_time,order_code", "", -1, -1)
-	fmt.Println("SendDataExportMailForPayed find no service order num", len(*unServiceList))
 	if unServiceList == nil || len(*unServiceList) == 0 {
 		log.Printf("SendDataExportMailForPayed not find Payed order")
 		return

src/jfw/modules/weixin/src/oauth/oauth.go

@@ -67,7 +67,6 @@ func WeixinOauth(w http.ResponseWriter, r *http.Request) {
 	if err == nil {
 		//取得openid,unionid
 		bs, _ := ioutil.ReadAll(resp.Body)
-		//fmt.Println("data:", string(bs))
 		tmp := map[string]interface{}{}
 		err = json.Unmarshal(bs, &tmp)
 		if err != nil {

src/jfw/modules/weixin/src/wx/wx.go

@@ -438,7 +438,7 @@ func saveUser(u *UserInfo, source, pre, RSource, CSource string) (bool, string,
 		newUser["s_province"] = u.Province
 		newUser["s_city"] = u.City
 		newUser["i_applystatus"] = 1
-		if len(strings.Split(source, "_")) > 2 {
+		if len(strings.Split(source, "_")) > 3 {
 			if strings.Split(source, "_")[2] == "GX" {
 				disStr := strings.Split(source, "_")[0] + "_" + strings.Split(source, "_")[1][1:] + "_" + strings.Split(source, "_")[2]
 				log.Println("disStr", disStr)
@@ -453,6 +453,7 @@ func saveUser(u *UserInfo, source, pre, RSource, CSource string) (bool, string,
 				endTime := time.Unix(startTimeInt64, 0)
 				newUser["endTime"] = endTime.AddDate(1, 0, 0).Unix()
 				newUser["disWords"] = strings.Split(source, "_")[1] + "_" + strings.Split(source, "_")[2]
+				newUser["shareType"] =strings.Split(source, "_")[3]
 			}
 		}
 		if isJyopUser {
@@ -945,7 +946,7 @@ func Subscribe(w ResponseWriter, r *Request) {
 		ek := strings.SplitN(r.EventKey, "_", 3)[2]
 		log.Println("ek:", ek)
 		encry := ek[:1]
-		if len(strings.Split(ek, "_")) > 1 {
+		if len(strings.Split(ek, "_")) > 2 {
 			suffix := strings.Split(ek, "_")[1]
 			fmt.Println(r.EventKey, ek, suffix)
 			if suffix == "GX" {
@@ -1125,7 +1126,7 @@ func ScanHandler(w ResponseWriter, r *Request) {
 	if strings.Contains(r.EventKey, "DIS_") {
 		ek := strings.Split(r.EventKey, "_")[1]
 		encry := ek[:1]
-		if len(strings.Split(r.EventKey, "_")) > 2 {
+		if len(strings.Split(r.EventKey, "_")) > 3 {
 			suffix := strings.Split(r.EventKey, "_")[2]
 			if suffix == "GX" {
 				encry = "G"
@@ -1134,10 +1135,11 @@ func ScanHandler(w ResponseWriter, r *Request) {
 		modular := util.ObjToMap(config.DistribConfig.Modular[encry])
 		if encry == "X" {
 			suffix := strings.Split(r.EventKey, "_")[2]
-			ek = ek + "_" + suffix
+			ek = ek + "_" + suffix+strings.Split(r.EventKey, "_")[3]
 		}
 		if encry == "G" {
-			ek = ek + "_GX"
+			suffix := strings.Split(r.EventKey, "_")[2]
+			ek = ek + "_GX"+suffix+strings.Split(r.EventKey, "_")[3]
 		}
 		fmt.Println(ek)
 		if modular != nil {

src/web/staticres/common-module/order-list/js/order-list.js

@@ -18,6 +18,7 @@ var vm = new Vue({
         '大会员-AI中标预测包',
         '大会员-招标文件解读',
         '大会员-子账号',
+        'VIP订阅',
       ]
     },
     tabList: [
@@ -480,13 +481,8 @@ var vm = new Vue({
       var orderStatus = order.order_status
       var productType = order.product_type
       var filterInfo = JSON.parse(order.filter)
-      var customPayProduction = [
-        '大会员',
-        '大会员-补充包',
-        '大会员-AI中标预测包',
-        '大会员-招标文件解读',
-        '大会员-子账号'
-      ]
+      var customPayProduction = this.prodConf.transformProductions
+
       var orderStateMap = {
         0: '待付款',
         1: '已完成',
@@ -518,10 +514,10 @@ var vm = new Vue({
           if (filterInfo.isAll) {
             customIsAll = filterInfo.isAll
           }
-          if (customIsAll === 2){
+          if (customIsAll === 2 || order.return_status === 0){
             stateText = '待付款'
             className = 'notpay'
-          }else if (customIsAll == 3) {
+          }else if (customIsAll === 3|| order.return_status === 2) {
             stateText = '待付完'
             className = 'notpay'
           }
@@ -760,7 +756,7 @@ var vm = new Vue({
           state.bugAgainText = '再次购买'
         }
         // 判断开发票
-        if (canInvoke.indexOf(productType) !== -1) {
+        if (canInvoke.indexOf(productType) !== -1 && order.billingMode === 1 && order.is_backstage_order === 0) {
           state.invokeButtonShow = true
         }
 
@@ -1642,17 +1638,17 @@ var vm = new Vue({
         }
       }
 
-      if (filter_vip.cyclecount && filter_vip.cycleunit) {
-        if (parseInt(filter_vip.cycleunit) === 1) {
-          effectiveduration_vip = filter_vip.cyclecount + "年"
-        } else if (parseInt(filter_vip.cycleunit) === 2) {
-          effectiveduration_vip = filter_vip.cyclecount + "个月"
-        }  else if (parseInt(filter_vip.cycleunit) === 4) {
-          effectiveduration_vip = filter_vip.cyclecount + "季"
-        } else {
-          effectiveduration_vip = "7天"
-        }
-      }
+      // if (filter_vip.cyclecount && filter_vip.cycleunit) {
+      //   if (parseInt(filter_vip.cycleunit) === 1) {
+      //     effectiveduration_vip = filter_vip.cyclecount + "年"
+      //   } else if (parseInt(filter_vip.cycleunit) === 2) {
+      //     effectiveduration_vip = filter_vip.cyclecount + "个月"
+      //   }  else if (parseInt(filter_vip.cycleunit) === 4) {
+      //     effectiveduration_vip = filter_vip.cyclecount + "季"
+      //   } else {
+      //     effectiveduration_vip = "7天"
+      //   }
+      // }
       if (filter_vip.cycleunit === 0 && filter_vip.cyclecount === 0) {
         effectiveduration_vip = "不延期";
       }
@@ -1802,11 +1798,11 @@ var vm = new Vue({
         text: '-'
       }
       // 订阅周期计算
-      if (level === 4) {
+      if (level === 4|| filterInfo.cycleType === 1) {
         duration.text = filterInfo.cycle + '天'
       } else {
         duration.text = filterInfo.cycle + '年'
-        if (filterInfo.createType) {
+        if (filterInfo.createType||filterInfo.cycleType === 0) {
           duration.text = filterInfo.cycle + '个月'
         }
       }

src/web/templates/frontRouter/wx/vipIntro/free/party.html

@@ -0,0 +1,172 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta name="keywords" content="剑鱼标讯">
+    <meta name="description" content="剑鱼标讯">
+    <meta name="author" content="剑鱼标讯">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no">
+    <meta name="browsermode" content="application">
+    <meta name="x5-orientation" content="portrait">
+    <meta name="screen-orientation" content="portrait">
+    <meta name="x5-page-mode" content="app">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <title>超级订阅</title>
+    <script src="/big-member/js/rem.js"></script>
+    <!--S-当前页面的css资源-->
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
+    <link rel="stylesheet" href='{{Msg "seo" "cdn"}}/common-module/vipsubscribe/css/vip-party.css?v={{Msg "seo" "version"}}' />
+</head>
+<body>
+<div class="j-container">
+    <div class="j-main vip_introduce">
+        <div class="main">
+            <div class="banner power group">
+                <div class="group-title">
+                    <span class="title-text line-title">超级订阅服务特权</span>
+                    <span class="title-bg-text">DINGYUEFUWU</span>
+                </div>
+                <div class="group-content grid">
+                    <span class="grid-item">
+                        <span class="circle-icon circle-icon-1"></span>
+                        <p class="item-desc">最多 300 组关键词</p>
+                    </span>
+                    <span class="grid-item">
+                        <span class="circle-icon circle-icon-2"></span>
+                        <p class="item-desc">每天最多接收 2000 条</p>
+                    </span>
+                    <span class="grid-item">
+                        <span class="circle-icon circle-icon-3"></span>
+                        <p class="item-desc">数据周报、月报</p>
+                    </span>
+                    <span class="grid-item">
+                        <span class="circle-icon circle-icon-4"></span>
+                        <p class="item-desc">订阅区域精确到市</p>
+                    </span>
+                    <span class="grid-item" style="height: 2.48rem;">
+                        <span class="circle-icon circle-icon-5"></span>
+                        <p class="item-desc">每购买一个省<br />可查看50个企业画像</p>
+                    </span>
+                    <span class="grid-item">
+                        <span class="circle-icon circle-icon-6"></span>
+                        <p class="item-desc">搜索全国超七千万企业</p>
+                    </span>
+                </div>
+            </div>
+            <div class="comparison group">
+                <div class="group-title">
+                    <span class="title-text line-title">整体服务对比</span>
+                    <span class="title-bg-text">FUWUDUIBI</span>
+                </div>
+                <div class="group-content">
+                    <div class="table">
+                        <div class="c-thead row">
+                            <span class="free column column-l">免费版</span>
+                            <span class="prop column column-r color-deep-gold">超级订阅专属服务</span>
+                        </div>
+                        <div class="c-tbody">
+                          <div class="row">
+                              <span class="column column-l">-</span>
+                              <span class="column column-r">
+                                  <p class="col-hd">
+                                      <span class="icon-new">企业画像</span>
+                                  </p>
+                                  <p class="col-bd">对企业进行全景透视，提供企业基本信息，中标项目分析、重点客户等，帮你挖掘销售线索。</p>
+                              </span>
+                          </div>
+                          <div class="row">
+                              <span class="column column-l">-</span>
+                              <span class="column column-r">
+                                  <p class="col-hd">
+                                      <span class="icon-new">企业搜索</span>
+                                  </p>
+                                  <p class="col-bd">搜索全国超七千万企业，获取企业情报信息，全方位监控竞争对手或用户关注的企业。</p>
+                              </span>
+                          </div>
+                            <div class="row">
+                                <span class="column column-l">-</span>
+                                <span class="column column-r">
+                                    <p class="col-hd">标讯高级搜索</p>
+                                    <p class="col-bd">支持按采购单位类型、采购单位联系方式、中标企业联系方式搜索，搜索招标采购项目更精准。</p>
+                                </span>
+                            </div>
+                            <div class="row">
+                                <span class="column column-l">-</span>
+                                <span class="column column-r">
+                                    <p class="col-hd">标讯收藏</p>
+                                    <p class="col-bd">关注的项目信息，一键收藏。支持创建收藏标签、标签分类检索，重要信息不遗漏，只看你最关注的。</p>
+                                </span>
+                            </div>
+                            <div class="row">
+                                <span class="column column-l">匹配单次公告信息</span>
+                                <span class="column column-r">
+                                    <p class="col-hd">匹配项目信息</p>
+                                    <p class="col-bd">根据你的订阅，为你推送所匹配项目后续的全部动态</p>
+                                </span>
+                            </div>
+                            <div class="row">
+                                <span class="column column-l">-</span>
+                                <span class="column column-r">
+                                    <p class="col-hd">按行业订阅</p>
+                                    <p class="col-bd">不知道如何设置关键词的时候，也可以按行业订阅</p>
+                                </span>
+                            </div>
+                            <div class="row">
+                                <span class="column column-l">-</span>
+                                <span class="column column-r">
+                                    <p class="col-hd">中标企业联系方式</p>
+                                    <p class="col-bd">招标公告与国家企业公示2种提取模式，让你直击企业</p>
+                                </span>
+                            </div>
+                            <div class="row">
+                                <span class="column column-l">最多10组关键词</span>
+                                <span class="column column-r">
+                                    <p class="col-hd">最多300组关键词</p>
+                                    <p class="col-bd">更多关键词，招标信息更全面</p>
+                                </span>
+                            </div>
+                            <div class="row">
+                              <span class="column column-l">仅支持标题匹配</span>
+                              <span class="column column-r">
+                                  <p class="col-hd">支持标题匹配+全文匹配</p>
+                                  <p class="col-bd">关键词匹配标题或全文 任你选</p>
+                              </span>
+                          </div>
+                          <div class="row">
+                            <span class="column column-l">订阅区域精确到省</span>
+                            <span class="column column-r">
+                                <p class="col-hd">订阅区域精确到市</p>
+                                <p class="col-bd">只看你最关注的招标信息</p>
+                            </span>
+                          </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="er-code">
+                  <img id="imgSrc" >
+                  <p>长按关注剑鱼标讯</p>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<script src=//cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js></script>
+<script>
+    $(document).ready(function () {
+        var roter = window.location.search.substring(1)
+        $.ajax({
+            url: '/distribution/share/shareLink?disWord=' + roter,
+            type: 'GET',
+            success: function (res) {
+                $('#imgSrc').attr('src', 'data:image/jpg;base64,' + res.data)
+            }
+        })
+    })
+</script>
+</body>
+</html>

src/web/templates/pc/aiPack_orderDetail.html

@@ -206,40 +206,47 @@
                         }else{
                           $("#status_success").removeClass("hide");
                         }
-                        $(".pay_time_p").css("display", "");
-                        if (r.data.pay_time) $(".pay_time").text(r.data.pay_time.replace("-", ".").replace("-", "."));
+                        if (r.data.pay_time){
+                            $(".pay_time_p").css("display", "");
+                            $(".pay_time").text(r.data.pay_time.replace("-", ".").replace("-", "."));
+                        }
                         //支付方式
-                        if (r.data.pay_way.indexOf("wx") > -1) {
-                            $(".pay_way_p").css("display", "");
-                            $(".pay_way").text("微信支付");
-                        } else if (r.data.pay_way.indexOf("ali") > -1) {
-                            $(".pay_way").text("支付宝支付");
-                            $(".pay_way_p").css("display", "");
-                        } else if (r.data.pay_way === "transferAccounts") {
-                            //$(".pay_time_p").css("display", "none");
-                            $(".pay_num_p").css("display", "none");
-                            if (filterObj.transferV && r.data.product_type!="大会员-补充包") {
-                                $(".pay_pic").css("display", "")
-                                $(".show_pay_pic").attr("onclick", "showImg('" + filterObj.transferV + "')")
-                            }
-                            $(".pay_way").text("公对公转账");
-                            $(".pay_way_p").css("display", "");
+                        if (r.data.billingMode===1){
+                            if (r.data.pay_way.indexOf("wx") > -1||r.data.return_type===1) {
+                                $(".pay_way_p").css("display", "");
+                                $(".pay_way").text("微信支付");
+                            } else if (r.data.pay_way.indexOf("ali") > -1||r.data.return_type===2) {
+                                $(".pay_way").text("支付宝支付");
+                                $(".pay_way_p").css("display", "");
+                            } else if (r.data.pay_way === "transferAccounts"&&(r.data.is_backstage_order===1&&r.data.return_status>0||r.data.is_backstage_order===0)) {
+                                //$(".pay_time_p").css("display", "none");
+                                $(".pay_num_p").css("display", "none");
+                                if (filterObj.transferV && r.data.product_type!="大会员-补充包") {
+                                    $(".pay_pic").css("display", "")
+                                    $(".show_pay_pic").attr("onclick", "showImg('" + filterObj.transferV + "')")
+                                }
+                                $(".pay_way").text("公对公转账");
+                                $(".pay_way_p").css("display", "");
 
-                            $(".price").text("￥ " + formatMoney(r.data.pay_money / 100) + "元");
+                                $(".price").text("￥ " + formatMoney(r.data.pay_money / 100) + "元");
+                            }
                         }
+
                         if (r.data.prepay_id) {
                             $(".pay_num").text(r.data.prepay_id);
                             $(".pay_num_p").css("display", "");
                         }
                         if (source===""){
-                          //发票
-                          if (r.data.applybill_status === 0) {
-                              $(".openinvoice").css("display", "");
-                          }  else if (r.data.applybill_status === 1 || r.data.applybill_status === 2) {
-                            $(".lookinvoice").css("display", "").on("click", function () {
-                                checkinvoice(r.data.applybill_status, orderCode)
-                            })
-                          }
+                            if (r.data.is_backstage_order!==1){
+                                //发票
+                                if (r.data.applybill_status === 0) {
+                                    $(".openinvoice").css("display", "");
+                                }  else if (r.data.applybill_status === 1 || r.data.applybill_status === 2) {
+                                    $(".lookinvoice").css("display", "").on("click", function () {
+                                        checkinvoice(r.data.applybill_status, orderCode)
+                                    })
+                                }
+                            }
                         }
                     }
                     if (r.data.order_status === -2) {

src/web/templates/pc/biddetail_rec.html

@@ -1321,9 +1321,11 @@ var IframeOnClick = {
 					keyArr.push(buyerObj)
 				} else if(keys) {
 					if(keys.indexOf(",") != -1) {
-						keys = keys.split(' ')
-					} else {
 						keys = keys.split(',')
+					} else if(keys.indexOf("+") != -1) {
+						keys = keys.split('+')
+					} else {
+						keys = keys.split(' ')
 					}
 					keys.forEach(function(item) {
 						let buyerObj = {
@@ -1430,7 +1432,7 @@ var IframeOnClick = {
 				if(bidPower) {
 					bidPower = JSON.parse(bidPower)
 					if(bidPower.indexOf(6) != -1) {
-						location.href = '/swordfish/page_big_pc/analysis_result?ptid=' + {{.T.obj._id}}
+						location.href = '/swordfish/page_big_pc/analysis_result?sid=' + {{.T.obj._id}}
 					}
 				}
 			},

src/web/templates/pc/createOrderPage.html

@@ -52,7 +52,7 @@
         <div class="infotitle clearfix">
             <span>当前搜索到<i class="msgCount"></i>条信息</span>
             <em style="display:none">最大限额20,000条</em>
-            <a class="dataPreview"><span class="iconfont icon-yulan"></span>预览数据</a>
+            <a class="dataPreview" id="track-data-preview-for-link"><span class="iconfont icon-yulan"></span>预览数据</a>
             <a class="fr goback" style="position: relative;text-decoration: none;">
                 <img class="goback" src="{{Msg "seo" "cdn"}}/dataExport/image/sieve.png"
                 style="width: 16px;height: 16px;position: absolute;left: -19px;top: 2px;">返回筛选</a>
@@ -60,7 +60,7 @@
         <div id="entuserguige" hidden="hidden">
             <div class="title">支付方式</div>
             <div class="inner clearfix switch-dataType" id="payTypeSelect">
-                <div class="qy no-select" data-pay-type="数据流量包" style="display: none;">
+                <div class="qy no-select" id="select-data-pack-item" data-pay-type="数据流量包" style="display: none;">
                     <p>数据流量包扣除</p>
                     <div id="llb-tip-block" style="width: 164px;height: 28px;opacity: 1;background: rgba(0,0,0,0.75);text-align: center;padding: 4px;
                         border-radius: 4px;box-shadow: 0px 0px 28px 0px rgba(0,0,0,0.08);
@@ -70,14 +70,14 @@
                             position: relative;left: 46%;"></div>
                     </div>
                 </div>
-                <div class="dr no-select" data-pay-type="单日限量包" style="display: none;">
+                <div id="select-day-pack-item" class="dr no-select" data-pay-type="单日限量包" style="display: none;">
                     <p>单日限量数据包扣除</p>
                 </div>
                 <div class="gr no-select" data-pay-type="个人支付"><p>个人支付</p></div>
             </div>
             <div class="datapackage-buy-tip-group">
                 <span>数据流量包已上线，特惠充值随心导，2年有效</span>
-                <a href="/front/dataPack/createOrder">立即购买数据流量包  ＞</a>
+                <a id="buy-data-pack-for-link" href="/front/dataPack/createOrder">立即购买数据流量包  ＞</a>
             </div>
         </div>
         <div id="select-ent-datapack" class="guige" data-show-type="数据流量包">
@@ -198,9 +198,9 @@
 
                 </p>
                 <p class="btn_createOrder">
-                    <button class="dataPreview">预览数据</button>
-                    <button class="toPay" data-need-bind-phone disabled="disabled">确认支付</button>
-                    <button class="toDeduction" data-need-bind-phone style="display: none" disabled="disabled">确认扣除
+                    <button class="dataPreview" id="track-data-preview-for-button">预览数据</button>
+                    <button id="pay-button-for-money" class="toPay" data-need-bind-phone disabled="disabled">确认支付</button>
+                    <button id="pay-button-for-datapack" class="toDeduction" data-need-bind-phone style="display: none" disabled="disabled">确认扣除
                     </button>
                 </p>
             </div>
@@ -244,11 +244,11 @@
 
                 </div>
                 <div class="modal-footers">
-                    <button type="button" class="btn btn-primary">我知道了</button>
+                    <button id="read-tip-for-dialog" type="button" class="btn btn-primary">我知道了</button>
                 </div>
                 <div class="modal-footers cancel" style="display: none">
-                    <button type="button" class="btn btn-primary">立即充值</button>
-                    <button type="button" class="btn btn-cancel">取消</button>
+                    <button id="buy-data-pack-for-dialog" type="button" class="btn btn-primary">立即充值</button>
+                    <button id="cancel-buy-data-pack-for-dialog" type="button" class="btn btn-cancel">取消</button>
                 </div>
             </div>
         </div>

src/web/templates/pc/dataPack/createOrderForDataPackage.html

@@ -108,7 +108,7 @@
 
                 </p>
                 <p class="btn_createOrder">
-                    <button class="toPay" data-need-bind-phone disabled="disabled">确认支付</button>
+                    <button id="buy-datapack-pay-button" class="toPay" data-need-bind-phone disabled="disabled">确认支付</button>
                 </p>
             </div>
         </div>

src/web/templates/pc/dataPack/packDetail.html

@@ -175,8 +175,10 @@
                     }
                     if (r.data.order.order_status == 1) {
                         $("#status_success").removeClass("hide");
-                        $(".pay_time_p").css("display", "");
-                        if (r.data.order.pay_time) $(".pay_time").text(r.data.order.pay_time.replace("-", ".").replace("-", "."));
+                        if (r.data.order.pay_time){
+                            $(".pay_time_p").css("display", "");
+                            $(".pay_time").text(r.data.order.pay_time.replace("-", ".").replace("-", "."));
+                        }
                         //支付方式
                         if (r.data.order.pay_way.indexOf("wx") > -1) {
                             $(".pay_way_p").css("display", "");

src/web/templates/pc/member_orderDetail.html

@@ -137,7 +137,6 @@
             $(".public-nav").css("border-bottom", "1px solid #e0e0e0");
             $("section[id='drder']").css("padding-top", "80px");
             haslogin({{.T.logid}});
-
             var orderCode = getParam("order_code");
             $(".order_id").text("订单编号：" + orderCode);
             $.post("/subscribepay/orderListDetails/getMemberDetail", {"order_code": orderCode}, function (r) {
@@ -198,14 +197,14 @@
                     //if (r.data.combo!=""&&r.data.combo!=null&&r.data.combo!=undefined){
                     //  level="自定义-"+r.data.combo;
                     //}
+                    //启明星后台创建的订单 cycleType: 1-天  0-月  cycle:数量
                     $(".level").text(level);
                     var cycle =r.data.cycle;
-                    if(r.data.level==4){
+                    if(r.data.level==4||filterObj.cycleType===1){
                       cycle+="天"
                       $(".vip_type").text("-试用版")
                     }else{
-                      var createType = filterObj.createType
-                      if (createType){
+                      if (filterObj.createType||filterObj.cycleType===0){
                         cycle+="个月";
                       }else{
                         cycle+="年"
@@ -231,46 +230,65 @@
                         }else{
                           $("#status_success").removeClass("hide");
                         }
-                        $(".pay_time_p").css("display", "");
-                        if (r.data.pay_time) $(".pay_time").text(r.data.pay_time.replace("-", ".").replace("-", "."));
+                        if (r.data.pay_time){
+                            $(".pay_time_p").css("display", "");
+                            $(".pay_time").text(r.data.pay_time.replace("-", ".").replace("-", "."));
+                        }
                         //支付方式
-                        if (r.data.pay_way.indexOf("wx") > -1) {
-                            $(".pay_way_p").css("display", "");
-                            $(".pay_way").text("微信支付");
-                        } else if (r.data.pay_way.indexOf("ali") > -1) {
-                            $(".pay_way").text("支付宝支付");
-                            $(".pay_way_p").css("display", "");
-                        } else if (r.data.pay_way === "transferAccounts") {
-                            window.isTransferPay = r.data.applybill_status === 0
-                            //$(".pay_time_p").css("display", "none");
-                            $(".pay_num_p").css("display", "none");
-                            if (filterObj.transferV&&r.data.level!=5) {
-                                $(".pay_pic").css("display", "")
-                                $(".show_pay_pic").attr("onclick", "showImg('" + filterObj.transferV + "')")
-                            }
-                            $(".pay_way").text("公对公转账");
-                            $(".pay_way_p").css("display", "");
+                        if (r.data.billingMode===1){
+                            if (r.data.pay_way.indexOf("wx") > -1||r.data.return_type===1) {
+                                $(".pay_way_p").css("display", "");
+                                $(".pay_way").text("微信支付");
+                            } else if (r.data.pay_way.indexOf("ali") > -1||r.data.return_type===2) {
+                                $(".pay_way").text("支付宝支付");
+                                $(".pay_way_p").css("display", "");
+                            } else if (r.data.pay_way === "transferAccounts"&&(r.data.is_backstage_order===1&&r.data.return_status>0||r.data.is_backstage_order===0)) {
+                                window.isTransferPay = r.data.applybill_status === 0
+                                //$(".pay_time_p").css("display", "none");
+                                $(".pay_num_p").css("display", "none");
+                                if (filterObj.transferV&&r.data.level!=5) {
+                                    $(".pay_pic").css("display", "")
+                                    $(".show_pay_pic").attr("onclick", "showImg('" + filterObj.transferV + "')")
+                                }
+                                $(".pay_way").text("公对公转账");
+                                $(".pay_way_p").css("display", "");
 
-                            $(".price").text("￥ " + formatMoney(r.data.pay_money / 100) + "元");
-                            $(".openinvoice").css({
-                                'background': '#EDEFF2',
-                                'color': '#5F5E64'
-                            })
+                                $(".price").text("￥ " + formatMoney(r.data.pay_money / 100) + "元");
+                                $(".openinvoice").css({
+                                    'background': '#EDEFF2',
+                                    'color': '#5F5E64'
+                                })
+                            }
                         }
 
+
                         if (r.data.prepay_id) {
                           $(".pay_num").text(r.data.prepay_id);
                            $(".pay_num_p").show();
                         }
                         if (source===""){
-                          //发票
-                          if (r.data.applybill_status === 0) {
-                              $(".openinvoice").css("display", "");
-                          }else if (r.data.applybill_status === 1 || r.data.applybill_status === 2) {
-                            $(".lookinvoice").css("display", "").on("click", function () {
-                                checkinvoice(r.data.applybill_status, orderCode)//查看发票
-                            })
-                          }
+                            if(r.data.is_backstage_order!==1){ //发票
+                                if (r.data.applybill_status === 0) {
+                                    $(".openinvoice").css("display", "").on("click", function () {
+                                        if (window.isTransferPay) {
+                                            checkinvoice(2, '', '请联系客服开票<br>客服热线：400-108-6670')
+                                            return
+                                        }
+                                        $.post("/subscribepay/orderListDetails/isOver", {"order_code": orderCode}, function (r) {
+                                            if (r.status != 1) {
+                                                window.open("/front/order/invoicetimeOut", '_self');
+                                            } else {
+                                                window.open("/front/order/invoice/" + orderCode, '_self');
+                                            }
+                                        })
+                                    });
+                                }else if (r.data.applybill_status === 1 || r.data.applybill_status === 2) {
+                                    $(".lookinvoice").css("display", "").on("click", function () {
+                                        checkinvoice(r.data.applybill_status, orderCode)//查看发票
+                                    })
+                                }
+                            }
+
                         }else{
                           var buchongbaoHtml = '';
                           var serversName = filterObj.serversName;
@@ -318,21 +336,6 @@
                 }
             })
 
-
-            $(".openinvoice").on("click", function () {
-                if (window.isTransferPay) {
-                    checkinvoice(2, '', '请联系客服开票<br>客服热线：400-108-6670')
-                    return
-                }
-                $.post("/subscribepay/orderListDetails/isOver", {"order_code": orderCode}, function (r) {
-                    if (r.status != 1) {
-                        window.open("/front/order/invoicetimeOut", '_self');
-                    } else {
-                        window.open("/front/order/invoice/" + orderCode, '_self');
-                    }
-                })
-            })
-
             $(".payOrder").on("click", function () {
                 var paramsUnit = getParam('unit')
                 location.href = "/front/member/orderPay/" + orderCode + (paramsUnit ? ('?unit=' + paramsUnit): '')

src/web/templates/pc/myOrder.html

@@ -344,8 +344,8 @@
                                         <span v-else-if="item.course_status === 3" style='color: #FE737A'>未收到转账</span>
                                     </div>
                                     <div v-if="item.order_status === 1">
-                                        <p class="finish_status" v-if="item.filter.isAll == 2">待付款</p>
-                                        <p class="finish_status" v-else-if="item.filter.isAll == 3">待付完</p>
+                                        <p class="finish_status" v-if="item.filter.isAll == 2 || item.return_status === 0">待付款</p>
+                                        <p class="finish_status" v-else-if="item.filter.isAll == 3 || item.return_status === 2">待付完</p>
                                         <p class="finish_status" v-else>已完成</p>
                                     </div>
                                     <p v-if="item.order_status === -2 || item.order_status === -3" class="finish_status">已取消</p>
@@ -368,6 +368,10 @@
                                 <div class="stateBox" v-else>
                                     <!--待支付-->
                                     <p class="finish_status" v-if="item.order_status === 0">待付款</p>
+                                    <!--已开通未付钱-->
+                                    <p class="finish_status" v-else-if="item.order_status === 1 && item.return_status === 0">待付款</p>
+                                    <!--已开通未付完-->
+                                    <p class="finish_status" v-else-if="item.order_status === 1 && item.return_status === 2">待付完</p>
                                     <!--已完成-->
                                     <p class="finish_status" v-else-if="item.order_status === 1">已完成</p>
                                     <!--已取消-->
@@ -409,7 +413,7 @@
                                     <p v-if="item.order_status === 0"><a class="go_pay" data-jy-track="click-hover" @click="goPay(item)">去支付</a></p>
                                     <p v-if="item.order_status === 0"><a data-jy-track="click-hover" @click="goCancel(item)">取消订单</a></p>
                                     <!--已完成-->
-                                    <p v-if="item.order_status === 1"><a v-if="item.applybill_status === 0" data-jy-track="click-hover" @click="goInvoice(item)">开发票</a></p>
+                                    <p v-if="item.order_status === 1"><a v-if="item.applybill_status === 0 && item.billingMode === 1 && item.is_backstage_order === 0" data-jy-track="click-hover" @click="goInvoice(item)">开发票</a></p>
                                     <p v-if="item.order_status === 1"><a v-if="item.applybill_status === 1 || item.applybill_status === 2" data-jy-track="click-hover" @click="goInvoice(item)">发票信息</a></p>
                                     <!--已取消-->
                                     <!--历史数据 再次购买-->
@@ -1069,15 +1073,15 @@
               if (v.vip_endtime != null) {
                 v.memberInfo.endTime = formatTime(v.vip_endtime).replace(/\./g, "/") + " 到期";
               }
-              if (v.filter.level == 4) {
-                v.memberInfo.cycle = v.filter.cycle + "天";
-              } else {
-                v.memberInfo.cycle = v.filter.cycle + "年";
-                var createType = v.filter.createType
-                if (createType){
-                  v.memberInfo.cycle = v.filter.cycle + "个月";
+                //启明星后台创建的订单 cycleType: 1-天  0-月  cycle:数量
+                if (v.filter.level == 4||v.filter.cycleType===1) {
+                    v.memberInfo.cycle = v.filter.cycle + "天";
+                }else {
+                    v.memberInfo.cycle = v.filter.cycle + "年";
+                    if (v.filter.createType||v.filter.cycleType===0){
+                        v.memberInfo.cycle = v.filter.cycle + "个月";
+                    }
                 }
-              }
               // 超级订阅
               if (v.product_type === 'VIP订阅') {
                 var vipOriginalInfo = v.filter.newBuyset
@@ -1142,10 +1146,12 @@
                     vipInfo.cycle = v.filter.cyclecount + "年"
                   } else if (parseInt(v.filter.cycleunit) === 2) {
                     vipInfo.cycle = v.filter.cyclecount + "个月"
-                  } else if (parseInt(v.filter.cycleunit) === 4) {
+                  } else if (parseInt(v.filter.cycleunit) === 3) {
+                    vipInfo.cycle = v.filter.cyclecount + "天"
+                  }else if (parseInt(v.filter.cycleunit) === 4) {
                     vipInfo.cycle = v.filter.cyclecount + "季"
                   } else {
-                    vipInfo.cycle = "7天"
+                    vipInfo.cycle = "-"
                   }
                 }
                 if (v.filter.cycleunit === 0 && v.filter.cyclecount === 0) {

src/web/templates/pc/subAccount_orderDetail.html

@@ -186,39 +186,47 @@
                         }else{
                           $("#status_success").removeClass("hide");
                         }
-                        $(".pay_time_p").css("display", "");
-                        if (r.data.pay_time) $(".pay_time").text(r.data.pay_time.replace("-", ".").replace("-", "."));
+
+                        if (r.data.pay_time){
+                            $(".pay_time_p").css("display", "");
+                            $(".pay_time").text(r.data.pay_time.replace("-", ".").replace("-", "."));
+                        }
                         //支付方式
-                        if (r.data.pay_way.indexOf("wx") > -1) {
-                            $(".pay_way_p").css("display", "");
-                            $(".pay_way").text("微信支付");
-                        } else if (r.data.pay_way.indexOf("ali") > -1) {
-                            $(".pay_way").text("支付宝支付");
-                            $(".pay_way_p").css("display", "");
-                        } else if (r.data.pay_way === "transferAccounts") {
-                            //$(".pay_time_p").css("display", "none");
-                            $(".pay_num_p").css("display", "none");
-                            if (filterObj.transferV && false) { //子账号只能后台创建订单、后台创建订单不展示凭证
-                                $(".pay_pic").css("display", "")
-                                $(".show_pay_pic").attr("onclick", "showImg('" + filterObj.transferV + "')")
-                            }
-                            $(".pay_way").text("公对公转账");
-                            $(".pay_way_p").css("display", "");
+                        if (r.data.billingMode===1){
+                            if (r.data.pay_way.indexOf("wx") > -1||r.data.return_type===1) {
+                                $(".pay_way_p").css("display", "");
+                                $(".pay_way").text("微信支付");
+                            } else if (r.data.pay_way.indexOf("ali") > -1||r.data.return_type===2) {
+                                $(".pay_way").text("支付宝支付");
+                                $(".pay_way_p").css("display", "");
+                            } else if (r.data.pay_way === "transferAccounts"&&(r.data.is_backstage_order===1&&r.data.return_status>0||r.data.is_backstage_order===0)) {
+                                //$(".pay_time_p").css("display", "none");
+                                $(".pay_num_p").css("display", "none");
+                                if (filterObj.transferV && false) { //子账号只能后台创建订单、后台创建订单不展示凭证
+                                    $(".pay_pic").css("display", "")
+                                    $(".show_pay_pic").attr("onclick", "showImg('" + filterObj.transferV + "')")
+                                }
+                                $(".pay_way").text("公对公转账");
+                                $(".pay_way_p").css("display", "");
 
-                            $(".price").text("￥ " + formatMoney(r.data.pay_money / 100) + "元");
+                                $(".price").text("￥ " + formatMoney(r.data.pay_money / 100) + "元");
+                            }
                         }
 
+
                         if (r.data.prepay_id) $(".pay_num").text(r.data.prepay_id);
 
                         if (source===""){
                           //发票
-                          if (r.data.applybill_status === 0) {
-                              $(".openinvoice").css("display", "");
-                          } else if (r.data.applybill_status === 1 || r.data.applybill_status === 2) {
-                              $(".lookinvoice").css("display", "").on("click", function () {
-                                  checkinvoice(r.data.applybill_status, orderCode)//查看发票
-                              })
-                          }
+                            if (r.data.is_backstage_order!==1){
+                                if (r.data.applybill_status === 0) {
+                                    $(".openinvoice").css("display", "");
+                                } else if (r.data.applybill_status === 1 || r.data.applybill_status === 2) {
+                                    $(".lookinvoice").css("display", "").on("click", function () {
+                                        checkinvoice(r.data.applybill_status, orderCode)//查看发票
+                                    })
+                                }
+                            }
                         }
                     }
                     if (r.data.order_status === -2) {

src/web/templates/pc/vip_orderDetail.html

@@ -63,6 +63,7 @@
             <p class="clearfix order_state">
                 <!--greenFont为绿色字体 redFont为红色字体 -->
                 <span class="greenFont hide" id="status_success">已完成</span>
+                <span class="redFont hide" id="status_wait_payfull">待付完</span>
                 <span class="redFont hide" id="status_wait_pay">待付款</span>
                 <span class="qxBgFont hide" id="status_cancelled">已取消</span>
 
@@ -184,31 +185,56 @@
                         $(".discount-container").removeClass("hide");
                         $(".highlight-text").text("赠送"+give_cycle);
                     }
-                    if (r.data.order.order_status == 1) {
-                        $("#status_success").removeClass("hide");
-                        $(".pay_time_p").css("display", "");
-                        if (r.data.order.pay_time) $(".pay_time").text(r.data.order.pay_time.replace("-", ".").replace("-", "."));
+                    if (r.data.order.order_status === 1) {
+                        if(r.data.order.return_status === 0 ||r.data.order.return_status === 2 ){
+                            $("#bg").addClass("yellowBg").removeClass("greenBg");
+                            if (r.data.order.return_status === 0){
+                                $("#status_wait_pay").removeClass("hide");
+                            }else if (r.data.order.return_status === 2 ){
+                                $("#status_wait_payfull").removeClass("hide");
+                            }
+                        }else {
+                            $("#status_success").removeClass("hide");
+                        }
+
+                        if (r.data.order.pay_time){
+                            $(".pay_time_p").css("display", "");
+                            $(".pay_time").text(r.data.order.pay_time.replace("-", ".").replace("-", "."));
+                        }
                         //支付方式
-                        if (r.data.order.pay_way.indexOf("wx") > -1) {
-                            $(".pay_way_p").css("display", "");
-                            $(".pay_way").text("微信支付");
-                        } else if (r.data.order.pay_way.indexOf("ali") > -1) {
-                            $(".pay_way").text("支付宝支付");
-                            $(".pay_way_p").css("display", "");
+                        if (r.data.order.billingMode===1){
+                            if (r.data.order.pay_way.indexOf("wx") > -1||r.data.order.return_type===1) {
+                                $(".pay_way_p").css("display", "");
+                                $(".pay_way").text("微信支付");
+                            } else if (r.data.order.pay_way.indexOf("ali") > -1||r.data.order.return_type===2) {
+                                $(".pay_way").text("支付宝支付");
+                                $(".pay_way_p").css("display", "");
+                            }else if(r.data.order.pay_way === "transferAccounts"&&(r.data.order.is_backstage_order===1&&r.data.order.return_status>0||r.data.order.is_backstage_order===0)) {
+                                $(".pay_way").text("公对公转账");
+                                $(".pay_way_p").css("display", "");
+                            }
                         }
-                        if (r.data.order.original_price == 0) {
+
+
+                        if (r.data.order.order_money == 0) {
                             $(".pay_time_p").css("display", "none");
-                            $(".vip_type").text("（试用）");
+                            if (r.data.order.billingMode!=0){
+                                $(".vip_type").text("（试用）");
+                            }
                         } else {
-                            $(".pay_num_p").css("display", "");
-                            if (r.data.transaction_id) $(".pay_num").text(r.data.transaction_id);
+                            if (r.data.transaction_id){
+                                $(".pay_num_p").css("display", "");
+                                $(".pay_num").text(r.data.transaction_id);
+                            }
                             //发票
-                            if (r.data.order.applybill_status === 0) {
-                                $(".openinvoice").css("display", "");
-                            } else if (r.data.applybill_status === 1 || r.data.applybill_status === 2) {
-                                $(".lookinvoice").css("display", "").on("click", function () {
-                                    checkinvoice(r.data.applybill_status, orderCode)//查看发票
-                                })
+                            if (r.data.order.is_backstage_order!==1){
+                                if (r.data.order.applybill_status === 0) {
+                                    $(".openinvoice").css("display", "");
+                                } else if (r.data.applybill_status === 1 || r.data.applybill_status === 2) {
+                                    $(".lookinvoice").css("display", "").on("click", function () {
+                                        checkinvoice(r.data.applybill_status, orderCode)//查看发票
+                                    })
+                                }
                             }
                         }
                     }

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

@@ -68,11 +68,11 @@
             <div class="select-type-group">
                 <div class="select-type-title">请选择支付方式</div>
                 <div class="select-card-group">
-                    <div class="select-card-item" @click="togglePayType('数据流量包')" v-show="payMap['数据流量包'].show" :class="{active: payType == '数据流量包'}">数据流量包</div>
-                    <div class="select-card-item" @click="togglePayType('单日限量包')" v-show="payMap['单日限量包'].show" :class="{active: payType == '单日限量包'}">单日限量数据包</div>
+                    <div id="select-data-pack-item" class="select-card-item" @click="togglePayType('数据流量包')" v-show="payMap['数据流量包'].show" :class="{active: payType == '数据流量包'}">数据流量包</div>
+                    <div id="select-day-pack-item" class="select-card-item" @click="togglePayType('单日限量包')" v-show="payMap['单日限量包'].show" :class="{active: payType == '单日限量包'}">单日限量数据包</div>
                     <div class="select-card-item" @click="togglePayType('个人支付')" v-show="payMap['个人支付'].show" :class="{active: payType == '个人支付'}">个人支付</div>
                 </div>
-                <div class="buy-data-pack-tip">数据流量包已上线，特惠充值随心导，2年有效。<a href="/swordfish/dataPack/createOrder">立即购买  ＞</a></div>
+                <div class="buy-data-pack-tip">数据流量包已上线，特惠充值随心导，2年有效。<a id="buy-data-pack-for-link" href="/swordfish/dataPack/createOrder">立即购买  ＞</a></div>
             </div>
             <div class="select-type-group" v-show="payType == '个人支付'"  style="margin-top: 0.16rem">
                 <div class="select-type-title">请选择数据规格</div>
@@ -233,8 +233,8 @@
             </div>
         </div>
         <div class="form-btn j-button-group">
-            <button class="btn prew dataPreview j-button-cancel" style="flex:none;line-height: normal;">预览数据</button>
-            <button data-need-bind-phone  class="btn enter toPay toDataPack j-button-confirm" style="flex:none;line-height: normal;" disabled="disabled">
+            <button id="track-data-preview-for-button" class="btn prew dataPreview j-button-cancel" style="flex:none;line-height: normal;">预览数据</button>
+            <button id="pay-button-for-datapack" data-need-bind-phone  class="btn enter toPay toDataPack j-button-confirm" style="flex:none;line-height: normal;" disabled="disabled">
                 确认扣除
             </button>
         </div>
@@ -307,14 +307,14 @@
                 <p class="tip-warning error-admin"  data-pay-type="数据流量包-线下" style="display: none">您的每日导出限额已超过管理员设置数量，请联系管理员或选择个人支付</p>
             </div>
             <div class="weui-dialog__ft" data-pay-type="单日限量包" style="display: none;">
-                <a href="javascript:;" class="weui-dialog__btn weui-dialog__btn_primary">我知道了</a>
+                <a href="javascript:;" id="read-day-tip-for-dialog" class="weui-dialog__btn weui-dialog__btn_primary">我知道了</a>
             </div>
             <div class="weui-dialog__ft" data-pay-type="数据流量包-线下" style="display: none;">
-                <a href="javascript:;" class="weui-dialog__btn weui-dialog__btn_primary">我知道了</a>
+                <a href="javascript:;" id="read-datapack-tip-for-dialog" class="weui-dialog__btn weui-dialog__btn_primary">我知道了</a>
             </div>
             <div class="weui-dialog__ft" data-pay-type="数据流量包-线上" style="display: none;">
-                <a href="javascript:;" class="weui-dialog__btn weui-dialog__btn_cancel">取消</a>
-                <a href="javascript:;" class="weui-dialog__btn weui-dialog__btn_primary">立即充值</a>
+                <a href="javascript:;" id="cancel-buy-data-pack-for-dialog" class="weui-dialog__btn weui-dialog__btn_cancel">取消</a>
+                <a href="javascript:;" id="buy-data-pack-for-dialog" class="weui-dialog__btn weui-dialog__btn_primary">立即充值</a>
             </div>
         </div>
     </div>

src/web/templates/weixin/member/aiForecastPackdetail.html

@@ -241,34 +241,40 @@
                       $('.j-footer').show().html(pay_again);
                     }
                     //支付方式
-                    if (r.data.pay_way.indexOf("wx") > -1) {
-                        $(".line_payway").css("display", "");
-                        $(".payWay").text("微信支付");
-                    } else if (r.data.pay_way.indexOf("ali") > -1) {
-                        $(".payWay").text("支付宝支付");
-                        $(".line_payway").css("display", "");
-                    } else if (r.data.pay_way === "transferAccounts") {//试用用户
-                        $(".payWay").html("公对公转账");
-                        if (filterObj.transferV&&r.data.product_type!="大会员-补充包") {
-                          $(".payWay").html("公对公转账<span style='color: #2ABED1' onclick='showImg(\"" + filterObj.transferV + "\")'>&nbsp;查看凭证</span>");
+                    if (r.data.billingMode===1){
+                        if (r.data.pay_way.indexOf("wx") > -1||r.data.return_type===1) {
+                            $(".line_payway").css("display", "");
+                            $(".payWay").text("微信支付");
+                        } else if (r.data.pay_way.indexOf("ali") > -1||r.data.return_type===2) {
+                            $(".payWay").text("支付宝支付");
+                            $(".line_payway").css("display", "");
+                        } else if (r.data.pay_way === "transferAccounts"&&(r.data.is_backstage_order===1&&r.data.return_status>0||r.data.is_backstage_order===0)) {//试用用户
+                            $(".payWay").html("公对公转账");
+                            if (filterObj.transferV&&r.data.product_type!="大会员-补充包") {
+                                $(".payWay").html("公对公转账<span style='color: #2ABED1' onclick='showImg(\"" + filterObj.transferV + "\")'>&nbsp;查看凭证</span>");
+                            }
+                            $(".line_payway").css("display", "");
+
+                            $(".l-item.paymoney").css("display", "");
+                            $(".paymoney .price").text("￥ " + formatMoney(r.data.pay_money / 100) + "元");
+                            return
+                        } else {//试用用户
+                            $(".invoice").css("display", "none");
+                            return
                         }
-                        $(".line_payway").css("display", "");
-    
-                        $(".l-item.paymoney").css("display", "");
-                        $(".paymoney .price").text("￥ " + formatMoney(r.data.pay_money / 100) + "元");
-                        return
-                    } else {//试用用户
-                        $(".invoice").css("display", "none");
-                        return
                     }
+
     
                     if (r.data.pay_time) {
                         $(".line_paytime").css("display", "");
                         $(".payTime").text(r.data.pay_time.replace("-", ".").replace("-", "."));
                     }
     
-                    $(".line_transaction").css("display", "");
-                    if (r.data.prepay_id){ $(".transaction_id").text(r.data.prepay_id);}
+
+                    if (r.data.prepay_id){
+                        $(".transaction_id").text(r.data.prepay_id);
+                        $(".line_transaction").css("display", "");
+                    }
                 }
                 if (r.data.order_status == 0) {
                     //未支付
@@ -339,6 +345,9 @@
                     $("#pageTitle").text("已取消");
                     $(".invoice").css("display", "none");//隐藏开发票
                 }
+                if(r.data.is_backstage_order===1){
+                    $(".invoice").css("display", "none");//隐藏开发票
+                }
             }
         })
     })

src/web/templates/weixin/member/memberdetail.html

@@ -229,12 +229,14 @@
             $(".level_value").text(level);
             //
             var cycle = r.data.cycle;
-            if (filterObj.level == 4) {
+            if (filterObj.level === 4) {
                 cycle += "天"
                 $(".vip_type").text("-试用版");
-            } else {
+            } else if (filterObj.cycleType===1){
+                cycle += "天"
+            }else {
               var createType = filterObj.createType
-              if (createType){
+              if (createType||filterObj.cycleType===0){
                 cycle+="个月";
               }else{
                 cycle+="年"
@@ -298,28 +300,31 @@
                   }
                 }
                 //支付方式
-                if (r.data.pay_way.indexOf("wx") > -1) {
-                    $(".line_payway").css("display", "");
-                    $(".payWay").text("微信支付");
-                } else if (r.data.pay_way.indexOf("ali") > -1) {
-                    $(".payWay").text("支付宝支付");
-                    $(".line_payway").css("display", "");
-                } else if (r.data.pay_way === "transferAccounts") {//试用用户 
-                    window.isTransferPay = r.data.applybill_status === 0
-                    $(".payWay").html("公对公转账");
-                    if(filterObj.transferV&&filterObj.level!=5){
-                        initImgView(filterObj.transferV)
-                        $(".payWay").html("公对公转账<span style='color: #2ABED1' onclick='showImg()'>&nbsp;查看凭证</span>");
-                    }
-                    $(".line_payway").css("display", "");
+                if (r.data.billingMode===1){
+                    if (r.data.pay_way.indexOf("wx") > -1||r.data.return_type===1) {
+                        $(".line_payway").css("display", "");
+                        $(".payWay").text("微信支付");
+                    } else if (r.data.pay_way.indexOf("ali") > -1||r.data.return_type===2) {
+                        $(".payWay").text("支付宝支付");
+                        $(".line_payway").css("display", "");
+                    } else if (r.data.pay_way === "transferAccounts"&&(r.data.is_backstage_order===1&&r.data.return_status>0||r.data.is_backstage_order===0)) {//试用用户
+                        window.isTransferPay = r.data.applybill_status === 0
+                        $(".payWay").html("公对公转账");
+                        if(filterObj.transferV&&filterObj.level!=5){
+                            initImgView(filterObj.transferV)
+                            $(".payWay").html("公对公转账<span style='color: #2ABED1' onclick='showImg()'>&nbsp;查看凭证</span>");
+                        }
+                        $(".line_payway").css("display", "");
 
-                    $(".l-item.paymoney").css("display", "");
-                    //$(".price").text("￥ " + formatMoney(r.data.pay_money / 100) + "元");
-                    //return
-                } else {//试用用户
-                    $(".invoice").css("display", "none");
-                    //return
+                        $(".l-item.paymoney").css("display", "");
+                        //$(".price").text("￥ " + formatMoney(r.data.pay_money / 100) + "元");
+                        //return
+                    } else {//试用用户
+                        $(".invoice").css("display", "none");
+                        //return
+                    }
                 }
+
                 $(".l-item.paymoney").css("display", "");
                 $(".price").text("￥ " + formatMoney(r.data.pay_money / 100));
                 if (r.data.pay_time) {

src/web/templates/weixin/member/subAccountDetail.html

@@ -230,27 +230,30 @@
                   $('.j-footer').show().html(pay_again);
                 }
                 //支付方式
-                if (r.data.pay_way.indexOf("wx") > -1) {
-                    $(".line_payway").css("display", "");
-                    $(".payWay").text("微信支付");
-                } else if (r.data.pay_way.indexOf("ali") > -1) {
-                    $(".payWay").text("支付宝支付");
-                    $(".line_payway").css("display", "");
-                } else if (r.data.pay_way === "transferAccounts") {//试用用户
-                    $(".payWay").html("公对公转账");
-                    if (filterObj.transferV) {
-                      $(".payWay").html("公对公转账<span style='color: #2ABED1' onclick='showImg(\"" + filterObj.transferV + "\")'>&nbsp;查看凭证</span>");
-                    }
-                    $(".line_payway").css("display", "");
+                if(r.data.billingMode===1){
+                    if (r.data.pay_way.indexOf("wx") > -1||r.data.return_type===1) {
+                        $(".line_payway").css("display", "");
+                        $(".payWay").text("微信支付");
+                    } else if (r.data.pay_way.indexOf("ali") > -1||r.data.return_type===2) {
+                        $(".payWay").text("支付宝支付");
+                        $(".line_payway").css("display", "");
+                    } else if (r.data.pay_way === "transferAccounts"&&(r.data.is_backstage_order===1&&r.data.return_status>0||r.data.is_backstage_order===0)) {//试用用户
+                        $(".payWay").html("公对公转账");
+                        if (filterObj.transferV) {
+                            $(".payWay").html("公对公转账<span style='color: #2ABED1' onclick='showImg(\"" + filterObj.transferV + "\")'>&nbsp;查看凭证</span>");
+                        }
+                        $(".line_payway").css("display", "");
 
-                    $(".l-item.paymoney").css("display", "");
-                    $(".paymoney .price").text("￥ " + formatMoney(r.data.pay_money / 100));
-                   // return
-                } else {//试用用户
-                    $(".invoice").css("display", "none");
-                    return
+                        $(".l-item.paymoney").css("display", "");
+                        $(".paymoney .price").text("￥ " + formatMoney(r.data.pay_money / 100));
+                        // return
+                    } else {//试用用户
+                        $(".invoice").css("display", "none");
+                        return
+                    }
                 }
 
+
                 if (r.data.pay_time) {
                     $(".line_paytime").css("display", "");
                     $(".payTime").text(r.data.pay_time.replace("-", ".").replace("-", "."));
@@ -330,6 +333,9 @@
                 $("#pageTitle").text("已取消");
                 $(".invoice").css("display", "none");//隐藏开发票
             }
+            if(r.data.is_backstage_order===1){
+                $(".invoice").css("display", "none");//隐藏开发票
+            }
         })
     })
 

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

@@ -223,7 +223,9 @@
                 }
                 //产品类型
                 if (r.data.order.order_money == 0) {
-                    $(".productType").text("超级订阅（试用）");
+                    if (r.data.order.billingMode!=0){
+                        $(".productType").text("超级订阅（试用）");
+                    }
                     $(".discountPrice").parent().hide();
                 }
                 //价格
@@ -634,11 +636,26 @@
                     }
                     $(".payPrice").text("￥ " + formatMoney(parseFloat(r.data.order.order_money) / 100) + "元");
                     $("#card-header-bg").addClass("bg finish-bg")
+
+
+                    if (r.data.order.return_status === 0||r.data.order.return_status === 2){
+                        $("#card-header-bg").addClass("bg nopay-bg")
+                        if (r.data.order.return_status === 0){
+                            $("#pageTitle").text("待付款");
+                        }else if (r.data.order.return_status === 2){
+                            $("#pageTitle").text("待付完");
+                        }
+                    }else{
+                        $("#card-header-bg").addClass("bg finish-bg")
+                        $("#pageTitle").text("已完成");
+                    }
                     $("#pageTitle").addClass("status")
-                    $("#pageTitle").text("已完成");
+
                     //支付时间
-                    $(".line_paytime").css("display", "");
-                    if (r.data.order.pay_time) $(".payTime").text(r.data.order.pay_time.replace("-", ".").replace("-", "."));
+                    if (r.data.order.pay_time){
+                        $(".line_paytime").css("display", "");
+                        $(".payTime").text(r.data.order.pay_time.replace("-", ".").replace("-", "."));
+                    }
                     if (r.data.order.order_money == 0) {
                         $(".line_paytime").css("display", "none");
                     }
@@ -658,29 +675,40 @@
                     }
 
                     //支付方式
-                    if (r.data.order.pay_way&&r.data.order.pay_way.indexOf("wx") > -1) {
-                        $(".line_payway").css("display", "");
-                        $(".payWay").text("微信支付");
-                    } else if (r.data.order.pay_way&&r.data.order.pay_way.indexOf("ali") > -1) {
-                        $(".payWay").text("支付宝支付");
-                        $(".line_payway").css("display", "");
-                    } else {//试用用户
-                        $(".invoice").css("display", "none");
-                        return
+                    if(r.data.order.billingMode===1){
+                        if (r.data.order.pay_way.indexOf("wx") > -1||r.data.order.return_type===1) {
+                            $(".line_payway").css("display", "");
+                            $(".payWay").text("微信支付");
+                        } else if (r.data.order.pay_way.indexOf("ali") > -1||r.data.order.return_type===2) {
+                            $(".payWay").text("支付宝支付");
+                            $(".line_payway").css("display", "");
+                        } else if(r.data.order.pay_way === "transferAccounts"&&(r.data.order.is_backstage_order===1&&r.data.order.return_status>0||r.data.order.is_backstage_order===0)){
+                            $(".payWay").text("公对公转账");
+                            $(".line_payway").css("display", "");
+                        }else {
+                            $(".invoice").css("display", "none");
+                            return
+                        }
+                    }
+
+
+                    if (r.data.transaction_id){
+                        $(".line_transaction").css("display", "");
+                        $(".transaction_id").text(r.data.transaction_id);
                     }
 
-                    $(".line_transaction").css("display", "");
-                    if (r.data.transaction_id) $(".transaction_id").text(r.data.transaction_id);
-                    var pay_again = ""
                     //发票
-                    if (r.data.order.applybill_status === 0) {
-                        //已支付未申请发票
-                        pay_again += "<button class=\"j-button-cancel\" onclick='invoiceAdd()'>开发票</button>"
-                    } else if (r.data.order.applybill_status === 1 || r.data.order.applybill_status === 2) {
-                        //已支付已申请发票
-                        pay_again += "<button class=\"j-button-cancel\" onclick='checkInvoice(" + r.data.order.applybill_status + ")'>查看发票</button>"
+                    if (r.data.order.is_backstage_order!==1){
+                        var pay_again = ""
+                        if (r.data.order.applybill_status === 0) {
+                            //已支付未申请发票
+                            pay_again += "<button class=\"j-button-cancel\" onclick='invoiceAdd()'>开发票</button>"
+                        } else if (r.data.order.applybill_status === 1 || r.data.order.applybill_status === 2) {
+                            //已支付已申请发票
+                            pay_again += "<button class=\"j-button-cancel\" onclick='checkInvoice(" + r.data.order.applybill_status + ")'>查看发票</button>"
+                        }
+                        $('.j-footer').show().html(pay_again)
                     }
-                    $('.j-footer').show().html(pay_again)
                 } else if (r.data.order.order_status == -2 || r.data.order.order_status == -3) {
                     $("#card-header-bg").addClass("bg cancel-bg")
                     $("#pageTitle").addClass("status")