From ac5c91d9017f4fc3dac1508b4cade5bd6a402769 Mon Sep 17 00:00:00 2001
From: "376654749@qq.com" <bobbin262246>
Date: Fri, 11 Mar 2022 15:29:14 +0800
Subject: [PATCH] adding generateOrder error msg logic

---
 .../module/system/royalcanin/CouponConfigService.java       | 6 +++---
 .../smartadmin/module/system/royalcanin/CouponService.java  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/CouponConfigService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/CouponConfigService.java
index 6c48dd4b..177aae6c 100644
--- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/CouponConfigService.java
+++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/CouponConfigService.java
@@ -51,17 +51,17 @@ public class CouponConfigService {
         com.alibaba.fastjson.JSONArray afterFilterArrary = new JSONArray();
         for(int i = 0;i < jsonArray.size();i ++){
             JSONObject jsonResult = (JSONObject)jsonArray.get(i);
-            if(jsonResult.getString("udf2") != null) {
+            if(jsonResult.getString("udf2") != null&& !"0".equals(jsonResult.getString("leftAllotment"))) {
                 Date compareDate = SmartDateUtil.parseYMD(jsonResult.get("fPublishTo").toString());
                 if ("H5".equals(jsonResult.getString("udf2"))&&"".equals(storeCode)&&!"".equals(productCode)) {
                     for(int g = 0 ;g<productCode.length;g++) {
-                        if (jsonResult.get("productCodes").toString().indexOf(productCode[g]) != -1&&compareDate.compareTo(currentDate)>=0) {
+                        if ((jsonResult.get("productCodes")!=null?jsonResult.get("productCodes").toString().indexOf(productCode[g]):"".indexOf(productCode[g])) != -1&&compareDate.compareTo(currentDate)>=0) {
                             afterFilterArrary.add(jsonResult);
                         }
                     }
                 }else if ("H5".equals(jsonResult.getString("udf2"))&&!"".equals(storeCode)&&!"".equals(productCode)){
                     for(int g = 0 ;g<productCode.length;g++) {
-                        if (jsonResult.get("productCodes").toString().indexOf(productCode[g]) != -1 && couponConfigFindAllEntity.getStoreCode().equals(jsonResult.get("storeCodes")!=null ?jsonResult.get("storeCodes").toString():"")&&compareDate.compareTo(currentDate)>=0) {
+                        if ((jsonResult.get("productCodes")!=null?jsonResult.get("productCodes").toString().indexOf(productCode[g]):"".indexOf(productCode[g])) != -1 && couponConfigFindAllEntity.getStoreCode().equals(jsonResult.get("storeCodes")!=null ?jsonResult.get("storeCodes").toString():"")&&compareDate.compareTo(currentDate)>=0) {
                             afterFilterArrary.add(jsonResult);
                         }
                     }
diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/CouponService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/CouponService.java
index 77dd2d53..ccf7fcfa 100644
--- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/CouponService.java
+++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/CouponService.java
@@ -57,7 +57,7 @@ public class CouponService {
                 if ("H5".equals(jsonResult.getString("udf2"))&&"".equals(productCode)) {
                         afterFilterArrary.add(jsonResult);
                 }else if ("H5".equals(jsonResult.getString("udf2"))&&!"".equals(productCode)){
-                    if (jsonResult.get("productCodes").toString().indexOf(productCode) != -1){
+                    if ((jsonResult.get("productCodes")!=null?jsonResult.get("productCodes").toString().indexOf(productCode):"".indexOf(productCode)) != -1){
                         afterFilterArrary.add(jsonResult);
                     }
                 }