购物车时效性

crmeb-admin/src/main/java/com/zbkj/admin/controller/merchant/NewMerchantApi.java

@@ -496,7 +496,7 @@ public class NewMerchantApi {
             String[] split = phone.split(",");
             LambdaQueryWrapper<User> queryWrapper2 = new LambdaQueryWrapper<>();
             queryWrapper2.in(User::getPhone, split);
-            queryWrapper2.eq(User::getPhone, 0);
+            queryWrapper2.eq(User::getIsLogoff, 0);
             List<User> list = userService.list(queryWrapper2);
             return CommonResult.success(CommonPage.restPage(CommonPage.copyPageInfo(page, list)));
         } else {

crmeb-common/src/main/java/com/zbkj/common/model/cat/CartShare.java

@@ -60,6 +60,9 @@ public class CartShare implements Serializable {
     @ApiModelProperty(value = "购物车分享时间")
     private Date startTime;
 
+    @ApiModelProperty(value = "过期时间")
+    private Integer hour;
+
     @ApiModelProperty(value = "购物车到期时间")
     private Date endTime;
 

crmeb-front/src/main/java/com/zbkj/front/controller/NewFrontApi.java

@@ -341,8 +341,6 @@ public class NewFrontApi {
     @ApiOperation(value = "获取小程序码")
     @RequestMapping(value = "/getwxacode", method = RequestMethod.POST)
     public CommonResult<String> getwxacode(@RequestBody @Validated GetwxacodeRequest getwxacodeRequest) {
-
-
         String image = aaaService.getImage(getwxacodeRequest);
         return CommonResult.success(image);
     }

crmeb-front/src/main/java/com/zbkj/front/service/impl/AAAServiceImpl.java

@@ -4,12 +4,16 @@ package com.zbkj.front.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.zbkj.common.model.cat.Cart;
 import com.zbkj.common.model.cat.CartShare;
+import com.zbkj.common.model.system.SystemConfig;
+import com.zbkj.common.model.system.SystemFormTemp;
 import com.zbkj.common.request.GetwxacodeRequest;
 import com.zbkj.common.request.SmsPayRequest;
 import com.zbkj.common.utils.RedisUtil;
 import com.zbkj.front.service.AAAService;
 import com.zbkj.service.service.CartService;
 import com.zbkj.service.service.CartShareService;
+import com.zbkj.service.service.SystemConfigService;
+import com.zbkj.service.service.SystemFormTempService;
 import org.apache.commons.io.IOUtils;
 import org.apache.poi.ss.formula.functions.IDStarAlgorithm;
 import org.springframework.beans.BeanUtils;
@@ -35,6 +39,7 @@ import java.nio.charset.StandardCharsets;
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 
 
@@ -47,6 +52,8 @@ public class AAAServiceImpl implements AAAService {
     private CartService cartService;
     @Autowired
     private CartShareService cartShareService;
+    @Autowired
+    private SystemConfigService systemConfigService;
 
     private static final String APP_ID = "wx2198b51c8406aed0";
 
@@ -75,6 +82,9 @@ public class AAAServiceImpl implements AAAService {
         for (CartShare cartShare : cartShareList) {
             cartShare.setStartTime(new Date());
         }
+
+
+
         cartShareService.updateBatchById(cartShareList);
 
 

crmeb-service/src/main/java/com/zbkj/service/service/impl/CartServiceImpl.java

@@ -18,6 +18,7 @@ import com.zbkj.common.model.cat.CartShare;
 import com.zbkj.common.model.merchant.Merchant;
 import com.zbkj.common.model.product.Product;
 import com.zbkj.common.model.product.ProductAttrValue;
+import com.zbkj.common.model.system.SystemConfig;
 import com.zbkj.common.model.user.User;
 import com.zbkj.common.request.CartNumRequest;
 import com.zbkj.common.request.CartRequest;
@@ -64,6 +65,8 @@ public class CartServiceImpl extends ServiceImpl<CartDao, Cart> implements CartS
     private ProductRelationService productRelationService;
     @Autowired
     private CartShareService cartShareService;
+    @Autowired
+    private SystemConfigService systemConfigService;
 
     /**
      * 列表
@@ -137,16 +140,25 @@ public class CartServiceImpl extends ServiceImpl<CartDao, Cart> implements CartS
         lqw.in(CartShare::getId, ids);
         lqw.orderByDesc(CartShare::getId);
         List<CartShare> cartList = cartShareDao.selectList(lqw);
-//        for (CartShare cartShare : cartList) {
-//            Date endTime = cartShare.getEndTime();
-//            Date date = new Date();
-//            if (date.after(endTime)){
-//                cartShare.setIsInvalid(0);
-//            }else {
-//                cartShare.setIsInvalid(1);
-//            }
-//            cartShareDao.updateById(cartShare);
-//        }
+        for (CartShare cartShare : cartList) {
+            HashMap<String, String> info = systemConfigService.info(58);
+            String loseTime = info.get("loseTime");
+
+            Date dt = cartShare.getStartTime();
+            Calendar rightNow = Calendar.getInstance();
+            rightNow.setTime(dt);
+            rightNow.add(Calendar.HOUR, Integer.parseInt(loseTime));
+            Date endTime = rightNow.getTime();
+
+            Date date = new Date();
+
+            if (date.after(endTime)) {
+                cartShare.setIsInvalid(0);
+            } else {
+                cartShare.setIsInvalid(1);
+            }
+            cartShareDao.updateById(cartShare);
+        }
 
         if (CollUtil.isEmpty(cartList)) {
             return CollUtil.newArrayList();
@@ -159,12 +171,15 @@ public class CartServiceImpl extends ServiceImpl<CartDao, Cart> implements CartS
             CartMerchantResponse merchantResponse = new CartMerchantResponse();
             merchantResponse.setMerId(merId);
             merchantResponse.setIsInvalid(1);
-//            for (CartShare cartShare : cartList) {
-//                if (0==cartShare.getIsInvalid()){
-//                    merchantResponse.setIsInvalid(0);
-//                }
-//
-//            }
+            for (CartShare cartShare : cartList) {
+                if (null != cartShare.getIsInvalid()) {
+                    if (0 == cartShare.getIsInvalid()) {
+                        merchantResponse.setIsInvalid(0);
+                    }
+                } else {
+                    merchantResponse.setIsInvalid(0);
+                }
+            }
             merchantResponse.setMerName(merchantMap.get(merId).getName());
             List<CartShare> merCartList = cartList.stream().filter(e -> e.getMerId().equals(merId)).collect(Collectors.toList());
             List<CartInfoResponse> infoResponseList = merCartList.stream().map(storeCart -> {
@@ -320,7 +335,7 @@ public class CartServiceImpl extends ServiceImpl<CartDao, Cart> implements CartS
             Cart forUpdateStoreCart = getByUniqueAndUid(cartRequest.getProductAttrUnique(), currentUser.getId());
             CartShare forUpdateStoreCartShare = getCartShareByUniqueAndUid(cartRequest.getProductAttrUnique(), currentUser.getId());
 
-            if (ObjectUtil.isNotNull(forUpdateStoreCart)&&ObjectUtil.isNotNull(forUpdateStoreCartShare)) { // 购物车添加数量
+            if (ObjectUtil.isNotNull(forUpdateStoreCart) && ObjectUtil.isNotNull(forUpdateStoreCartShare)) { // 购物车添加数量
                 forUpdateStoreCart.setCartNum(forUpdateStoreCart.getCartNum() + cartRequest.getCartNum());
                 updateCartList.add(forUpdateStoreCart);
 

crmeb-service/src/main/java/com/zbkj/service/service/impl/SystemConfigServiceImpl.java

@@ -118,11 +118,11 @@ public class SystemConfigServiceImpl extends ServiceImpl<SystemConfigDao, System
     public Boolean saveForm(SystemFormCheckRequest systemFormCheckRequest) {
         //检测form表单，并且返回需要添加的数据
         systemFormTempService.checkForm(systemFormCheckRequest);
-        List<SystemFormItemCheckRequest> fields = systemFormCheckRequest.getFields();
-        for (SystemFormItemCheckRequest field : fields) {
-            Integer value = Integer.valueOf(field.getValue());
-            this.loseTime(value);
-        }
+//        List<SystemFormItemCheckRequest> fields = systemFormCheckRequest.getFields();
+//        for (SystemFormItemCheckRequest field : fields) {
+//            Integer value = Integer.valueOf(field.getValue());
+//            this.loseTime(value);
+//        }
 
         List<SystemConfig> systemConfigList = new ArrayList<>();
         //批量添加
@@ -452,6 +452,7 @@ public class SystemConfigServiceImpl extends ServiceImpl<SystemConfigDao, System
             rightNow.add(Calendar.HOUR, loseTime);
             Date dt1 = rightNow.getTime();
             cartShare.setEndTime(dt1);
+            cartShare.setHour(loseTime);
         }
         cartShareService.updateBatchById(list);