From 32665e44dbf3ee2289b2945f49870c8db534d3f9 Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Thu, 25 Jan 2024 16:59:26 +0800
Subject: [PATCH] 1/25

---
 .../yxt/yythmall/biz/empcard/EmpCardService.java    |  2 +-
 .../biz/empcardgift/EmpCardGiftService.java         |  2 +-
 .../biz/lpkgiftcard/LpkGiftCardService.java         |  2 +-
 .../biz/transferrecords/TransferRecordsService.java |  3 +++
 .../VegeCellarReserveOrderService.java              | 13 ++++---------
 .../biz/vegetablecellar/VegetableCellarService.java |  4 +++-
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/yxt/yythmall/biz/empcard/EmpCardService.java b/src/main/java/com/yxt/yythmall/biz/empcard/EmpCardService.java
index 31e309d..6496fac 100644
--- a/src/main/java/com/yxt/yythmall/biz/empcard/EmpCardService.java
+++ b/src/main/java/com/yxt/yythmall/biz/empcard/EmpCardService.java
@@ -144,7 +144,7 @@ public class EmpCardService extends MybatisBaseService<EmpCardMapper, EmpCard> {
         baseMapper.updateById(lpkGiftCard);
         List<vegeVo> k = baseMapper.getGoodsList(lpkGiftCard.getSid());
         VegetableCellarDto dto = new VegetableCellarDto();
-        dto.setCustomerSid(dto.getCustomerSid());
+        dto.setCustomerSid(bindCardDto.getCustomerSid());
         dto.setVos(k);
         vegetableCellarService.save1Goods(dto);
         vegeReplenishService.saveBindRecord(bindCardDto, "1");
diff --git a/src/main/java/com/yxt/yythmall/biz/empcardgift/EmpCardGiftService.java b/src/main/java/com/yxt/yythmall/biz/empcardgift/EmpCardGiftService.java
index 91069bf..41861ac 100644
--- a/src/main/java/com/yxt/yythmall/biz/empcardgift/EmpCardGiftService.java
+++ b/src/main/java/com/yxt/yythmall/biz/empcardgift/EmpCardGiftService.java
@@ -126,7 +126,7 @@ public class EmpCardGiftService extends MybatisBaseService<EmpCardGiftMapper, Em
         baseMapper.updateById(empCardGift);
         List<vegeVo> k = baseMapper.getGoodsList(empCardGift.getSid());
         VegetableCellarDto dto = new VegetableCellarDto();
-        dto.setCustomerSid(dto.getCustomerSid());
+        dto.setCustomerSid(bindCardDto.getCustomerSid());
         dto.setVos(k);
         vegetableCellarService.save1Goods(dto);
         vegeReplenishService.saveBindRecord(bindCardDto,"2");
diff --git a/src/main/java/com/yxt/yythmall/biz/lpkgiftcard/LpkGiftCardService.java b/src/main/java/com/yxt/yythmall/biz/lpkgiftcard/LpkGiftCardService.java
index 23af395..6372d12 100644
--- a/src/main/java/com/yxt/yythmall/biz/lpkgiftcard/LpkGiftCardService.java
+++ b/src/main/java/com/yxt/yythmall/biz/lpkgiftcard/LpkGiftCardService.java
@@ -166,7 +166,7 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
         ;
         System.out.println(a.substring(0, 2));
     }
-
+    @Transactional(rollbackFor = Exception.class)
     public ResultBean bindAllCard(BindCardDto bindCardDto) {
         ResultBean rb = new ResultBean().fail();
 
diff --git a/src/main/java/com/yxt/yythmall/biz/transferrecords/TransferRecordsService.java b/src/main/java/com/yxt/yythmall/biz/transferrecords/TransferRecordsService.java
index bd6aeda..be3dca0 100644
--- a/src/main/java/com/yxt/yythmall/biz/transferrecords/TransferRecordsService.java
+++ b/src/main/java/com/yxt/yythmall/biz/transferrecords/TransferRecordsService.java
@@ -53,6 +53,9 @@ public class TransferRecordsService extends MybatisBaseService<TransferRecordsMa
 
     public ResultBean submission(TransferRecordsDto dto) {
         ResultBean rb = new ResultBean().fail();
+        if(StringUtils.isBlank(dto.getCustomerSid())){
+            return rb.setMsg("参数不全");
+        }
         TransferRecords order = new TransferRecords();
         BeanUtil.copyProperties(dto, order, "id", "sid");
         
diff --git a/src/main/java/com/yxt/yythmall/biz/vegecallerreserveorder/VegeCellarReserveOrderService.java b/src/main/java/com/yxt/yythmall/biz/vegecallerreserveorder/VegeCellarReserveOrderService.java
index b6f8070..38bb2be 100644
--- a/src/main/java/com/yxt/yythmall/biz/vegecallerreserveorder/VegeCellarReserveOrderService.java
+++ b/src/main/java/com/yxt/yythmall/biz/vegecallerreserveorder/VegeCellarReserveOrderService.java
@@ -38,20 +38,12 @@ import java.util.Map;
 public class VegeCellarReserveOrderService extends MybatisBaseService<VegeCellarReserveOrderMapper, VegeCellarReserveOrder> {
     @Autowired
     VegeCellarReserveDetailsService vegeCellarReserveDetailsService;
-    //    @Autowired
-//    LpkGiftCardMapper lpkGiftCardMapper;
-//    @Autowired
-//    LpkGiftBagGoodsService lpkGiftBagGoodsService;
     @Autowired
     LpkStoreService lpkStoreService;
-    //    @Autowired
-//    private FileUploadComponent fileUploadComponent;
+
     @Autowired
     private LpkGoodsService lpkGoodsService;
 
-    //    @Autowired
-//    private HttpServletResponse response;
-//
     @Transactional(rollbackFor = Exception.class)
     public ResultBean submission(VegeCellarReserveOrderDto dto) {
         ResultBean rb = new ResultBean().fail();
@@ -59,6 +51,9 @@ public class VegeCellarReserveOrderService extends MybatisBaseService<VegeCellar
         if (!b) {
             return rb.setMsg("周六、周日不能预约提货");
         }
+        if(StringUtils.isBlank(dto.getCustomerSid())){
+            return rb.setMsg("参数不全");
+        }
         VegeCellarReserveOrder order = new VegeCellarReserveOrder();
         LpkStore lpkStore = lpkStoreService.getOne(new QueryWrapper<LpkStore>().eq("sid", dto.getStoreSid()));
         BeanUtil.copyProperties(dto, order, "id", "sid");
diff --git a/src/main/java/com/yxt/yythmall/biz/vegetablecellar/VegetableCellarService.java b/src/main/java/com/yxt/yythmall/biz/vegetablecellar/VegetableCellarService.java
index 092c7d6..9edc9ef 100644
--- a/src/main/java/com/yxt/yythmall/biz/vegetablecellar/VegetableCellarService.java
+++ b/src/main/java/com/yxt/yythmall/biz/vegetablecellar/VegetableCellarService.java
@@ -56,6 +56,9 @@ public class VegetableCellarService extends MybatisBaseService<VegetableCellarMa
     public ResultBean addGoods(String mainSid) {
         ResultBean rb = ResultBean.fireFail();
         OrdOrder ordOrder=ordOrderService.getOne(new QueryWrapper<OrdOrder>().eq("mainSid",mainSid));
+        if(ordOrder.getPayStatus()!=2){
+            return rb.setMsg("此订单不可用");
+        }
         List<OrdOrderDetail> detailList=ordOrderDetailService.list(new QueryWrapper<OrdOrderDetail>().eq("orderSid",ordOrder.getSid()));
         for(OrdOrderDetail detail:detailList){
             LpkGoods cl=lpkGoodsService.getOne(new QueryWrapper<LpkGoods>().eq("sid",detail.getGoodsSid()));
@@ -84,7 +87,6 @@ public class VegetableCellarService extends MybatisBaseService<VegetableCellarMa
     @Transactional(rollbackFor = Exception.class)
     public ResultBean saveGoods(VegetableCellarDto  dto) {
         ResultBean rb = ResultBean.fireFail();
-
         List<ShoppingCart> carts=shoppingCartService.list(new QueryWrapper<ShoppingCart>().eq("customerSid",dto.getCustomerSid()).eq("affiliation",dto.getBrandId()));
         for(ShoppingCart detail:carts){
             VegetableCellar vegetableCellar=baseMapper.selectOne(new QueryWrapper<VegetableCellar>().eq("customerSid",dto.getCustomerSid())