From 4024f62a6cb9411d66f6d7f4725120cc7f61cb7c Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Fri, 7 May 2021 14:50:20 +0800
Subject: [PATCH] aa

---
 business/jxstore/cms/order.go         | 5 ++++-
 business/jxstore/partner/pdd/union.go | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/business/jxstore/cms/order.go b/business/jxstore/cms/order.go
index dfd120b31..3914e8a20 100644
--- a/business/jxstore/cms/order.go
+++ b/business/jxstore/cms/order.go
@@ -217,6 +217,7 @@ func NewUnionOrder(unionOrder *model.UnionOrder, orderStatus *model.UnionOrderSt
 		dao.Rollback(db, txDB)
 		return err
 	}
+	dao.WrapAddIDCULEntity(orderStatus, jxcontext.AdminCtx.GetUserName())
 	if err = dao.CreateEntityTx(txDB, orderStatus); err != nil {
 		dao.Rollback(db, txDB)
 		return err
@@ -233,7 +234,7 @@ func ChangeUnionOrder(unionOrder *model.UnionOrder, orderStatus *model.UnionOrde
 	var (
 		db = dao.GetDB()
 	)
-	globals.SugarLogger.Debugf("ChangeUnionOrder, unionorder:", utils.Format4Output(unionOrder, true))
+	globals.SugarLogger.Debugf("ChangeUnionOrder1, unionorder: %v", utils.Format4Output(unionOrder, true))
 	txDB, _ := dao.Begin(db)
 	defer func() {
 		if r := recover(); r != nil {
@@ -242,10 +243,12 @@ func ChangeUnionOrder(unionOrder *model.UnionOrder, orderStatus *model.UnionOrde
 		}
 	}()
 	unionOrder.Status = orderStatus.Status
+	globals.SugarLogger.Debugf("ChangeUnionOrder2, unionorder: %v", utils.Format4Output(unionOrder, true))
 	if _, err = dao.UpdateEntityTx(txDB, unionOrder, "Status"); err != nil {
 		dao.Rollback(db, txDB)
 		return err
 	}
+	dao.WrapAddIDCULEntity(orderStatus, jxcontext.AdminCtx.GetUserName())
 	if err = dao.CreateEntityTx(txDB, orderStatus); err != nil {
 		dao.Rollback(db, txDB)
 		return err
diff --git a/business/jxstore/partner/pdd/union.go b/business/jxstore/partner/pdd/union.go
index 40d32fbed..4506a405e 100644
--- a/business/jxstore/partner/pdd/union.go
+++ b/business/jxstore/partner/pdd/union.go
@@ -238,6 +238,7 @@ func GetUnionOrders() {
 				orderStatus.Comment = "售后中"
 			} else if detail.ReturnStatus == 2 {
 				orderStatus.Comment = "售后完成"
+				orderStatus.Status = model.UnionOrderStatusFail
 			}
 			//change
 			jxutils.CallMsgHandler(func() {