Merge branch 'develop-kjf' into develop

* develop-kjf:
  添加了库存校验以及限购起购校验
  添加了反馈意见类型接口

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

@@ -22,14 +22,17 @@ import com.kxs.common.security.util.SecurityUtils;
 import com.kxs.product.api.dto.kxsapp.shop.GoodsSubmitDTO;
 import com.kxs.product.api.dto.kxsapp.shop.PayOrderDTO;
 import com.kxs.product.api.model.KxsShopGoods;
+import com.kxs.product.api.model.KxsShopGoodsSku;
 import com.kxs.product.api.model.KxsShopOrder;
 import com.kxs.product.api.model.KxsShopOrderInfo;
 import com.kxs.product.api.vo.kxsapp.shop.*;
 import com.kxs.product.biz.constant.enums.KxsShopEnum;
 import com.kxs.product.biz.constant.enums.ProductErrorTypeEnum;
 import com.kxs.product.biz.mapper.KxsShopGoodsMapper;
+import com.kxs.product.biz.mapper.KxsShopGoodsSkuMapper;
 import com.kxs.product.biz.mapper.KxsShopOrderInfoMapper;
 import com.kxs.product.biz.mapper.KxsShopOrderMapper;
+import com.kxs.product.biz.service.KxsShopGoodsSkuService;
 import com.kxs.product.biz.service.KxsShopOrderService;
 import com.kxs.user.api.feign.RemoteKxsUserService;
 import com.lly835.bestpay.enums.OrderStatusEnum;
@@ -64,7 +67,7 @@ public class KxsShopOrderServiceImpl extends ServiceImpl<KxsShopOrderMapper, Kxs
     private final RemoteKxsUserService remoteKxsUserService;
 
     private final PaymentFactory paymentFactory;
-
+    private final KxsShopGoodsSkuMapper kxsShopGoodsSkuMapper;
     @Override
     @Transactional(rollbackFor = Exception.class)
     public R submitOrder(GoodsSubmitDTO param) {
@@ -86,6 +89,32 @@ public class KxsShopOrderServiceImpl extends ServiceImpl<KxsShopOrderMapper, Kxs
         //查询商品
         KxsShopGoods goods = goodsMapper.selectById(param.getGoodsId());
         Optional.ofNullable(goods).orElseThrow(() -> new GlobalCustomerException("商品不存在"));
+        //查询商品sku
+        KxsShopGoodsSku kxsShopGoodsSku = kxsShopGoodsSkuMapper.selectOne(Wrappers.<KxsShopGoodsSku>query().lambda().eq(KxsShopGoodsSku::getGoodId, goods.getId()));
+        if (kxsShopGoodsSku != null){
+            //当sku库存不为null时需做存量校验
+            if (kxsShopGoodsSku.getStockNum() != null && kxsShopGoodsSku.getStockNum() != -1){
+                int i = kxsShopGoodsSku.getStockNum() - param.getNumber();
+                if(i < 0){
+                    return R.failed("当前库存不足");
+                }
+                kxsShopGoodsSku.setStockNum(i);
+                //修改库存
+                kxsShopGoodsSkuMapper.updateById(kxsShopGoodsSku);
+            }
+            //校验是否存在起购以及限购数量校验
+            if (kxsShopGoodsSku.getStartByCount() != null && kxsShopGoodsSku.getStartByCount() != 0){
+                boolean b = kxsShopGoodsSku.getStartByCount() > param.getNumber();
+                if (b){
+                    return R.failed("该商品最低" + kxsShopGoodsSku.getStartByCount() + "件起购");
+                }
+            }else if (kxsShopGoodsSku.getLimitCount() != null && kxsShopGoodsSku.getLimitCount() != 0){
+                boolean b = kxsShopGoodsSku.getLimitCount() < param.getNumber();
+                if (b){
+                    return R.failed("该商品每人最多购买" + kxsShopGoodsSku.getLimitCount() + "件");
+                }
+            }
+        }
         //订单详情
         KxsShopOrderInfo orderInfo = new KxsShopOrderInfo();
         orderInfo.setNumber(param.getNumber());
@@ -185,6 +214,8 @@ public class KxsShopOrderServiceImpl extends ServiceImpl<KxsShopOrderMapper, Kxs
             //修改订单信息
             this.update(lambdaUpdateWrapper);
             //TODO 余额走支付接下来的逻辑
+
+
         }
 
 

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

@@ -29,6 +29,7 @@ import java.util.List;
 @RequestMapping("storeAdvance")
 public class StoreAdvanceController {
 
+
     /**
      * 服务对象
      */

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/vo/kxsapp/FeedBackTypeVO.java

@@ -0,0 +1,15 @@
+package com.kxs.system.api.vo.kxsapp;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * 意见反馈类型
+ */
+@Data
+public class FeedBackTypeVO {
+    private Long id;
+    private String typeName;//类型名称
+    private LocalDateTime createTime;
+}

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

@@ -9,10 +9,7 @@ import com.kxs.system.biz.service.KxsFeedbackService;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.BeanUtils;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * 意见反馈
@@ -37,4 +34,8 @@ public class FeedbackController {
         kxsFeedback.setUserId(userId.intValue());
         return R.ok(kxsFeedbackService.save(kxsFeedback));
     }
+    @GetMapping("/getAllFeedBackType")
+    public R getAllFeedBackType(){
+        return R.ok(kxsFeedbackService.getAllFeedBackType());
+    }
 }

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

@@ -1,8 +1,10 @@
 package com.kxs.system.biz.controller.kxsapp;
 
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.kxs.common.core.util.R;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.kxs.system.api.model.KxsServiceCenter;
 import com.kxs.system.api.vo.kxsapp.serviceCenter.ServiceCenterListVO;
 import com.kxs.system.biz.service.KxsServiceMenuService;
 import org.springdoc.core.annotations.ParameterObject;
@@ -68,6 +70,16 @@ public class ServiceCenterController {
     public R getById(@RequestParam("id") Integer id) {
         return R.ok(kxsServiceCenterService.getById(id));
     }
+    /**
+     * 服务中心-搜索
+     *
+     * @param title 标题
+     * @return 服务中心-服务详情
+     */
+    @GetMapping("/getByTitle")
+    public R getByTitle(@ParameterObject Page<KxsServiceCenter> page, @RequestParam("title") String title) {
+        return R.ok(kxsServiceCenterService.page(page, Wrappers.<KxsServiceCenter>query().lambda().like(KxsServiceCenter::getTitle,title)));
+    }
 
 
 

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/mapper/KxsFeedbackMapper.java

@@ -2,8 +2,11 @@ package com.kxs.system.biz.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.kxs.system.api.model.KxsFeedback;
+import com.kxs.system.api.vo.kxsapp.FeedBackTypeVO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 用户反馈信息(KxsFeedback)表数据库访问层
  *
@@ -13,5 +16,7 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface KxsFeedbackMapper extends BaseMapper<KxsFeedback> {
 
+    List<FeedBackTypeVO> getAllFeedBackType();
+
 }
 

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/service/KxsFeedbackService.java

@@ -3,6 +3,9 @@ package com.kxs.system.biz.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.kxs.system.api.dto.kxsapp.FeedBackDto;
 import com.kxs.system.api.model.KxsFeedback;
+import com.kxs.system.api.vo.kxsapp.FeedBackTypeVO;
+
+import java.util.List;
 
 /**
  * 用户反馈信息(KxsFeedback)表服务接口
@@ -12,5 +15,7 @@ import com.kxs.system.api.model.KxsFeedback;
  */
 public interface KxsFeedbackService extends IService<KxsFeedback> {
 
+    List<FeedBackTypeVO> getAllFeedBackType();
+
 }
 

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/service/impl/KxsFeedbackServiceImpl.java

@@ -1,11 +1,15 @@
 package com.kxs.system.biz.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.kxs.system.api.vo.kxsapp.FeedBackTypeVO;
 import com.kxs.system.biz.mapper.KxsFeedbackMapper;
 import com.kxs.system.api.model.KxsFeedback;
 import com.kxs.system.biz.service.KxsFeedbackService;
+import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 用户反馈信息(KxsFeedback)表服务实现类
  *
@@ -13,7 +17,14 @@ import org.springframework.stereotype.Service;
  * @since 2023-12-15 12:16:31
  */
 @Service("kxsFeedbackService")
+@RequiredArgsConstructor
 public class KxsFeedbackServiceImpl extends ServiceImpl<KxsFeedbackMapper, KxsFeedback> implements KxsFeedbackService {
+    private final KxsFeedbackMapper kxsFeedbackMapper;
+
+    @Override
+    public List<FeedBackTypeVO> getAllFeedBackType() {
 
+        return kxsFeedbackMapper.getAllFeedBackType();
+    }
 }
 

kxs-system/kxs-system-biz/src/main/resources/mapper/KxsFeedbackMapper.xml

@@ -13,5 +13,8 @@
         <result column="back_type" property="backType" />
 
     </resultMap>
+    <select id="getAllFeedBackType" resultType="com.kxs.system.api.vo.kxsapp.FeedBackTypeVO">
+        select id,type_name,create_time from kxs_feedback_type where del_flag != 1
+    </select>
 
 </mapper>