修正记录

src/order/optimizeOrder.go

@@ -1,6 +1,8 @@
 package order
 
 import (
+	"encoding/json"
+	"errors"
 	"mongodb"
 	qutil "qfw/util"
 	"strings"
@@ -24,6 +26,41 @@ func AddUpdateRecord(context *admin.Context) (interface{}, error) {
 	if err != nil {
 		return nil, err
 	}
+	orderData := util.JysqlDB.FindOne("dataexport_order", map[string]interface{}{"order_code": param.OrderCode}, "", "")
+	if orderData == nil {
+		return nil, errors.New("未找到订单")
+	}
+	filterMap := map[string]interface{}{}
+	if err := json.Unmarshal([]byte(qutil.ObjToString((*orderData)["filter"])), &filterMap); err != nil {
+		return nil, errors.New("修正失败")
+	}
+	if param.PayMoney != 0 {
+		filterMap["bigPayMoneyUpdate"] = param.PayMoney
+	}
+	if param.BigSubMoney != 0 {
+		filterMap["subPayMoneyUpdate"] = param.BigSubMoney
+	}
+	if param.SupplyMoney != 0 {
+		filterMap["supplyPayMoneyUpdate"] = param.SupplyMoney
+	}
+	updateData := map[string]interface{}{
+		"pay_money": param.PayMoney + param.BigSubMoney + param.SupplyMoney,
+	}
+	if param.OrderMoney != 0 {
+		updateData["order_money"] = param.OrderMoney
+		filterMap["orderMoneyUpdate"] = param.SupplyMoney
+	}
+	if param.Commission != 0 {
+		updateData["commission"] = param.Commission
+		filterMap["commissionUpdate"] = param.SupplyMoney
+	}
+	if param.ProceduresMoney != 0 {
+		updateData["procedures_money"] = param.ProceduresMoney
+		filterMap["proceduresMoneyUpdate"] = param.SupplyMoney
+	}
+	filterByte, _ := json.Marshal(filterMap)
+	updateData["filter"] = string(filterByte)
+	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,

src/order/orderManageController.go

@@ -490,8 +490,12 @@ func OrderDetails(context *admin.Context) (interface{}, error) {
 		}
 		(*res)["productType"] = (*res)["product_type"]
 		(*res)["orderStatus"] = (*res)["order_status"]
-		moneyCorrectionData := util.JysqlDB.Find("moneyCorrection", map[string]interface{}{"orderCode": orderCode}, "", "createTime desc", 0, 0)
-		(*res)["moneyCorrectionData"] = moneyCorrectionData
+		moneyCorrectionData := util.JysqlDB.Find("moneyCorrection", map[string]interface{}{"orderCode": orderCode}, "", "createTime desc", -1, -1)
+		if moneyCorrectionData != nil {
+			(*res)["moneyCorrectionData"] = moneyCorrectionData
+		} else {
+			(*res)["moneyCorrectionData"] = []map[string]interface{}{}
+		}
 		if param.Type == "VIP订阅" || param.Type == "超级订阅" { //VIP订阅
 			result = VipOrderDetails(res)
 		} else if param.Type == "数据报告" { //数据报告
@@ -540,6 +544,7 @@ func ConfirmRefund(context *admin.Context) (interface{}, error) {
 		IsOffline    int    `form:"isOffline"`    //是否线下订单 0-不是 1-是
 		RefundStatus int    `form:"refundStatus"` //退款状态  1-全额退款 2-部分退款
 		RefundMoney  int    `form:"refundMoney"`  //退款金额
+		RefundType   string `form:"refundType"`
 	})
 	err := context.Form(param)
 	if err != nil {
@@ -548,6 +553,9 @@ func ConfirmRefund(context *admin.Context) (interface{}, error) {
 	orderCode := param.OrderCode
 	qMap := map[string]interface{}{}
 	qMap["order_code"] = orderCode
+	if param.RefundType == "其他" {
+		param.RefundReason = ""
+	}
 	if param.IsOffline == 0 {
 		ok := util.JysqlDB.Update("dataexport_order", qMap, map[string]interface{}{
 			"refund_status": param.RefundStatus,
@@ -559,6 +567,7 @@ func ConfirmRefund(context *admin.Context) (interface{}, error) {
 				"refund_time":   qutil.NowFormat(qutil.Date_Full_Layout),
 				"refund_money":  param.RefundMoney,
 				"refund_reason": param.RefundReason,
+				"refund_type":   param.RefundType,
 			})
 			data := util.JysqlDB.Find("invoice", qMap, "", "create_time", 0, 0)
 			if *data != nil && len(*data) != 0 {
@@ -596,18 +605,23 @@ func ConfirmRefund(context *admin.Context) (interface{}, error) {
 			"refund_time":   qutil.NowFormat(qutil.Date_Full_Layout),
 			"refund_money":  param.RefundMoney,
 			"refund_reason": param.RefundReason,
+			"refund_type":   param.RefundType,
 		})
 		if okid > 0 {
 			orderData := util.JysqlDB.SelectBySql("select  (IFNULL( a.pay_money, 0 )-IFNULL(a.commission,0)-IFNULL(a.procedures_money,0))-(select  IFNULL(sum(b.return_money),0) from  return_money_record  b where b.order_code=a.order_code and  b.state=1) + (select  IFNULL(sum(c.refund_money),0) from refund_record c where c.order_code=a.order_code) as outstandingPayment,(IFNULL( a.pay_money, 0 )-IFNULL(a.commission,0)-IFNULL(a.procedures_money,0)) as moneys from dataexport_order a where  a.order_code=?", orderCode)
 			outstandingPayment := qutil.IntAll((*orderData)[0]["outstandingPayment"]) //未回款金额
 			moneys := qutil.IntAll((*orderData)[0]["moneys"])                         //应收金额
+			return_status := 0
 			if outstandingPayment == moneys {
 				param.RefundStatus = 1
+
 			} else if 0 < outstandingPayment && outstandingPayment < moneys {
 				param.RefundStatus = 2
+				return_status = 2
 			}
 			ok := util.JysqlDB.Update("dataexport_order", qMap, map[string]interface{}{
 				"refund_status": param.RefundStatus,
+				"return_status": return_status,
 			})
 			if ok {
 				return true, nil

src/order/otherOrderService.go

@@ -1460,8 +1460,12 @@ func UpdateBatchReturnInfo(transactionData *map[string]interface{}, orderArr map
 			}
 			if return_money == qutil.IntAll(value["outstandingPayment"]) {
 				updateData["return_status"] = 1
+				updateData["refund_status"] = 0
 			} else {
 				updateData["return_status"] = 2
+				if qutil.IntAll(value["refund_status"]) > 0 {
+					updateData["refund_status"] = 2
+				}
 			}
 			if qutil.IntAll(value["order_status"]) == 0 {
 				updateData["order_status"] = 1