订单列表增加待三审

src/order/orderManageController.go

@@ -75,7 +75,7 @@ type Params struct {
 	Order_status                    int    `form:"order_status"` // 订单状态 0:未支付 1:已支付 -1:逻辑删除 -2:已取消 -3:已退款
 	OrderCode                       string `form:"orderCode"`    //订单编号
 	UpdateType                      int    `form:"updateType"`   // 修改状态 0暂不开通修改 1开通修改
-	AuditStatus                     int    // 审核状态 0：待提交  1：待审核  2：一审通过  3：审核通过 -2 一审退回  -3 二审退回
+	AuditStatus                     int    // 审核状态 0：待提交  1：待审核  2：一审通过  -2 一审退回  4 二审通过  -3 二审退回 -4 三审退回   3：审核通过
 	Open                            bool   // 是否开通权限
 	Save                            int    `form:"save"`                              // 1-暂存 2-提交
 	BuySubject                      string `form:"buySubject"`                        //购买主体  1 个人， 2公司
@@ -123,6 +123,7 @@ func orderList(context *admin.Context) (interface{}, error) {
 		AdSource         int    `form:"adSource"`         //广告来源
 		SalesSecondLevel string `form:"salesSecondLevel"` //销售渠道二级分类
 		AuditStatus      string `form:"auditStatus"`      // 订单审核状态
+		ContractNature   int    `form:"contractNature"`   //合同性质  0 全部  1 新增合同  2 续签合同
 	})
 	err := context.Form(param)
 	if err != nil {
@@ -136,9 +137,11 @@ func orderList(context *admin.Context) (interface{}, error) {
 	}
 	if param.AuditStatus != "" {
 		if param.AuditStatus == "4" { // 已退回
-			str += " e.audit_status in (-2,-3)  and"
+			str += " e.audit_status in (-2,-3,-4)  and"
+		} else if param.AuditStatus == "5" {
+			str += fmt.Sprintf(" e.audit_status = %d and", 4)
 		} else {
-			str += " e.audit_status = " + fmt.Sprintf("%v", qutil.IntAll(param.AuditStatus)) + " and"
+			str += fmt.Sprintf(" e.audit_status = %d and", qutil.IntAll(param.AuditStatus))
 		}
 	}
 	// 是否只查自己的订单
@@ -394,10 +397,12 @@ func orderList(context *admin.Context) (interface{}, error) {
 			str += " (( e.user_id in (" + userIdStr + " ))  OR ( e.user_phone like '%" + param.Phone + "%' AND e.is_backstage_order = 1 )  ) and"
 		} else {
 			str += " ( e.user_phone like '%" + param.Phone + "%' AND e.is_backstage_order = 1 )   and"
-
 		}
 	}
-	sqlFind := fmt.Sprintf("select e.company_name, e.id,e.order_code,e.product_type,e.create_time,e.pay_money,e.order_money,e.order_status,e.applybill_status,e.filter,e.dis_word,e.vip_type,e.pay_way,e.course_status,e.refund_status,e.return_status,e.user_phone,e.distribution_channel,e.order_channel,e.signing_subject,e.user_id,e.salesperson,e.salesperson_id,e.audit_status from %s e ", DataExportOrder)
+	if param.ContractNature != 0 {
+		str += fmt.Sprintf(" contract_nature = %d and", param.ContractNature)
+	}
+	sqlFind := fmt.Sprintf("select e.contract_nature,e.company_name, e.id,e.order_code,e.product_type,e.create_time,e.pay_money,e.order_money,e.order_status,e.applybill_status,e.filter,e.dis_word,e.vip_type,e.pay_way,e.course_status,e.refund_status,e.return_status,e.user_phone,e.distribution_channel,e.order_channel,e.signing_subject,e.user_id,e.salesperson,e.salesperson_id,e.audit_status from %s e ", DataExportOrder)
 	sqlCount := fmt.Sprintf("SELECT count(*) FROM %s e", DataExportOrder)
 	sqlM := fmt.Sprintf("SELECT sum( CASE WHEN e.is_backstage_order = 1 THEN e.pay_money ELSE 0 END ) AS sum_line,sum( CASE WHEN e.is_backstage_order = 0 THEN e.order_money ELSE 0 END ) AS sum_qmx  FROM %s e ", DataExportOrder)
 	sqlRefund2 := fmt.Sprintf("select sum(b.refund_money) from refund_record b inner join %s e on", DataExportOrder)
@@ -508,6 +513,7 @@ func OrderDetails(context *admin.Context) (interface{}, error) {
 		}
 		(*res)["productType"] = (*res)["product_type"]
 		(*res)["orderStatus"] = (*res)["order_status"]
+		(*res)["discountRate"] = fmt.Sprintf("%.2f", qutil.Float64All((*res)["pay_mpney"])/qutil.Float64All((*res)["order_mpney"]))
 		saleCode, payType := qutil.ObjToString((*res)["saleDep"]), qutil.ObjToString((*res)["pay_way"])
 		if saleCode != "" {
 			if strings.Contains(saleCode, ",") {

src/order/orderManageService.go

@@ -183,6 +183,9 @@ func VipOrderDetails(res *map[string]interface{}) map[string]interface{} {
 	order_status := qutil.IntAll((*res)["order_status"])
 	payway := qutil.ObjToString((*res)["pay_way"])
 	original_price := qutil.Int64All((*res)["original_price"])
+	if qutil.IntAll((*res)["buy_subject"]) == 1 {
+		(*res)["buy_count"] = 1
+	}
 	//产品类型
 	if qutil.Int64All((*res)["vip_type"]) == 1 { //1续费
 		(*res)["product_type"] = "VIP订阅（续费）"