联合丽格

src/main/java/com/caimei365/commodity/components/PriceUtilService.java

@@ -284,26 +284,50 @@ public class PriceUtilService {
      * @param product ProductItemVo
      */
     public void setProductDetails(Integer userId, ProductItemVo product, Integer ind) {
+        Integer organizeId = priceMapper.getOrganize(userId);
         // 设置图片
         product.setImage(ImageUtils.getImageURL("product", product.getImage(), 0, domain));
         // 数据库获取基本价格信息
         PriceVo price = priceMapper.getDetailPrice(product.getProductId());
-        // 根据用户id设置详细价格
-        setPriceByUserId(price, userId, ind);
-        // 设置价格
-        product.setActStatus(price.getActStatus());
-        product.setPromotions(price.getPromotions());
-        product.setUserIdentity(price.getUserIdentity());
-        product.setSvipProductFlag(price.getSvipProductFlag());
-        product.setSvipPriceTag(price.getSvipPriceTag());
-        product.setPrice(price.getPrice());
-        product.setSkuId(price.getSkuId());
-        product.setOriginalPrice(price.getOriginalPrice());
-        product.setPriceGrade(getPriceGrade(price.getPrice()));
-        product.setMinBuyNumber(price.getMinBuyNumber());
-        product.setUnit(price.getUnit());
-        product.setStock(price.getStock());
-        product.setSkus(price.getSkus());
+        if (0 == organizeId) {
+            // 根据用户id设置详细价格
+            setPriceByUserId(price, userId, ind);
+            // 设置价格
+            product.setActStatus(price.getActStatus());
+            product.setPromotions(price.getPromotions());
+            product.setUserIdentity(price.getUserIdentity());
+            product.setSvipProductFlag(price.getSvipProductFlag());
+            product.setSvipPriceTag(price.getSvipPriceTag());
+            product.setPrice(price.getPrice());
+            product.setSkuId(price.getSkuId());
+            product.setOriginalPrice(price.getOriginalPrice());
+            product.setPriceGrade(getPriceGrade(price.getPrice()));
+            product.setMinBuyNumber(price.getMinBuyNumber());
+            product.setUnit(price.getUnit());
+            product.setStock(price.getStock());
+            product.setSkus(price.getSkus());
+        } else {
+            List<MallProductSkuVo> organizeSkus = priceMapper.findOrganizeSkus(product.getProductId());
+            if (null != organizeSkus) {
+                product.setPrice(organizeSkus.get(0).getPrice());
+                product.setMinBuyNumber(organizeSkus.get(0).getMinBuyNumber());
+                product.setUnit(organizeSkus.get(0).getUnit());
+                product.setStock(organizeSkus.get(0).getStock());
+                product.setOrganizeSkus(organizeSkus);
+                product.setSkuId(organizeSkus.get(0).getSkuId());
+                /*product.setActStatus(price.getActStatus());
+                product.setPromotions(price.getPromotions());
+                product.setUserIdentity(price.getUserIdentity());
+                product.setSvipProductFlag(price.getSvipProductFlag());
+                product.setSvipPriceTag(price.getSvipPriceTag());*/
+                //设置展示的价格等级
+                product.setPriceGrade(getPriceGrade(product.getPrice()));
+            }
+            // 价格等级
+            organizeSkus.forEach(o -> {
+                o.setPriceGrade(getPriceGrade(o.getPrice()));
+            });
+        }
     }
 
 }

src/main/java/com/caimei365/commodity/mapper/MallOrganizeMapper.java

@@ -105,6 +105,13 @@ public interface MallOrganizeMapper {
      */
     List<MallOrganizeProductVo> getMenuActiveList(@Param("activeId") Integer activeId);
 
+    /**
+     * 活动类型
+     * @param imageId
+     * @return
+     */
+    MallActiveVo getActiveInfo(@Param("imageId") Integer imageId)
+;
     /**
      * 活动宣传商品
      * @param imageId

src/main/java/com/caimei365/commodity/mapper/PriceMapper.java

@@ -74,6 +74,13 @@ public interface PriceMapper {
      * 根据用户Id查询供应商Id
      */
     Integer getShopIdByUserId(Integer userId);
+
+    /**
+     * 组织Id
+     * @param userId
+     * @return
+     */
+    Integer getOrganize(Integer userId);
     /**
      * 添加销量记录
      * @param productId 商品Id
@@ -88,6 +95,13 @@ public interface PriceMapper {
      */
     List<Sku> findSkus(Integer productId);
 
+    /**
+     * skus
+     * @param productId
+     * @return
+     */
+    List<Sku> findOrganizeProductSkus(Integer productId);
+
     /**
      * 外部商城sku
      * @param productId

src/main/java/com/caimei365/commodity/mapper/ShopMapper.java

@@ -137,6 +137,13 @@ public interface ShopMapper {
      */
     ProductDetailInfoPo getProductDetailInfo(Integer productId);
 
+    /**
+     * 商品详情--组织
+     * @param productId
+     * @return
+     */
+    ProductDetailInfoPo getProductOrganizeDetailInfo(Integer productId);
+
     /**
      * 供应商信息
      */

src/main/java/com/caimei365/commodity/model/vo/ProductItemVo.java

@@ -278,4 +278,8 @@ public class ProductItemVo implements Serializable {
      * 楼层相关商品图片3
      */
     private List<FloorImageVo> floorImageList3;
+    /**
+     * 外部商城sku
+     */
+    private List<MallProductSkuVo> organizeSkus;
 }

src/main/java/com/caimei365/commodity/service/impl/MallOrganizeServiceImpl.java

@@ -6,6 +6,7 @@ import com.caimei365.commodity.model.ResponseJson;
 import com.caimei365.commodity.model.po.ProcurePo;
 import com.caimei365.commodity.model.vo.*;
 import com.caimei365.commodity.service.MallOrganizeService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -88,12 +89,18 @@ public class MallOrganizeServiceImpl implements MallOrganizeService {
                 if ("1".equals(active.getActiveType())) {
                     // 商品列表
                     List<MallOrganizeProductVo> activeProduct = mallOrganizeMapper.getActiveProduct(activeId);
+                    activeProduct.forEach(p -> {
+                        // 设置价格等级
+                        p.setPriceGrade(priceUtilService.getPriceGrade(p.getPrice()));
+                    });
                     active.setProducts(activeProduct);
                 } else {
                     // 活动宣传图
                     List<MallActiveImageVo> imageList = mallOrganizeMapper.getActiveImageById(activeId);
                     active.setActiveImageVos(imageList);
                 }
+            } else {
+                return ResponseJson.error(-1,"该活动不存在，请联系维护人员",null);
             }
             map.put("active", active);
         } else {
@@ -109,11 +116,20 @@ public class MallOrganizeServiceImpl implements MallOrganizeService {
      */
     @Override
     public ResponseJson<List<MallOrganizeProductVo>> activeProduct(Integer imageId) {
+        // 活动类型
+        MallActiveVo activeInfo = mallOrganizeMapper.getActiveInfo(imageId);
         // 活动商品信息
         List<MallOrganizeProductVo> menuList = mallOrganizeMapper.getImageProduct(imageId);
         menuList.forEach(p -> {
             // 价格等级
             p.setPriceGrade(priceUtilService.getPriceGrade(p.getPrice()));
+            if (StringUtils.isBlank(p.getTopic())) {
+                if (StringUtils.isNotBlank(activeInfo.getTopic())) {
+                    p.setTopic(activeInfo.getTopic());
+                } else {
+                    p.setTopic("未知");
+                }
+            }
         });
 
         return ResponseJson.success(menuList);

src/main/java/com/caimei365/commodity/service/impl/PageServiceImpl.java

@@ -712,10 +712,10 @@ public class PageServiceImpl implements PageService {
         }
         product.setImageList(imageList);
         // 商品详情
-        ProductDetailInfoPo productDetail = shopMapper.getProductDetailInfo(productId);
+        ProductDetailInfoPo productDetail = shopMapper.getProductOrganizeDetailInfo(productId);
         product.setProductDetail(productDetail);
         // 相关参数
-        List<ProductParameterPo> parametersList = shopMapper.getProductParameters(productId);
+        List<ProductParameterPo> parametersList = shopMapper.getProductParameters(product.getProductId());
         product.setParametersList(parametersList);
         // 分类名称
         String typeName = shopMapper.getTypeName(product.getBigTypeId(), product.getSmallTypeId(), product.getTinyTypeId());
@@ -768,9 +768,13 @@ public class PageServiceImpl implements PageService {
                 //设置展示的价格等级
                 product.setPriceGrade(priceUtilService.getPriceGrade(product.getPrice()));
                 //查询商品收藏情况，1未收藏，0未收藏，未收藏过该商品用户是null
-                Integer like = likeMapper.findLike(userId, productId);
+                Integer like = likeMapper.findLike(userId, product.getProductId());
                 product.setUserLike(like);
             }
+            organizeSkus.forEach(o -> {
+                // 设置价格等级
+                o.setPriceGrade(priceUtilService.getPriceGrade(o.getPrice()));
+            });
         }
         // 设置售罄标记
         /*Integer flag = priceMapper.getSaleOutFlag(product.getProductId()) > 0 ? 0 : 1;

src/main/java/com/caimei365/commodity/service/impl/ProcureService.java

@@ -98,14 +98,18 @@ public class ProcureService {
         Query query = new Query();
         query.addCriteria(Criteria.where("createUserId").ne(null));
         if (status == 1) {
+            // 我参与的
             query.addCriteria(Criteria.where("userId").ne(userId.toString()));
-//            query.addCriteria(Criteria.where("isInvolved").is(1));
+            query.addCriteria(Criteria.where("delFlag").is("0"));
         } else if (status == 2) {
+            // 我发起的
             query.addCriteria(Criteria.where("userId").is(userId.toString()));
             query.addCriteria(Criteria.where("isInvolved").is(2));
+        } else {
+            // 所有
+            query.addCriteria(Criteria.where("delFlag").is("0"));
         }
         query.with(Sort.by(Sort.Direction.DESC, "saveTime"));
-//        query.with(pageable);
         List<ProcurePo> procurePos = mongoTemplate.find(query, ProcurePo.class);
         /*long count1 = mongoTemplate.count(query, ProcurePo.class);
         PageImpl<ProcurePo> procurePos1 = new PageImpl<>(procurePos, pageable, count1);*/

src/main/java/com/caimei365/commodity/service/impl/ProcurementServiceImpl.java

@@ -13,6 +13,7 @@ import com.caimei365.commodity.utils.ListPagingUtil;
 import com.caimei365.commodity.utils.MongodbUtils;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -29,6 +30,7 @@ import java.util.stream.Collectors;
  * @author : Charles
  * @date : 2023/4/26
  */
+@Slf4j
 @Service
 public class ProcurementServiceImpl implements ProcurementService {
     @Value("${caimei.wwwDomain}")
@@ -98,21 +100,11 @@ public class ProcurementServiceImpl implements ProcurementService {
                 procurementDto.setDelFlag(p.getDelFlag());
                 // 参与机构数量
                 procurementDto.setPartNumber(additionalPoList.size());
-//                // 是否参与集采 0未参与 1参与 2我创建的
-//                if (p.getCreateUserId().equals(userId.toString())) {
-//                    procurementDto.setIsInvolved(2);
-//                } else {
-//                    List<String> stringList = additionalPoList.stream().map(a -> a.getAdditionalId()).collect(Collectors.toList());
-//                    List<ProcurePo> collect = involvedList.stream().filter(item -> stringList.contains(item.getId())).collect(Collectors.toList());
-//                    if (null != collect && collect.size() > 0) {
-//                        procurementDto.setIsInvolved(1);
-//                    } else {
-//                        procurementDto.setIsInvolved(0);
-//                    }
-//                }
                 if (!p.getUserId().equals(userId)) {
                     additionalService.findProcureById(p.getId()).forEach(s -> {
-                        procurementDto.setSId(s.getAdditionalId());
+                        if (s.getProcureId().equals(p.getId()) && involvedList.stream().map(ProcurePo::getId).collect(Collectors.toList()).contains(s.getAdditionalId())) {
+                            procurementDto.setSId(s.getAdditionalId());
+                        }
                         procurementDto.setProcurePo(procureService.findById(s.getAdditionalId()));
                     });
                 }
@@ -141,7 +133,9 @@ public class ProcurementServiceImpl implements ProcurementService {
     public ResponseJson<Map<String, Object>> detailProcurement(String id, Integer userId) {
         Map<String, Object> map = new HashMap<>();
         // 我参与的
+        log.info("userId====="+userId);
         List<ProcurePo> involvedList = procureService.findInvolvedList(userId.toString());
+        log.info("involvedList====="+involvedList);
         // 参与集采集合
         List<AdditionalPo> additionalPoLi = additionalService.findProcureById(id);
         // 参与者集合
@@ -178,8 +172,9 @@ public class ProcurementServiceImpl implements ProcurementService {
             }
         }
         // sid
+        log.info("involvedList====="+involvedList);
         for(AdditionalPo add: additionalPoLi) {
-            if (add.getProcureId().equals(procurePo.getId())) {
+            if (add.getProcureId().equals(procurePo.getId()) && involvedList.stream().map(ProcurePo::getId).collect(Collectors.toList()).contains(add.getAdditionalId())) {
                 procurementDto.setSId(add.getAdditionalId());
             }
         }
@@ -215,37 +210,6 @@ public class ProcurementServiceImpl implements ProcurementService {
             procurementList.add(procurement);
         }
 
-//        // 设置参与者信息
-//        List<AdditionalPo> additionalList = additionalService.findProcureById(procurePo.getId());
-//        for (AdditionalPo add : additionalList) {
-//            // 参与者信息
-//            ProcurePo procure = procureService.findById(add.getProcureId());
-//            procurement.setId(procure.getId());
-//            procurement.setUserId(procure.getUserId());
-//            String imageURL = ImageUtils.getImageURL("product", procure.getProductImage(), 0, domain);
-//            if (StringUtils.isNotBlank(imageURL)) {
-//                procurement.setProductImage(imageURL);
-//            }
-//            procurement.setProductName(procure.getProductName());
-//            procurement.setPrice(procure.getPrice());
-//            procurement.setSaveTime(returnFormat.format(procure.getSaveTime()));
-//            if (StringUtils.isNotBlank(procure.getCreateUserId())) {
-//                procurement.setCreateUserId(procure.getCreateUserId());
-//            }
-//            procurement.setNumber(procure.getNumber());
-//            procurement.setIsAchieve(procure.getIsAchieve());
-//            procurement.setDelFlag(procure.getDelFlag());
-//            procurementList.add(procurement);
-//        }
-//        // 用户信息获取
-//        List<String> userIds = procurementList.stream().map(ProcurementDto::getUserId).collect(Collectors.toList());
-//        List<UserVo> userInfo = procurementMapper.selUserInfo(userIds);
-//        // 用户信息赋予
-//        if (null != userInfo) {
-//            procurementList.forEach(p -> {
-//                p.setUserName(userInfo.get(userInfo.indexOf(p.getUserId())).getUserName());
-//            });
-//        }
         map.put("procurementList", procurementList);
         return ResponseJson.success(map);
     }
@@ -343,7 +307,6 @@ public class ProcurementServiceImpl implements ProcurementService {
                 if (null != collect && collect.size() > 0) {
                     p.setUserName(collect.get(0).getUserName());
                 }
-//                p.setUserName(userInfo.get(userInfo.indexOf(p.getUserId())).getUserName());
             });
         }
         return ResponseJson.success(procurementList);
@@ -371,16 +334,12 @@ public class ProcurementServiceImpl implements ProcurementService {
             procurementDto.setIsInvolved(2);
         }
         // 检索匹配
-//        ProcurePo procurePo = involvedList.get(involvedList.indexOf(id));
         ProcurePo procurePo = null;
         for (ProcurePo s : involvedList) {
             if (id.equals(s.getId())) {
                 procurePo = s;
             }
         }
-        /*List<String> userIds = new ArrayList<>();
-        userIds.add(procurePo.getUserId());
-        List<UserVo> userInfo = procurementMapper.selUserInfo(userIds);*/
         // 返回赋值
         procurementDto.setId(procurePo.getId());
         procurementDto.setUserId(procurePo.getUserId());
@@ -422,10 +381,6 @@ public class ProcurementServiceImpl implements ProcurementService {
         if (StringUtils.isNotBlank(procurementDto.getId())) {
             // 修改集采信息
             procurePo.setId(procurementDto.getId());
-//            procurePo.setCreateUserId(procurementDto.getCreateUserId());
-//            procurePo.setIsAchieve(procurementDto.getIsAchieve());
-//            procurePo.setIsInvolved(procurementDto.getIsInvolved());
-//            procurePo.setDelFlag(procurementDto.getDelFlag());
             MongodbUtils.updateFirst("_id", procurePo.getId(),
                     new String[]{"productImage", "productName", "price", "number"},
                     new String[]{procurePo.getProductImage(),
@@ -456,7 +411,6 @@ public class ProcurementServiceImpl implements ProcurementService {
         ProcurePo procurePo = new ProcurePo();
         String id=procurementDto.getId();
         if (status ==1) {
-//            procureService.deleteById(procurePo.getId());
             id=((AdditionalPo)MongodbUtils.find(AdditionalPo.class, new java.lang.String[]{"additionalId"}, new java.lang.String[]{procurementDto.getId()}).get(0)).getProcureId();
             MongodbUtils.removeById("additionalId", procurementDto.getId(), AdditionalPo.class);
             MongodbUtils.removeById("_id", procurementDto.getId(), ProcurePo.class);
@@ -470,7 +424,6 @@ public class ProcurementServiceImpl implements ProcurementService {
         procurePo.setSaveTime(Long.valueOf(saveFormat.parse(time).getTime()));
         procurePo.setNumber(procurementDto.getNumber());
         procurePo.setClubName(procurementDto.getUserName());
-//        procurePo.setCreateUserId(procurementDto.getUserId());
         procurePo.setIsAchieve("0");
         procurePo.setIsInvolved(1);
         procurePo.setDelFlag("0");
@@ -482,28 +435,6 @@ public class ProcurementServiceImpl implements ProcurementService {
         additionalPo.setAdditionalId(procurePo.getId());
         additionalPo.setDelFlag("0");
         additionalService.save(additionalPo);
-//        } else {
-//            // 参与集采需求
-//            procurePo.setId(procurementDto.getId());
-//            procurePo.setUserId(procurementDto.getUserId());
-//            procurePo.setProductImage(procurementDto.getProductImage());
-//            procurePo.setProductName(procurementDto.getProductName());
-//            procurePo.setPrice(procurementDto.getPrice());
-//            String time = saveFormat.format(new Date());
-//            procurePo.setSaveTime(Long.valueOf(saveFormat.parse(time).getTime()));
-//            procurePo.setNumber(procurementDto.getNumber());
-////        procurePo.setCreateUserId(procurementDto.getUserId());
-//            procurePo.setIsAchieve("0");
-//            procurePo.setIsInvolved(1);
-//            procurePo.setDelFlag("0");
-//            procureService.updateFirst(procurePo);
-////            // 设置集采 发布与参与对应关系
-////            AdditionalPo additionalPo = new AdditionalPo();
-////            additionalPo.setProcureId(procurementDto.getId());
-////            additionalPo.setAdditionalId(procurePo.getId());
-////            additionalPo.setDelFlag("0");
-////            additionalService.update(additionalPo);
-//        }
         return ResponseJson.success();
     }
 
@@ -519,37 +450,10 @@ public class ProcurementServiceImpl implements ProcurementService {
     public ResponseJson updateProcurement(String id, Integer userId, Integer procurementType) {
         // 更新集采信息
         if (1 == procurementType) {
-            // 删除集采
-            /*ProcurePo procurePo = new ProcurePo();
-            procurePo.setId(id.toString());
-            procurePo.setIsInvolved(0);
-            MongodbUtils.updateFirst("_id", procurePo.getId(),
-                    new String[]{"IsInvolved"},
-                    new String[]{procurePo.getIsInvolved().toString()},
-                    ProcurePo.class);*/
             // 退出集采
             procureService.deleteById(id);
             // 删除关系
             additionalService.deleteByAdditionalId(id);
-
-
-//            AdditionalPo additionalPo = new AdditionalPo();
-//            ProcurePo procurePo = new ProcurePo();
-//            // 主集采下所有参与者 参与id
-//            List<AdditionalPo> poList = additionalService.findProcureById(id.toString());
-//            for (AdditionalPo add : poList) {
-//                ProcurePo byId = procureService.findById(add.getAdditionalId());
-//                if (byId.getUserId().equals(userId)) {
-//                    // 修改集采参与记录关系
-//                    additionalPo.setAdditionalId(byId.getId());
-//                    additionalPo.setDelFlag("1");
-//                    additionalService.update(additionalPo);
-//                    // 修改集采参与记录
-//                    procurePo.setId(byId.getId());
-//                    procurePo.setDelFlag("1");
-//                    procureService.update(procurePo);
-//                }
-//            }
         } else {
             // 删除集采
             ProcurePo procurePo = new ProcurePo();

src/main/resources/mapper/MallOrganizeMapper.xml

@@ -158,7 +158,8 @@
         FROM  cm_mall_organize_products cmop
                   LEFT JOIN product p ON cmop.productId = p.productId
                   LEFT JOIN cm_mall_active_product cmap ON cmop.id = cmap.productId
-        WHERE cmap.activeId = #{activeId}
+        WHERE cmap.activeId = #{activeId} and cmop.validFlag = 1
+        order by cmap.sort
     </select>
     <select id="getActiveImageById" resultType="com.caimei365.commodity.model.vo.MallActiveImageVo">
         select id, activeId, topic, image
@@ -185,6 +186,13 @@
         where  cma.id = #{activeId}
           and cma.enabledStatus = 1 and cmop.delFlag = 0
     </select>
+    <select id="getActiveInfo" resultType="com.caimei365.commodity.model.vo.MallActiveVo">
+        SELECT
+        cma.id, cma.topic, cma.activeType
+        FROM cm_mall_active cma
+        LEFT JOIN cm_mall_active_image cmai ON cma.id = cmai.activeId
+        WHERE cma.enabledStatus = 1 AND cmai.id = #{imageId}
+    </select>
     <select id="getImageProduct" resultType="com.caimei365.commodity.model.vo.MallOrganizeProductVo">
         SELECT
             cmap.imageId AS imageId,
@@ -199,10 +207,11 @@
             cmop.validFlag,
             p.name,
             p.mainImage
-        FROM cm_mall_active_product cmap
-                 LEFT JOIN cm_mall_organize_products cmop ON cmop.id = cmap.productId
+        FROM cm_mall_organize_products cmop
+                 LEFT JOIN cm_mall_active_product cmap ON cmop.id = cmap.productId
                  LEFT JOIN product p ON cmop.productId = p.productId
-            where cmap.imageId = #{imageId}
+            where cmap.imageId = #{imageId} and cmop.validFlag = 1
+            order by cmap.sort
     </select>
     <select id="getOrganizeProducts" resultType="com.caimei365.commodity.model.vo.MallOrganizeProductVo">
         SELECT

src/main/resources/mapper/PageMapper.xml

@@ -346,7 +346,7 @@
                p.machineType,
                p.productCode,
                p.updateTime,
-               p.validFlag,
+               cmop.validFlag,
                p.searchKey,
                p.allAreaFlag,
                p.step,

src/main/resources/mapper/PriceMapper.xml

@@ -189,6 +189,9 @@
         FROM shop
         WHERE userID = #{userId}
     </select>
+    <select id="getOrganize" resultType="java.lang.Integer">
+        select userOrganizeID as organizeId from user where userId = #{userId}
+    </select>
     <select id="findSkus" resultType="com.caimei365.commodity.model.dto.Sku">
         select cs.skuId,
                price,
@@ -212,6 +215,23 @@
         where cs.productId = #{productId}
         ORDER BY cs.price ASC
     </select>
+    <select id="findOrganizeProductSkus" resultType="com.caimei365.commodity.model.dto.Sku">
+        SELECT cs.skuId,
+               cmps.price,
+               cs.normalPrice,
+               cs.costPrice,
+               IFNULL(cs.ladderPriceFlag, 0)                                                                           AS ladderPriceFlag,
+               cs.costCheckFlag,
+               cs.costProportional,
+               IFNULL(cs.stock, 0)                                                                                     AS stock,
+               cs.unit,
+               cmps.minBuyNumber AS minBuyNumber
+
+        FROM cm_sku cs
+                 LEFT JOIN cm_mall_product_sku cmps ON cs.skuId = cmps.skuId
+        WHERE cs.productId = #{productId} OR cmps.mallProductId = #{productId}
+        ORDER BY cs.price ASC
+    </select>
     <select id="findOrganizeSkus" resultType="com.caimei365.commodity.model.vo.MallProductSkuVo">
         SELECT cmps.id,
                cs.skuId,

src/main/resources/mapper/ShopMapper.xml

@@ -601,6 +601,23 @@
         from productdetailinfo
         where productId = #{productId}
     </select>
+    <select id="getProductOrganizeDetailInfo" resultType="com.caimei365.commodity.model.po.ProductDetailInfoPo">
+        SELECT 	       p.productDetailInfoId,
+                         p.productId,
+                         p.detailInfo,
+                         p.commonDetailInfo,
+                         p.serviceInfo,
+                         p.orderInfo,
+                         p.propValueAlias,
+                         p.propValueImages,
+                         p.detailInfoTxt,
+                         p.seoTitle,
+                         p.seoKeyword,
+                         p.seoDes
+        FROM productdetailinfo p
+                 LEFT JOIN cm_mall_organize_products cmop ON cmop.productId = p.productId
+        WHERE p.productId = #{product} OR cmop.id = #{product}
+    </select>
     <select id="getProductShopById" resultType="com.caimei365.commodity.model.vo.ShopVo">
         select userID                     as userId,
                shopID                     as shopId,