超级会员优惠券供应商名称回显

src/main/java/com/caimei/modules/coupon/entity/SvipCouponForm.java

@@ -23,6 +23,12 @@ public class SvipCouponForm extends DataEntity<SvipCouponForm> {
     private String productInfo2;        //商品json数据
     private String productInfo3;        //商品json数据
     private String productInfo4;        //商品json数据
+
+    private String shopName1;
+    private String shopName2;
+    private String shopName3;
+    private String shopName4;
+
 //    /**
 //     * 网站活动页banner
 //     */
@@ -88,6 +94,38 @@ public class SvipCouponForm extends DataEntity<SvipCouponForm> {
     private Integer shopId3;
     private Integer shopId4;
 
+    public String getShopName1() {
+        return shopName1;
+    }
+
+    public void setShopName1(String shopName1) {
+        this.shopName1 = shopName1;
+    }
+
+    public String getShopName2() {
+        return shopName2;
+    }
+
+    public void setShopName2(String shopName2) {
+        this.shopName2 = shopName2;
+    }
+
+    public String getShopName3() {
+        return shopName3;
+    }
+
+    public void setShopName3(String shopName3) {
+        this.shopName3 = shopName3;
+    }
+
+    public String getShopName4() {
+        return shopName4;
+    }
+
+    public void setShopName4(String shopName4) {
+        this.shopName4 = shopName4;
+    }
+
     public String getProductInfo1() {
         return productInfo1;
     }

src/main/java/com/caimei/modules/coupon/service/CmVipCouponService.java

@@ -291,6 +291,8 @@ public class CmVipCouponService extends CrudService<SvipCouponListDao, SvipCoupo
         }
         if (coupon1.getCouponType() == 3) {
             form.setShopId1(coupon1.getShopId());
+            String shopName = vipDao.findShopName(coupon1.getShopId());
+            form.setShopName1(shopName);
         }
 
         if (coupon2.getCouponType() == 0) {
@@ -301,6 +303,8 @@ public class CmVipCouponService extends CrudService<SvipCouponListDao, SvipCoupo
         }
         if (coupon2.getCouponType() == 3) {
             form.setShopId2(coupon2.getShopId());
+            String shopName = vipDao.findShopName(coupon2.getShopId());
+            form.setShopName2(shopName);
         }
 
         if (coupon3.getCouponType() == 0) {
@@ -311,6 +315,8 @@ public class CmVipCouponService extends CrudService<SvipCouponListDao, SvipCoupo
         }
         if (coupon3.getCouponType() == 3) {
             form.setShopId3(coupon3.getShopId());
+            String shopName = vipDao.findShopName(coupon3.getShopId());
+            form.setShopName3(shopName);
         }
 
         if (coupon4.getCouponType() == 0) {
@@ -321,6 +327,8 @@ public class CmVipCouponService extends CrudService<SvipCouponListDao, SvipCoupo
         }
         if (coupon4.getCouponType() == 3) {
             form.setShopId4(coupon4.getShopId());
+            String shopName = vipDao.findShopName(coupon4.getShopId());
+            form.setShopName4(shopName);
         }
 
         return form;

src/main/resources/mappings/modules/super/CmSvipHistoryMapper.xml

@@ -141,7 +141,7 @@
                 and (payTime between #{startPayTime} and #{endPayTime})
             </if>
             <if test="startEndTime !=null and startEndTime!='' and endEndTime!=null and endEndTime!=''">
-                and (endTime between #{startEndTime} and #{endEndTime})
+                and (cu.endTime between #{startEndTime} and #{endEndTime})
             </if>
             <if test="packageId !=null and packageId!=''">
                 and packageId=#{packageId}

src/main/webapp/WEB-INF/views/modules/svip/cmSvipCouponList.jsp

@@ -78,7 +78,7 @@
                     <c:if test="${cmCoupon.svipCoupons.categoryType1 eq '1'}">仅可购买产品类商品</c:if>
                 </c:if>
                 <c:if test="${cmCoupon.svipCoupons.couponType1 eq 3}">店铺券￥${cmCoupon.svipCoupons.couponAmount1}，满${cmCoupon.svipCoupons.touchPrice1}可用，仅可购买店铺
-                    ${cmCoupon.svipCoupons.shopId1}的商品
+                    ${cmCoupon.svipCoupons.shopName1} 的商品
                 </c:if>
                 <br/>
                 优惠券2：
@@ -91,7 +91,7 @@
                     <c:if test="${cmCoupon.svipCoupons.categoryType2 eq '1'}">仅可购买产品类商品</c:if>
                 </c:if>
                 <c:if test="${cmCoupon.svipCoupons.couponType2 eq 3}">店铺券￥${cmCoupon.svipCoupons.couponAmount2}，满${cmCoupon.svipCoupons.touchPrice2}可用，仅可购买店铺
-                    ${cmCoupon.svipCoupons.shopId2}的商品
+                    ${cmCoupon.svipCoupons.shopName2} 的商品
                 </c:if>
                 <br/>
                 优惠券3：
@@ -104,7 +104,7 @@
                     <c:if test="${cmCoupon.svipCoupons.categoryType3 eq '1'}">仅可购买产品类商品</c:if>
                 </c:if>
                 <c:if test="${cmCoupon.svipCoupons.couponType3 eq 3}">店铺券￥${cmCoupon.svipCoupons.couponAmount3}，满${cmCoupon.svipCoupons.touchPrice3}可用，仅可购买店铺
-                    ${cmCoupon.svipCoupons.shopId3}的商品
+                    ${cmCoupon.svipCoupons.shopName3} 的商品
                 </c:if>
                 <br/>
                 优惠券4：
@@ -117,7 +117,7 @@
                     <c:if test="${cmCoupon.svipCoupons.categoryType4 eq '1'}">仅可购买产品类商品</c:if>
                 </c:if>
                 <c:if test="${cmCoupon.svipCoupons.couponType4 eq 3}">店铺券￥${cmCoupon.svipCoupons.couponAmount4}，满${cmCoupon.svipCoupons.touchPrice4}可用，仅可购买店铺
-                    ${cmCoupon.svipCoupons.shopId4}的商品
+                    ${cmCoupon.svipCoupons.shopName4} 的商品
                 </c:if>
             </td>