@@ -216,9 +216,15 @@ def consumer_info_api(request): |
||
216 | 216 |
try: |
217 | 217 |
brand = BrandInfo.objects.get(pk=brandID) |
218 | 218 |
except BrandInfo.DoesNotExist: |
219 |
- return response(ProductBrandStatusCode.BRAND_NOT_FOUND) |
|
219 |
+ brand = None |
|
220 | 220 |
except ValueError: |
221 |
- return response(ProductBrandStatusCode.BRAND_NOT_FOUND) |
|
221 |
+ brand = None |
|
222 |
+ |
|
223 |
+ if not brand: |
|
224 |
+ try: |
|
225 |
+ brand = BrandInfo.objects.get(brand_id=brandID) |
|
226 |
+ except BrandInfo.DoesNotExist: |
|
227 |
+ return response(ProductBrandStatusCode.BRAND_NOT_FOUND) |
|
222 | 228 |
|
223 | 229 |
try: |
224 | 230 |
model = ModelInfo.objects.get(pk=modelID) |
@@ -45,9 +45,15 @@ def clerk_sale_submit_api(request): |
||
45 | 45 |
try: |
46 | 46 |
brand = BrandInfo.objects.get(pk=brandID) |
47 | 47 |
except BrandInfo.DoesNotExist: |
48 |
- return response(ProductBrandStatusCode.BRAND_NOT_FOUND) |
|
48 |
+ brand = None |
|
49 | 49 |
except ValueError: |
50 |
- return response(ProductBrandStatusCode.BRAND_NOT_FOUND) |
|
50 |
+ brand = None |
|
51 |
+ |
|
52 |
+ if not brand: |
|
53 |
+ try: |
|
54 |
+ brand = BrandInfo.objects.get(brand_id=brandID) |
|
55 |
+ except BrandInfo.DoesNotExist: |
|
56 |
+ return response(ProductBrandStatusCode.BRAND_NOT_FOUND) |
|
51 | 57 |
|
52 | 58 |
try: |
53 | 59 |
model = ModelInfo.objects.get(pk=modelID) |
@@ -220,9 +226,15 @@ def clerk_integral_list_api(request): |
||
220 | 226 |
try: |
221 | 227 |
brand = BrandInfo.objects.get(pk=brandID) |
222 | 228 |
except BrandInfo.DoesNotExist: |
223 |
- return response(ProductBrandStatusCode.BRAND_NOT_FOUND) |
|
229 |
+ brand = None |
|
224 | 230 |
except ValueError: |
225 |
- return response(ProductBrandStatusCode.BRAND_NOT_FOUND) |
|
231 |
+ brand = None |
|
232 |
+ |
|
233 |
+ if not brand: |
|
234 |
+ try: |
|
235 |
+ brand = BrandInfo.objects.get(brand_id=brandID) |
|
236 |
+ except BrandInfo.DoesNotExist: |
|
237 |
+ return response(ProductBrandStatusCode.BRAND_NOT_FOUND) |
|
226 | 238 |
|
227 | 239 |
try: |
228 | 240 |
clerk = SaleclerkInfo.objects.get(brand_id=brand.brand_id, unionid=user.unionid, status=True) |