From e9390eb5f18d057bfd0a5bdfee7476eef32c334a Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Wed, 24 Jan 2024 12:40:24 +0800
Subject: [PATCH] 1/24

---
 .../yythmall/biz/customerstore/CustomerStoreService.java | 9 +++++++--
 .../yythmall/biz/shoppingcart/ShoppingCartService.java   | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/yxt/yythmall/biz/customerstore/CustomerStoreService.java b/src/main/java/com/yxt/yythmall/biz/customerstore/CustomerStoreService.java
index c213185..47ffffe 100644
--- a/src/main/java/com/yxt/yythmall/biz/customerstore/CustomerStoreService.java
+++ b/src/main/java/com/yxt/yythmall/biz/customerstore/CustomerStoreService.java
@@ -34,8 +34,8 @@ public class CustomerStoreService extends MybatisBaseService<CustomerStoreMapper
     LpkStoreService lpkStoreService;
     public ResultBean<CustomerStoreVo> getStoreBySid(String customerSid) {
         ResultBean rb=new ResultBean().fail();
-        CustomerStoreVo vo=new CustomerStoreVo();
-        vo=baseMapper.getStoreBySid(customerSid);
+
+        CustomerStoreVo vo=baseMapper.getStoreBySid(customerSid);
 
 //        if(null==vo){
 //         LpkStoreVo list= lpkStoreService.getAllStoreByQuery(new LpkStoreQuery()).getData().get(0);
@@ -47,6 +47,11 @@ public class CustomerStoreService extends MybatisBaseService<CustomerStoreMapper
 //            vo1=getStart(vo1);
 //            return rb.success().setData(vo1);
 //        }
+        if(null==vo){
+            CustomerStoreVo vo1=new CustomerStoreVo();
+            vo1=getStart(vo1);
+            return rb.success().setData(vo1);
+        }
         vo=getStart(vo);
         return rb.success().setData(vo);
     }
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 a13e2d8..420ec1c 100644
--- a/src/main/java/com/yxt/yythmall/biz/shoppingcart/ShoppingCartService.java
+++ b/src/main/java/com/yxt/yythmall/biz/shoppingcart/ShoppingCartService.java
@@ -123,7 +123,7 @@ public class ShoppingCartService extends MybatisBaseService<ShoppingCartMapper,
         vo.setRemarks("已减免附加额");
         if(weight<=99){
             if(weight<20){
-                vo.setRemarks("不足20斤，请继续选菜");
+                vo.setRemarks("不足20斤");
             }else{
                 double a =1.1;
                 double d=Double.valueOf(vo.getTotalPrice());