bugfix

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

@@ -90,6 +90,7 @@ public class PriceUtilService {
     /**
      * 根据用户id设置详细价格
      * ind=1不屏蔽价格
+     *
      * @param price  商品价格类
      * @param userId 用户Id
      */
@@ -148,35 +149,33 @@ public class PriceUtilService {
             if (1 == price.getSvipProductFlag()) {
                 // 超级会员优惠商品,不参与促销活动（普通机构购买该商品可参与店铺促销）/阶梯价/复购价
                 s.setLadderPriceFlag(0);
-                // 根据sku查询vip优惠
-                VipSkuPriceDto vipSku=priceMapper.getVipSku(s.getSkuId());
                 // 超级会员优惠价
-                BigDecimal svipDiscountPrice = BigDecimal.valueOf(vipSku.getDiscountPrice());
-                if (1 == vipSku.getPriceType()) {
+                BigDecimal svipDiscountPrice = BigDecimal.valueOf(skus.get(0).getDiscountPrice());
+                if (1 == skus.get(0).getPriceType()) {
                     // 折扣价
-                    price.setSvipPriceTag(MathUtil.div(vipSku.getDiscount(), 10, 1) + "折");
+                    price.setSvipPriceTag(MathUtil.div(skus.get(0).getDiscount(), 10, 1) + "折");
                     if (isSuperVip) {
                         // 超级会员用户设置优惠价
                         price.setOriginalPrice(atomicDouble.get());
                         s.setOriginalPrice(s.getPrice());
-                        svipDiscountPrice = MathUtil.div(MathUtil.mul(s.getPrice(), vipSku.getDiscount()), 100, 2);
+                        svipDiscountPrice = MathUtil.div(MathUtil.mul(s.getPrice(), skus.get(0).getDiscount()), 100, 2);
                         s.setPrice(svipDiscountPrice.doubleValue());
                         price.setPrice(svipDiscountPrice.doubleValue());
                     }
-                } else if (2 == vipSku.getPriceType()) {
+                } else if (2 == skus.get(0).getPriceType()) {
                     // 直接优惠价
                     if (isSuperVip) {
                         // 超级会员用户设置优惠价
                         s.setPrice(svipDiscountPrice.doubleValue());
                         price.setPrice(svipDiscountPrice.doubleValue());
                     }
-                    if (taxFlag) {
-                        //添加税费
-                        BigDecimal thisTaxFee = MathUtil.div(MathUtil.mul(svipDiscountPrice, price.getTaxRate()), 100, 2);
-                        svipDiscountPrice = MathUtil.add(svipDiscountPrice, thisTaxFee);
-                    }
-                    price.setSvipPriceTag("￥" + svipDiscountPrice);
                 }
+                if (taxFlag) {
+                    //添加税费
+                    BigDecimal thisTaxFee = MathUtil.div(MathUtil.mul(svipDiscountPrice, price.getTaxRate()), 100, 2);
+                    svipDiscountPrice = MathUtil.add(svipDiscountPrice, thisTaxFee);
+                }
+                price.setSvipPriceTag("￥" + svipDiscountPrice);
             } else if (null != promotions) {
                 // 促销活动
                 price.setActStatus(1);
@@ -188,11 +187,11 @@ public class PriceUtilService {
                 }
                 if (promotions.getType() == 1 && promotions.getMode() == 1) {
                     // 单品优惠价的时候，取当前sku的touchprice
-                    Double touchPrice=priceMapper.getTouchPriceBySku(s.getSkuId());
+                    Double touchPrice = priceMapper.getTouchPriceBySku(s.getSkuId());
                     s.setOriginalPrice(s.getPrice());
                     price.setOriginalPrice(atomicDouble.get());
                     s.setPrice(touchPrice);
-                    price.setPrice(touchPrice);
+                    price.setPrice(skus.get(0).getTouchPrice());
                 }
                 price.setPromotions(promotions);
             } else {

src/main/java/com/caimei365/commodity/model/dto/Sku.java

@@ -15,6 +15,18 @@ import java.util.List;
 public class Sku {
 
     private Integer productId;
+
+    @ApiModelProperty("单品促销优惠价")
+    private Double touchPrice;
+
+    @ApiModelProperty("超级会员折扣")
+    private Double discount;
+
+    @ApiModelProperty("超级会员优惠价")
+    private Double discountPrice;
+
+    @ApiModelProperty("超级会员价类型：1折扣，2优惠价")
+    private Integer priceType;
     /**
      * 划线价格
      */

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

@@ -556,8 +556,8 @@ public class PageServiceImpl implements PageService {
             //商品不存在
             product = new ProductDetailVo();
             product.setValidFlag(0);
-        }else{
-            if(null!=product.getReturnGoodsStutas()&&2==product.getReturnGoodsStutas()){
+        } else {
+            if (null != product.getReturnGoodsStutas() && 2 == product.getReturnGoodsStutas()) {
                 String helpContent = pageMapper.getHelpContent(1040);
                 product.setHelpContent(helpContent);
             }
@@ -1359,52 +1359,59 @@ public class PageServiceImpl implements PageService {
 
     /**
      * 获取供应商词条信息
+     *
      * @param baikeProductVo
      * @param pageNum
      * @param pageSize
      * @return
      */
     @Override
-    public ResponseJson<PaginationVo<BaikeProductVo>> getAuthUserList(BaikeProductVo baikeProductVo,Integer pageNum,Integer pageSize){
+    public ResponseJson<PaginationVo<BaikeProductVo>> getAuthUserList(BaikeProductVo baikeProductVo, Integer pageNum, Integer pageSize) {
         PageHelper.startPage(pageNum, pageSize);
         List<BaikeProductVo> authUserList = pageMapper.getAuthUserList(baikeProductVo);
         PaginationVo<BaikeProductVo> pageData = new PaginationVo(authUserList);
         return ResponseJson.success(pageData);
     }
+
     /**
      * 修改状态  0保存草稿箱  1已发布
+     *
      * @param id
      * @return
      */
     @Override
-    public  ResponseJson upEntryStatusById(Integer id,Integer status){
-        Date publishTime=null;
-        if(1==status){
-            publishTime=new Date();
+    public ResponseJson upEntryStatusById(Integer id, Integer status) {
+        Date publishTime = null;
+        if (1 == status) {
+            publishTime = new Date();
         }
-        pageMapper.upEntryStatusById(id,status,publishTime);
+        pageMapper.upEntryStatusById(id, status, publishTime);
         return ResponseJson.success();
     }
+
     /**
      * 根据id删除词条
+     *
      * @param id
      * @return
      */
     @Override
-    public  ResponseJson delEntryStatusById(Integer id){
+    public ResponseJson delEntryStatusById(Integer id) {
         pageMapper.delEntryStatusById(id);
         return ResponseJson.success();
     }
+
     /**
      * 根据id查询详细信息
+     *
      * @param id
      * @return
      */
-    public ResponseJson<BaikeProductVo> getEntryInfoById(Integer id){
+    public ResponseJson<BaikeProductVo> getEntryInfoById(Integer id) {
         //获取词条信息
         BaikeProductVo entryInfo = pageMapper.getEntryInfoById(id);
         //概述图册
-        List<BaikeImageVo>  imageListById = pageMapper.getImageListById(id);
+        List<BaikeImageVo> imageListById = pageMapper.getImageListById(id);
         entryInfo.setImageList(imageListById);
         //视频列表
         List<BaikeVideoVo> videoList = pageMapper.getVideoListById(id);
@@ -1417,22 +1424,23 @@ public class PageServiceImpl implements PageService {
         entryInfo.setTextInfoList(textInfoListList);
         //参考资料
         List<CmBaikeReferenceInfo> referenceList = pageMapper.getReferenceListById(id);
-        if(referenceList!=null&&referenceList.size()>0){
-            for(CmBaikeReferenceInfo reference : referenceList){
-                SimpleDateFormat dateFormat=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-                if(null!=reference.getPublishTime()){
-                   String publishTime= dateFormat.format(reference.getPublishTime());
+        if (referenceList != null && referenceList.size() > 0) {
+            for (CmBaikeReferenceInfo reference : referenceList) {
+                SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                if (null != reference.getPublishTime()) {
+                    String publishTime = dateFormat.format(reference.getPublishTime());
                     reference.setPublishTimeStr(publishTime);
                 }
-                if(null!=reference.getAcitationTime()){
-                    String acitationTime= dateFormat.format(reference.getAcitationTime());
+                if (null != reference.getAcitationTime()) {
+                    String acitationTime = dateFormat.format(reference.getAcitationTime());
                     reference.setAcitationTimeStr(acitationTime);
                 }
-                if(null!=reference.getPublicationYear()){
-                    String publicationYear= dateFormat.format(reference.getPublicationYear());
+                if (null != reference.getPublicationYear()) {
+                    String publicationYear = dateFormat.format(reference.getPublicationYear());
                     reference.setPublicationYearStr(publicationYear);
                 }
-            };
+            }
+            ;
         }
         entryInfo.setReferenceList(referenceList);
         //分类集合
@@ -1440,239 +1448,252 @@ public class PageServiceImpl implements PageService {
         entryInfo.setTypeList(TypeList);
         return ResponseJson.success(entryInfo);
     }
+
     /**
      * 根据id删除资料
+     *
      * @param id
      * @return
      */
     @Override
-    public ResponseJson delReferenceById(Integer id){
+    public ResponseJson delReferenceById(Integer id) {
         pageMapper.delReferenceById(id);
         return ResponseJson.success();
     }
 
     /**
      * 根据id查询资料
+     *
      * @param id
      * @return
      */
     @Override
-    public ResponseJson<CmBaikeReferenceInfo> getReferenceById(Integer id){
+    public ResponseJson<CmBaikeReferenceInfo> getReferenceById(Integer id) {
         CmBaikeReferenceInfo reference = pageMapper.getReferenceById(id);
-        SimpleDateFormat dateFormat=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        if(null!=reference.getPublishTime()){
-            String publishTime= dateFormat.format(reference.getPublishTime());
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        if (null != reference.getPublishTime()) {
+            String publishTime = dateFormat.format(reference.getPublishTime());
             reference.setPublishTimeStr(publishTime);
         }
-        if(null!=reference.getAcitationTime()){
-            String acitationTime= dateFormat.format(reference.getAcitationTime());
+        if (null != reference.getAcitationTime()) {
+            String acitationTime = dateFormat.format(reference.getAcitationTime());
             reference.setAcitationTimeStr(acitationTime);
         }
-        if(null!=reference.getPublicationYear()){
-            String publicationYear= dateFormat.format(reference.getPublicationYear());
+        if (null != reference.getPublicationYear()) {
+            String publicationYear = dateFormat.format(reference.getPublicationYear());
             reference.setPublicationYearStr(publicationYear);
         }
         return ResponseJson.success(reference);
     }
+
     /**
      * 更新资料
+     *
      * @param cmBaikeReferenceInfo
      * @return
      */
     @Override
-    public ResponseJson upReferenceInfoByid(CmBaikeReferenceInfo cmBaikeReferenceInfo){
+    public ResponseJson upReferenceInfoByid(CmBaikeReferenceInfo cmBaikeReferenceInfo) {
         pageMapper.upReferenceInfoByid(cmBaikeReferenceInfo);
         return ResponseJson.success();
     }
+
     /**
      * 新增资料
+     *
      * @param cmBaikeReferenceInfo
      * @return
      */
     @Override
-    public ResponseJson insertReferenceInfo(CmBaikeReferenceInfo cmBaikeReferenceInfo){
+    public ResponseJson insertReferenceInfo(CmBaikeReferenceInfo cmBaikeReferenceInfo) {
         pageMapper.insertReferenceInfo(cmBaikeReferenceInfo);
         return ResponseJson.success();
     }
+
     /**
      * 获取分类下来列表
+     *
      * @return
      */
     @Override
-    public ResponseJson<List<BaikeTypeVo>> geTypeList(){
+    public ResponseJson<List<BaikeTypeVo>> geTypeList() {
         List<BaikeTypeVo> TypeList = pageMapper.geTypeList();
-      return ResponseJson.success(TypeList);
+        return ResponseJson.success(TypeList);
     }
+
     /**
      * 修改词条详细信息
+     *
      * @param baikeProductVo
      * @return
      */
-   @Override
-   @Transactional
-    public ResponseJson upEntryInfo(BaikeProductVo baikeProductVo){
+    @Override
+    @Transactional
+    public ResponseJson upEntryInfo(BaikeProductVo baikeProductVo) {
 //       //根据authUserId获取shopid
 //       if(null!=baikeProductVo&&null!=baikeProductVo.getAuthUserId()){
 //           Integer shopid = pageMapper.getShopid(baikeProductVo.getAuthUserId());
 //           baikeProductVo.setShopId(shopid);
 //           baikeProductVo.setPublishSource(2);
 //       }
-        if(null!=baikeProductVo &&null!=baikeProductVo.getShopId()){
+        if (null != baikeProductVo && null != baikeProductVo.getShopId()) {
             baikeProductVo.setPublishSource(2);
         }
-       //保存词条信息
-       if(null!=baikeProductVo&&baikeProductVo.getStatus()==1){
-           Date date=new Date();
-           baikeProductVo.setPublishTime(date);
-       }
-       pageMapper.upEntryInfo(baikeProductVo);
+        //保存词条信息
+        if (null != baikeProductVo && baikeProductVo.getStatus() == 1) {
+            Date date = new Date();
+            baikeProductVo.setPublishTime(date);
+        }
+        pageMapper.upEntryInfo(baikeProductVo);
         //删除概述图片（视频）/信息栏/正文信息
-       pageMapper.delImageListByEntryId(baikeProductVo.getProductId());//图片
-       pageMapper.delVideoListByEntryId(baikeProductVo.getProductId());//视频
-       pageMapper.delInfoListByEntryId(baikeProductVo.getProductId());//信息栏
-       pageMapper.delTextListByEntryId(baikeProductVo.getProductId());//正文
-       pageMapper.delreferenceByEntryId(baikeProductVo.getProductId());//资料
-
-       //保存新的概述图册
-       List<BaikeImageVo> imageList = baikeProductVo.getImageList();
-       if(null!=imageList&&imageList.size()>0){
-           for (BaikeImageVo baikeImageVo:imageList) {
-               baikeImageVo.setEntryId(baikeProductVo.getProductId());
-               pageMapper.insertImage(baikeImageVo);
-           }
-       }
-       //保存视频
-       List<BaikeVideoVo> videoList = baikeProductVo.getVideoList();
-       if(null!=videoList&&videoList.size()>0){
-           for (BaikeVideoVo baikeVideoVo:videoList) {
-               baikeVideoVo.setEntryId(baikeProductVo.getProductId());
-               pageMapper.insertVideo(baikeVideoVo);
-           }
-       }
-       //保存信息栏
-       List<BaikeInfoVo> infoList = baikeProductVo.getInfoList();
-       if(null!=infoList&&infoList.size()>0){
-           for (BaikeInfoVo baikeInfoVo:infoList) {
-               baikeInfoVo.setEntryId(baikeProductVo.getProductId());
-               pageMapper.insertInfo(baikeInfoVo);
-           }
-       }
-       //保存正文
-       List<BaikeTextInfoVo> TextList = baikeProductVo.getTextInfoList();
-       if(null!=infoList&&infoList.size()>0){
-           for (BaikeTextInfoVo baikeInfoVo:TextList) {
-               baikeInfoVo.setEntryId(baikeProductVo.getProductId());
-               pageMapper.insertText(baikeInfoVo);
-           }
-       }
-         //保存资料
-       List<CmBaikeReferenceInfo> referenceList = baikeProductVo.getReferenceList();
-       if(null!=referenceList&&referenceList.size()>0){
-           for (CmBaikeReferenceInfo reference:referenceList) {
-               if(null!=reference){
-                        if(null==reference.getPublicationYear()){
-                           reference.setPublicationYear(null);
-                       }
-                       if(StringUtils.isEmpty(reference.getPublicationYearStr())){
-                           reference.setPublicationYearStr(null);
-                       }
-                       if(null==reference.getPublishTime()){
-                           reference.setPublishTime(null);
-                       }
-                       if(StringUtils.isEmpty(reference.getPublishTimeStr())){
-                           reference.setPublishTimeStr(null);
-                       }
-                       if(null==reference.getAcitationTime()){
-                           reference.setAcitationTime(null);
-                       }
-                       if(StringUtils.isEmpty(reference.getAcitationTimeStr())){
-                           reference.setAcitationTimeStr(null);
-                       }
-                   }
-                   reference.setEntryId(baikeProductVo.getProductId());
-                   pageMapper.insertreference(reference);
-               }
-       }
-       return ResponseJson.success();
+        pageMapper.delImageListByEntryId(baikeProductVo.getProductId());//图片
+        pageMapper.delVideoListByEntryId(baikeProductVo.getProductId());//视频
+        pageMapper.delInfoListByEntryId(baikeProductVo.getProductId());//信息栏
+        pageMapper.delTextListByEntryId(baikeProductVo.getProductId());//正文
+        pageMapper.delreferenceByEntryId(baikeProductVo.getProductId());//资料
+
+        //保存新的概述图册
+        List<BaikeImageVo> imageList = baikeProductVo.getImageList();
+        if (null != imageList && imageList.size() > 0) {
+            for (BaikeImageVo baikeImageVo : imageList) {
+                baikeImageVo.setEntryId(baikeProductVo.getProductId());
+                pageMapper.insertImage(baikeImageVo);
+            }
+        }
+        //保存视频
+        List<BaikeVideoVo> videoList = baikeProductVo.getVideoList();
+        if (null != videoList && videoList.size() > 0) {
+            for (BaikeVideoVo baikeVideoVo : videoList) {
+                baikeVideoVo.setEntryId(baikeProductVo.getProductId());
+                pageMapper.insertVideo(baikeVideoVo);
+            }
+        }
+        //保存信息栏
+        List<BaikeInfoVo> infoList = baikeProductVo.getInfoList();
+        if (null != infoList && infoList.size() > 0) {
+            for (BaikeInfoVo baikeInfoVo : infoList) {
+                baikeInfoVo.setEntryId(baikeProductVo.getProductId());
+                pageMapper.insertInfo(baikeInfoVo);
+            }
+        }
+        //保存正文
+        List<BaikeTextInfoVo> TextList = baikeProductVo.getTextInfoList();
+        if (null != infoList && infoList.size() > 0) {
+            for (BaikeTextInfoVo baikeInfoVo : TextList) {
+                baikeInfoVo.setEntryId(baikeProductVo.getProductId());
+                pageMapper.insertText(baikeInfoVo);
+            }
+        }
+        //保存资料
+        List<CmBaikeReferenceInfo> referenceList = baikeProductVo.getReferenceList();
+        if (null != referenceList && referenceList.size() > 0) {
+            for (CmBaikeReferenceInfo reference : referenceList) {
+                if (null != reference) {
+                    if (null == reference.getPublicationYear()) {
+                        reference.setPublicationYear(null);
+                    }
+                    if (StringUtils.isEmpty(reference.getPublicationYearStr())) {
+                        reference.setPublicationYearStr(null);
+                    }
+                    if (null == reference.getPublishTime()) {
+                        reference.setPublishTime(null);
+                    }
+                    if (StringUtils.isEmpty(reference.getPublishTimeStr())) {
+                        reference.setPublishTimeStr(null);
+                    }
+                    if (null == reference.getAcitationTime()) {
+                        reference.setAcitationTime(null);
+                    }
+                    if (StringUtils.isEmpty(reference.getAcitationTimeStr())) {
+                        reference.setAcitationTimeStr(null);
+                    }
+                }
+                reference.setEntryId(baikeProductVo.getProductId());
+                pageMapper.insertreference(reference);
+            }
+        }
+        return ResponseJson.success();
     }
+
     /**
      * 新增词条详细信息
+     *
      * @param baikeProductVo
      * @return
      */
     @Override
     @Transactional
-    public ResponseJson insertEntryInfo(BaikeProductVo baikeProductVo){
+    public ResponseJson insertEntryInfo(BaikeProductVo baikeProductVo) {
         //根据authUserId获取shopid
 //        if(null!=baikeProductVo&&null!=baikeProductVo.getAuthUserId()){
 //            Integer shopid = pageMapper.getShopid(baikeProductVo.getAuthUserId());
 //            baikeProductVo.setShopId(shopid);
 //            baikeProductVo.setPublishSource(2);
 //        }
-        if(null!=baikeProductVo &&null!=baikeProductVo.getShopId()){
+        if (null != baikeProductVo && null != baikeProductVo.getShopId()) {
             baikeProductVo.setPublishSource(2);
         }
-        if(null!=baikeProductVo&&baikeProductVo.getStatus()==1){
-            Date date=new Date();
+        if (null != baikeProductVo && baikeProductVo.getStatus() == 1) {
+            Date date = new Date();
             baikeProductVo.setPublishTime(date);
         }
         //新增词条信息
         pageMapper.insertEntryInfo(baikeProductVo);
         //查询新添加的词条id
-        Integer id=pageMapper.getentryId();
+        Integer id = pageMapper.getentryId();
         //保存新的概述图册
         List<BaikeImageVo> imageList = baikeProductVo.getImageList();
-        if(null!=imageList&&imageList.size()>0){
-            for (BaikeImageVo baikeImageVo:imageList) {
+        if (null != imageList && imageList.size() > 0) {
+            for (BaikeImageVo baikeImageVo : imageList) {
                 baikeImageVo.setEntryId(id);
                 pageMapper.insertImage(baikeImageVo);
             }
         }
         //保存视频
         List<BaikeVideoVo> videoList = baikeProductVo.getVideoList();
-        if(null!=videoList&&videoList.size()>0){
-            for (BaikeVideoVo baikeVideoVo:videoList) {
+        if (null != videoList && videoList.size() > 0) {
+            for (BaikeVideoVo baikeVideoVo : videoList) {
                 baikeVideoVo.setEntryId(id);
                 pageMapper.insertVideo(baikeVideoVo);
             }
         }
         //保存信息栏
         List<BaikeInfoVo> infoList = baikeProductVo.getInfoList();
-        if(null!=infoList&&infoList.size()>0){
-            for (BaikeInfoVo baikeInfoVo:infoList) {
+        if (null != infoList && infoList.size() > 0) {
+            for (BaikeInfoVo baikeInfoVo : infoList) {
                 baikeInfoVo.setEntryId(id);
                 pageMapper.insertInfo(baikeInfoVo);
             }
         }
         //保存正文
         List<BaikeTextInfoVo> TextList = baikeProductVo.getTextInfoList();
-        if(null!=infoList&&infoList.size()>0){
-            for (BaikeTextInfoVo baikeInfoVo:TextList) {
+        if (null != infoList && infoList.size() > 0) {
+            for (BaikeTextInfoVo baikeInfoVo : TextList) {
                 baikeInfoVo.setEntryId(id);
                 pageMapper.insertText(baikeInfoVo);
             }
         }
         //保存资料
         List<CmBaikeReferenceInfo> referenceList = baikeProductVo.getReferenceList();
-        if(null!=referenceList&&referenceList.size()>0){
-            for (CmBaikeReferenceInfo reference:referenceList) {
-                if(null!=reference){
-                    if(null==reference.getPublicationYear()){
+        if (null != referenceList && referenceList.size() > 0) {
+            for (CmBaikeReferenceInfo reference : referenceList) {
+                if (null != reference) {
+                    if (null == reference.getPublicationYear()) {
                         reference.setPublicationYear(null);
                     }
-                    if(StringUtils.isEmpty(reference.getPublicationYearStr())){
+                    if (StringUtils.isEmpty(reference.getPublicationYearStr())) {
                         reference.setPublicationYearStr(null);
                     }
-                    if(null==reference.getPublishTime()){
+                    if (null == reference.getPublishTime()) {
                         reference.setPublishTime(null);
                     }
-                    if(StringUtils.isEmpty(reference.getPublishTimeStr())){
+                    if (StringUtils.isEmpty(reference.getPublishTimeStr())) {
                         reference.setPublishTimeStr(null);
                     }
-                    if(null==reference.getAcitationTime()){
+                    if (null == reference.getAcitationTime()) {
                         reference.setAcitationTime(null);
                     }
-                    if(StringUtils.isEmpty(reference.getAcitationTimeStr())){
+                    if (StringUtils.isEmpty(reference.getAcitationTimeStr())) {
                         reference.setAcitationTimeStr(null);
                     }
                 }

src/main/resources/mapper/PriceMapper.xml

@@ -26,11 +26,12 @@
                ccs.discountPrice            as svipDiscountPrice,
                p.productType
         from product p
-                 left join cm_svip_product csp on p.productID = csp.productId
-        left join (select priceType,discount,discountPrice,csps.productId from cm_svip_product_sku csps
-        left join cm_sku cs on csps.skuId=cs.skuId
-        where csps.productId=#{productId}
-            order by cs.price asc limit 1) ccs on ccs.productId=p.productId
+        left join cm_svip_product csp on p.productID = csp.productId
+        left join (select priceType,discount,discountPrice,csps.productId
+                from cm_svip_product_sku csps
+                left join cm_sku cs on csps.skuId=cs.skuId
+                where csps.productId=#{productId}
+                order by cs.price asc limit 1) ccs on ccs.productId=p.productId
         where p.productID = #{productId}
     </select>
     <select id="getListPriceByProductIds" resultType="com.caimei365.commodity.model.vo.PriceVo">
@@ -183,7 +184,7 @@
         WHERE userID = #{userId}
     </select>
     <select id="findSkus" resultType="com.caimei365.commodity.model.dto.Sku">
-        select skuId,
+        select cs.skuId,
                price,
                normalPrice,
                costPrice,
@@ -196,10 +197,16 @@
                                      FROM product_ladder_price
                                      WHERE skuId = cs.skuId
                                      ORDER BY buyNum asc
-                                     LIMIT 1))                                                                      AS minBuyNumber
+                                     LIMIT 1))                                                                      AS minBuyNumber,
+               cps.touchPrice,
+               csps.priceType,
+               csps.discountPrice,
+               csps.discount
         from cm_sku cs
-        where productId = #{productId}
-        ORDER BY price ASC
+        left join cm_promotion_sku cps on cs.skuId = cps.skuId
+        left join cm_svip_product_sku csps on cs.skuId = csps.skuId
+        where cs.productId = #{productId}
+        ORDER BY cs.price ASC
     </select>
     <select id="findLowPrice" resultType="com.caimei365.commodity.model.vo.ProductItemVo">
         select plp.buyPrice as price, cs.unit as unit, plp.buyNum as minBuyNumber, cs.skuId as skuId, cs.stock