Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-api-cloud

pjcloud-canteen/pjcloud-canteen-api/pom.xml

@@ -28,6 +28,10 @@
 			<groupId>com.baomidou</groupId>
 			<artifactId>mybatis-plus-extension</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>com.baomidou</groupId>
+			<artifactId>mybatis-plus-spring</artifactId>
+		</dependency>
 		<!--feign 工具类-->
 		<dependency>
 			<groupId>com.bsd</groupId>

pjcloud-canteen/pjcloud-canteen-api/src/main/resources/META-INF/spring/org.springframework.cloud.openfeign.FeignClient.imports

@@ -0,0 +1,5 @@
+com.bsd.pjcloud.canteen.api.feign.RemoteCanteenCategoryService
+com.bsd.pjcloud.canteen.api.feign.RemoteCanteenOnlineCategoryService
+com.bsd.pjcloud.canteen.api.feign.RemoteCanteenSpuService
+com.bsd.pjcloud.canteen.api.feign.RemoteOnlineCanteenSpuService
+

pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/BoxesAvailabilityController.java

@@ -1,6 +1,5 @@
 package com.bsd.pjcloud.canteen.controller;
 
-import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;

pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/BoxesBookingController.java

@@ -1,19 +1,15 @@
 package com.bsd.pjcloud.canteen.controller;
 
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.bsd.pjcloud.canteen.vo.APPBookingInfo;
 import com.bsd.pjcloud.canteen.vo.AppMakeSaveReqVO;
 import com.bsd.pjcloud.common.core.util.R;
 import com.bsd.pjcloud.common.log.annotation.SysLog;
 import com.bsd.pjcloud.canteen.entity.BoxesBookingEntity;
 import com.bsd.pjcloud.canteen.service.BoxesBookingService;
-import org.springframework.beans.BeanUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import com.bsd.pjcloud.common.excel.annotation.ResponseExcel;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;

pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/BoxesInfoController.java

@@ -1,6 +1,5 @@
 package com.bsd.pjcloud.canteen.controller;
 
-import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.collection.CollUtil;
@@ -30,7 +29,6 @@ import org.springframework.web.bind.annotation.*;
 import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 
 /**
  * 包厢信息

pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenCategoryController.java

@@ -23,7 +23,6 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
-import java.util.Objects;
 
 /**
  * 菜品分类

pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenDailyMenuController.java

@@ -27,7 +27,6 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
-import java.util.Objects;
 
 /**
  * 每日菜谱

pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenOnlineCategoryController.java

@@ -6,12 +6,10 @@ import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.bsd.pjcloud.canteen.entity.CanteenCategoryEntity;
 import com.bsd.pjcloud.common.core.util.R;
 import com.bsd.pjcloud.common.log.annotation.SysLog;
 import com.bsd.pjcloud.canteen.entity.CanteenOnlineCategoryEntity;
 import com.bsd.pjcloud.canteen.service.CanteenOnlineCategoryService;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import com.bsd.pjcloud.common.excel.annotation.ResponseExcel;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
@@ -23,7 +21,6 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
-import java.util.Objects;
 
 /**
  * 在线点餐分类

pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenOnlineSpuController.java

@@ -7,8 +7,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.bsd.pjcloud.canteen.dto.CanteenOnlineSpuUpdateStockReqDTO;
-import com.bsd.pjcloud.canteen.dto.CanteenSpuUpdateStockReqDTO;
-import com.bsd.pjcloud.canteen.entity.CanteenSpuEntity;
 import com.bsd.pjcloud.common.core.util.R;
 import com.bsd.pjcloud.common.log.annotation.SysLog;
 import com.bsd.pjcloud.canteen.entity.CanteenOnlineSpuEntity;

pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenOrderingPreferencesController.java

@@ -1,31 +1,17 @@
 package com.bsd.pjcloud.canteen.controller;
 
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.ArrayUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.bsd.pjcloud.canteen.dto.UserPageDTO;
-import com.bsd.pjcloud.canteen.entity.CanteenCategoryEntity;
-import com.bsd.pjcloud.canteen.service.CanteenCategoryService;
 import com.bsd.pjcloud.canteen.service.OrderingPreferencesService;
-import com.bsd.pjcloud.canteen.vo.LikeFoodVO;
 import com.bsd.pjcloud.common.core.util.R;
-import com.bsd.pjcloud.common.excel.annotation.ResponseExcel;
-import com.bsd.pjcloud.common.log.annotation.SysLog;
-import com.bsd.pjcloud.common.security.util.SecurityUtils;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springdoc.core.annotations.ParameterObject;
 import org.springframework.http.HttpHeaders;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 /**
  * 用户订餐喜好分析
  *

pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenSpuController.java

@@ -3,12 +3,10 @@ package com.bsd.pjcloud.canteen.controller;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.collection.CollUtil;
-import com.alibaba.excel.util.StringUtils;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.bsd.pjcloud.canteen.dto.CanteenSpuUpdateStockReqDTO;
-import com.bsd.pjcloud.canteen.entity.CanteenDailyMenuEntity;
 import com.bsd.pjcloud.common.core.util.R;
 import com.bsd.pjcloud.common.log.annotation.SysLog;
 import com.bsd.pjcloud.canteen.entity.CanteenSpuEntity;
@@ -24,7 +22,6 @@ import io.swagger.v3.oas.annotations.Operation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Collection;
 import java.util.List;
 import java.util.Objects;
 

pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/MerchantInfoController.java

@@ -2,7 +2,6 @@ package com.bsd.pjcloud.canteen.controller;
 
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.extra.qrcode.QrCodeUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -14,15 +13,10 @@ import com.bsd.pjcloud.canteen.vo.MerchantCollectMoneyCodeDto;
 import com.bsd.pjcloud.canteen.vo.MerchantInfoVO;
 import com.bsd.pjcloud.common.core.util.QRCodeImageGenerator;
 import com.bsd.pjcloud.common.core.util.R;
-import com.bsd.pjcloud.common.file.core.FileProperties;
-import com.bsd.pjcloud.common.file.core.FileTemplate;
 import com.bsd.pjcloud.common.log.annotation.SysLog;
 import com.bsd.pjcloud.canteen.entity.MerchantInfoEntity;
 import com.bsd.pjcloud.canteen.service.MerchantInfoService;
-import feign.Response;
-import io.swagger.v3.oas.annotations.Parameter;
 import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.security.access.prepost.PreAuthorize;
 import com.bsd.pjcloud.common.excel.annotation.ResponseExcel;
@@ -38,7 +32,6 @@ import org.springframework.web.multipart.MultipartFile;
 import java.io.ByteArrayInputStream;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**

pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/job/BoxesAvaliabilityJob.java

@@ -6,7 +6,6 @@ import com.bsd.pjcloud.canteen.entity.BoxesInfoEntity;
 import com.bsd.pjcloud.canteen.mapper.BoxesAvailabilityMapper;
 import com.bsd.pjcloud.canteen.mapper.BoxesInfoMapper;
 import com.bsd.pjcloud.canteen.service.BoxesAvailabilityService;
-import com.bsd.pjcloud.canteen.service.BoxesInfoService;
 import com.xxl.job.core.context.XxlJobHelper;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import lombok.AllArgsConstructor;

pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/mapper/CanteenOnlineSpuMapper.java

@@ -1,7 +1,6 @@
 package com.bsd.pjcloud.canteen.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.bsd.pjcloud.canteen.entity.CanteenSpuEntity;
 import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper;
 import com.bsd.pjcloud.canteen.entity.CanteenOnlineSpuEntity;
 import org.apache.ibatis.annotations.Mapper;

pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/mapper/CanteenSpuMapper.java

@@ -1,14 +1,10 @@
 package com.bsd.pjcloud.canteen.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.bsd.pjcloud.canteen.dto.DailyMenuAll;
-import com.bsd.pjcloud.common.data.datascope.DataScope;
 import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper;
 import com.bsd.pjcloud.canteen.entity.CanteenSpuEntity;
 import org.apache.ibatis.annotations.Mapper;
 
-import java.util.List;
-
 @Mapper
 public interface CanteenSpuMapper extends PjcloudBaseMapper<CanteenSpuEntity> {
 

pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/mapper/OrderingPreferencesMapper.java

@@ -3,7 +3,6 @@ package com.bsd.pjcloud.canteen.mapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.bsd.pjcloud.canteen.dto.UserPageDTO;
-import com.bsd.pjcloud.canteen.entity.MerchantInfoEntity;
 import com.bsd.pjcloud.common.data.datascope.DataScope;
 import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper;
 import org.apache.ibatis.annotations.Mapper;

pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/CanteenSpuService.java

@@ -3,12 +3,9 @@ package com.bsd.pjcloud.canteen.service;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.bsd.pjcloud.canteen.dto.CanteenSpuUpdateStockReqDTO;
-import com.bsd.pjcloud.canteen.dto.DailyMenuAll;
 import com.bsd.pjcloud.canteen.entity.CanteenSpuEntity;
 import com.bsd.pjcloud.common.core.util.R;
 
-import java.util.List;
-
 public interface CanteenSpuService extends IService<CanteenSpuEntity> {
 
 

pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenCategoryServiceImpl.java

@@ -7,7 +7,6 @@ import com.bsd.pjcloud.canteen.entity.CanteenCategoryEntity;
 import com.bsd.pjcloud.canteen.mapper.CanteenCategoryMapper;
 import com.bsd.pjcloud.canteen.service.CanteenCategoryService;
 import com.bsd.pjcloud.common.data.datascope.DataScope;
-import com.bsd.pjcloud.common.security.util.SecurityUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.List;

pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenOnlineSpuServiceImpl.java

@@ -4,14 +4,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.bsd.pjcloud.canteen.dto.CanteenOnlineSpuUpdateStockReqDTO;
 import com.bsd.pjcloud.canteen.entity.CanteenOnlineSpuEntity;
-import com.bsd.pjcloud.canteen.entity.CanteenSpuEntity;
 import com.bsd.pjcloud.canteen.mapper.CanteenOnlineSpuMapper;
 import com.bsd.pjcloud.canteen.service.CanteenOnlineSpuService;
-import com.bsd.pjcloud.canteen.vo.ADCanteenSpuListVO;
 import com.bsd.pjcloud.canteen.vo.APPOnlineSpuVO;
 import com.bsd.pjcloud.common.core.util.BeanUtils;
 import com.bsd.pjcloud.common.core.util.R;
-import com.bsd.pjcloud.common.data.datascope.DataScope;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 

pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenSpuServiceImpl.java

@@ -3,7 +3,6 @@ package com.bsd.pjcloud.canteen.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.bsd.pjcloud.canteen.dto.CanteenSpuUpdateStockReqDTO;
-import com.bsd.pjcloud.canteen.dto.DailyMenuAll;
 import com.bsd.pjcloud.canteen.entity.CanteenSpuEntity;
 import com.bsd.pjcloud.canteen.mapper.CanteenSpuMapper;
 import com.bsd.pjcloud.canteen.service.CanteenDailyMenuService;
@@ -12,10 +11,7 @@ import com.bsd.pjcloud.canteen.vo.ADCanteenSpuListVO;
 import com.bsd.pjcloud.common.core.util.BeanUtils;
 import com.bsd.pjcloud.common.core.util.R;
 import com.bsd.pjcloud.common.data.datascope.DataScope;
-import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import lombok.AllArgsConstructor;
-import lombok.Data;
-import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/CanteenCategoryMapper.xml

@@ -18,5 +18,6 @@
         <result property="updateTime" column="update_time"/>
         <result property="tenantId" column="tenant_id"/>
         <result property="categoryType" column="category_type"/>
+        <result property="merchantId" column="merchant_id"/>
   </resultMap>
 </mapper>

pjcloud-supermarket/pjcloud-supermarket-api/pom.xml

@@ -28,6 +28,10 @@
 			<groupId>com.baomidou</groupId>
 			<artifactId>mybatis-plus-extension</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>com.baomidou</groupId>
+			<artifactId>mybatis-plus-spring</artifactId>
+		</dependency>
 		<!--feign 工具类-->
 		<dependency>
 			<groupId>com.bsd</groupId>

pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/SupermarketUnitWithSpuVo.java

@@ -0,0 +1,120 @@
+package com.bsd.pjcloud.supermarket.vo;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.bsd.pjcloud.common.core.util.MoneyDeserializer;
+import com.bsd.pjcloud.common.core.util.MoneySerializer;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class SupermarketUnitWithSpuVo {
+
+    /**
+     * 货号
+     */
+    @Schema(description="货号")
+    private String productCode;
+
+    /**
+     * 自编码/条码
+     */
+    @Schema(description="自编码/条码")
+    private String barcode;
+
+    /**
+     * 商品封面图
+     */
+    @Schema(description="商品封面图")
+    private String picUrl;
+
+    /**
+     * 商品名称
+     */
+    @Schema(description="商品名称")
+    private String productName;
+
+
+    /**
+     * 商品分类编号
+     */
+    @Schema(description="商品分类编号")
+    private Long categoryId;
+
+
+
+    /**
+     * 品牌id
+     */
+    @Schema(description="品牌id")
+    private Long brandId;
+
+
+    /**
+     * sku参数
+     */
+    /**
+     * 包装单位id
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    @Schema(description="包装单位id")
+    private Long id;
+
+    /**
+     * 条码
+     */
+    @Schema(description="条码")
+    private String barCode;
+
+    /**
+     * 规格
+     */
+    @Schema(description="规格")
+    private String spec;
+
+    /**
+     * 单位
+     */
+    @Schema(description="单位")
+    private String unit;
+
+    /**
+     * 状态(0正常，1停销)
+     */
+    @Schema(description="状态(0正常，1停销)")
+    private Integer status;
+
+    /**
+     * 内装数量
+     */
+    @Schema(description="内装数量")
+    private Integer packageNum;
+
+    /**
+     * 进价/单位分
+     */
+    @Schema(description="进价")
+    @JsonSerialize(using = MoneySerializer.class) // 分 -> 元
+    @JsonDeserialize(using = MoneyDeserializer.class) // 元 -> 分
+    private Integer purchasePrice;
+
+    /**
+     * 零售价/单位分
+     */
+    @Schema(description="零售价")
+    @JsonSerialize(using = MoneySerializer.class) // 分 -> 元
+    @JsonDeserialize(using = MoneyDeserializer.class) // 元 -> 分
+    private Integer retailPrice;
+
+    /**
+     * spuID
+     */
+    @Schema(description="spuID")
+    private Long spuId;
+
+
+
+}

pjcloud-supermarket/pjcloud-supermarket-api/src/main/resources/META-INF/spring/org.springframework.cloud.openfeign.FeignClient.imports

@@ -0,0 +1,3 @@
+com.bsd.pjcloud.supermarket.api.feign.RemoteSupermarketCategoryService
+com.bsd.pjcloud.supermarket.api.feign.RemoteSupermarketSpuService
+com.bsd.pjcloud.supermarket.api.feign.RemoteSupermarketUnitSkuService

pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SupermarketBrandController.java

@@ -10,10 +10,8 @@ import com.bsd.pjcloud.common.core.util.BeanUtils;
 import com.bsd.pjcloud.common.core.util.R;
 import com.bsd.pjcloud.common.log.annotation.SysLog;
 import com.bsd.pjcloud.supermarket.entity.SupermarketBrandEntity;
-import com.bsd.pjcloud.supermarket.entity.SupermarketCategoryEntity;
 import com.bsd.pjcloud.supermarket.service.SupermarketBrandService;
 import com.bsd.pjcloud.supermarket.vo.SupermarketBrandSimpleVo;
-import com.bsd.pjcloud.supermarket.vo.SupermarketCategorySimpleVo;
 import org.springframework.security.access.prepost.PreAuthorize;
 import com.bsd.pjcloud.common.excel.annotation.ResponseExcel;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
@@ -25,7 +23,6 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
-import java.util.Objects;
 
 /**
  * 超市品牌

pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SupermarketCategoryController.java

@@ -23,7 +23,6 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
-import java.util.Objects;
 
 /**
  * 商品分类

pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SupermarketSpuController.java

@@ -176,4 +176,6 @@ public class SupermarketSpuController {
     }
 
 
+
+
 }

pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SupermarketUnitController.java

@@ -124,14 +124,14 @@ public class SupermarketUnitController {
 //    -----------------APP------------------------------
 
     /**
-     * 通过id查询商品包装单位(sku)
+     * 通过ids查询商品包装单位(sku)
      * @param ids
      * @return R
      */
-    @Operation(summary = "通过id查询" , description = "通过id查询" )
-    @GetMapping("/ad/getSupermarketUnits" )
+    @Operation(summary = "通过ids查询" , description = "通过ids查询" )
+    @PostMapping("/ad/getSupermarketUnits" )
     public R getSupermarketUnits(@RequestBody List<Long> ids) {
-        return R.ok(supermarketUnitService.list(new LambdaQueryWrapper<SupermarketUnitEntity>().in(SupermarketUnitEntity::getId,ids)));
+        return R.ok(supermarketUnitService.getSupermarketUnitsWithSpu(ids));
     }
 
 }

pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SupermarketUnitMapper.java

@@ -2,10 +2,19 @@ package com.bsd.pjcloud.supermarket.mapper;
 
 import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper;
 import com.bsd.pjcloud.supermarket.entity.SupermarketUnitEntity;
+import com.bsd.pjcloud.supermarket.vo.SupermarketUnitWithSpuVo;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 @Mapper
 public interface SupermarketUnitMapper extends PjcloudBaseMapper<SupermarketUnitEntity> {
 
 
+    /**
+     * 根据ids获取超市包装单位信息和商品信息
+     * @param ids
+     * @return
+     */
+    List<SupermarketUnitWithSpuVo> getSupermarketUnitsWithSpu(List<Long> ids);
 }

pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SupermarketUnitService.java

@@ -2,8 +2,17 @@ package com.bsd.pjcloud.supermarket.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.bsd.pjcloud.supermarket.entity.SupermarketUnitEntity;
+import com.bsd.pjcloud.supermarket.vo.SupermarketUnitWithSpuVo;
+
+import java.util.List;
 
 public interface SupermarketUnitService extends IService<SupermarketUnitEntity> {
 
 
+    /**
+     * 根据包装单位id，查询商品包装单位信息以及spu基础信息
+     * @param ids
+     * @return
+     */
+    List<SupermarketUnitWithSpuVo> getSupermarketUnitsWithSpu(List<Long> ids);
 }

pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SupermarketUnitServiceImpl.java

@@ -4,7 +4,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.bsd.pjcloud.supermarket.entity.SupermarketUnitEntity;
 import com.bsd.pjcloud.supermarket.mapper.SupermarketUnitMapper;
 import com.bsd.pjcloud.supermarket.service.SupermarketUnitService;
+import com.bsd.pjcloud.supermarket.vo.SupermarketUnitWithSpuVo;
 import org.springframework.stereotype.Service;
+
+import java.util.List;
+
 /**
  * 商品包装单位(sku)
  *
@@ -13,4 +17,9 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class SupermarketUnitServiceImpl extends ServiceImpl<SupermarketUnitMapper, SupermarketUnitEntity> implements SupermarketUnitService {
+    @Override
+    public List<SupermarketUnitWithSpuVo> getSupermarketUnitsWithSpu(List<Long> ids) {
+
+        return baseMapper.getSupermarketUnitsWithSpu(ids);
+    }
 }

pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SupermarketUnitMapper.xml

@@ -22,4 +22,51 @@
         <result property="delFlag" column="del_flag"/>
         <result property="tenantId" column="tenant_id"/>
   </resultMap>
+
+      <resultMap id="SupermarketUnitWithSpuVoMap" type="com.bsd.pjcloud.supermarket.vo.SupermarketUnitWithSpuVo">
+            <id property="id" column="id" />
+            <result property="productCode" column="product_code" />
+            <result property="barcode" column="barcode" />
+            <result property="picUrl" column="pic_url" />
+            <result property="productName" column="product_name" />
+            <result property="unit" column="unit" />
+            <result property="categoryId" column="category_id" />
+            <result property="brandId" column="brand_id" />
+            <result property="barCode" column="bar_code" />
+            <result property="spec" column="spec" />
+            <result property="status" column="status" />
+            <result property="packageNum" column="package_num" />
+            <result property="purchasePrice" column="purchase_price" />
+            <result property="retailPrice" column="retail_price" />
+            <result property="spuId" column="spu_id" />
+      </resultMap>
+    <select id="getSupermarketUnitsWithSpu" resultMap="SupermarketUnitWithSpuVoMap">
+          SELECT u.id,
+                 s.product_code,
+                 s.barcode,
+                 s.pic_url,
+                 s.product_name,
+                 s.unit,
+                 s.category_id,
+                 s.brand_id,
+                 u.bar_code,
+                 u.spec,
+                 u.status,
+                 u.package_num,
+                 u.purchase_price,
+                 u.retail_price,
+                 u.spu_id
+          FROM supermarket_unit u
+                     LEFT JOIN supermarket_spu s
+                               on u.spu_id = s.id
+          <where>
+                u.del_flag = '0'
+                <if test="ids != null and ids.size() > 0">
+                      and u.id in
+                      <foreach collection="ids" item="id" open="(" separator="," close=")">
+                            #{id}
+                      </foreach>
+                </if>
+          </where>
+    </select>
 </mapper>