From c991eb3b06f26db26614fe5299b8cd44b700788c Mon Sep 17 00:00:00 2001
From: Admin <376654749@qq.com>
Date: Sat, 22 Jan 2022 07:39:22 +0000
Subject: [PATCH] fix

---
 .../module/system/royalcanin/good/OrderController.java        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java
index 60a46e4b..22e18121 100644
--- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java
+++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java
@@ -70,7 +70,7 @@ public class OrderController {
             orderDatilListEntity.setProductCode(ordersEntitys.getProductCode());
             orderDatilListEntity.setEcPrice(ordersEntitys.getPayAmount());
             orderDatilListJson.add(orderDatilListEntity);
-            if(ordersEntitys.getCouponCode() != "") {
+            if(ordersEntitys.getCouponCode() != "" && ordersEntitys.getCouponCode() != null) {
                 ordersEntity.setCouponAmount(ordersEntitys.getCouponAmount());
                 ordersEntity.setCouponCode(ordersEntitys.getCouponCode());
                 ordersEntity.setCouponName(ordersEntitys.getCouponName());
@@ -133,7 +133,7 @@ public class OrderController {
             orderDatilListEntity.setProductCode(ordersEntitys.getProductCode());
             orderDatilListEntity.setEcPrice(ordersEntitys.getPayAmount());
             orderDatilListJson.add(orderDatilListEntity);
-            if(ordersEntitys.getCouponCode() != "") {
+            if(ordersEntitys.getCouponCode() != "" && ordersEntitys.getCouponCode() != null) {
                 ordersEntity.setCouponAmount(ordersEntitys.getCouponAmount());
                 ordersEntity.setCouponCode(ordersEntitys.getCouponCode());
                 ordersEntity.setCouponName(ordersEntitys.getCouponName());