bug fixes

src/main/java/com/caimei/modules/order/entity/NewOrderProduct.java

@@ -111,6 +111,7 @@ public class NewOrderProduct extends DataEntity<NewOrderProduct> {
     private String secondHandType;//二手商品分类，1二手仪器，2临期产品，3其他
     private CmPromotion productPromotion; //下单时商品对应的促销活动
     private Integer ladderPriceFlag;        // 启用阶梯价格标识 0否 1是
+    private Integer couponsLogo;        //显示优惠券查看: 1不显示 2显示
 
     public Integer getLadderPriceFlag() {
         return ladderPriceFlag;
@@ -944,4 +945,12 @@ public class NewOrderProduct extends DataEntity<NewOrderProduct> {
     public void setHeUserName(String heUserName) {
         this.heUserName = heUserName;
     }
+
+    public Integer getCouponsLogo() {
+        return couponsLogo;
+    }
+
+    public void setCouponsLogo(Integer couponsLogo) {
+        this.couponsLogo = couponsLogo;
+    }
 }

src/main/java/com/caimei/modules/order/web/NewOrderController.java

@@ -11,6 +11,7 @@ import com.caimei.modules.bulkpurchase.service.PurchaseProductService;
 import com.caimei.modules.common.utils.ExcelUtil;
 import com.caimei.modules.common.utils.UploadUtils;
 import com.caimei.modules.coupon.entity.CmCouponOrderRecord;
+import com.caimei.modules.coupon.service.CmCouponService;
 import com.caimei.modules.order.dao.CmDiscernReceiptDao;
 import com.caimei.modules.order.dao.CmReceiptOrderRelationDao;
 import com.caimei.modules.order.dao.CmReturnedPurchaseDao;
@@ -135,6 +136,8 @@ public class NewOrderController extends BaseController {
     private CmPromotionDao cmPromotionDao;
     @Autowired
     private PurchaseProductService purchaseProductService;
+    @Autowired
+    private CmCouponService cmCouponService;
 
     @ModelAttribute
     public NewOrder get(@RequestParam(required = false) String id) {
@@ -238,8 +241,8 @@ public class NewOrderController extends BaseController {
                             orderProduct.setLadderPriceFlag(0);
                         }
                     }
+                    Product product = productDao.get(orderProduct.getProductID().toString());
                     if (null == orderPromotions) {
-                        Product product = productDao.get(orderProduct.getProductID().toString());
                         if (1 == orderProduct.getLadderPriceFlag() && "1".equals(product.getLadderPriceFlag())) {
                             // 查询商品当前阶梯价格
                             List<ProductLadderPrice> ladderPriceList = purchaseProductService.findLadderPriceList(orderProduct.getProductID().longValue());
@@ -259,6 +262,13 @@ public class NewOrderController extends BaseController {
                             orderProduct.setIsActProduct("0");
                         }
                     }
+                    //是否有优惠券可以查看
+                    Boolean couponsLogo = cmCouponService.setCouponsLogo(newOrder.getUserID(), orderProduct.getProductID(), orderProduct.getShopID(), product.getCommodityType());
+                    if (couponsLogo) {
+                        orderProduct.setCouponsLogo(2);
+                    } else {
+                        orderProduct.setCouponsLogo(1);
+                    }
                 }
             }
             if (null != newOrder.getOrderID() && null != newOrder.getClauseName()) {

src/main/webapp/WEB-INF/views/modules/coupon/productCouponDetails.jsp

@@ -14,8 +14,9 @@
         .productDetail p{margin:0;line-height:22px;}
         .couponList{margin:20px auto;}
         .couponList h4{margin-bottom:10px;}
+        .couponList ul{display:flex;flex-wrap:wrap;}
         .couponList ul:after{content:"";display:table;clear:both}
-        .couponList ul li{float:left;list-style:none;list-style-position:inside;border:1px solid #eee;margin:0 20px 20px 0;width:250px;padding:10px}
+        .couponList ul li{list-style:none;list-style-position:inside;border:1px solid #eee;margin:0 20px 20px 0;width:250px;padding:10px}
         .couponList ul span{display:inline-block;width:100%;padding:2px}
         .couponList ul span.couponDesc{min-height:72px;}
     </style>

src/main/webapp/WEB-INF/views/modules/order/orderForm.jsp

@@ -23,8 +23,9 @@
         .ladderPrice:hover .list{display:block}
         .ladderPrice .list span{margin:0 20px;width:60px;text-align:center;display:inline-block}
         .ladderPrice .list span.price{color:red}
+        ul.couponContent{display:flex;flex-wrap:wrap;}
         ul.couponContent:after{content:"";display:table;clear:both}
-        ul.couponContent li{float:left;list-style:none;list-style-position:inside;border:1px solid #eee;margin:20px 20px 20px 0;width:300px;padding:10px}
+        ul.couponContent li{list-style:none;list-style-position:inside;border:1px solid #eee;margin:20px 20px 20px 0;width:300px;padding:10px}
         ul.couponContent label{display:flex;align-items:center}
         ul.couponContent span{display:inline-block;width:100%;padding:2px}
         ul.couponContent span.couponDesc{min-height:72px;}