作者 唐旭辉

修复bug:检查订单唯一性时条件缺损

@@ -34,6 +34,7 @@ func (dao OrderBaseDao) CheckOrderExist(companyId int64, orderCode string, @@ -34,6 +34,7 @@ func (dao OrderBaseDao) CheckOrderExist(companyId int64, orderCode string,
34 query := tx.Model(&models.OrderBase{}). 34 query := tx.Model(&models.OrderBase{}).
35 Where("company_id=?", companyId). 35 Where("company_id=?", companyId).
36 Where("order_code=?", orderCode). 36 Where("order_code=?", orderCode).
  37 + Where("delivery_code=?", deliveryCode).
37 Where("partner_id=?", partnerId). 38 Where("partner_id=?", partnerId).
38 Where(`partner_category @>'{"id":?}'`, partnerCategory). 39 Where(`partner_category @>'{"id":?}'`, partnerCategory).
39 Where("id<>?", notId) 40 Where("id<>?", notId)