订单详情返回机具券

创客学堂放开token限制

kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/kxsapp/shop/ShopOrderDetailVO.java

@@ -209,8 +209,10 @@ public class ShopOrderDetailVO implements Serializable {
     @Schema(description = "商城订单详情表")
     private List<ShopOrderInfoListVO> goodsList = new ArrayList<>();
 
-
-
+    /**
+     * 券码集合
+     */
+    private List<String> ticketCodes;
 
 
 	

kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/kxsapp/shop/ShopOrderInfoListVO.java

@@ -66,9 +66,5 @@ public class ShopOrderInfoListVO implements Serializable {
     @Schema(description = "商品类型 0实物商品 1虚拟物品")
     private Integer goodsType;
 
-    /**
-     * 券码集合
-     */
-    private List<String> ticketCodes;
 
 }

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

@@ -149,10 +149,11 @@ public class KxsShopOrderServiceImpl extends ServiceImpl<KxsShopOrderMapper, Kxs
             ShopOrderInfoListVO infoListVO = new ShopOrderInfoListVO();
             BeanUtils.copyProperties(item, infoListVO);
             infoListVO.setGoodsType(kxsShopGoods.getGoodsType());
-            List<KxsTicket> kxsTickets = kxsTicketMapper.selectList(Wrappers.<KxsTicket>lambdaQuery().eq(KxsTicket::getOrderId, orderId));
-            infoListVO.setTicketCodes(kxsTickets.stream().map(KxsTicket::getTicketCode).collect(Collectors.toList()));
             shopOrderDetailVO.getGoodsList().add(infoListVO);
         });
+        //机具券集合
+        List<KxsTicket> kxsTickets = kxsTicketMapper.selectList(Wrappers.<KxsTicket>lambdaQuery().eq(KxsTicket::getOrderId, orderId));
+        shopOrderDetailVO.setTicketCodes(kxsTickets.stream().map(KxsTicket::getTicketCode).collect(Collectors.toList()));
 
         return shopOrderDetailVO;
     }

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

@@ -2,6 +2,7 @@ package com.kxs.system.biz.controller.kxsapp;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.kxs.common.core.util.R;
+import com.kxs.common.security.annotation.Inner;
 import com.kxs.system.api.model.KxsActivityMarket;
 import com.kxs.system.api.vo.kxsapp.activityMarket.ActivityMarketVO;
 import com.kxs.system.api.vo.kxsapp.activityMarket.ActivityMarketListVO;
@@ -40,6 +41,7 @@ public class ActivityMarketController {
      * @return 市场活动-市场活动列表
      */
     @GetMapping("/list")
+    @Inner(value = false)
     public R list(@ParameterObject Page<ActivityMarketListVO> page, @RequestParam("menuId") Integer menuId) {
 
         return R.ok(kxsActivityMarketService.getByPage(page, menuId));
@@ -53,6 +55,7 @@ public class ActivityMarketController {
      * @return 市场活动-市场活动详情
      */
     @GetMapping("/getById")
+    @Inner(value = false)
     public R getById(@RequestParam("id") Integer id) {
 
         KxsActivityMarket byId = kxsActivityMarketService.getById(id);

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

@@ -3,6 +3,7 @@ package com.kxs.system.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.annotation.Inner;
 import com.kxs.system.api.model.KxsSchoolMenu;
 import com.kxs.system.api.model.KxsSchoolStudy;
 import com.kxs.system.biz.service.KxsSchoolMenuService;
@@ -38,6 +39,7 @@ public class SchoolController {
      *
      * @return 商学院-创客学堂一级分类
      */
+    @Inner(value = false)
     @GetMapping("/firstMenu")
     public R firstMenu() {
 
@@ -52,6 +54,7 @@ public class SchoolController {
      * @return 商学院-创客学堂列表
      */
     @GetMapping("/page")
+    @Inner(value = false)
     public R page(@ParameterObject Page<KxsSchoolStudy> page, @RequestParam("menuId") Integer menuId) {
 
         return R.ok(kxsSchoolStudyService.schoolList(page,menuId));
@@ -65,6 +68,7 @@ public class SchoolController {
      * @return 商学院-创客学堂二级分类
      */
     @GetMapping("/secondMenu")
+    @Inner(value = false)
     public R secondMenu(@RequestParam("colId") Integer colId) {
 
         return R.ok(kxsSchoolMenuService

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

@@ -4,6 +4,7 @@ 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.common.security.annotation.Inner;
 import com.kxs.system.api.model.KxsServiceCenter;
 import com.kxs.system.api.vo.kxsapp.serviceCenter.ServiceCenterListVO;
 import com.kxs.system.biz.service.KxsServiceMenuService;
@@ -43,6 +44,7 @@ public class ServiceCenterController {
      * @return 服务中心-服务分类列表
      */
     @GetMapping("/menuList")
+    @Inner(value = false)
     public R menuList(@ParameterObject Page<KxsServiceMenu> page) {
         return R.ok(kxsServiceMenuService.page(page));
     }
@@ -55,6 +57,7 @@ public class ServiceCenterController {
      * @return 服务中心-服务列表
      */
     @GetMapping("/list")
+    @Inner(value = false)
     public R list(@ParameterObject Page<ServiceCenterListVO> page, @RequestParam("menuId")Long menuId) {
         return R.ok(kxsServiceCenterService.ServiceCenterList(page,menuId));
     }
@@ -67,9 +70,11 @@ public class ServiceCenterController {
      * @return 服务中心-服务详情
      */
     @GetMapping("/getById")
+    @Inner(value = false)
     public R getById(@RequestParam("id") Integer id) {
         return R.ok(kxsServiceCenterService.getById(id));
     }
+
     /**
      * 服务中心-搜索
      *
@@ -77,6 +82,7 @@ public class ServiceCenterController {
      * @return 服务中心-服务详情
      */
     @GetMapping("/getByTitle")
+    @Inner(value = false)
     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)));
     }