颜选1.3.1

src/main/java/com/caimei/controller/CouponApi.java

@@ -141,4 +141,10 @@ public class CouponApi {
     public ResponseJson<String> shareCouponDisplay() {
         return couponService.shareCouponDisplay();
     }
+
+    @ApiOperation("分享券金额展示")
+    @GetMapping("/share/amount/display")
+    public ResponseJson<Map<String,Object>> shareCouponAmount() {
+        return couponService.shareCouponAmount();
+    }
 }

src/main/java/com/caimei/controller/ProductApi.java

@@ -1,9 +1,6 @@
 package com.caimei.controller;
 
-import com.alibaba.fastjson.JSONObject;
-import com.caimei.model.ResponseJson;
-import com.caimei.model.vo.CmHeHeImageVo;
-import com.caimei.service.ProductService;
+
 import com.caimei.util.HttpRequest;
 import com.caimei.util.OkHttpUtil;
 import io.swagger.annotations.Api;
@@ -30,7 +27,6 @@ import java.util.List;
 @RequiredArgsConstructor
 @RequestMapping("/product")
 public class ProductApi {
-    private final ProductService productService;
 
     @Value("${caimei.cloudApi}")
     private String cloudApi;

src/main/java/com/caimei/mapper/CouponMapper.java

@@ -170,4 +170,6 @@ public interface CouponMapper {
     ReceiveCouponPo getReceiveCouponById(Integer receiveCouponId);
 
     Integer getShareRecordCount(Integer orderId);
+
+    List<Double> getCouponAmountList(int couponType);
 }

src/main/java/com/caimei/mapper/ProductMapper.java

@@ -1,8 +1,6 @@
 package com.caimei.mapper;
 
 import com.caimei.model.po.CmHeheCollageProductPo;
-import com.caimei.model.po.ProductDetailInfoPo;
-import com.caimei.model.po.UserSearchHistoryPo;
 import com.caimei.model.vo.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -57,7 +55,7 @@ public interface ProductMapper {
      * @param userId
      * @return
      */
-    Integer findProductDiscount(@Param("productId") Integer productId, @Param("userId") Integer userId);
+    HeHeDiscountVo findProductDiscount(@Param("productId") Integer productId, @Param("userId") Integer userId);
 
     /**
      * 查找拼团商品

src/main/java/com/caimei/model/vo/CmHeHeImageVo.java

@@ -12,15 +12,30 @@ import java.io.Serializable;
 @Data
 public class CmHeHeImageVo implements Serializable {
 
+    /**
+     * 主题
+     */
+    private String topic;
+
     /**
      * 轮播图
      */
     private String image;
 
     /**
-     * 链接
+     * 跳转链接
+     */
+    private String jumpLink;
+
+    /**
+     * 跳转商品id
+     */
+    private String jumpProductId;
+
+    /**
+     * 跳转图片
      */
-    private String link;
+    private String jumpImage;
 
     private static final long serialVersionUID = 1L;
 }

src/main/java/com/caimei/model/vo/HeHeDiscountVo.java

@@ -0,0 +1,30 @@
+package com.caimei.model.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * Description
+ *
+ * @author : plf
+ * @date : 2021/4/27
+ */
+@Data
+public class HeHeDiscountVo implements Serializable {
+    /**
+     * 内部优惠活动id
+     */
+    private Integer discountId;
+
+    /**
+     * 折扣率
+     */
+    private Integer discount;
+
+    /**
+     * 折扣价
+     */
+    private BigDecimal discountPrice;
+}

src/main/java/com/caimei/service/CouponService.java

@@ -89,4 +89,10 @@ public interface CouponService {
      * 分享券广告展示
      */
     ResponseJson<String> shareCouponDisplay();
+
+    /**
+     * 分享券金额展示
+     * @return
+     */
+    ResponseJson<Map<String, Object>> shareCouponAmount();
 }

src/main/java/com/caimei/service/ProductService.java

@@ -1,26 +0,0 @@
-package com.caimei.service;
-
-import com.caimei.model.ResponseJson;
-import com.caimei.model.vo.CmHeHeImageVo;
-import com.caimei.model.vo.FloorVo;
-import com.caimei.model.vo.HeHeActivityVo;
-import com.caimei.model.vo.ProductVo;
-import com.github.pagehelper.PageInfo;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * Description
- *
- * @author : plf
- * @date : 2021/4/22
- */
-public interface ProductService {
-    /**
-     * 轮播图
-     *
-     * @return
-     */
-    ResponseJson<List<CmHeHeImageVo>> carouselFigure();
-}

src/main/java/com/caimei/service/impl/CouponServiceImpl.java

@@ -1,19 +1,14 @@
 package com.caimei.service.impl;
 
 import com.caimei.mapper.CouponMapper;
-import com.caimei.mapper.ProductMapper;
 import com.caimei.model.ResponseJson;
 import com.caimei.model.dto.CouponsDto;
 import com.caimei.model.po.ReceiveCouponPo;
-import com.caimei.model.po.UserSearchHistoryPo;
 import com.caimei.model.vo.*;
 import com.caimei.service.CouponService;
-import com.caimei.service.ProductService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -29,10 +24,6 @@ import java.util.*;
 public class CouponServiceImpl implements CouponService {
     @Resource
     private CouponMapper couponMapper;
-    @Autowired
-    private ProductService productService;
-    @Resource
-    private ProductMapper productMapper;
 
 
     @Override
@@ -115,29 +106,6 @@ public class CouponServiceImpl implements CouponService {
         return ResponseJson.success(map);
     }
 
-    /*@Override
-    public ResponseJson<PageInfo<ProductVo>> productPage(Integer couponId, Integer userId, String productName, int pageNum, int pageSize) {
-        PageHelper.startPage(pageNum, pageSize);
-        List<ProductVo> productList = couponMapper.getCouponProduct(couponId, productName);
-        //搜索关键字
-        if (StringUtils.isNotBlank(productName) && userId != null && userId > 0) {
-            Integer recordId = productMapper.findSearchHistory(userId, productName);
-            if (recordId != null && recordId > 0) {
-                productMapper.updateHistoryByDate(recordId);
-            } else {
-                UserSearchHistoryPo history = new UserSearchHistoryPo();
-                history.setUserId(Long.valueOf(userId));
-                history.setDelFlag("0");
-                history.setSearchWord(productName);
-                history.setSearchDate(new Date());
-                productMapper.insertSearchHistory(history);
-            }
-        }
-        productList.forEach(product -> productService.setProductDetails(product,userId));
-        PageInfo<ProductVo> pageInfo = new PageInfo<>(productList);
-        return ResponseJson.success(pageInfo);
-    }*/
-
     @Override
     public ResponseJson<String> collarCoupons(CouponsDto couponsDto) {
         Integer receiveCouponId = couponMapper.findReceiveCouponId(couponsDto.getUserId(), couponsDto.getCouponId(), couponsDto.getCouponShareId());
@@ -211,4 +179,20 @@ public class CouponServiceImpl implements CouponService {
         couponDisplay += shareCouponCount > 0 ? ",3" : "";
         return ResponseJson.success(couponDisplay);
     }
+
+    @Override
+    public ResponseJson<Map<String, Object>> shareCouponAmount() {
+        // 好友邀请券
+        List<Double> inviteCouponList = couponMapper.getCouponAmountList(4);
+        // 好友消费券
+        List<Double> consumeCouponList = couponMapper.getCouponAmountList(5);
+        // 消费分享券
+        List<Double> shareCouponList = couponMapper.getCouponAmountList(6);
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("inviteCouponList", inviteCouponList);
+        map.put("consumeCouponList", consumeCouponList);
+        map.put("shareCouponList", shareCouponList);
+        return ResponseJson.success(map);
+    }
+
 }

src/main/java/com/caimei/service/impl/OrderServiceImpl.java

@@ -12,7 +12,6 @@ import com.caimei.model.po.ReceiveCouponPo;
 import com.caimei.model.po.UserSearchHistoryPo;
 import com.caimei.model.vo.*;
 import com.caimei.service.OrderService;
-import com.caimei.service.ProductService;
 import com.caimei.service.ShoppingCartService;
 import com.caimei.util.MathUtil;
 import com.caimei.util.ProductUtils;
@@ -46,8 +45,6 @@ public class OrderServiceImpl implements OrderService {
     private ProductMapper productMapper;
     @Resource
     private CouponMapper couponMapper;
-    @Resource
-    private ProductService productService;
     @Value("${caimei.oldapi}")
     private String domain;
 
@@ -432,14 +429,6 @@ public class OrderServiceImpl implements OrderService {
         if (null != userId && userId > 0) {
             Integer orderId = collageMapper.getMemberOrderId(collageId, userId);
             collageDetails.setOrderId(orderId);
-            // 内部优惠
-            Integer discount = productMapper.findProductDiscount(product.getProductId(), userId);
-            if (null != discount && discount > 0) {
-                product.setPrice(MathUtil.div(MathUtil.mul(product.getPrice(), discount), 100));
-                if (null != product.getNormalPrice()) {
-                    product.setNormalPrice(MathUtil.div(MathUtil.mul(product.getNormalPrice(), discount), 100));
-                }
-            }
             //税费
             boolean addTaxFlag = ("0".equals(product.getIncludedTax()) && ("1".equals(product.getInvoiceType()) || "2".equals(product.getInvoiceType())));
             if (addTaxFlag) {

src/main/java/com/caimei/service/impl/OrderSubmitServiceImpl.java

@@ -308,6 +308,8 @@ public class OrderSubmitServiceImpl implements OrderSubmitService {
                     Integer activityId = productMapper.getActivityIdByProductId(productId);
                     // 商品参与的限时特价活动
                     BigDecimal discountPrice = productMapper.getDiscountPrice(productId);
+                    // 内部优惠折扣
+                    HeHeDiscountVo discount = productMapper.findProductDiscount(product.getProductId(), userId);
                     if (activityId != null && activityId > 0) {
                         //活动阶梯
                         List<ActivityLadderVo> ladderList = productMapper.getActivityLadderList(activityId, productId);
@@ -330,11 +332,18 @@ public class OrderSubmitServiceImpl implements OrderSubmitService {
                         // 限时特价
                         priceType = 3;
                         productPrice = discountPrice;
-                    }
-
-                    Integer discount = productMapper.findProductDiscount(productId, userId);
-                    if (null != discount && discount > 0) {
-                        productPrice = MathUtil.div(MathUtil.mul(productPrice, discount), 100);
+                    }  else if (discount != null) {
+                        // 内部优惠价
+                        priceType = 4;
+                        // 折扣价
+                        BigDecimal disPrice = discount.getDiscountPrice();
+                        // 折扣率
+                        Integer dis = discount.getDiscount();
+                        if (null != disPrice && disPrice.compareTo(BigDecimal.ZERO)>0) {
+                            productPrice = disPrice;
+                        } else if (null != dis && dis > 0) {
+                            productPrice = MathUtil.div(MathUtil.mul(product.getPrice(), dis), 100);
+                        }
                     }
                     //不含税可开票商品计算税费
                     boolean addTaxFlag = (0 == product.getIncludedTax()) && (1 == product.getInvoiceType() || 2 == product.getInvoiceType());

src/main/java/com/caimei/service/impl/ProductServiceImpl.java

@@ -1,238 +0,0 @@
-package com.caimei.service.impl;
-
-import com.caimei.mapper.ProductMapper;
-import com.caimei.model.ResponseJson;
-import com.caimei.model.po.CmHeheCollageProductPo;
-import com.caimei.model.vo.*;
-import com.caimei.service.ProductService;
-import com.caimei.util.MathUtil;
-import com.caimei.util.ProductUtils;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.math.BigDecimal;
-import java.util.*;
-
-/**
- * Description
- *
- * @author : plf
- * @date : 2021/4/22
- */
-@Service
-public class ProductServiceImpl implements ProductService {
-    @Resource
-    private ProductMapper productMapper;
-    @Value("${caimei.oldapi}")
-    private String domain;
-
-    @Override
-    public ResponseJson<List<CmHeHeImageVo>> carouselFigure() {
-        List<CmHeHeImageVo> images = productMapper.findAllImage();
-        return ResponseJson.success(images);
-    }
-
-    /*@Override
-    public ResponseJson<PageInfo<ProductVo>> productList(String name, Integer userId, Integer pageNum, Integer pageSize) {
-        PageHelper.startPage(pageNum, pageSize);
-        List<ProductVo> productList = productMapper.findProductList(name);
-        productList.forEach(product -> setProductDetails(product, userId));
-        PageInfo<ProductVo> pageInfo = new PageInfo<>(productList);
-
-        //搜索关键字
-        if (StringUtils.isNotBlank(name) && userId != null && userId > 0) {
-            Integer recordId = productMapper.findSearchHistory(userId, name);
-            if (recordId != null && recordId > 0) {
-                productMapper.updateHistoryByDate(recordId);
-            } else {
-                UserSearchHistoryPo history = new UserSearchHistoryPo();
-                history.setUserId(Long.valueOf(userId));
-                history.setDelFlag("0");
-                history.setSearchWord(name);
-                history.setSearchDate(new Date());
-                productMapper.insertSearchHistory(history);
-            }
-        }
-        return ResponseJson.success(pageInfo);
-    }*/
-
-    /*@Override
-    public void setProductDetails(ProductVo product, Integer userId) {
-        product.setMainImage(ProductUtils.getImageURL("product", product.getMainImage(), 0, domain));
-        Integer activityId = productMapper.getActivityIdByProductId(product.getProductId());
-        // 拼团商品
-        CmHeheCollageProductPo collageProduct = productMapper.findCollageProduct(product.getProductId());
-        if (activityId != null && activityId > 0) {
-            product.setActiveStatus(1);
-            //活动阶梯
-            List<ActivityLadderVo> ladderList = productMapper.getActivityLadderList(activityId, product.getProductId());
-            if (ladderList != null && ladderList.size() > 0) {
-                ActivityLadderVo ladder = ladderList.get(0);
-                // 没有起订量概念，默认显示购买1个商品的价格，若第一阶梯为一个商品，则取第一阶梯时间
-                product.setPrice(1 == ladder.getBuyNum() ? ladder.getBuyPrice() : product.getPrice());
-            }
-        } else if (collageProduct != null) {
-            // 拼团价
-            product.setNormalPrice(product.getPrice());
-            product.setPrice(collageProduct.getPrice());
-            product.setCollageStatus(1);
-            product.setCollageProduct(collageProduct);
-        }
-        Integer discount = productMapper.findProductDiscount(product.getProductId(), userId);
-        if (null != discount && discount > 0) {
-            product.setPrice(MathUtil.div(MathUtil.mul(product.getPrice(), discount), 100));
-            if (null != product.getNormalPrice()) {
-                product.setNormalPrice(MathUtil.div(MathUtil.mul(product.getNormalPrice(), discount), 100));
-            }
-        }
-        //税费
-        boolean addTaxFlag = ("0".equals(product.getIncludedTax()) && ("1".equals(product.getInvoiceType()) || "2".equals(product.getInvoiceType())));
-        if (addTaxFlag) {
-            BigDecimal addedValueTax = MathUtil.div(MathUtil.mul(product.getPrice(), product.getClubTaxPoint()), BigDecimal.valueOf(100), 2);
-            BigDecimal price = MathUtil.add(product.getPrice(), addedValueTax);
-            product.setPrice(price);
-            if (null != product.getNormalPrice()) {
-                addedValueTax = MathUtil.div(MathUtil.mul(product.getNormalPrice(), product.getClubTaxPoint()), BigDecimal.valueOf(100), 2);
-                price = MathUtil.add(product.getNormalPrice(), addedValueTax);
-                product.setNormalPrice(price);
-            }
-        }
-        // 正在进行的全商城商品优惠券数量
-        Integer allCount = productMapper.findAllProductCouponCount();
-        if (allCount > 0) {
-            product.setCouponsLogo(true);
-        }
-        // 该商品参与的正在进行的部分商品优惠券
-        Integer partCount = productMapper.findPartProductCounponCount(product.getProductId());
-        if (partCount > 0) {
-            product.setCouponsLogo(true);
-        }
-    }*/
-
-    /*@Override
-    public ResponseJson<ProductVo> productDetails(Integer productId, Integer userId) {
-        ProductDetailsVo product = productMapper.findProductByProductId(productId);
-        if (product == null) {
-            //商品不存在
-            return ResponseJson.error("商品不存在", null);
-        }
-        String[] split = null;
-        //商品标签
-        if (product.getTags() != null) {
-            String tags = product.getTags();
-            tags = tags.replace(" ", ",").replace("、", ",").replace("，", ",");
-            split = tags.split(",");
-            List<String> list = new ArrayList<>();
-            for (String s : split) {
-                if (StringUtils.isNotBlank(s)) {
-                    list.add(s);
-                }
-            }
-            split = list.toArray(new String[list.size()]);
-        }
-        product.setTagsList(split);
-        //商品图片
-        List<String> list = new ArrayList<>();
-        List<String> imageList = productMapper.findProductImages(product.getProductId());
-        for (String image : imageList) {
-            image = ProductUtils.getImageURL("product", image, 0, domain);
-            list.add(image);
-        }
-        product.setImageList(list);
-        //商品详情
-        ProductDetailInfoPo productDetail = productMapper.findProductDetail(product.getProductId());
-        product.setProductDetail(productDetail);
-        //商品分类
-        String typeName = productMapper.findTypeName(product.getBigTypeId(), product.getSmallTypeId(), product.getTinyTypeId());
-        product.setTypeName(typeName);
-        //品牌名称
-        String brandName = productMapper.findBrandName(product.getBrandId());
-        if (StringUtils.isNotBlank(brandName)) {
-            product.setBrandName(brandName);
-        }
-        //相关参数
-        List<RelatedParametersVo> parametersList = productMapper.findParameters(product.getProductId());
-        product.setParametersList(parametersList);
-        Integer activityId = productMapper.findActivityByProductId(product.getProductId());
-        //内部优惠折扣
-        Integer discount = productMapper.findProductDiscount(product.getProductId(), userId);
-        //税费
-        boolean addTaxFlag = ("0".equals(product.getIncludedTax()) && ("1".equals(product.getInvoiceType()) || "2".equals(product.getInvoiceType())));
-        if (activityId != null && activityId > 0) {
-            //活动阶梯
-            List<ActivityLadderVo> ladderList = productMapper.findActivityLadder(activityId, product.getProductId());
-            if (null != discount && discount > 0 && null != ladderList && ladderList.size() > 0) {
-                ladderList.forEach(ladder-> ladder.setBuyPrice(MathUtil.div(MathUtil.mul(ladder.getBuyPrice(), discount), 100)));
-            }
-            if (addTaxFlag && null != ladderList && ladderList.size() > 0) {
-                ladderList.forEach(ladder->{
-                    BigDecimal addedValueTax = MathUtil.div(MathUtil.mul(ladder.getBuyPrice(), product.getClubTaxPoint()), BigDecimal.valueOf(100), 2);
-                    BigDecimal price = MathUtil.add(ladder.getBuyPrice(), addedValueTax);
-                    ladder.setBuyPrice(price);
-                });
-            }
-            product.setLadderList(ladderList);
-        }
-        setProductDetails(product, userId);
-        return ResponseJson.success(product);
-    }
-
-    @Override
-    public ResponseJson<List<String>> searchHistory(Integer userId) {
-        List<String> searchList = productMapper.searchHistory(userId);
-        if (searchList.size() == 10) {
-            //只保留10条记录
-            productMapper.deleteHistoryByUserId(userId);
-        }
-        return ResponseJson.success(searchList);
-    }
-
-    @Override
-    public ResponseJson<String> deleteHistory(Integer userId) {
-        productMapper.deleteHistory(userId);
-        return ResponseJson.success(null);
-    }
-
-    @Override
-    public ResponseJson<PageInfo<HeHeActivityVo>> activityArea(Integer userId, Integer pageNum, Integer pageSize) {
-        PageHelper.startPage(pageNum, pageSize);
-        List<HeHeActivityVo> activityList = productMapper.findActivityAll(userId);
-        PageInfo<HeHeActivityVo> pageInfo = new PageInfo<>(activityList);
-        return ResponseJson.success(pageInfo);
-    }
-
-    @Override
-    public ResponseJson<Map<String, Object>> activityDetails(Integer userId, Integer activityId, Integer pageNum, Integer pageSize) {
-        Map<String, Object> map = new HashMap<>(2);
-        String image = productMapper.findActivityById(activityId);
-        PageHelper.startPage(pageNum, pageSize);
-        List<ProductVo> productList = productMapper.findActivityProduct(userId, activityId);
-        productList.forEach(product -> setProductDetails(product, userId));
-        PageInfo<ProductVo> pageInfo = new PageInfo<>(productList);
-        map.put("image", image);
-        map.put("pageInfo", pageInfo);
-        return ResponseJson.success(map);
-    }
-
-
-    @Override
-    public ResponseJson<List<FloorVo>> productFloor(Integer userId) {
-        List<FloorVo> floorList = productMapper.findAllFloor();
-        floorList.forEach(floor -> {
-            List<ProductVo> productList = productMapper.findFloorProductList(floor.getFloorId(), null, 6);
-            productList.forEach(product -> setProductDetails(product, userId));
-            floor.setProductList(productList);
-        });
-        return ResponseJson.success(floorList);
-    }
-
-    @Override
-    public ResponseJson<PageInfo<ProductVo>> floorDetail(Integer floorId, Integer userId, String productName, Integer pageNum, Integer pageSize) {
-        PageHelper.startPage(pageNum, pageSize);
-        List<ProductVo> productList = productMapper.findFloorProductList(floorId, productName, null);
-        productList.forEach(product -> setProductDetails(product, userId));
-        PageInfo<ProductVo> pageInfo = new PageInfo<>(productList);
-        return ResponseJson.success(pageInfo);
-    }*/
-}

src/main/java/com/caimei/service/impl/ShoppingCartServiceImpl.java

@@ -96,6 +96,8 @@ public class ShoppingCartServiceImpl implements ShoppingCartService {
         CmHeheCollageProductPo collageProduct = productMapper.findCollageProduct(product.getProductId());
         // 限时特价
         BigDecimal discountPrice = productMapper.getDiscountPrice(product.getProductId());
+        // 内部优惠折扣
+        HeHeDiscountVo discount = productMapper.findProductDiscount(product.getProductId(), userId);
         if (activityId != null && activityId > 0) {
             product.setActiveStatus(1);
             //活动阶梯
@@ -117,17 +119,20 @@ public class ShoppingCartServiceImpl implements ShoppingCartService {
             // 限时特价
             product.setPrice(discountPrice);
             product.setDiscountStatus(1);
-        }
-        List<ActivityLadderVo> ladderList = product.getLadderList();
-        // 内部优惠折扣
-        Integer discount = productMapper.findProductDiscount(product.getProductId(), userId);
-        if (null != discount && discount > 0) {
-            product.setPrice(MathUtil.div(MathUtil.mul(product.getPrice(), discount), 100, 2));
-            product.setNormalPrice(MathUtil.div(MathUtil.mul(product.getNormalPrice(), discount), 100, 2));
-            if (null != ladderList) {
-                ladderList.forEach(ladder-> ladder.setBuyPrice((MathUtil.div(MathUtil.mul(ladder.getBuyPrice(), discount), 100, 2))));
+        } else if (discount != null) {
+            BigDecimal price = product.getPrice();
+            // 折扣价
+            BigDecimal disPrice = discount.getDiscountPrice();
+            // 折扣率
+            Integer dis = discount.getDiscount();
+            if (null != disPrice && disPrice.compareTo(BigDecimal.ZERO)>0) {
+                price = disPrice;
+            } else if (null != dis && dis > 0) {
+                price = MathUtil.div(MathUtil.mul(product.getPrice(), dis), 100);
             }
+            product.setPrice(price);
         }
+        List<ActivityLadderVo> ladderList = product.getLadderList();
         //税费
         boolean addTaxFlag = ("0".equals(product.getIncludedTax()) && ("1".equals(product.getInvoiceType()) || "2".equals(product.getInvoiceType())));
         // 为商品价格和阶梯列表添加税费

src/main/resources/mapper/CouponMapper.xml

@@ -244,5 +244,13 @@
     <select id="getShareRecordCount" resultType="java.lang.Integer">
         select count(*) from cm_hehe_coupon_share where orderId = #{orderId}
     </select>
+    <select id="getCouponAmountList" resultType="java.lang.Double">
+        select couponAmount
+        from cm_hehe_coupon
+        where couponType = #{couponType}
+          and if(startNowFlag = 1, true, NOW() <![CDATA[  >=  ]]> startTime)
+          and if(permanentFlag = 1, true, NOW() <![CDATA[  <=  ]]> endTime)
+        order by couponAmount;
+    </select>
 
 </mapper>

src/main/resources/mapper/ProductMapper.xml

@@ -4,14 +4,15 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.caimei.mapper.ProductMapper">
     <select id="findAllImage" resultType="com.caimei.model.vo.CmHeHeImageVo">
-        SELECT
-            image,link
-        FROM
-            cm_hehe_image
-        WHERE
-            status = 1
-        ORDER BY
-            - sort DESC
+        SELECT topic,
+               image,
+               jumpType,
+               jumpLink,
+               jumpProductId,
+               jumpImage
+        FROM cm_hehe_image
+        WHERE status = 1
+        ORDER BY - sort DESC
     </select>
 
 
@@ -68,8 +69,8 @@
             a.productId = #{productId}
     </select>
 
-    <select id="findProductDiscount" resultType="java.lang.Integer">
-        select chd.discount
+    <select id="findProductDiscount" resultType="com.caimei.model.vo.HeHeDiscountVo">
+        select chd.id as discountId, chd.discount,if(chd.productType = 2,chdp.discountPrice,null) as discountPrice
         from cm_hehe_discount chd
                  left join cm_hehe_discount_product chdp on chd.id = chdp.discountId
                  left join cm_hehe_discount_user chdu on chd.id = chdu.discountId