订单审核修改

src/order/optimizeOrder.go

@@ -14,11 +14,11 @@ import (
 
 func AddUpdateRecord(context *admin.Context) (interface{}, error) {
 	param := new(struct {
-		OrderCode        string `form:"orderCode"`
-		OrderMoney       int    `form:"orderMoney"`
-		PayMoney         int    `form:"payMoney"`    //支付金额
-		BigSubMoney      int    `form:"bigSubMoney"` //大会员子账号金额
-		SupplyMoney      int    `form:"supplyMoney"` //补充包金额
+		OrderCode  string `form:"orderCode"`
+		OrderMoney int    `form:"orderMoney"`
+		PayMoney   int    `form:"payMoney"` //支付金额
+		//BigSubMoney      int    `form:"bigSubMoney"` //大会员子账号金额
+		//SupplyMoney      int    `form:"supplyMoney"` //补充包金额
 		Commission       int    `form:"commission"`
 		ProceduresMoney  int    `form:"proceduresMoney"` //手续费
 		CorrectionReason string `form:"correctionReason"`
@@ -58,10 +58,10 @@ func AddUpdateRecord(context *admin.Context) (interface{}, error) {
 		//if param.PayMoney != 0 {
 		if qutil.ObjToString((*orderData)["product_type"]) == "大会员" {
 			filterMap["bigPayMoneyUpdate"] = param.PayMoney
-			updateData["pay_money"] = param.PayMoney + param.BigSubMoney + param.SupplyMoney
-			insertData["payMoney"] = param.PayMoney - qutil.IntAll(filterMap["bigPayMoney"])
-			filterMap["bigPayMoney"] = param.PayMoney
-			util.JysqlDB.Update("contract", map[string]interface{}{"order_code": param.OrderCode}, map[string]interface{}{"contract_money": param.PayMoney + param.BigSubMoney + param.SupplyMoney})
+			updateData["pay_money"] = param.PayMoney
+			insertData["payMoney"] = param.PayMoney
+			//filterMap["bigPayMoney"] = param.PayMoney
+			util.JysqlDB.Update("contract", map[string]interface{}{"order_code": param.OrderCode}, map[string]interface{}{"contract_money": param.PayMoney})
 		} else {
 			filterMap["payMoneyUpdate"] = param.PayMoney
 			updateData["pay_money"] = param.PayMoney
@@ -70,13 +70,13 @@ func AddUpdateRecord(context *admin.Context) (interface{}, error) {
 		}
 		//}
 		//大会员子账号金额修改
-		filterMap["subPayMoneyUpdate"] = param.BigSubMoney
-		insertData["bigSubMoney"] = param.BigSubMoney - qutil.IntAll(filterMap["subPayMoney"])
+		//filterMap["subPayMoneyUpdate"] = param.BigSubMoney
+		/*insertData["bigSubMoney"] = param.BigSubMoney - qutil.IntAll(filterMap["subPayMoney"])
 		filterMap["subPayMoney"] = param.BigSubMoney
 
 		filterMap["supplyPayMoneyUpdate"] = param.SupplyMoney
 		insertData["supplyMoney"] = param.SupplyMoney - qutil.IntAll(filterMap["supplyPayMoney"])
-		filterMap["supplyPayMoney"] = param.SupplyMoney
+		filterMap["supplyPayMoney"] = param.SupplyMoney*/
 
 		updateData["order_money"] = param.OrderMoney
 		insertData["orderMoney"] = param.OrderMoney - qutil.IntAll((*orderData)["order_money"])
@@ -96,9 +96,9 @@ func AddUpdateRecord(context *admin.Context) (interface{}, error) {
 		refundData := util.JysqlDB.SelectBySql(`select IFNULL(sum(refund_money),0) as refund_money from refund_record where order_code=?`, param.OrderCode)
 		return_money := qutil.IntAll((*returnData)[0]["return_money"])
 		refund_money := qutil.IntAll((*refundData)[0]["refund_money"])
-		if param.PayMoney+param.BigSubMoney+param.SupplyMoney-param.Commission-param.ProceduresMoney == return_money-refund_money {
+		if param.PayMoney-param.Commission-param.ProceduresMoney == return_money-refund_money {
 			updateData["return_status"] = 1
-		} else if param.PayMoney+param.BigSubMoney+param.SupplyMoney-param.Commission-param.ProceduresMoney > return_money-refund_money && return_money-refund_money > 0 {
+		} else if param.PayMoney-param.Commission-param.ProceduresMoney > return_money-refund_money && return_money-refund_money > 0 {
 			updateData["return_status"] = 2
 		}
 		if return_money == refund_money && return_money > 0 {

src/order/orderManageController.go

@@ -3750,6 +3750,7 @@ func BackOrderAuditList(context *admin.Context) (interface{}, error) {
 		OrderCode   string `form:"orderCode"`   //订单编号
 		SalePerson  string `form:"salePerson"`  // 销售人员
 		AuditStatus string `form:"auditStatus"` // 订单审核状态
+		SaleDep     string `form:"saleDep"`     //业绩归属部门
 	})
 	err := context.Form(param)
 	if err != nil {
@@ -3758,14 +3759,17 @@ func BackOrderAuditList(context *admin.Context) (interface{}, error) {
 	condition := []string{
 		"is_backstage_order=1",
 	}
+	if param.SaleDep != "" {
+		condition = append(condition, fmt.Sprintf(`condition = '%s'`, param.SaleDep))
+	}
 	if param.AuditStatus == "-1" {
 		// condition = append(condition, "audit_status !=0")
-		condition = append(condition, `(audit_status in (-2,-3,1,2,4) or (audit_status=3 and locate('"audit_type":"人工审核"', filter)>0))`)
+		condition = append(condition, `(audit_status in (-2,-3,-4,1,2,4) or (audit_status=3 and locate('"audit_type":"人工审核"', filter)>0))`)
 	} else if param.AuditStatus == "4" {
-		condition = append(condition, "audit_status in (-2,-3)")
+		condition = append(condition, "audit_status in (-2,-3,-4)")
 
 	} else if param.AuditStatus == "" {
-		condition = append(condition, "audit_status in (1,2)")
+		condition = append(condition, "audit_status in (1,2,4)")
 	} else if param.AuditStatus == "3" {
 		condition = append(condition, "audit_status =3")
 		condition = append(condition, `locate('"audit_type":"人工审核"', filter)>0`)
@@ -3785,11 +3789,17 @@ func BackOrderAuditList(context *admin.Context) (interface{}, error) {
 	if count != nil && len(*count) > 0 {
 		q := fmt.Sprintf("select order_code,salesperson,audit_status,id,product_type,filter,vip_type, order_code as a ,\n    (case WHEN last_update_time IS NULL THEN create_time else last_update_time end ) as create_time from dataexport_order where %s order by create_time  limit %d ,%d", strings.Join(condition, " and "), param.Page.Offset, param.PageSize)
 		res = util.JysqlDB.SelectBySql(q)
+		showDeptMap := map[string]string{}
+		saleCodeD := util.JysqlDB.FindOne("dict_dep", map[string]interface{}{}, "", "")
+		if saleCodeD != nil && len(*saleCodeD) > 0 {
+			showDeptMap[qutil.ObjToString((*saleCodeD)["code"])] = qutil.ObjToString((*saleCodeD)["show"])
+		}
 		for i := 0; i < len(*res); i++ {
 			productType := qutil.ObjToString((*res)[i]["product_type"])
 			if productType == "大会员-AI中标预测包" || productType == "大会员-招标文件解读" {
 				(*res)[i]["product_type"] = "大会员-补充包"
 			}
+			(*res)[i]["saleDep"] = showDeptMap[qutil.ObjToString((*res)[i]["saleDep"])]
 		}
 		data["total"] = (*count)[0]["count"]
 	} else {

src/order/suppleSalePerson.go

@@ -379,8 +379,11 @@ func OrdersExamine(context *admin.Context) (interface{}, error) {
 			if oldState == 1 { //记录为待审核状态
 				newState = 2
 			} else if oldState == 2 { //记录为一审通过状态
-				newState = 3
+				newState = 4
 				operatorType = 3
+			} else if oldState == 4 {
+				newState = 3
+				operatorType = 5 //三审
 			}
 		} else {
 			if oldState == 1 {
@@ -388,6 +391,9 @@ func OrdersExamine(context *admin.Context) (interface{}, error) {
 			} else if oldState == 2 {
 				newState = -3
 				operatorType = 3
+			} else if oldState == 4 {
+				newState = -4
+				operatorType = 5
 			}
 		}
 		var productType string