未归档修改业绩时间、企业版大会员超级订阅创建两条权限

src/order/orderManageController.go

@@ -3636,7 +3636,6 @@ func AutomaticallyCreatingEnt(name, phone, orderCode string, orderStatus int, us
 	if orderStatus != 1 || !reg.MatchString(phone) || name == "" {
 		return 0, nil, ""
 	}
-	log.Println("config.SysConfigs.CreatEntRpc", config.SysConfigs.CreatEntRpc)
 	r, err := rpc.DialHTTP("tcp", config.SysConfigs.CreatEntRpc)
 	if err != nil {
 		return entId, err, ""
@@ -3725,7 +3724,7 @@ func EntLicense(entId, empowerCount, provinceCount, orderId, userCount int, prod
 			util.JysqlDB.Insert("entniche_order", inData)
 			if userCount > 0 {
 				if user != nil && len(*user) > 0 {
-					sql := "SELECT  COUNT(1)  FROM  entniche_power a  INNER JOIN entniche_wait_empower b ON a.wait_empower_id = b.id  where  a.ent_id=" + fmt.Sprint(entId) + " and a.ent_user_id=" + qutil.InterfaceToStr((*user)["id"]) + " and  a.`status`=1 and  b.product_type='" + productType + "'"
+					sql := "SELECT  COUNT(1)  FROM  entniche_power a  INNER JOIN entniche_wait_empower b ON a.wait_empower_id = b.id  where  a.ent_id=" + fmt.Sprint(entId) + " and a.ent_user_id=" + qutil.InterfaceToStr((*user)["id"]) + " and  a.`status`=1"
 					number := util.JysqlDB.CountBySql(sql)
 					if number == 0 {
 						util.JysqlDB.Insert("entniche_power", map[string]interface{}{"wait_empower_id": id,

src/order/otherOrderService.go

@@ -1567,7 +1567,7 @@ func UpdateBatchReturnInfo(transactionData *map[string]interface{}, orderArr map
 			}
 			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 && contract != nil && qutil.IntAll((*contract)["contract_status"]) == 0 {
+			if count < 1 && contract != nil && qutil.IntAll((*contract)["contract_archive_status"]) != 1 {
 				updateData["sale_time"] = (*transactionData)["BNKTIM"]
 			}
 			ok_1 := util.JysqlDB.UpdateByTx(tx, "dataexport_order", map[string]interface{}{"id": value["id"]}, updateData)
@@ -1641,7 +1641,7 @@ func ManualUpdateBatchReturnInfo(orderArr map[string]map[string]interface{}, ope
 			}
 			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 && contract != nil && qutil.IntAll((*contract)["contract_status"]) == 0 {
+			if count < 1 && contract != nil && qutil.IntAll((*contract)["contract_archive_status"]) != 1 {
 				updateData["sale_time"] = param.BNKTIM
 			}
 			ok1 := util.JysqlDB.UpdateByTx(tx, "dataexport_order", map[string]interface{}{"id": value["id"]}, updateData)

userSync/src/server/server.go

@@ -128,7 +128,7 @@ func StartTask1() {
 							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 && contract != nil && qu.IntAll((*contract)["contract_status"]) == 0 {
+							if count < 1 && contract != nil && qu.IntAll((*contract)["contract_archive_status"]) != 1 {
 								updateData["sale_time"] = returnTime
 							}
 							returnId := Mysql.Insert("return_money_record", map[string]interface{}{