呵呵商城改版part6

src/main/java/com/caimei/modules/hehe/dao/HeHeNewOrderDao.java

@@ -34,4 +34,10 @@ public interface HeHeNewOrderDao extends CrudDao<NewOrder> {
      * @return
      */
     Double findReductionTouchPrice(Integer orderID);
+
+    /**
+     * 取消订单
+     * @param orderID
+     */
+    void cancleOrder(Integer orderID);
 }

src/main/java/com/caimei/modules/hehe/entity/CmHeheCoupon.java

@@ -22,7 +22,7 @@ public class CmHeheCoupon extends DataEntity<CmHeheCoupon> {
 	private Date endTime;		// 下架时间
 	private Integer startNowFlag;		// 立即上架标记 0否 1是
 	private Integer permanentFlag;		// 永久上架标记 0否 1是
-	private Integer couponType;		// 劵类型 1活动券 2专享券 3新人券 4好友邀请券 5好友消费券
+	private Integer couponType;		// 劵类型 1活动券 2专享券 3新人券 4好友邀请券 5好友消费券 6消费分享券
 	private Integer productType;		// 优惠商品：1全商城商品 2指定商品(活动券有效)
 	private Integer receivePeriod;		// 领取期限（天）
 	private Integer receiveFlag;		// 领取期限同上下架时间标记（在上下架期间内都可领取）

src/main/java/com/caimei/modules/hehe/entity/CmHeheCouponOrderRecord.java

@@ -22,7 +22,7 @@ public class CmHeheCouponOrderRecord implements Serializable {
      */
     private Integer receiveCouponId;
     /**
-     * 劵类型 1活动券 2专享券 3新人券 4好友邀请券 5好友消费券
+     * 劵类型 1活动券 2专享券 3新人券 4好友邀请券 5好友消费券 6消费分享券
      */
     private Integer couponType;
     /**

src/main/java/com/caimei/modules/hehe/entity/CmHeheImage.java

@@ -16,6 +16,7 @@ public class CmHeheImage extends DataEntity<CmHeheImage> {
 	private static final long serialVersionUID = 1L;
 	private String topic;		// 主题
 	private String image;		// 图片
+	private String link;		// 跳转链接
 	private String sort;		// 排序值
 	private String status;		// 小程序状态:1启用,2停用
 	private Date addTime;		// 添加时间
@@ -70,5 +71,12 @@ public class CmHeheImage extends DataEntity<CmHeheImage> {
 	public void setAddTime(Date addTime) {
 		this.addTime = addTime;
 	}
-	
+
+	public String getLink() {
+		return link;
+	}
+
+	public void setLink(String link) {
+		this.link = link;
+	}
 }

src/main/java/com/caimei/modules/hehe/entity/CmHeheReceiveUser.java

@@ -29,7 +29,7 @@ public class CmHeheReceiveUser extends DataEntity<CmHeheReceiveUser> {
     private String nickName;    //微信昵称
     private String mobile;      //手机号
     private Integer userIdentity;       // 用户身份：1普通用户 2分销者
-    private Integer couponType;        // 劵类型 1活动券 2专享券 3新人券 4好友邀请券 5好友消费券
+    private Integer couponType;        // 劵类型 1活动券 2专享券 3新人券 4好友邀请券 5好友消费券 6消费分享券
     private BigDecimal couponAmount;        // 优惠券金额(面值)
     private BigDecimal touchPrice;        // 优惠满减条件金额
     private Integer couponStatus;    // 状态 0未生效 1已生效 2已关闭 3已失效

src/main/java/com/caimei/modules/hehe/service/HeHeNewOrderService.java

@@ -290,4 +290,9 @@ public class HeHeNewOrderService extends CrudService<HeHeNewOrderDao, NewOrder>
         }
         return pageResult;
     }
+
+    @Transactional(readOnly = false)
+    public void cancelOrder(Integer orderID) {
+        heHeNewOrderDao.cancleOrder(orderID);
+    }
 }

src/main/java/com/caimei/modules/hehe/web/HeHeNewOrderController.java

@@ -2,6 +2,7 @@ package com.caimei.modules.hehe.web;
 
 import com.caimei.modules.bulkpurchase.entity.BpClause;
 import com.caimei.modules.bulkpurchase.service.BpClauseService;
+import com.caimei.modules.common.utils.ExcelUtil;
 import com.caimei.modules.hehe.dao.CmHeheUserDao;
 import com.caimei.modules.hehe.entity.CmHeheUser;
 import com.caimei.modules.hehe.service.HeHeNewOrderService;
@@ -13,16 +14,20 @@ import com.caimei.modules.order.service.CmDiscernReceiptService;
 import com.caimei.modules.order.service.CmReceiptOrderRelationService;
 import com.caimei.modules.order.service.CmReturnedPurchaseService;
 import com.caimei.modules.order.service.NewOrderConfigService;
+import com.caimei.modules.order.utils.OrderUtil;
+import com.thinkgem.jeesite.common.config.Global;
 import com.thinkgem.jeesite.common.persistence.Page;
 import com.thinkgem.jeesite.common.utils.StringUtils;
 import com.thinkgem.jeesite.common.web.BaseController;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -227,4 +232,128 @@ public class HeHeNewOrderController extends BaseController {
         model.addAttribute("returnedPurchaseFee", returnedPurchaseFee);
         return "modules/hehe/heheNewOrderDetail";
     }
+
+    /**
+     * 取消订单
+     *
+     * @return
+     */
+    @RequestMapping("cancelOrder")
+    public String cancelOrder(Integer orderID, RedirectAttributes redirectAttributes) {
+        heHeNewOrderService.cancelOrder(orderID);
+        addMessage(redirectAttributes, "取消订单成功");
+        return "redirect:" + Global.getAdminPath() + "/hehe/new/order/detail/?id=" + orderID;
+    }
+
+    /*@RequestMapping(value = "batchExportOrder")
+    public void exportTest(String startTime, String endTime, CmDiscernReceipt cmDiscernReceipt, RedirectAttributes redirectAttributes, HttpServletRequest request, HttpServletResponse response) {
+        //获取订单数据
+        String fileName = "收款账单.xls";
+        String template = Global.getConfig("export.template");
+        String templateFileName = template + "/discern_receipt_export.xls";
+        List<String> listSheetNames = new ArrayList<String>();
+        ArrayList<List> objects = new ArrayList<List>();
+        //收款时间筛查
+        if (startTime == null) {
+            cmDiscernReceipt.setStartTime("2019-10-01 00:00:00");
+        } else {
+            cmDiscernReceipt.setStartTime(startTime);
+        }
+        if (endTime == null) {
+            cmDiscernReceipt.setEndTime("2019-10-31 23:59:59");
+        } else {
+            cmDiscernReceipt.setEndTime(endTime);
+        }
+        try {
+
+            List<CmMainReceiptExport> list = cmDiscernReceiptService.exportTest(cmDiscernReceipt);
+            for (CmMainReceiptExport bean : list) {
+                String productNames = bean.getProductNames();
+                if (StringUtils.isNotEmpty(productNames)) {
+                    String[] productNameArr = productNames.split(",");
+                    for (int i = 0; i < productNameArr.length; i++) {
+                        productNameArr[i] = (i + 1) + "." + productNameArr[i] + "\r\n";
+                        productNames = i==0?productNameArr[i]:productNames + productNameArr[i];
+                    }
+                    bean.setProductNames(productNames);
+                }
+                bean.setPayType(OrderUtil.getPayTypeStr(bean.getPayType()));
+            }
+            //返佣数据
+            List<CmMainReceiptExport> list1 = cmDiscernReceiptService.exportRebate(cmDiscernReceipt);
+            for (CmMainReceiptExport export : list1) {
+                export.setPayType(OrderUtil.getPayTypeStr(export.getPayType()));
+                export.setOrderID(export.getOrderID() + ("5".equals(export.getReceiptType())?"(供应商退款订单)":"(返佣订单)"));
+                list.add(export);
+            }
+            //非订单款
+            List<CmMainReceiptExport> list2 = cmDiscernReceiptService.theOrder(cmDiscernReceipt);
+            for (CmMainReceiptExport export : list2) {
+                export.setOrderID("非订单");
+                export.setUserName("");
+                export.setPayType(OrderUtil.getPayTypeStr(export.getPayType()));
+                list.add(export);
+            }
+
+            //退款记录表
+            List<CmReturnedPurchase> purchases = cmDiscernReceiptService.exportRefund(cmDiscernReceipt);
+            for (CmReturnedPurchase purchase : purchases) {
+                String refundWay = "";
+                if ("1".equals(purchase.getReturnedWay())) {
+                    if (purchase.getRefundBalanceFee() != null && purchase.getRefundBalanceFee() != 0) {
+                        refundWay += "账户余额";
+                    }
+                    if (purchase.getRefundOnlineFee() != null && purchase.getRefundOnlineFee() != 0) {
+                        refundWay += ";线上退回";
+                    }
+                    if (purchase.getRefundOfflineFee() != null && purchase.getRefundOfflineFee() != 0) {
+                        refundWay += ";线下转账";
+                    }
+                }
+                purchase.setReturnedWay(refundWay);
+                String payType = OrderUtil.getPayType(purchase.getPayType());
+                purchase.setPayType(payType);
+            }
+
+            //超级会员款
+            List<CmMainReceiptExport> svipList = cmDiscernReceiptService.svipReceipt(cmDiscernReceipt);
+            for (CmMainReceiptExport export : svipList) {
+                export.setOrderID("超级会员款");
+                export.setPayType(OrderUtil.getPayTypeStr(export.getPayType()));
+                list.add(export);
+            }
+
+            //二手商品上架费
+            List<CmMainReceiptExport> secondList = cmDiscernReceiptService.secondReceipt(cmDiscernReceipt);
+            for (CmMainReceiptExport export : secondList) {
+                export.setOrderID("二手商品上架费");
+                export.setUserName("");
+                export.setPayType(OrderUtil.getPayTypeStr(export.getPayType()));
+                list.add(export);
+            }
+
+            //	收款进度  1待收  2部分收  3全收
+            cmDiscernReceipt.setReceiptProgress("2");
+            List<CmReceiptExportData> ListExportData1 = getListExportData(cmDiscernReceipt);
+            cmDiscernReceipt.setReceiptProgress("3");
+            List<CmReceiptExportData> ListExportData2 = getListExportData(cmDiscernReceipt);
+
+            objects.add(list);
+            *//*objects.add(ListExportData1);
+            objects.add(ListExportData2);
+            objects.add(getListOrderPayment(cmDiscernReceipt));
+            objects.add(purchases);*//*
+            listSheetNames.add("收款表");
+            *//*listSheetNames.add("部分收款");
+            listSheetNames.add("已收款");
+            listSheetNames.add("返佣订单");
+            listSheetNames.add("退款记录表");*//*
+
+            new ExcelUtil().createMultipleSheetsExcel(templateFileName, fileName, listSheetNames, objects, response);
+        } catch (Exception e) {
+            addMessage(redirectAttributes, "收款列表导出失败！" + e.getMessage());
+            logger.info(e.getMessage());
+            e.printStackTrace();
+        }
+    }*/
 }

src/main/resources/mappings/modules/hehe/CmHeheImageMapper.xml

@@ -6,6 +6,7 @@
 		a.id AS "id",
 		a.topic AS "topic",
 		a.image AS "image",
+		a.link,
 		a.sort AS "sort",
 		a.status AS "status",
 		a.addTime AS "addTime"
@@ -70,12 +71,14 @@
 		INSERT INTO cm_hehe_image(
 			topic,
 			image,
+		    link,
 			sort,
 			status,
 			addTime
 		) VALUES (
 			#{topic},
 			#{image},
+			#{link},
 			#{sort},
 			#{status},
 			NOW()
@@ -86,6 +89,7 @@
 		UPDATE cm_hehe_image SET 	
 			topic = #{topic},
 			image = #{image},
+			link = #{link},
 			sort = #{sort},
 			status = #{status},
 			addTime = #{addTime}

src/main/resources/mappings/modules/hehe/HeHeNewOrderMapper.xml

@@ -59,6 +59,9 @@
         if(chcm.id is not null,1,0) as collageFlag,
         chc.status as collageStatus
 	</sql>
+    <update id="cancleOrder">
+        update cm_order set status = 6 where orderID = #{orderID}
+    </update>
 
     <select id="get" resultType="newOrder">
         SELECT <include refid="columns"/>

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

@@ -265,7 +265,7 @@
             <c:if test="${not empty order.heheCouponRecord}">
                 <a href="${ctx}/hehe/cmHeheCoupon/receiveDetails?userId=${order.userID}">
                     <font color="red">
-                        （${order.heheCouponRecord.couponType eq 1 ? '活动':order.heheCouponRecord.couponType eq 2?'专享':order.heheCouponRecord.couponType eq 3?'新人':order.heheCouponRecord.couponType eq 4?'好友分享':'好友消费'}券抵扣￥${order.heheCouponRecord.couponAmount}，满${order.heheCouponRecord.touchPrice}减${order.heheCouponRecord.couponAmount}）
+                        （${order.heheCouponRecord.couponType eq 1 ? '活动':order.heheCouponRecord.couponType eq 2?'专享':order.heheCouponRecord.couponType eq 3?'新人':order.heheCouponRecord.couponType eq 4?'好友分享':order.heheCouponRecord.couponType eq 5?'好友消费':'消费分享'}券抵扣￥${order.heheCouponRecord.couponAmount}，满${order.heheCouponRecord.touchPrice}减${order.heheCouponRecord.couponAmount}）
                     </font>
                 </a>
             </c:if>

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

@@ -380,7 +380,7 @@
                     <c:if test="${not empty order.heheCouponRecord}">
                         <a href="${ctx}/hehe/cmHeheCoupon/receiveDetails?userId=${order.userID}">
                             <font color="red">
-                                （${order.heheCouponRecord.couponType eq 1 ? '活动':order.heheCouponRecord.couponType eq 2?'专享':order.heheCouponRecord.couponType eq 3?'新人':order.heheCouponRecord.couponType eq 4?'好友分享':'好友消费'}券抵扣￥${order.heheCouponRecord.couponAmount}，满${order.heheCouponRecord.touchPrice}减${order.heheCouponRecord.couponAmount}）
+                                （${order.heheCouponRecord.couponType eq 1 ? '活动':order.heheCouponRecord.couponType eq 2?'专享':order.heheCouponRecord.couponType eq 3?'新人':order.heheCouponRecord.couponType eq 4?'好友分享':order.heheCouponRecord.couponType eq 5?'好友消费':'消费分享'}券抵扣￥${order.heheCouponRecord.couponAmount}，满${order.heheCouponRecord.touchPrice}减${order.heheCouponRecord.couponAmount}）
                             </font>
                         </a>
                     </c:if>

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

@@ -345,7 +345,7 @@
             <c:if test="${not empty order.heheCouponRecord}">
                 <a href="${ctx}/hehe/cmHeheCoupon/receiveDetails?userId=${order.userID}">
                     <font color="red">
-                        （${order.heheCouponRecord.couponType eq 1 ? '活动':order.heheCouponRecord.couponType eq 2?'专享':order.heheCouponRecord.couponType eq 3?'新人':order.heheCouponRecord.couponType eq 4?'好友分享':'好友消费'}券抵扣￥${order.heheCouponRecord.couponAmount}，满${order.heheCouponRecord.touchPrice}减${order.heheCouponRecord.couponAmount}）
+                        （${order.heheCouponRecord.couponType eq 1 ? '活动':order.heheCouponRecord.couponType eq 2?'专享':order.heheCouponRecord.couponType eq 3?'新人':order.heheCouponRecord.couponType eq 4?'好友分享':order.heheCouponRecord.couponType eq 5?'好友消费':'消费分享'}券抵扣￥${order.heheCouponRecord.couponAmount}，满${order.heheCouponRecord.touchPrice}减${order.heheCouponRecord.couponAmount}）
                     </font>
                 </a>
             </c:if>

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

@@ -212,7 +212,7 @@
             <c:if test="${not empty order.heheCouponRecord}">
                 <a href="${ctx}/hehe/cmHeheCoupon/receiveDetails?userId=${order.userID}">
                     <font color="red">
-                        （${order.heheCouponRecord.couponType eq 1 ? '活动':order.heheCouponRecord.couponType eq 2?'专享':order.heheCouponRecord.couponType eq 3?'新人':order.heheCouponRecord.couponType eq 4?'好友分享':'好友消费'}券抵扣￥${order.heheCouponRecord.couponAmount}，满${order.heheCouponRecord.touchPrice}减${order.heheCouponRecord.couponAmount}）
+                        （${order.heheCouponRecord.couponType eq 1 ? '活动':order.heheCouponRecord.couponType eq 2?'专享':order.heheCouponRecord.couponType eq 3?'新人':order.heheCouponRecord.couponType eq 4?'好友分享':order.heheCouponRecord.couponType eq 5?'好友消费':'消费分享'}券抵扣￥${order.heheCouponRecord.couponAmount}，满${order.heheCouponRecord.touchPrice}减${order.heheCouponRecord.couponAmount}）
                     </font>
                 </a>
             </c:if>

src/main/webapp/WEB-INF/views/modules/hehe/cmHeheCouponForm.jsp

@@ -99,8 +99,28 @@
 <body>
 	<ul class="nav nav-tabs">
 		<li><a href="${ctx}/hehe/cmHeheCoupon/?couponType=${cmHeheCoupon.couponType}">优惠券列表</a></li>
-		<li class="active"><a href="${ctx}/hehe/cmHeheCoupon/form?id=${cmHeheCoupon.id}&couponType=${cmHeheCoupon.couponType}">${not empty cmHeheCoupon.id?'编辑':'添加'}${cmHeheCoupon.couponType eq 1?'活动':cmHeheCoupon.couponType eq 2?'专享':cmHeheCoupon.couponType eq 3?'新人':cmHeheCoupon.couponType eq 4?'好友邀请':'好友消费'}券</a></li>
+		<li class="active"><a href="${ctx}/hehe/cmHeheCoupon/form?id=${cmHeheCoupon.id}&couponType=${cmHeheCoupon.couponType}">${not empty cmHeheCoupon.id?'编辑':'添加'}${cmHeheCoupon.couponType eq 1?'活动':cmHeheCoupon.couponType eq 2?'专享':cmHeheCoupon.couponType eq 3?'新人':cmHeheCoupon.couponType eq 4?'好友邀请':cmHeheCoupon.couponType eq 5?'好友消费':'消费分享'}券</a></li>
 	</ul><br/>
+	<label style="color: red;margin-left: 20px;margin-bottom: 15px;font-size: 14px">
+		<c:if test="${cmHeheCoupon.couponType eq 1}">
+			活动券适合在某些节日或者主题活动时创建，且适用于所有用户以及商城全部商品或指定商品。
+		</c:if>
+		<c:if test="${cmHeheCoupon.couponType eq 2}">
+			专享券适用于指定的用户，且适用于商城全部商品或指定商品。
+		</c:if>
+		<c:if test="${cmHeheCoupon.couponType eq 3}">
+			新人券适合新登录的用户，且适用于商城全部商品或指定商品。
+		</c:if>
+		<c:if test="${cmHeheCoupon.couponType eq 4}">
+			好友邀请券适用于将商城商品分享给好友，该券且适用于商城全部商品或指定商品。
+		</c:if>
+		<c:if test="${cmHeheCoupon.couponType eq 5}">
+			好友消费券适合分享后的好友消费，且适用于商城全部商品或指定商品。
+		</c:if>
+		<c:if test="${cmHeheCoupon.couponType eq 6}">
+			消费分享券适合每完成一笔订单后的分享，且适用于商城全部商品或指定商品。
+		</c:if>
+	</label>
 	<form:form id="inputForm" modelAttribute="cmHeheCoupon" action="${ctx}/hehe/cmHeheCoupon/save" method="post" class="form-horizontal">
 		<form:hidden path="id"/>
 		<form:hidden path="productInfo"/>

src/main/webapp/WEB-INF/views/modules/hehe/cmHeheCouponList.jsp

@@ -27,6 +27,7 @@
 		<li class="${cmHeheCoupon.couponType eq 3?'active':''}"><a href="${ctx}/hehe/cmHeheCoupon/?couponType=3">新人券</a></li>
 		<li class="${cmHeheCoupon.couponType eq 4?'active':''}"><a href="${ctx}/hehe/cmHeheCoupon/?couponType=4">好友邀请券</a></li>
 		<li class="${cmHeheCoupon.couponType eq 5?'active':''}"><a href="${ctx}/hehe/cmHeheCoupon/?couponType=5">好友消费券</a></li>
+		<li class="${cmHeheCoupon.couponType eq 6?'active':''}"><a href="${ctx}/hehe/cmHeheCoupon/?couponType=6">消费分享券</a></li>
 	</ul>
 	<form:form id="searchForm" modelAttribute="cmHeheCoupon" action="${ctx}/hehe/cmHeheCoupon/" method="post" class="breadcrumb form-search">
 		<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
@@ -44,7 +45,7 @@
 				</form:select>
 			&nbsp;&nbsp;<input id="btnSubmit" class="btn btn-primary" type="submit" value="查询"/>
 			<a class="btn btn-primary" href="${ctx}/hehe/cmHeheCoupon/form?couponType=${cmHeheCoupon.couponType}" style="margin-left: 15px">
-				添加${cmHeheCoupon.couponType eq 1?'活动':cmHeheCoupon.couponType eq 2?'专享':cmHeheCoupon.couponType eq 3?'新人':cmHeheCoupon.couponType eq 4?'好友邀请':'好友消费'}券
+				添加${cmHeheCoupon.couponType eq 1?'活动':cmHeheCoupon.couponType eq 2?'专享':cmHeheCoupon.couponType eq 3?'新人':cmHeheCoupon.couponType eq 4?'好友邀请':cmHeheCoupon.couponType eq 5?'好友消费':'消费分享'}券
 			</a>
 			<div class="clearfix"></div>
 		</div>

src/main/webapp/WEB-INF/views/modules/hehe/cmHeheImageForm.jsp

@@ -107,6 +107,12 @@
 				</div>
 			</div>
 		</div>
+		<div class="control-group">
+			<label class="control-label">链接：</label>
+			<div class="controls">
+				<form:input path="link" htmlEscape="false" class="input-xxlarge"/>
+			</div>
+		</div>
 		<div class="control-group">
 			<label class="control-label"><font color="red">*</font>排序：</label>
 			<div class="controls">

src/main/webapp/WEB-INF/views/modules/hehe/heheNewOrderDetail.jsp

@@ -197,7 +197,7 @@
             <c:if test="${not empty order.heheCouponRecord}">
                 <a href="${ctx}/hehe/cmHeheCoupon/receiveDetails?userId=${order.userID}">
                     <font color="red">
-                        （${order.heheCouponRecord.couponType eq 1 ? '活动':order.heheCouponRecord.couponType eq 2?'专享':order.heheCouponRecord.couponType eq 3?'新人':order.heheCouponRecord.couponType eq 4?'好友分享':'好友消费'}券抵扣￥${order.heheCouponRecord.couponAmount}，满${order.heheCouponRecord.touchPrice}减${order.heheCouponRecord.couponAmount}）
+                        （${order.heheCouponRecord.couponType eq 1 ? '活动':order.heheCouponRecord.couponType eq 2?'专享':order.heheCouponRecord.couponType eq 3?'新人':order.heheCouponRecord.couponType eq 4?'好友分享':order.heheCouponRecord.couponType eq 5?'好友消费':'消费分享'}券抵扣￥${order.heheCouponRecord.couponAmount}，满${order.heheCouponRecord.touchPrice}减${order.heheCouponRecord.couponAmount}）
                     </font>
                 </a>
             </c:if>

src/main/webapp/WEB-INF/views/modules/hehe/heheNewOrderList.jsp

@@ -894,13 +894,13 @@
             </li>
             <li>
                 <c:if test="${order.sendOutStatus == 1}">
-                    待发货
+                    <font color="green">待发货</font>
                 </c:if>
                 <c:if test="${order.sendOutStatus == 2}">
-                    部分发货
+                    <font color="##FF9966">部分发货</font>
                 </c:if>
                 <c:if test="${order.sendOutStatus == 3}">
-                    已发货
+                    <font color="red">已发货</font>
                 </c:if>
             </li>
             <li>
@@ -975,6 +975,10 @@
                     </shiro:hasPermission>
 
                     <shiro:hasPermission name="order:order:edit">
+                        <c:if test="${order.status == 0 || order.status == 11}">
+                            <a href="${ctx}/hehe/new/order/cancelOrder?orderID=${order.orderID}"
+                               onclick="return confirmx('是否取消订单?', this.href)">取消订单</a>
+                        </c:if>
                         <c:if test="${order.status ne 0}">
                             <a href="${ctx}/order/printOrder?orderID=${order.orderID}">打印发货单</a>
                         </c:if>

src/main/webapp/WEB-INF/views/modules/hehe/receiveDetailsList.jsp

@@ -40,6 +40,7 @@
 					<form:option value="3" label="新人券"/>
 					<form:option value="4" label="好友邀请券"/>
 					<form:option value="5" label="好友消费券"/>
+					<form:option value="6" label="消费分享券"/>
 				</form:select>
 			<label>状态：</label>
 				<form:select path="useStatus" class="input-medium">
@@ -74,7 +75,7 @@
 					${cmHeheCoupon.name}
 				</td>
 				<td>
-					${cmHeheCoupon.couponType eq 1?'活动':cmHeheCoupon.couponType eq 2?'专享':cmHeheCoupon.couponType eq 3?'新人':cmHeheCoupon.couponType eq 4?'好友分享':'好友消费'}券
+					${cmHeheCoupon.couponType eq 1?'活动':cmHeheCoupon.couponType eq 2?'专享':cmHeheCoupon.couponType eq 3?'新人':cmHeheCoupon.couponType eq 4?'好友分享':cmHeheCoupon.couponType eq 5?'好友消费':'消费分享'}券
 				</td>
 				<td>
 					${cmHeheCoupon.couponAmount}