金额修正

src/order/optimizeOrder.go

@@ -35,9 +35,16 @@ func AddUpdateRecord(context *admin.Context) (interface{}, error) {
 		return nil, errors.New("修正失败")
 	}
 	updateData, payMoney := map[string]interface{}{}, 0
+	insertData := map[string]interface{}{
+		"orderCode":        param.OrderCode,
+		"correctionReason": param.CorrectionReason,
+		"createTime":       qutil.NowFormat(qutil.Date_Full_Layout),
+		"createPerson":     context.User.Username,
+	}
 	if param.PayMoney != 0 {
 		if strings.Contains(qutil.ObjToString((*orderData)["product_type"]), "大会员") {
 			filterMap["bigPayMoneyUpdate"] = param.PayMoney
+			filterMap["bigPayMoney"] = param.PayMoney
 			payMoney = param.PayMoney - qutil.IntAll(filterMap["bigPayMoney"])
 			updateData["pay_money"] = param.PayMoney + param.BigSubMoney + param.SupplyMoney
 		} else {
@@ -45,24 +52,32 @@ func AddUpdateRecord(context *admin.Context) (interface{}, error) {
 			updateData["pay_money"] = param.PayMoney
 			payMoney = param.PayMoney - qutil.IntAll((*orderData)["pay_money"])
 		}
+		insertData["payMoney"] = payMoney
 	}
 	if param.BigSubMoney != 0 {
 		filterMap["subPayMoneyUpdate"] = param.BigSubMoney
+		filterMap["subPayMoney"] = param.BigSubMoney
+		insertData["bigSubMoney"] = param.BigSubMoney - qutil.IntAll(filterMap["subPayMoney"])
 	}
 	if param.SupplyMoney != 0 {
 		filterMap["supplyPayMoneyUpdate"] = param.SupplyMoney
+		filterMap["supplyPayMoney"] = param.BigSubMoney
+		insertData["supplyMoney"] = param.SupplyMoney - qutil.IntAll(filterMap["supplyPayMoney"])
 	}
 	if param.OrderMoney != 0 {
 		updateData["order_money"] = param.OrderMoney
 		filterMap["orderMoneyUpdate"] = param.OrderMoney
+		insertData["orderMoney"] = param.OrderMoney - qutil.IntAll((*orderData)["order_money"])
 	}
 	if param.Commission != 0 {
 		updateData["commission"] = param.Commission
 		filterMap["commissionUpdate"] = param.Commission
+		insertData["commission"] = param.Commission - qutil.IntAll((*orderData)["commission"])
 	}
 	if param.ProceduresMoney != 0 {
 		updateData["procedures_money"] = param.ProceduresMoney
 		filterMap["proceduresMoneyUpdate"] = param.ProceduresMoney - qutil.IntAll((*orderData)["procedures_money"])
+		insertData["proceduresMoney"] = param.ProceduresMoney - qutil.IntAll((*orderData)["procedures_money"])
 	}
 	filterByte, _ := json.Marshal(filterMap)
 	updateData["filter"] = string(filterByte)
@@ -81,18 +96,7 @@ func AddUpdateRecord(context *admin.Context) (interface{}, error) {
 		updateData["refund_status"] = 2
 	}
 	util.JysqlDB.Update("dataexport_order", map[string]interface{}{"order_code": param.OrderCode}, updateData)
-	util.JysqlDB.Insert("moneyCorrection", map[string]interface{}{
-		"orderCode":        param.OrderCode,
-		"orderMoney":       param.OrderMoney - qutil.IntAll((*orderData)["order_money"]),
-		"payMoney":         payMoney,
-		"bigSubMoney":      param.BigSubMoney - qutil.IntAll(filterMap["subPayMoney"]),
-		"supplyMoney":      param.SupplyMoney - qutil.IntAll(filterMap["supplyPayMoney"]),
-		"commission":       param.Commission - qutil.IntAll((*orderData)["commission"]),
-		"proceduresMoney":  param.ProceduresMoney - qutil.IntAll((*orderData)["procedures_money"]),
-		"correctionReason": param.CorrectionReason,
-		"createTime":       qutil.NowFormat(qutil.Date_Full_Layout),
-		"createPerson":     context.User.Username,
-	})
+	util.JysqlDB.Insert("moneyCorrection", insertData)
 	return map[string]interface{}{"status": 1}, nil
 }
 

src/order/orderManageController.go

@@ -3585,7 +3585,8 @@ func BackOrderAuditList(context *admin.Context) (interface{}, error) {
 		"is_backstage_order=1",
 	}
 	if param.AuditStatus == "-1" {
-		condition = append(condition, "audit_status !=0")
+		// 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)`)
 	} else if param.AuditStatus == "4" {
 		condition = append(condition, "audit_status in (-2,-3)")