首页弹窗接口

kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/feign/RemoteKxsProductService.java

@@ -194,4 +194,13 @@ public interface RemoteKxsProductService {
 	 */
 	@GetExchange("/shop/shopOrderTimeout")
 	void shopOrderTimeout(@RequestHeader(SecurityConstants.FROM) String fromIn);
+
+	/**
+	 * 查询30分钟内绑定的机器
+	 *
+	 * @param fromIn 从中
+	 * @return {@link List}<{@link String}>
+	 */
+	@GetExchange("/machine/loadByPrePosBind30minute")
+	List<String> loadByPrePosBind30minute(@RequestHeader(SecurityConstants.FROM) String fromIn);
 }

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/controller/kxsapp/MachineController.java

@@ -249,6 +249,17 @@ public class MachineController {
         return R.ok(kxsMachineService.searchStoreMachine(page, param));
     }
 
+    /**
+     * 查询30分钟内绑定的机器
+     *
+     * @return {@link R}
+     */
+    @GetMapping("/loadByPrePosBind30minute")
+    public R loadByPrePosBind30minute() {
+
+        return R.ok(kxsMachineService.loadByPrePosBind30minute());
+    }
+
     /**
      * 通过id查询信息
      *

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/mapper/KxsMachineMapper.java

@@ -123,5 +123,6 @@ public interface KxsMachineMapper extends BaseMapper<KxsMachine> {
      * @return
      */
     Integer getActivityMachineByIdAndTime(@Param("param")GetActivityMachineByIdAndTimeDTO param,@Param("brandId") Long brandId);
+
 }
 

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/KxsMachineService.java

@@ -146,5 +146,13 @@ public interface KxsMachineService extends IService<KxsMachine> {
      */
     R updatePledge(MachineUpdatePledgeDTO param);
 
+    /**
+     * 查询30分钟内绑定的机器
+     *
+     * @return {@link List}<{@link String}>
+     */
+    List<String> loadByPrePosBind30minute();
+
+
 }
 

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/impl/KxsMachineServiceImpl.java

@@ -364,6 +364,30 @@ public class KxsMachineServiceImpl extends ServiceImpl<KxsMachineMapper, KxsMach
 
     }
 
+    @Override
+    public List<String> loadByPrePosBind30minute() {
+
+        List<KxsMachine> list = list(Wrappers.<KxsMachine>query()
+                .select("pos_sn")
+                .between("bind_time", LocalDateTime.now().minusMinutes(30), LocalDateTime.now())
+                .eq("user_id", SecurityUtils.getUser().getId()));
+
+
+        return list.stream()
+                .map(KxsMachine::getPosSn)
+                .collect(Collectors.toList());
+    }
+
+
+
+
+
+
+
+
+
+
+
 
 }
 

kxs-store/kxs-store-biz/src/main/java/com/kxs/store/biz/controller/kxsapp/StoreController.java

@@ -1,9 +1,11 @@
 package com.kxs.store.biz.controller.kxsapp;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.kxs.common.core.util.R;
 import com.kxs.common.security.util.SecurityUtils;
 import com.kxs.store.api.dto.kxsapp.store.StoreSearchListDTO;
+import com.kxs.store.api.model.KxsWarehouse;
 import com.kxs.store.api.vo.kxsapp.store.*;
 import com.kxs.store.biz.service.*;
 import jakarta.validation.Valid;
@@ -36,6 +38,17 @@ public class StoreController {
 
 
 
+    /**
+     * 是否有仓库
+     *
+     */
+    @GetMapping("/isExistWhs")
+    public R isExistWhs() {
+
+        return R.ok(kxsWarehouseService.count(Wrappers.<KxsWarehouse>lambdaQuery()
+                .eq(KxsWarehouse::getUserId, SecurityUtils.getUser().getId())));
+    }
+
     /**
      * 搜索仓库列表
      *

kxs-store/kxs-store-biz/src/main/java/com/kxs/store/biz/controller/kxsapp/UserAdvanceController.java

@@ -33,7 +33,27 @@ public class UserAdvanceController {
     private final KxsMachineAdvanceService kxsMachineAdvanceService;
     private final KxsForAmountWithdrawService kxsForAmountWithdrawService;
 
+    /**
+     * 25-29天预发机弹窗接口
+     *
+     * @return {@link R}
+     */
+    @GetMapping("/userPrePosModal")
+    public R userPrePosModal() {
+
+        return R.ok(kxsMachineAdvanceService.userPrePosModal());
+    }
 
+    /**
+     * 预发机已绑定未申请弹窗
+     *
+     * @return {@link R}
+     */
+    @GetMapping("/userPrePosBindModal")
+    public R userPrePosBindModal() {
+
+        return R.ok(kxsMachineAdvanceService.userPrePosBindModal());
+    }
 
     /**
      * 用户预发机额度初始化

kxs-store/kxs-store-biz/src/main/java/com/kxs/store/biz/mapper/KxsMachineAdvanceMapper.java

@@ -83,5 +83,14 @@ public interface KxsMachineAdvanceMapper extends BaseMapper<KxsMachineAdvance> {
      * @return {@link Long}
      */
     Long selectWarehouseUserCount(Integer warehouseId);
+
+    /**
+     * 选择最大天数预超时
+     *
+     * @param userId 用户 ID
+     * @return {@link Integer}
+     */
+    Integer selectMaxDayPreTimeout(Long userId);
+
 }
 

kxs-store/kxs-store-biz/src/main/java/com/kxs/store/biz/service/KxsMachineAdvanceService.java

@@ -78,5 +78,22 @@ public interface KxsMachineAdvanceService extends IService<KxsMachineAdvance> {
      * @return {@link IPage}<{@link UserAdvanceListVO}>
      */
     List<UserAdvanceListVO> advanceUserList();
+
+    /**
+     * 用户预发机最大天数
+     *
+     * @return {@link Integer}
+     */
+    Integer userPrePosModal();
+
+
+    /**
+     * 预发机已绑定未申请
+     *
+     * @return {@link List}<{@link String}>
+     */
+    List<String> userPrePosBindModal();
+
+
 }
 

kxs-store/kxs-store-biz/src/main/java/com/kxs/store/biz/service/impl/KxsMachineAdvanceServiceImpl.java

@@ -150,9 +150,7 @@ public class KxsMachineAdvanceServiceImpl extends ServiceImpl<KxsMachineAdvanceM
 
         machineAdvanceInfo.setIsReturn(CommonConstants.SUCCESS);
         machineAdvanceInfo.setReturnTime(LocalDateTime.now());
-        //直接删除记录
-        kxsMachineAdvanceInfoMapper.deleteById(machineAdvanceInfo.getId());
-        baseMapper.deleteById(machineAdvanceInfo.getOrderId());
+
 
         //修改状态为在库
         KxsMachine machine = new KxsMachine();
@@ -164,10 +162,10 @@ public class KxsMachineAdvanceServiceImpl extends ServiceImpl<KxsMachineAdvanceM
             throw new GlobalCustomerException(ErrorTypeEnum.REMOTE_DATA_ERROR.getDescription());
         }
 
-        if(Objects.equals(machineAdvanceInfo.getIsUseAmount(), CommonConstants.SUCCESS)){
+        //查询主订单预发机
+        KxsMachineAdvance kxsMachineAdvance = baseMapper.selectById(machineAdvanceInfo.getOrderId());
 
-            //查询主订单预发机
-            KxsMachineAdvance kxsMachineAdvance = baseMapper.selectById(machineAdvanceInfo.getOrderId());
+        if(Objects.equals(machineAdvanceInfo.getIsUseAmount(), CommonConstants.SUCCESS)){
 
             //查询品牌
             R<KxsBrand> kxsBrandR = remoteKxsProductService.loadByBrand(kxsMachineAdvance.getBrandId(), SecurityConstants.FROM_IN);
@@ -181,8 +179,9 @@ public class KxsMachineAdvanceServiceImpl extends ServiceImpl<KxsMachineAdvanceM
             //增加仓库已用额度减少仓库可用额度
             kxsWarehouseLimitService.refreshWarehouseAmount(kxsMachineAdvance.getSendUserId(), price, KindTypeEnum.ADD.getType());
         }
-
-        KxsMachineAdvance kxsMachineAdvance = baseMapper.selectById(machineAdvanceInfo.getOrderId());
+        //直接删除记录
+        kxsMachineAdvanceInfoMapper.deleteById(machineAdvanceInfo.getId());
+        baseMapper.deleteById(machineAdvanceInfo.getOrderId());
         //查询用户
         R<KxsUser> kxsUserR = remoteKxsUserService.loadUserById(kxsMachineAdvance.getToUserId(), SecurityConstants.FROM_IN);
         KxsUser toUser = RetOps.of(kxsUserR)
@@ -423,6 +422,29 @@ public class KxsMachineAdvanceServiceImpl extends ServiceImpl<KxsMachineAdvanceM
         return userAdvanceList;
     }
 
+    @Override
+    public Integer userPrePosModal() {
+
+        Long userId = SecurityUtils.getUser().getId();
+
+        return baseMapper.selectMaxDayPreTimeout(userId);
+    }
+
+    @Override
+    public List<String> userPrePosBindModal() {
+
+        List<String> sns = remoteKxsProductService.loadByPrePosBind30minute(SecurityConstants.FROM_IN);
+        if(!sns.isEmpty()){
+            List<UserAdvanceListVO> advanceList = baseMapper.advanceUserList(SecurityUtils.getUser().getId());
+
+            sns = advanceList.stream()
+                    .map(UserAdvanceListVO::getPosSn)
+                    .filter(sns::contains)
+                    .toList();
+        }
+        return sns;
+    }
+
 
 }
 

kxs-store/kxs-store-biz/src/main/java/com/kxs/store/biz/service/impl/KxsMachineApplyServiceImpl.java

@@ -298,7 +298,6 @@ public class KxsMachineApplyServiceImpl extends ServiceImpl<KxsMachineApplyMappe
                 .getData()
                 .orElseThrow(() -> new GlobalCustomerException(StoreErrorTypeEnum.DATA_ERROR.getDescription()));
         order.setBrandName(brand.getName());
-        log.info("消耗时间1");
         //添加订单
         baseMapper.insert(order);
         for (int i = 0; i < param.getSnList().size(); i++) {
@@ -310,7 +309,6 @@ public class KxsMachineApplyServiceImpl extends ServiceImpl<KxsMachineApplyMappe
             KxsMachine machine = RetOps.of(machineResult)
                     .getData()
                     .orElseThrow(() -> new GlobalCustomerException(StoreErrorTypeEnum.MACHINE_IS_NULL.getDescription()));
-            log.info("消耗时间2");
             //新增订单详情
             KxsMachineApplyDetail orderDetail = new KxsMachineApplyDetail();
             orderDetail.setOrderId(order.getId());
@@ -320,7 +318,6 @@ public class KxsMachineApplyServiceImpl extends ServiceImpl<KxsMachineApplyMappe
             KxsTicket ticket = RetOps.of(ticketResult)
                     .getData()
                     .orElseThrow(() -> new GlobalCustomerException(StoreErrorTypeEnum.TICKET_NOT_FIND.getDescription()));
-            log.info("消耗时间3");
             //券码被使用返回错误
             if (!ticket.getStatus().equals(TicketStatusEnum.TICKET_UNUSED.getType())) {
                 throw new GlobalCustomerException(StoreErrorTypeEnum.TICKET_CODE_UN.getDescription());

kxs-store/kxs-store-biz/src/main/resources/mapper/KxsMachineAdvanceMapper.xml

@@ -121,5 +121,16 @@
           and b.is_return = 0
           and b.is_confirm = 1
     </select>
+    <select id="selectMaxDayPreTimeout" resultType="java.lang.Integer">
+        select IFNULL(MAX(DATEDIFF(NOW(), a.create_time)), 0) AS day
+        from kxs_machine_advance a
+                 left join kxs_machine_advance_info b on a.id = b.order_id
+        where a.del_flag = 0
+          and a.to_user_id = #{userId}
+          and b.is_apply = 0
+          and b.is_return = 0
+          and b.is_confirm = 1
+          and b.is_advance = 0
+    </select>
 
 </mapper>

kxs-visual/kxs-rocket/broker/broker.conf

@@ -6,7 +6,7 @@ fileReservedTime = 48
 brokerRole = ASYNC_MASTER
 flushDiskType = ASYNC_FLUSH
 # 注意，宿主IP是你计算机网卡的IP
-brokerIP1 = 192.168.101.250
+brokerIP1 = 192.168.101.67
 # 在发送消息时，自动创建服务器不存在的topic，默认创建的队列数
 defaultTopicQueueNums=4