From ea019a8a26643d2a1be552cfc8615236bd847413 Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Mon, 29 Jan 2024 18:05:47 +0800
Subject: [PATCH] 1/29

---
 .../biz/newcomerrecorecord/NewcomerRecoRecordService.java     | 4 ++++
 .../yxt/yythmall/biz/shoppingcart/ShoppingCartService.java    | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/yxt/yythmall/biz/newcomerrecorecord/NewcomerRecoRecordService.java b/src/main/java/com/yxt/yythmall/biz/newcomerrecorecord/NewcomerRecoRecordService.java
index db4f03d..6f7fe5f 100644
--- a/src/main/java/com/yxt/yythmall/biz/newcomerrecorecord/NewcomerRecoRecordService.java
+++ b/src/main/java/com/yxt/yythmall/biz/newcomerrecorecord/NewcomerRecoRecordService.java
@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.yythmall.api.lpkcustomer.LpkCustomer;
 import com.yxt.yythmall.api.newcomerrecorecord.NewcomerRecoRecord;
@@ -69,6 +70,9 @@ public class NewcomerRecoRecordService extends MybatisBaseService<NewcomerRecoRe
         if(newcomer!=null){
             return rb.success();
         }
+        if(StringUtils.isBlank(dto.getOrderSid())){
+            return rb.success();
+        }
         LpkCustomer customer=lpkCustomerService.getOne(new QueryWrapper<LpkCustomer>().eq("sid",dto.getCustomerSid()));
         if(null==customer){
             return rb.setMsg("参数不全");
diff --git a/src/main/java/com/yxt/yythmall/biz/shoppingcart/ShoppingCartService.java b/src/main/java/com/yxt/yythmall/biz/shoppingcart/ShoppingCartService.java
index d5cdf41..bab4922 100644
--- a/src/main/java/com/yxt/yythmall/biz/shoppingcart/ShoppingCartService.java
+++ b/src/main/java/com/yxt/yythmall/biz/shoppingcart/ShoppingCartService.java
@@ -174,7 +174,7 @@ public class ShoppingCartService extends MybatisBaseService<ShoppingCartMapper,
                 if(DoubleUtils.removeZeros(c).equals("0")){
                     vo.setRemarks("");
                 }else{
-                    vo.setRemarks("优惠" + removeZeros(c) + "元");
+                    vo.setRemarks("已优惠" + removeZeros(c) + "元");
                 }
             }
             return vo;