更新 订单归集 销售渠道

account_order/account_order_change.go

@@ -284,7 +284,8 @@ func allDataOrderSaleRecordForAccountOrderChange() {
 					account_order_change.SigningSubject = "北京拓普丰联信息科技股份有限公司"
 				}
 				account_order_change.OrderChannel = data_exOrder.OrderChannel
-				account_order_change.DistributionChannel = data_exOrder.DistributionChannel
+				account_order_change.DistributionChannel = order_sale_record.DistributionChannel
+				//account_order_change.DistributionChannel = data_exOrder.DistributionChannel
 				if data_exOrder.IsBackstageOrder == 0 {
 					account_order_change.IsBackstageOrder = "否"
 				} else if data_exOrder.IsBackstageOrder == 1 {
@@ -582,7 +583,8 @@ func allDataRefundRecordForAccountOrderChange() {
 					account_order_change.SigningSubject = "北京拓普丰联信息科技股份有限公司"
 				}
 				account_order_change.OrderChannel = data_exOrder.OrderChannel
-				account_order_change.DistributionChannel = data_exOrder.DistributionChannel
+				account_order_change.DistributionChannel = order_sale_record.DistributionChannel
+				//account_order_change.DistributionChannel = data_exOrder.DistributionChannel
 				if data_exOrder.IsBackstageOrder == 0 {
 					account_order_change.IsBackstageOrder = "否"
 				} else if data_exOrder.IsBackstageOrder == 1 {

account_order/account_return.go

@@ -184,7 +184,8 @@ func allDataReturnMoneyRecordForAccountReturn() {
 				account_return.BankFlow = return_money_record.BankFlow
 				account_return.BankName = return_money_record.BankName
 				account_return.OrderChannel = data_exOrder.OrderChannel //下单渠道
-				account_return.DistributionChannel = data_exOrder.DistributionChannel
+				//account_return.DistributionChannel = data_exOrder.DistributionChannel
+				account_return.DistributionChannel = order_sale_record.DistributionChannel
 				//退款状态
 				switch data_exOrder.RefundStatus {
 				case 1:
@@ -293,7 +294,7 @@ func allDataDataexportOrderForAccountReturn() {
 						log.Info("allDataDataexportOrderForAccountReturn, filter.json.Unmarshal", zap.Error(err), zap.Any("data_exOrder.Filter", data_exOrder.Filter), zap.String("OrderCode", data_exOrder.OrderCode))
 					}
 				}
-				
+
 				// 规格
 				if data_exOrder.ProductType == "大会员" || data_exOrder.ProductType == "大会员-子账号" || data_exOrder.ProductType == "大会员-补充包" {
 					switch util.IntAll(filterMap["level"]) {
@@ -382,7 +383,8 @@ func allDataDataexportOrderForAccountReturn() {
 				//下单渠道
 				account_return.OrderChannel = data_exOrder.OrderChannel
 				//销售渠道-distribution_channel
-				account_return.DistributionChannel = data_exOrder.DistributionChannel
+				//account_return.DistributionChannel = data_exOrder.DistributionChannel
+				account_return.DistributionChannel = order_sale_record.DistributionChannel
 				//退款状态-refund_status
 				switch data_exOrder.RefundStatus {
 				case 1:
@@ -392,7 +394,7 @@ func allDataDataexportOrderForAccountReturn() {
 				case 0:
 					account_return.RefundStatus = "未退款"
 				}
-				account_return.OperateType = "自动回款"       //关联方式
+				account_return.OperateType = "自动回款"           //关联方式
 				account_return.OperatePerson = "jianyu@admin" //创建人
 				account_return.DataexportOrderID = data_exOrder.ID
 				account_return.ReturnMoneyRecordState = 1

account_order/account_return_change.go

@@ -182,7 +182,8 @@ func allDataOrderSaleRecordForAccountReturnChange() {
 					account_return_change.BankFlow = return_money_record.BankFlow
 					account_return_change.BankName = return_money_record.BankName
 					account_return_change.OrderChannel = data_exOrder.OrderChannel
-					account_return_change.DistributionChannel = data_exOrder.DistributionChannel
+					//account_return_change.DistributionChannel = data_exOrder.DistributionChannel
+					account_return_change.DistributionChannel = order_sale_record.DistributionChannel
 					//退款状态
 					switch data_exOrder.RefundStatus {
 					case 1:
@@ -375,7 +376,8 @@ func allDataRefundRecordForAccountReturnChange() {
 				//下单渠道
 				account_return_change.OrderChannel = data_exOrder.OrderChannel
 				//销售渠道
-				account_return_change.DistributionChannel = data_exOrder.DistributionChannel
+				//account_return_change.DistributionChannel = data_exOrder.DistributionChannel
+				account_return_change.DistributionChannel = order_sale_record.DistributionChannel
 				//退款状态
 				switch data_exOrder.RefundStatus {
 				case 1: