协议规则页面需去除token限制

设置-模糊搜索开户银行
不传keyword时报错

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/constant/enums/ProductErrorTypeEnum.java

@@ -26,6 +26,7 @@ public enum ProductErrorTypeEnum {
 	MACHINE_NOT_USER(-1, "机具不属于该创客"),
 	BRAND_EMPTY(-1, "产品未找到"),
 	IMPORT_EMPTY(-1, "导入数据为空"),
+	DATA_EMPTY(-1, "数据为空"),
 	MACHINE_TRANSFER_NO(-1, "循环机不可划拨");
 
 	private final int code;

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

@@ -25,6 +25,7 @@ import com.kxs.product.api.model.KxsMachineRatio;
 import com.kxs.product.api.model.KxsMerchant;
 import com.kxs.product.api.req.kxs.FeeSetReq;
 import com.kxs.product.api.vo.kxsapp.merchant.MerchantDetailVO;
+import com.kxs.product.biz.constant.enums.ProductErrorTypeEnum;
 import com.kxs.product.biz.mapper.KxsBrandMapper;
 import com.kxs.product.biz.mapper.KxsMachineMapper;
 import com.kxs.product.biz.mapper.KxsMachineRatioMapper;
@@ -42,6 +43,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.util.Optional;
 
 /**
  * 客小爽商户表(KxsMerchant)表服务实现类
@@ -80,6 +82,8 @@ public class KxsMerchantServiceImpl extends ServiceImpl<KxsMerchantMapper, KxsMe
         MerchantDetailVO merchantDetailVO = new MerchantDetailVO();
         //商户信息
         KxsMerchant mchInfo = getById(merchantId);
+        Optional.ofNullable(mchInfo).orElseThrow(() -> new GlobalCustomerException(ProductErrorTypeEnum.DATA_EMPTY.getDescription()));
+
         BeanUtil.copyProperties(mchInfo,merchantDetailVO);
         //机具信息
         KxsMachine kxsMachine = kxsMachineMapper.selectById(mchInfo.getMachineId());

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

@@ -52,6 +52,7 @@ import java.time.temporal.TemporalAdjusters;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 /**
@@ -413,6 +414,7 @@ public class KxsMachineApplyServiceImpl extends ServiceImpl<KxsMachineApplyMappe
     public StoreOrderDetailVO storeOrderDetail(Integer id) {
 
         KxsMachineApply order = baseMapper.selectById(id);
+        Optional.ofNullable(order).orElseThrow(() -> new GlobalCustomerException(StoreErrorTypeEnum.ORDER_NULL.getDescription()));
         List<KxsMachineApplyDetail> orderDetail = kxsMachineApplyDetailMapper.selectList(Wrappers.<KxsMachineApplyDetail>lambdaQuery().eq(KxsMachineApplyDetail::getOrderId, id));
         StoreOrderDetailVO orderDetailVO = new StoreOrderDetailVO();
         BeanUtils.copyProperties(order, orderDetailVO);

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

@@ -17,6 +17,7 @@ import com.kxs.store.api.model.KxsWarehouseCreditAmount;
 import com.kxs.store.api.vo.kxsapp.storeAdvance.AdvanceUserDetailVO;
 import com.kxs.store.api.vo.kxsapp.storeLimit.WarehouseAmountVO;
 import com.kxs.store.api.vo.kxsapp.userAdvance.AdvanceAmountVO;
+import com.kxs.store.biz.constant.enums.StoreErrorTypeEnum;
 import com.kxs.store.biz.constant.enums.WarehouseLimitTypeEnum;
 import com.kxs.store.biz.mapper.KxsMachineAdvanceMapper;
 import com.kxs.store.biz.mapper.KxsWarehouseCreditAmountMapper;
@@ -99,13 +100,18 @@ public class KxsWarehouseLimitServiceImpl extends ServiceImpl<KxsWarehouseLimitM
         KxsWarehouseLimit kxsWarehouseLimit = baseMapper.selectOne(Wrappers.<KxsWarehouseLimit>lambdaQuery()
                 .eq(KxsWarehouseLimit::getUserId, userId)
                 .eq(KxsWarehouseLimit::getWarehouseType, WarehouseLimitTypeEnum.FC.getType()));
+        Optional.ofNullable(kxsWarehouseLimit).orElseThrow(() -> new GlobalCustomerException(StoreErrorTypeEnum.WAREHOUSE_NOT_FIND.getDescription()));
         WarehouseAmountVO warehouseAmountVO = new WarehouseAmountVO();
         BeanUtils.copyProperties(kxsWarehouseLimit, warehouseAmountVO);
+
         //统计为他人担保额度
         KxsWarehouseCreditAmount creditUserAmount = kxsWarehouseCreditAmountMapper.selectOne(Wrappers.query(KxsWarehouseCreditAmount.class)
                 .select("IFNULL(SUM(credit_amount), 0) as creditAmount")
                 .eq("credit_user_id", userId));
-        warehouseAmountVO.setToCreditAmount(creditUserAmount.getCreditAmount());
+        if(creditUserAmount != null){
+            warehouseAmountVO.setToCreditAmount(creditUserAmount.getCreditAmount());
+        }
+
         warehouseAmountVO.setTotalAmount(NumberUtil.add(kxsWarehouseLimit.getCreditAmount(), kxsWarehouseLimit.getForAmount(), kxsWarehouseLimit.getFixedAmount()));
         return warehouseAmountVO;
     }

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/controller/kxsapp/OpenBankController.java

@@ -40,7 +40,7 @@ public class OpenBankController {
      * @return 设置-模糊搜索开户银行
      */
     @GetMapping("/search")
-    public R search(@ParameterObject Page<KxsOpenBank> page, @RequestParam("keyword") String keyword) {
+    public R search(@ParameterObject Page<KxsOpenBank> page, @RequestParam(value = "keyword", required = false) String keyword) {
 
         return R.ok(kxsOpenBankService.page(page, Wrappers.<KxsOpenBank>lambdaQuery().like(KxsOpenBank::getBankName, keyword)));
     }

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/controller/kxsapp/RuleMakingController.java

@@ -1,6 +1,7 @@
 package com.kxs.system.biz.controller.kxsapp;
 
 import com.kxs.common.core.util.R;
+import com.kxs.common.security.annotation.Inner;
 import com.kxs.system.biz.service.KxsRuleMakingService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -30,6 +31,7 @@ public class RuleMakingController {
      * @param id 主键ID
      * @return 获取协议内容
      */
+    @Inner(value = false)
     @GetMapping("/getById")
     public R getById(@RequestParam("id") Integer id) {
         return R.ok(kxsRulemakingService.getById(id));