优惠券申请退款相关

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

@@ -239,6 +239,11 @@ public class CmRefundsProductController extends BaseController {
                     }
                 }
             }
+            //使用优惠券只能全退
+            if (newOrder.getCouponAmount() > 0) {
+                isPromotions = true;
+                returnedPurchaseFee = MathUtil.sub(returnedPurchaseFee, newOrder.getCouponAmount()).doubleValue();
+            }
             returnedPurchaseFee = returnedPurchaseFee - newOrder.getPromotionFullReduction();
             refundFee += getRefundFee(newOrder, returnedPurchaseFee, 1);//运费默认是退的
             cmReturnedPurchase.setRefundFee(refundFee);
@@ -389,6 +394,10 @@ public class CmRefundsProductController extends BaseController {
                     //减去促销满减金额
                     returnedPurchaseFee = returnedPurchaseFee - newOrder.getPromotionFullReduction();
                 }
+                if (newOrder.getCouponAmount() > 0) {
+                    //减去优惠券金额
+                    returnedPurchaseFee = MathUtil.sub(returnedPurchaseFee, newOrder.getCouponAmount()).doubleValue();
+                }
                 refundFee += getRefundFee(newOrder, returnedPurchaseFee, freightNum);
             }
 

src/main/java/com/caimei/modules/coupon/dao/CmCouponClubDao.java

@@ -38,13 +38,6 @@ public interface CmCouponClubDao extends CrudDao<CmCouponClub> {
      */
     CmCoupon getCoupons(Integer couponId);
 
-    /**
-     * 保存用户优惠券信息
-     *
-     * @param couponClub
-     */
-    void insertCouponClub(CmCouponClub couponClub);
-
     /**
      * 更新兑换码使用状态
      *
@@ -52,4 +45,11 @@ public interface CmCouponClubDao extends CrudDao<CmCouponClub> {
      * @param clubCouponId 用户关联优惠券id
      */
     void updateRedemptionCode(@Param("id") String id, @Param("clubCouponId") String clubCouponId);
+
+    /**
+     * 逻辑删除订单退回
+     *
+     * @param returnedId
+     */
+    void deleteByReturnedId(int returnedId);
 }

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

@@ -19,6 +19,7 @@ public class CmCouponClub extends DataEntity<CmCouponClub> {
     private Integer userId;        // 机构用户Id
     private Integer couponId;        // 优惠券id
     private Integer orderId;        // 订单id
+    private Integer returnedId;     //退款id,订单退回时有效
     private String source;        // 领取渠道：1小程序 2网站 3订单退回
     private String status;        // 使用状态 1未使用 2已使用
     private Date useDate;        // 使用时间
@@ -64,6 +65,14 @@ public class CmCouponClub extends DataEntity<CmCouponClub> {
         this.orderId = orderId;
     }
 
+    public Integer getReturnedId() {
+        return returnedId;
+    }
+
+    public void setReturnedId(Integer returnedId) {
+        this.returnedId = returnedId;
+    }
+
     @Length(min = 0, max = 1, message = "领取渠道：1小程序 2网站 3订单退回长度必须介于 0 和 1 之间")
     public String getSource() {
         return source;

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

@@ -100,7 +100,7 @@ public class CmCouponClubService extends CrudService<CmCouponClubDao, CmCouponCl
         couponClub.setStatus("1");
         couponClub.setCreateDate(new Date());
         couponClub.setDelFlag("0");
-        cmCouponClubDao.insertCouponClub(couponClub);
+        cmCouponClubDao.insert(couponClub);
         cmCouponClubDao.updateRedemptionCode(cmCouponRedemptionCode.getId(), couponClub.getId());
         map.put("code", 0);
         map.put("msg", "优惠券兑换成功");

src/main/java/com/caimei/modules/coupon/web/CmCouponClubController.java

@@ -1,5 +1,6 @@
 package com.caimei.modules.coupon.web;
 
+import com.caimei.modules.coupon.dao.CmCouponClubDao;
 import com.caimei.modules.coupon.entity.CmCouponClub;
 import com.caimei.modules.coupon.entity.CmCouponRedemptionCode;
 import com.caimei.modules.coupon.service.CmCouponClubService;
@@ -17,6 +18,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -31,6 +33,8 @@ public class CmCouponClubController extends BaseController {
 
     @Autowired
     private CmCouponClubService cmCouponClubService;
+    @Autowired
+    private CmCouponClubDao cmCouponClubDao;
 
     @ModelAttribute
     public CmCouponClub get(@RequestParam(required = false) String id) {
@@ -67,6 +71,9 @@ public class CmCouponClubController extends BaseController {
      */
     @RequestMapping("couponDetails")
     public String clubCouponDetails(CmCouponClub cmCouponClub, HttpServletRequest request, HttpServletResponse response, Model model) {
+        List<CmCouponClub> couponClubList = cmCouponClubDao.receivingUserList(cmCouponClub);
+        cmCouponClub.setNum(couponClubList.get(0).getNum());
+        cmCouponClub.setClubName(couponClubList.get(0).getClubName());
         Page<CmCouponClub> page = cmCouponClubService.findCouponDetails(new Page<CmCouponClub>(request, response), cmCouponClub);
         model.addAttribute("page", page);
         model.addAttribute("cmCouponClub", cmCouponClub);

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

@@ -1,6 +1,9 @@
 package com.caimei.modules.order.service;
 
 import com.alibaba.fastjson.JSONObject;
+import com.caimei.modules.coupon.dao.CmCouponClubDao;
+import com.caimei.modules.coupon.entity.CmCouponClub;
+import com.caimei.modules.coupon.entity.CmCouponOrderRecord;
 import com.caimei.modules.miniprogram.utils.DateUtils;
 import com.caimei.modules.order.dao.*;
 import com.caimei.modules.order.entity.*;
@@ -83,6 +86,8 @@ public class CmReturnedPurchaseService extends CrudService<CmReturnedPurchaseDao
     private NewCmClubDao newCmClubDao;
     @Autowired
     private CmUserbeanshistoryDao cmUserbeanshistoryDao;
+    @Autowired
+    private CmCouponClubDao cmCouponClubDao;
 
 
     public CmReturnedPurchase get(String id) {
@@ -214,6 +219,10 @@ public class CmReturnedPurchaseService extends CrudService<CmReturnedPurchaseDao
             //减去促销满减金额
             returnedPurchaseFee = returnedPurchaseFee - newOrder.getPromotionFullReduction();
         }
+        if (newOrder.getCouponAmount() > 0) {
+            //减去优惠券金额
+            returnedPurchaseFee = MathUtil.sub(returnedPurchaseFee, newOrder.getCouponAmount()).doubleValue();
+        }
         cmReturnedPurchase.setReturnedPurchaseFee(returnedPurchaseFee);
         refundFee += getRefundFee(newOrder, cmReturnedPurchase, freightNum);
         //充值或缴纳订金订单
@@ -618,6 +627,19 @@ public class CmReturnedPurchaseService extends CrudService<CmReturnedPurchaseDao
                     cmUserDao.updateUserBeans(newOrder.getUserID(), userBeans);
                 }
             }
+            //优惠券退回
+            CmCouponOrderRecord couponOrderRecord = newOrder.getCouponOrderRecord();
+            if (newOrder.getCouponAmount() > 0 && couponOrderRecord != null) {
+                CmCouponClub couponClub = cmCouponClubDao.get(couponOrderRecord.getClubCouponId().toString());
+                couponClub.setOrderId(null);
+                couponClub.setReturnedId(Integer.valueOf(cmReturnedPurchase.getId()));
+                couponClub.setSource("3");
+                couponClub.setStatus("1");
+                couponClub.setCreateDate(new Date());
+                couponClub.setUseDate(null);
+                couponClub.setDelFlag("0");
+                cmCouponClubDao.insert(couponClub);
+            }
             //退款短信推送
             try {
                 if (user != null && StringUtils.isNotBlank(user.getBindMobile()) && "0".equals(newOrder.getRebateFlag())) {
@@ -751,7 +773,6 @@ public class CmReturnedPurchaseService extends CrudService<CmReturnedPurchaseDao
 
     @Transactional(readOnly = false)
     public void revokeApply(CmReturnedPurchase cmReturnedPurchase, HttpServletRequest request) {
-
         try {
             //1.撤销退款退货表审核通过信息
             cmReturnedPurchase.setConfirmReturnTime(null);
@@ -845,6 +866,10 @@ public class CmReturnedPurchaseService extends CrudService<CmReturnedPurchaseDao
             }
             cmUserbeanshistoryDao.updateBeansHistoryByReturned(newOrder.getOrderID());
             cmUserDao.updateUserBeans(newOrder.getUserID(), userBeans);
+            //撤销优惠券退款
+            if (newOrder.getCouponAmount() > 0) {
+                cmCouponClubDao.deleteByReturnedId(Integer.parseInt(cmReturnedPurchase.getId()));
+            }
             //修改子订单信息
             updateShopOrderAmount(newOrder.getOrderID());
         } catch (Exception e) {

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

@@ -1116,6 +1116,13 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
         NewOrder newOrder = new NewOrder();
         if (null != cmReturnedPurchase) {
             newOrder = newOrderDao.get(cmReturnedPurchase.getOrderID().toString());
+            if (newOrder.getCouponAmount() > 0) {
+                CmCouponOrderRecord couponRecord = newOrderDao.findOrderCouponRecord(newOrder.getOrderID());
+                if (couponRecord != null) {
+                    newOrder.setClubCouponId(couponRecord.getClubCouponId());
+                    newOrder.setCouponOrderRecord(couponRecord);
+                }
+            }
             //获取订单客户
             OrderUserInfo orderUserInfo = orderUserInfoService.findByOrderID(cmReturnedPurchase.getOrderID());
             NewCmClub club = newCmClubDao.getclubByUserId(newOrder.getUserID());
@@ -2234,7 +2241,7 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
 
     @Transactional(readOnly = false)
     public Boolean updateClubCoupon(Integer clubCouponId, Integer orderId) {
-        CmCoupon coupon = newOrderDao.findClubCouponById(orderId);
+        CmCoupon coupon = newOrderDao.findClubCouponById(clubCouponId);
         if (coupon == null) {
             return false;
         }

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

@@ -87,6 +87,7 @@
 			userId,
 			couponId,
 			orderId,
+			returnedId,
 			source,
 			status,
 			createDate,
@@ -96,6 +97,7 @@
 			#{userId},
 			#{couponId},
 			#{orderId},
+			#{returnedId},
 			#{source},
 			#{status},
 			#{createDate},
@@ -137,6 +139,9 @@
 		  <if test="clubName != null and clubName != ''">
 			  AND c.name LIKE CONCAT('%',#{clubName},'%')
 		  </if>
+		  <if test="userId != null">
+			  AND c.userID = #{userId}
+		  </if>
 		GROUP BY
 		  c.userID
 		ORDER BY
@@ -220,30 +225,6 @@
           AND id = #{couponId}
     </select>
 
-	<insert id="insertCouponClub" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-        INSERT INTO `cm_coupon_club` (
-          `userId`,
-          `couponId`,
-          `orderId`,
-          `source`,
-          `status`,
-          `createDate`,
-          `useDate`,
-          `delFlag`
-        )
-        VALUES
-          (
-            #{userId},
-            #{couponId},
-            #{orderId},
-            #{source},
-            #{status},
-            #{createDate},
-            #{useDate},
-            #{delFlag}
-          )
-    </insert>
-
 	<update id="updateRedemptionCode">UPDATE
 		UPDATE
 		  cm_coupon_redemption_code
@@ -254,5 +235,9 @@
 		WHERE
 		  id = #{id}
     </update>
+
+	<update id="deleteByReturnedId">
+		UPDATE cm_coupon_club SET delFlag = 1 WHERE returnedId = #{returnedId} AND status = 1 AND source = 3
+	</update>
 	
 </mapper>

src/main/webapp/WEB-INF/views/modules/bulkpurchase/applyRefoundForm.jsp

@@ -344,6 +344,23 @@
         <tr>
             <td>
                 订单金额：￥<fmt:formatNumber type="number" value="${order.payTotalFee}" pattern="0.00" maxFractionDigits="2" />
+                <c:if test="${not empty order.couponOrderRecord}">
+                    <c:if test="${order.couponOrderRecord.couponType eq 0}">
+                        <a href="${ctx}/coupon/cmCouponClub/couponDetails?userId=${order.userID}"><font color="red">（活动券抵扣￥${order.couponOrderRecord.couponAmount}，满${order.couponOrderRecord.touchPrice}减${order.couponOrderRecord.couponAmount}）</font></a>
+                    </c:if>
+                    <c:if test="${order.couponOrderRecord.couponType eq 1}">
+                        <a href="${ctx}/coupon/cmCouponClub/couponDetails?userId=${order.userID}"><font color="red">（品类券抵扣￥${order.couponOrderRecord.couponAmount}，满${order.couponOrderRecord.touchPrice}减${order.couponOrderRecord.couponAmount}）</font></a>
+                    </c:if>
+                    <c:if test="${order.couponOrderRecord.couponType eq 2}">
+                        <a href="${ctx}/coupon/cmCouponClub/couponDetails?userId=${order.userID}"><font color="red">（用户专享券抵扣￥${order.couponOrderRecord.couponAmount}，满${order.couponOrderRecord.touchPrice}减${order.couponOrderRecord.couponAmount}）</font></a>
+                    </c:if>
+                    <c:if test="${order.couponOrderRecord.couponType eq 3}">
+                        <a href="${ctx}/coupon/cmCouponClub/couponDetails?userId=${order.userID}"><font color="red">（店铺券抵扣￥${order.couponOrderRecord.couponAmount}，满${order.couponOrderRecord.touchPrice}减${order.couponOrderRecord.couponAmount}）</font></a>
+                    </c:if>
+                    <c:if test="${order.couponOrderRecord.couponType eq 4}">
+                        <a href="${ctx}/coupon/cmCouponClub/couponDetails?userId=${order.userID}"><font color="red">（新用户券抵扣￥${order.couponOrderRecord.couponAmount}，满${order.couponOrderRecord.touchPrice}减${order.couponOrderRecord.couponAmount}）</font></a>
+                    </c:if>
+                </c:if>
             </td>
             <td>
                 应收总额：￥<fmt:formatNumber type="number" value="${order.payableAmount}" pattern="0.00" maxFractionDigits="2" />(账户余额抵扣：${order.balancePayFee})

src/main/webapp/WEB-INF/views/modules/bulkpurchase/orderConfirmReturnRecord.jsp

@@ -244,7 +244,24 @@
     </tr>
     <tr>
         <td>
-            订单金额：￥<fmt:formatNumber type="number" value="${order.payTotalFee}" pattern="0.00" maxFractionDigits="2"/>
+            订单金额：￥<fmt:formatNumber type="number" value="${order.payTotalFee}" pattern="0.00" maxFractionDigits="2"/>&nbsp;
+            <c:if test="${not empty order.couponOrderRecord}">
+                <c:if test="${order.couponOrderRecord.couponType eq 0}">
+                    <a href="${ctx}/coupon/cmCouponClub/couponDetails?userId=${order.userID}"><font color="red">（活动券抵扣￥${order.couponOrderRecord.couponAmount}，满${order.couponOrderRecord.touchPrice}减${order.couponOrderRecord.couponAmount}）</font></a>
+                </c:if>
+                <c:if test="${order.couponOrderRecord.couponType eq 1}">
+                    <a href="${ctx}/coupon/cmCouponClub/couponDetails?userId=${order.userID}"><font color="red">（品类券抵扣￥${order.couponOrderRecord.couponAmount}，满${order.couponOrderRecord.touchPrice}减${order.couponOrderRecord.couponAmount}）</font></a>
+                </c:if>
+                <c:if test="${order.couponOrderRecord.couponType eq 2}">
+                    <a href="${ctx}/coupon/cmCouponClub/couponDetails?userId=${order.userID}"><font color="red">（用户专享券抵扣￥${order.couponOrderRecord.couponAmount}，满${order.couponOrderRecord.touchPrice}减${order.couponOrderRecord.couponAmount}）</font></a>
+                </c:if>
+                <c:if test="${order.couponOrderRecord.couponType eq 3}">
+                    <a href="${ctx}/coupon/cmCouponClub/couponDetails?userId=${order.userID}"><font color="red">（店铺券抵扣￥${order.couponOrderRecord.couponAmount}，满${order.couponOrderRecord.touchPrice}减${order.couponOrderRecord.couponAmount}）</font></a>
+                </c:if>
+                <c:if test="${order.couponOrderRecord.couponType eq 4}">
+                    <a href="${ctx}/coupon/cmCouponClub/couponDetails?userId=${order.userID}"><font color="red">（新用户券抵扣￥${order.couponOrderRecord.couponAmount}，满${order.couponOrderRecord.touchPrice}减${order.couponOrderRecord.couponAmount}）</font></a>
+                </c:if>
+            </c:if>
         </td>
         <td>
             应收总额：￥<fmt:formatNumber type="number" value="${order.payableAmount}" pattern="0.00" maxFractionDigits="2"/>(账户余额抵扣：${order.balancePayFee})

src/main/webapp/WEB-INF/views/modules/bulkpurchase/orderPurchaseProductList.jsp

@@ -477,7 +477,7 @@
                         ----
                     </c:if>
                     <c:if test="${purchaseProduct.couponsLogo eq 2}">
-                        <a>查看</a>
+                        <a href="javascript:;" onclick="showSelect(${userId},${purchaseProduct.productId})">查看</a>
                     </c:if>
                 </td>
             </tr>
@@ -487,5 +487,21 @@
 </div>
 <div class="pagination">${page}</div>
 <script type="text/javascript" src="${ctxStatic}/modules/bulkpurchase/orderForm.js?<%=Math.random()%>"></script>
+<script>
+    // 展示商品选择框
+    function showSelect(userId, productId) {
+        var url = "${ctx}/coupon/cmCoupon/productDetails?userId=" + userId + "&productId=" + productId;
+        var title = '';
+        title = "查看优惠券";
+        top.$.jBox("iframe:" + url, {
+            iframeScrolling: 'yes',
+            width: $(top.document).width() - 600,
+            height: $(top.document).height() - 250,
+            persistent: true,
+            title: title,
+            buttons: {"确定": '1'}
+        });
+    }
+</script>
 </body>
 </html>

src/main/webapp/WEB-INF/views/modules/bulkpurchase/orderReturnRecord.jsp

@@ -355,6 +355,23 @@
             <tr>
                 <td>
                     订单金额：￥<fmt:formatNumber type="number" value="${order.payTotalFee}" pattern="0.00" maxFractionDigits="2" />
+                    <c:if test="${not empty order.couponOrderRecord}">
+                        <c:if test="${order.couponOrderRecord.couponType eq 0}">
+                            <a href="${ctx}/coupon/cmCouponClub/couponDetails?userId=${order.userID}"><font color="red">（活动券抵扣￥${order.couponOrderRecord.couponAmount}，满${order.couponOrderRecord.touchPrice}减${order.couponOrderRecord.couponAmount}）</font></a>
+                        </c:if>
+                        <c:if test="${order.couponOrderRecord.couponType eq 1}">
+                            <a href="${ctx}/coupon/cmCouponClub/couponDetails?userId=${order.userID}"><font color="red">（品类券抵扣￥${order.couponOrderRecord.couponAmount}，满${order.couponOrderRecord.touchPrice}减${order.couponOrderRecord.couponAmount}）</font></a>
+                        </c:if>
+                        <c:if test="${order.couponOrderRecord.couponType eq 2}">
+                            <a href="${ctx}/coupon/cmCouponClub/couponDetails?userId=${order.userID}"><font color="red">（用户专享券抵扣￥${order.couponOrderRecord.couponAmount}，满${order.couponOrderRecord.touchPrice}减${order.couponOrderRecord.couponAmount}）</font></a>
+                        </c:if>
+                        <c:if test="${order.couponOrderRecord.couponType eq 3}">
+                            <a href="${ctx}/coupon/cmCouponClub/couponDetails?userId=${order.userID}"><font color="red">（店铺券抵扣￥${order.couponOrderRecord.couponAmount}，满${order.couponOrderRecord.touchPrice}减${order.couponOrderRecord.couponAmount}）</font></a>
+                        </c:if>
+                        <c:if test="${order.couponOrderRecord.couponType eq 4}">
+                            <a href="${ctx}/coupon/cmCouponClub/couponDetails?userId=${order.userID}"><font color="red">（新用户券抵扣￥${order.couponOrderRecord.couponAmount}，满${order.couponOrderRecord.touchPrice}减${order.couponOrderRecord.couponAmount}）</font></a>
+                        </c:if>
+                    </c:if>
                 </td>
                 <td>
                     应收总额：￥<fmt:formatNumber type="number" value="${order.payableAmount}" pattern="0.00" maxFractionDigits="2" />(账户余额抵扣：${order.balancePayFee})

src/main/webapp/WEB-INF/views/modules/bulkpurchase/orderReviewReturnRecord.jsp

@@ -325,6 +325,23 @@
     <tr>
         <td>
             订单金额：￥<fmt:formatNumber type="number" value="${order.payTotalFee}" pattern="0.00" maxFractionDigits="2" />
+            <c:if test="${not empty order.couponOrderRecord}">
+                <c:if test="${order.couponOrderRecord.couponType eq 0}">
+                    <a href="${ctx}/coupon/cmCouponClub/couponDetails?userId=${order.userID}"><font color="red">（活动券抵扣￥${order.couponOrderRecord.couponAmount}，满${order.couponOrderRecord.touchPrice}减${order.couponOrderRecord.couponAmount}）</font></a>
+                </c:if>
+                <c:if test="${order.couponOrderRecord.couponType eq 1}">
+                    <a href="${ctx}/coupon/cmCouponClub/couponDetails?userId=${order.userID}"><font color="red">（品类券抵扣￥${order.couponOrderRecord.couponAmount}，满${order.couponOrderRecord.touchPrice}减${order.couponOrderRecord.couponAmount}）</font></a>
+                </c:if>
+                <c:if test="${order.couponOrderRecord.couponType eq 2}">
+                    <a href="${ctx}/coupon/cmCouponClub/couponDetails?userId=${order.userID}"><font color="red">（用户专享券抵扣￥${order.couponOrderRecord.couponAmount}，满${order.couponOrderRecord.touchPrice}减${order.couponOrderRecord.couponAmount}）</font></a>
+                </c:if>
+                <c:if test="${order.couponOrderRecord.couponType eq 3}">
+                    <a href="${ctx}/coupon/cmCouponClub/couponDetails?userId=${order.userID}"><font color="red">（店铺券抵扣￥${order.couponOrderRecord.couponAmount}，满${order.couponOrderRecord.touchPrice}减${order.couponOrderRecord.couponAmount}）</font></a>
+                </c:if>
+                <c:if test="${order.couponOrderRecord.couponType eq 4}">
+                    <a href="${ctx}/coupon/cmCouponClub/couponDetails?userId=${order.userID}"><font color="red">（新用户券抵扣￥${order.couponOrderRecord.couponAmount}，满${order.couponOrderRecord.touchPrice}减${order.couponOrderRecord.couponAmount}）</font></a>
+                </c:if>
+            </c:if>
         </td>
         <td>
             应收总额：￥<fmt:formatNumber type="number" value="${order.payableAmount}" pattern="0.00" maxFractionDigits="2" />(账户余额抵扣：${order.balancePayFee})

src/main/webapp/WEB-INF/views/modules/bulkpurchase/refundRecord.jsp

@@ -169,6 +169,23 @@
     <tr>
         <td>
             订单金额：￥${order.payTotalFee}
+            <c:if test="${not empty order.couponOrderRecord}">
+                <c:if test="${order.couponOrderRecord.couponType eq 0}">
+                    <a href="${ctx}/coupon/cmCouponClub/couponDetails?userId=${order.userID}"><font color="red">（活动券抵扣￥${order.couponOrderRecord.couponAmount}，满${order.couponOrderRecord.touchPrice}减${order.couponOrderRecord.couponAmount}）</font></a>
+                </c:if>
+                <c:if test="${order.couponOrderRecord.couponType eq 1}">
+                    <a href="${ctx}/coupon/cmCouponClub/couponDetails?userId=${order.userID}"><font color="red">（品类券抵扣￥${order.couponOrderRecord.couponAmount}，满${order.couponOrderRecord.touchPrice}减${order.couponOrderRecord.couponAmount}）</font></a>
+                </c:if>
+                <c:if test="${order.couponOrderRecord.couponType eq 2}">
+                    <a href="${ctx}/coupon/cmCouponClub/couponDetails?userId=${order.userID}"><font color="red">（用户专享券抵扣￥${order.couponOrderRecord.couponAmount}，满${order.couponOrderRecord.touchPrice}减${order.couponOrderRecord.couponAmount}）</font></a>
+                </c:if>
+                <c:if test="${order.couponOrderRecord.couponType eq 3}">
+                    <a href="${ctx}/coupon/cmCouponClub/couponDetails?userId=${order.userID}"><font color="red">（店铺券抵扣￥${order.couponOrderRecord.couponAmount}，满${order.couponOrderRecord.touchPrice}减${order.couponOrderRecord.couponAmount}）</font></a>
+                </c:if>
+                <c:if test="${order.couponOrderRecord.couponType eq 4}">
+                    <a href="${ctx}/coupon/cmCouponClub/couponDetails?userId=${order.userID}"><font color="red">（新用户券抵扣￥${order.couponOrderRecord.couponAmount}，满${order.couponOrderRecord.touchPrice}减${order.couponOrderRecord.couponAmount}）</font></a>
+                </c:if>
+            </c:if>
         </td>
         <td>
             应收总额：￥${order.payableAmount}

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

@@ -23,12 +23,10 @@
 <body>
 <ul class="nav nav-tabs">
     <li><a href="${ctx}/coupon/cmCouponClub/userList">领取用户列表</a></li>
-    <li class="active"><a href="${ctx}/coupon/cmCouponClub/couponDetails?userId=${cmCouponClub.userId}&num=${cmCouponClub.num}&clubName=${cmCouponClub.clubName}">优惠券详情</a></li>
+    <li class="active"><a href="${ctx}/coupon/cmCouponClub/couponDetails?userId=${cmCouponClub.userId}">优惠券详情</a></li>
 </ul>
 <form:form id="searchForm" modelAttribute="cmCouponClub" action="${ctx}/coupon/cmCouponClub/couponDetails" method="post" class="breadcrumb form-search">
     <input type="hidden" name="userId" value="${cmCouponClub.userId}">
-    <input type="hidden" name="num" value="${cmCouponClub.num}">
-    <input type="hidden" name="clubName" value="${cmCouponClub.clubName}">
     <input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
     <input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
     <div class="ul-form">

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

@@ -33,7 +33,7 @@
         </div>
     </div>
     <div class="couponList">
-        <h4>普通优惠券（6）</h4>
+        <h4>普通优惠券（${ordinaryCoupons.size()}）</h4>
         <ul>
             <c:forEach items="${ordinaryCoupons}" var="coupon">
                 <li><span class="couponDesc">
@@ -42,51 +42,24 @@
                         <span>兑换码：${coupon.redemptionCode}</span>
                     </c:if>
                     <span>${coupon.couponDesc}</span>
-                    <span>有效期：${coupon.startDate+' - '+${coupon.endDate}</span>
+                    <span>有效期：<fmt:formatDate value="${coupon.startDate}" pattern="yyyy-MM-dd"/>-<fmt:formatDate value="${coupon.endDate}" pattern="yyyy-MM-dd"/></span>
                 </span></li>
             </c:forEach>
-
-<!--            <li><span class="couponDesc">
-                <span>用户专享券￥100.00 满200.00可用</span>
-                <span>兑换码：123</span>
-                <span>全商城商品通用</span>
-                <span>有效期：2021-08-04 - 2021-08-31</span>
-            </span></li>
-            <li><span class="couponDesc">
-                <span>用户专享券￥100.00 满200.00可用</span>
-                <span>兑换码：123</span>
-                <span>全商城商品通用</span>
-                <span>有效期：2021-08-04 - 2021-08-31</span>
-            </span></li>
-            <li><span class="couponDesc">
-                <span>用户专享券￥100.00 满200.00可用</span>
-                <span>兑换码：123</span>
-                <span>全商城商品通用</span>
-                <span>有效期：2021-08-04 - 2021-08-31</span>
-            </span></li> -->
         </ul>
     </div>
     <div class="couponList">
-        <h4>兑换优惠券（2）</h4>
+        <h4>兑换优惠券（${redeemCoupons.size()}）</h4>
         <ul>
-<!--            <li><span class="couponDesc">
-                <span>用户专享券￥100.00 满200.00可用</span>
-                <span>兑换码：123</span>
-                <span>全商城商品通用</span>
-                <span>有效期：2021-08-04 - 2021-08-31</span>
-            </span></li>
-            <li><span class="couponDesc">
-                <span>用户专享券￥100.00 满200.00可用</span>
-                <span>兑换码：123</span>
-                <span>全商城商品通用</span>
-                <span>有效期：2021-08-04 - 2021-08-31</span>
-            </span></li>
-            <li><span class="couponDesc">
-                <span>用户专享券￥100.00 满200.00可用</span>
-                <span>兑换码：123</span>
-                <span>全商城商品通用</span>
-                <span>有效期：2021-08-04 - 2021-08-31</span>
-            </span></li> -->
+            <c:forEach items="${redeemCoupons}" var="coupon">
+                <li><span class="couponDesc">
+                    <span>${coupon.couponName}</span>
+                    <c:if test="${not empty coupon.redemptionCode}">
+                        <span>兑换码：${coupon.redemptionCode}</span>
+                    </c:if>
+                    <span>${coupon.couponDesc}</span>
+                    <span>有效期：<fmt:formatDate value="${coupon.startDate}" pattern="yyyy-MM-dd"/>-<fmt:formatDate value="${coupon.endDate}" pattern="yyyy-MM-dd"/></span>
+                </span></li>
+            </c:forEach>
         </ul>
     </div>
 </div>

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

@@ -57,7 +57,7 @@
                     ${club.num}
             </td>
             <td>
-                <a href="${ctx}/coupon/cmCouponClub/couponDetails?userId=${club.userId}&num=${club.num}&clubName=${club.clubName}" >查看详情</a>
+                <a href="${ctx}/coupon/cmCouponClub/couponDetails?userId=${club.userId}" >查看详情</a>
             </td>
         </tr>
     </c:forEach>

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

@@ -200,19 +200,19 @@
             订单金额：<fmt:formatNumber value="${order.payTotalFee}" type="currency"/>&nbsp;
             <c:if test="${not empty order.couponOrderRecord}">
                 <c:if test="${order.couponOrderRecord.couponType eq 0}">
-                    <a href=""><font color="red">活动券抵扣￥${order.couponOrderRecord.couponAmount}，满${order.couponOrderRecord.touchPrice}减${order.couponOrderRecord.couponAmount}</font></a>
+                    <a href="${ctx}/coupon/cmCouponClub/couponDetails?userId=${order.userID}"><font color="red">（活动券抵扣￥${order.couponOrderRecord.couponAmount}，满${order.couponOrderRecord.touchPrice}减${order.couponOrderRecord.couponAmount}）</font></a>
                 </c:if>
                 <c:if test="${order.couponOrderRecord.couponType eq 1}">
-                    <a href=""><font color="red">品类券抵扣￥${order.couponOrderRecord.couponAmount}，满${order.couponOrderRecord.touchPrice}减${order.couponOrderRecord.couponAmount}</font></a>
+                    <a href="${ctx}/coupon/cmCouponClub/couponDetails?userId=${order.userID}"><font color="red">（品类券抵扣￥${order.couponOrderRecord.couponAmount}，满${order.couponOrderRecord.touchPrice}减${order.couponOrderRecord.couponAmount}）</font></a>
                 </c:if>
                 <c:if test="${order.couponOrderRecord.couponType eq 2}">
-                    <a href=""><font color="red">用户专享券抵扣￥${order.couponOrderRecord.couponAmount}，满${order.couponOrderRecord.touchPrice}减${order.couponOrderRecord.couponAmount}</font></a>
+                    <a href="${ctx}/coupon/cmCouponClub/couponDetails?userId=${order.userID}"><font color="red">（用户专享券抵扣￥${order.couponOrderRecord.couponAmount}，满${order.couponOrderRecord.touchPrice}减${order.couponOrderRecord.couponAmount}）</font></a>
                 </c:if>
                 <c:if test="${order.couponOrderRecord.couponType eq 3}">
-                    <a href=""><font color="red">店铺券抵扣￥${order.couponOrderRecord.couponAmount}，满${order.couponOrderRecord.touchPrice}减${order.couponOrderRecord.couponAmount}</font></a>
+                    <a href="${ctx}/coupon/cmCouponClub/couponDetails?userId=${order.userID}"><font color="red">（店铺券抵扣￥${order.couponOrderRecord.couponAmount}，满${order.couponOrderRecord.touchPrice}减${order.couponOrderRecord.couponAmount}）</font></a>
                 </c:if>
                 <c:if test="${order.couponOrderRecord.couponType eq 4}">
-                    <a href=""><font color="red">新用户券抵扣￥${order.couponOrderRecord.couponAmount}，满${order.couponOrderRecord.touchPrice}减${order.couponOrderRecord.couponAmount}</font></a>
+                    <a href="${ctx}/coupon/cmCouponClub/couponDetails?userId=${order.userID}"><font color="red">（新用户券抵扣￥${order.couponOrderRecord.couponAmount}，满${order.couponOrderRecord.touchPrice}减${order.couponOrderRecord.couponAmount}）</font></a>
                 </c:if>
             </c:if>
         </td>