获取当前机构下所有已领取优惠券

src/main/java/com/caimei/modules/bulkpurchase/web/CmClubController.java

@@ -57,29 +57,6 @@ public class CmClubController extends BaseController {
 				club.setAddress(newAddress);
 			}
 		}
-       /* List<CmClub> list = page.getList();
-        for (CmClub club : list) {
-            StringBuilder builder =new StringBuilder();
-            String address = club.getAddress();
-            String recAddress = club.getRecAddress();
-            String city = club.getCity();
-            String town = club.getTown();
-            String province = club.getProvince();
-            if (null!=province){
-                builder.append(province);
-            } if (null!=province){
-                builder.append(city);
-            } if (null!=town){
-                builder.append(town);
-            } if (null!=address){
-                builder.append(address);
-            }else{
-                if(null!=recAddress){
-                    builder.append(recAddress);
-                }
-            }
-            club.setAddress(builder.toString());
-         }*/
         model.addAttribute("page", page);
 		return "modules/bulkpurchase/cmClubListBox";
 	}

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

@@ -7,6 +7,7 @@ import org.hibernate.validator.constraints.Length;
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 优惠券管理Entity
@@ -38,8 +39,10 @@ public class CmCoupon extends DataEntity<CmCoupon> {
     private String source;      //领取渠道：1小程序 2网站 3订单退回
     private String shopName;        //供应商名称
     private Integer codeNum;       //兑换码数量
+    private Integer clubCouponId;      //机构领券id
     private CmCouponClub couponClub;
     private NewCmShop shop;
+    private List<Integer> productIdList;
 
     public CmCoupon() {
         super();
@@ -239,4 +242,20 @@ public class CmCoupon extends DataEntity<CmCoupon> {
     public void setShop(NewCmShop shop) {
         this.shop = shop;
     }
+
+    public Integer getClubCouponId() {
+        return clubCouponId;
+    }
+
+    public void setClubCouponId(Integer clubCouponId) {
+        this.clubCouponId = clubCouponId;
+    }
+
+    public List<Integer> getProductIdList() {
+        return productIdList;
+    }
+
+    public void setProductIdList(List<Integer> productIdList) {
+        this.productIdList = productIdList;
+    }
 }

src/main/java/com/caimei/modules/order/dao/NewOrderDao.java

@@ -1,5 +1,6 @@
 package com.caimei.modules.order.dao;
 
+import com.caimei.modules.coupon.entity.CmCoupon;
 import com.caimei.modules.order.entity.CmFile;
 import com.caimei.modules.order.entity.NewOrder;
 import com.caimei.modules.product.entity.CmPromotion;
@@ -137,4 +138,20 @@ public interface NewOrderDao extends CrudDao<NewOrder> {
      * @param num
      */
     void updateSendNum(@Param("markId") int markId, @Param("num") int num);
+
+    /**
+     * 查询机构下所有优惠券
+     *
+     * @param userId
+     * @return
+     */
+    List<CmCoupon> findClubCouponList(Integer userId);
+
+    /**
+     * 查询活动券-指定商品
+     *
+     * @param couponId
+     * @return
+     */
+    List<Integer> findAllProductId(String couponId);
 }

src/main/java/com/caimei/modules/order/service/NewOrderService.java

@@ -7,6 +7,7 @@ import com.caimei.exception.BusinessException;
 import com.caimei.modules.bulkpurchase.dao.OrderInvoiceDao;
 import com.caimei.modules.bulkpurchase.entity.OrderInvoice;
 import com.caimei.modules.bulkpurchase.service.OrderInvoiceService;
+import com.caimei.modules.coupon.entity.CmCoupon;
 import com.caimei.modules.miniprogram.utils.UploadPicUtils;
 import com.caimei.modules.order.dao.*;
 import com.caimei.modules.order.entity.*;
@@ -2180,5 +2181,19 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
         }
         return logisticsRecords;
     }
+
+    public Map<String, Object> clubCouponList(Integer userId) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("success", true);
+        List<CmCoupon> couponList = newOrderDao.findClubCouponList(userId);
+        couponList.forEach(coupon -> {
+            if (coupon.getCouponType() == 0 && "2".equals(coupon.getProductType())) {
+                List<Integer> productIdList = newOrderDao.findAllProductId(coupon.getId());
+                coupon.setProductIdList(productIdList);
+            }
+        });
+        map.put("couponList", couponList);
+        return map;
+    }
 }
 

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

@@ -2116,4 +2116,18 @@ public class NewOrderController extends BaseController {
         model.addAttribute("orderId", orderId);
         return "modules/order/qualificationInfo";
     }
+
+    /**
+     * 获取当前机构下所有已领取优惠券
+     */
+    @RequestMapping("clubCouponList")
+    public Map<String, Object> clubCouponList(Integer userId) {
+        Map<String, Object> map = new HashMap<>();
+        if (null == userId) {
+            map.put("success", false);
+            map.put("msg", "参数异常");
+            return map;
+        }
+        return newOrderService.clubCouponList(userId);
+    }
 }

src/main/resources/mappings/modules/coupon/CmCouponMapper.xml

@@ -202,7 +202,7 @@
 		  p.name AS productName,
 		  p.mainImage AS image
 		FROM
-		  cm_coupon_associate cca
+		  cm_coupon_product cca
 		  LEFT JOIN product p ON cca.productId = p.productID
 		  LEFT JOIN shop s ON p.shopID = s.shopID
 		WHERE
@@ -213,7 +213,7 @@
 	</select>
 
 	<insert id="insertCouponAssociate">
-		INSERT INTO `cm_coupon_associate` (
+		INSERT INTO `cm_coupon_product` (
 		  `couponId`, `productId`, `pcStatus`,
 		  `appletsStatus`,
 		  `sort`, `addTime`, `delFlag`
@@ -227,12 +227,12 @@
 	</insert>
 
 	<select id="findByCouponId" resultType="integer">
-		SELECT id FROM cm_coupon_associate WHERE couponId = #{couponId} AND delFlag = 0
+		SELECT id FROM cm_coupon_product WHERE couponId = #{couponId} AND delFlag = 0
 	</select>
 
 	<update id="updateCouponAssociate">
 		UPDATE
-		  `cm_coupon_associate`
+		  `cm_coupon_product`
 		<set>
 		  <if test="pcStatus != null and pcStatus != ''">
 				`pcStatus` = #{pcStatus},
@@ -249,7 +249,7 @@
 	</update>
 
 	<update id="logicDeleteCouponAssociate">
-		UPDATE cm_coupon_associate SET delFlag = 1 WHERE id = #{id}
+		UPDATE cm_coupon_product SET delFlag = 1 WHERE id = #{id}
 	</update>
 
 	<update id="updateByDelFlag">
@@ -257,7 +257,7 @@
 	</update>
 
 	<update id="updateAssociateByDelFlag">
-		UPDATE cm_coupon_associate SET delFlag = 1 WHERE couponId = #{couponId}
+		UPDATE cm_coupon_product SET delFlag = 1 WHERE couponId = #{couponId}
 	</update>
 
 	<select id="findCouponClub" resultType="com.caimei.modules.coupon.entity.CmCouponClub">

src/main/resources/mappings/modules/order/OrderMapper.xml

@@ -860,4 +860,52 @@
 	<update id="updateSendNum">
         UPDATE cm_sms_statistics SET sendNum = (sendNum + #{num}) WHERE markId = #{markId}
     </update>
+
+	<select id="findClubCouponList" resultType="com.caimei.modules.coupon.entity.CmCoupon">
+		SELECT
+		  `id`,
+		  `name`,
+		  `couponAmount`,
+		  `touchPrice`,
+		  `startDate`,
+		  `endDate`,
+		  `status`,
+		  `couponType`,
+		  `userId`,
+		  `shopId`,
+		  `productType`,
+		  `pcBanner`,
+		  `appletsBanner`,
+		  `categoryType`,
+		  `couponsMode`,
+		  `createDate`,
+		  `delFlag`,
+		  a.id AS clubCouponId
+		FROM
+		  cm_coupon_club a
+		  LEFT JOIN cm_coupon cc ON a.couponId = cc.id
+		WHERE
+		  cc.delFlag = 0
+		  AND a.delFlag = 0
+		  AND a.userId =
+		  AND a.status = 1
+		  AND NOW() BETWEEN cc.startDate
+		  AND cc.endDate
+		  AND cc.status != 2
+		ORDER BY
+		  a.createDate DESC
+	</select>
+
+	<select id="findAllProductId" resultType="integer">
+		SELECT
+		  productId
+		FROM
+		  cm_coupon_product
+		WHERE
+		  couponId = #{couponId}
+		  AND (
+			pcStatus = 2
+			OR appletsStatus = 1
+		  )
+	</select>
 </mapper>

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

@@ -14,8 +14,8 @@
 						var productInfo = JSON.stringify(imageList);
 						$('#productInfo').val(productInfo);
 					}
-					var couponAmount = $("#couponAmount").val();
-					var touchPrice = $("#touchPrice").val();
+					var couponAmount = $("#couponAmount").val()*1;
+					var touchPrice = $("#touchPrice").val()*1;
 					if (couponAmount >= touchPrice) {
 						alertx("优惠券金额必须小于优惠条件金额");
 						return false;

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

@@ -10,8 +10,8 @@
             //$("#name").focus();
             $("#inputForm").validate({
                 submitHandler: function(form){
-                    var couponAmount = $("#couponAmount").val();
-                    var touchPrice = $("#touchPrice").val();
+                    var couponAmount = $("#couponAmount").val()*1;
+                    var touchPrice = $("#touchPrice").val()*1;
                     if (couponAmount >= touchPrice) {
                         alertx("优惠券金额必须小于优惠条件金额");
                         return false;

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

@@ -10,8 +10,8 @@
             //$("#name").focus();
             $("#inputForm").validate({
                 submitHandler: function(form){
-                    var couponAmount = $("#couponAmount").val();
-                    var touchPrice = $("#touchPrice").val();
+                    var couponAmount = $("#couponAmount").val()*1;
+                    var touchPrice = $("#touchPrice").val()*1;
                     if (couponAmount >= touchPrice) {
                         alertx("优惠券金额必须小于优惠条件金额");
                         return false;

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

@@ -13,8 +13,8 @@
                         alertx("请选择供应商");
                         return false;
                     }
-                    var couponAmount = $("#couponAmount").val();
-                    var touchPrice = $("#touchPrice").val();
+                    var couponAmount = $("#couponAmount").val()*1;
+                    var touchPrice = $("#touchPrice").val()*1;
                     if (couponAmount >= touchPrice) {
                         alertx("优惠券金额必须小于优惠条件金额");
                         return false;

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

@@ -10,8 +10,8 @@
             //$("#name").focus();
             $("#inputForm").validate({
                 submitHandler: function (form) {
-                    var couponAmount = $("#couponAmount").val();
-                    var touchPrice = $("#touchPrice").val();
+                    var couponAmount = $("#couponAmount").val()*1;
+                    var touchPrice = $("#touchPrice").val()*1;
                     if (couponAmount >= touchPrice) {
                         alertx("优惠券金额必须小于优惠条件金额");
                         return false;

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

@@ -9,8 +9,8 @@
         $(document).ready(function() {
             $("#inputForm").validate({
                 submitHandler: function(form){
-                    var couponAmount = $("#couponAmount").val();
-                    var touchPrice = $("#touchPrice").val();
+                    var couponAmount = $("#couponAmount").val()*1;
+                    var touchPrice = $("#touchPrice").val()*1;
                     if (couponAmount >= touchPrice) {
                         alertx("优惠券金额必须小于优惠条件金额");
                         return false;