bug fixes

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

@@ -72,8 +72,8 @@ public class CouponServiceImpl implements CouponService {
             ShopVo shop = shopMapper.getProductShopById(coupon.getShopId());
             if (shop != null && StringUtils.isNotBlank(shop.getName())) {
                 String shopName = shop.getName();
-                if (shopName.length() > 10) {
-                    shopName = shopName.substring(0, 10) + "...";
+                if (shopName.length() > 7) {
+                    shopName = shopName.substring(0, 6) + "...";
                 }
                 coupon.setShopName(shopName);
             }

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

@@ -9,13 +9,11 @@ import com.caimei365.commodity.model.ResponseJson;
 import com.caimei365.commodity.model.po.ProductDetailInfoPo;
 import com.caimei365.commodity.model.po.ProductImagePo;
 import com.caimei365.commodity.model.po.ProductParameterPo;
-import com.caimei365.commodity.model.vo.ProductRepairVo;
 import com.caimei365.commodity.model.search.ProductListVo;
 import com.caimei365.commodity.model.vo.*;
 import com.caimei365.commodity.service.PageService;
 import com.caimei365.commodity.utils.AppletsLinkUtil;
 import com.caimei365.commodity.utils.ImageUtils;
-import com.caimei365.commodity.components.PriceUtilService;
 import com.caimei365.commodity.utils.MathUtil;
 import com.github.pagehelper.PageHelper;
 import lombok.extern.slf4j.Slf4j;
@@ -26,8 +24,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -713,7 +709,6 @@ public class PageServiceImpl implements PageService {
     /**
      * 设置跳转参数
      *
-     *
      * @param floorContent FloorContentVo
      */
     private void setFloorLinkType(FloorContentVo floorContent) {
@@ -834,7 +829,7 @@ public class PageServiceImpl implements PageService {
                     couponsLogo = true;
                     break;
                 }
-                if (coupon.getCouponType() == 1 && product.getCommodityType().equals(coupon.getCategoryType())) {
+                if (coupon.getCouponType() == 1 && coupon.getCategoryType().equals(product.getCommodityType())) {
                     //品类券
                     couponsLogo = true;
                     break;