业绩统计时间更新修改

src/order/otherOrderService.go

@@ -1552,8 +1552,9 @@ func UpdateBatchReturnInfo(transactionData *map[string]interface{}, orderArr map
 			if qutil.IntAll(value["order_status"]) == 0 {
 				updateData["order_status"] = 1
 			}
+			contract := util.JysqlDB.FindOne("contract", map[string]interface{}{"order_code": qutil.ObjToString(value["order_code"])}, "", "")
 			count := util.JysqlDB.Count("return_money_record", map[string]interface{}{"order_code": qutil.ObjToString(value["order_code"])})
-			if count < 1 {
+			if count < 1 && contract != nil && qutil.IntAll((*contract)["contract_status"]) == 0 {
 				updateData["sale_time"] = (*transactionData)["BNKTIM"]
 			}
 			ok_1 := util.JysqlDB.UpdateByTx(tx, "dataexport_order", map[string]interface{}{"id": value["id"]}, updateData)
@@ -1625,9 +1626,10 @@ func ManualUpdateBatchReturnInfo(orderArr map[string]map[string]interface{}, ope
 			if qutil.IntAll(value["order_status"]) == 0 {
 				updateData["order_status"] = 1
 			}
+			contract := util.JysqlDB.FindOne("contract", map[string]interface{}{"order_code": qutil.ObjToString(value["order_code"])}, "", "")
 			count := util.JysqlDB.Count("return_money_record", map[string]interface{}{"order_code": qutil.ObjToString(value["order_code"])})
-			if count < 1 {
-				updateData["sale_time"] = param.BNKTIM
+			if count < 1 && contract != nil && qutil.IntAll((*contract)["contract_status"]) == 0 {
+				updateData["sale_time"] = (*transactionData)["BNKTIM"]
 			}
 			ok1 := util.JysqlDB.UpdateByTx(tx, "dataexport_order", map[string]interface{}{"id": value["id"]}, updateData)
 			ok2 := util.JysqlDB.InsertByTx(tx, "return_money_record", insertData)

userSync/src/server/server.go

@@ -126,8 +126,9 @@ func StartTask1() {
 						if !isExists || err != nil {
 							log.Println("自动回款匹配成功", id, orderCode)
 							updateData := map[string]interface{}{"return_status": 1}
+							contract := Mysql.FindOne("contract", map[string]interface{}{"order_code": orderCode}, "", "")
 							count := Mysql.Count("return_money_record", map[string]interface{}{"order_code": orderCode})
-							if count < 1 {
+							if count < 1 && contract != nil && qu.IntAll((*contract)["contract_status"]) == 0 {
 								updateData["sale_time"] = returnTime
 							}
 							returnId := Mysql.Insert("return_money_record", map[string]interface{}{