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());