修改 订单唯一性判定

@@ -225,20 +225,14 @@ func (service OrderInfoService) CreateNewOrder(cmd command.CreateOrderCommand) (
 	}); err != nil {
 	}); err != nil {
 		return nil, lib.ThrowError(lib.TRANSACTION_ERROR, err.Error())
 		return nil, lib.ThrowError(lib.TRANSACTION_ERROR, err.Error())
 	}
 	}
-	//检查order_code是否重复
-	// if ok, err := orderBaseDao.OrderCodeExist(cmd.OrderCode, cmd.PartnerCategory, cmd.PartnerId); err != nil {
-	// 	return nil, lib.ThrowError(lib.TRANSACTION_ERROR, err.Error())
-	// } else if ok {
-	// 	return nil, lib.ThrowError(lib.BUSINESS_ERROR, "订单号已存在")
-	// }
-	//检查delivery_code是否重复
-	if len(cmd.DeliveryCode) > 0 {
-		if ok, err := orderBaseDao.DeliveryCodeExist(cmd.DeliveryCode, cmd.CompanyId); err != nil {
-			return nil, lib.ThrowError(lib.TRANSACTION_ERROR, err.Error())
-		} else if ok {
-			return nil, lib.ThrowError(lib.BUSINESS_ERROR, "发货号已存在")
-		}
+
+	if ok, err := orderBaseDao.CheckOrderExist(cmd.CompanyId, cmd.OrderCode, cmd.DeliveryCode,
+		cmd.PartnerCategory, cmd.PartnerId, 0); err != nil {
+		return nil, lib.ThrowError(lib.TRANSACTION_ERROR, err.Error())
+	} else if ok {
+		return nil, lib.ThrowError(lib.BUSINESS_ERROR, "订单已存在")
 	}
 	}
+
 	newOrder := &domain.OrderBase{
 	newOrder := &domain.OrderBase{
 		OrderType: cmd.OrderType, OrderCode: cmd.OrderCode,
 		OrderType: cmd.OrderType, OrderCode: cmd.OrderCode,
 		DeliveryCode: cmd.DeliveryCode,
 		DeliveryCode: cmd.DeliveryCode,
@@ -436,12 +430,10 @@ func (service OrderInfoService) UpdateOrderData(cmd command.UpdateOrderCommand)
 	// 	}
 	// 	}
 	// }
 	// }
 	//检查delivery_code是否重复
 	//检查delivery_code是否重复
-	if cmd.DeliveryCode != oldOrderData.DeliveryCode {
-		if ok, err := orderBaseDao.DeliveryCodeExist(cmd.DeliveryCode, cmd.CompanyId, cmd.Id); err != nil {
-			return nil, lib.ThrowError(lib.TRANSACTION_ERROR, err.Error())
-		} else if ok {
-			return nil, lib.ThrowError(lib.BUSINESS_ERROR, "发货号已存在")
-		}
+	if ok, err := orderBaseDao.CheckOrderExist(cmd.CompanyId, cmd.OrderCode, cmd.DeliveryCode, cmd.PartnerCategory, cmd.PartnerId, cmd.Id); err != nil {
+		return nil, lib.ThrowError(lib.TRANSACTION_ERROR, err.Error())
+	} else if ok {
+		return nil, lib.ThrowError(lib.BUSINESS_ERROR, "订单已存在")
 	}
 	}
 	//获取旧的订单中的商品
 	//获取旧的订单中的商品
 	oldOrderGoods, _, err = orderGoodRepository.Find(domain.OrderGoodFindQuery{
 	oldOrderGoods, _, err = orderGoodRepository.Find(domain.OrderGoodFindQuery{

@@ -23,26 +23,20 @@ func NewOrderBaseDao(transactionContext *transaction.TransactionContext) (*Order
 	}
 	}
 }
 }
 
 
-//OrderCodeExist 检查order_code是否重复
-//
-func (dao OrderBaseDao) OrderCodeExist(code string, partnerCategory int64, partnerId int64) (bool, error) {
+//CheckOrderUnique 检查订单的是否已存在
+//@companyId 公司id
+//@orderCode 订单号
+//@deliveryCode 发货单号
+//@partnerCategoryCode 合伙人类型编号
+func (dao OrderBaseDao) CheckOrderExist(companyId int64, orderCode string,
+	deliveryCode string, partnerCategory int64, partnerId int64, notId int64) (bool, error) {
 	tx := dao.transactionContext.GetDB()
 	tx := dao.transactionContext.GetDB()
-	m := &models.OrderBase{}
-	query := tx.Model(m).
-		Where("order_code=?", code).
+	query := tx.Model(&models.OrderBase{}).
+		Where("company_id=?", companyId).
+		Where("order_code=?", orderCode).
 		Where("partner_id=?", partnerId).
 		Where("partner_id=?", partnerId).
-		Where(`partner_category @>'{"id":?}'`, partnerCategory)
-	ok, err := query.Exists()
-	return ok, err
-}
-
-func (dao OrderBaseDao) DeliveryCodeExist(code string, companyId int64, notId ...int64) (bool, error) {
-	tx := dao.transactionContext.GetDB()
-	m := &models.OrderBase{}
-	query := tx.Model(m).Where("delivery_code=?", code).Where("company_id=?", companyId)
-	if len(notId) > 0 {
-		query = query.WhereIn("id not in(?)", notId)
-	}
+		Where(`partner_category @>'{"id":?}'`, partnerCategory).
+		Where("id<>?", notId)
 	ok, err := query.Exists()
 	ok, err := query.Exists()
 	return ok, err
 	return ok, err
 }
 }