呵呵商城拼团/分享减免part3

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

@@ -20,5 +20,4 @@ public interface CmHeheCollageProductDao extends CrudDao<CmHeheCollageProduct> {
     List<Integer> findExistProductIds();
 
     List<Integer> findActivityProductIds();
-
 }

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

@@ -27,4 +27,11 @@ public interface HeHeNewOrderDao extends CrudDao<NewOrder> {
      * @return
      */
     CmHeheCouponOrderRecord findOrderCouponRecord(Integer orderID);
+
+    /**
+     * 查询分享减免条件金额
+     * @param orderID
+     * @return
+     */
+    Double findReductionTouchPrice(Integer orderID);
 }

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

@@ -66,7 +66,7 @@ public class CmHeheCollageProductService extends CrudService<CmHeheCollageProduc
 		// 已参与商品活动商品id
 		List<Integer> actProductIds = cmHeheCollageProductDao.findActivityProductIds();
 		productIds.addAll(actProductIds);
-		product.setProductIdList(productIds);
+		product.setIds(productIds);
 		List<Product> productList = cmHeheFloorProductDao.findAllProduct(product);
 		if (productList != null && productList.size() > 0) {
 			productList.forEach(item -> {

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

@@ -78,7 +78,7 @@ public class HeHeNewOrderService extends CrudService<HeHeNewOrderDao, NewOrder>
         else
             newOrder.setRebateOrder("0");
         if (null != newOrder) {
-            // 获取订单优惠记录
+            // 获取订单优惠券使用记录
             if (newOrder.getCouponAmount() != null && newOrder.getCouponAmount() > 0) {
                 CmHeheCouponOrderRecord couponRecord = heHeNewOrderDao.findOrderCouponRecord(newOrder.getOrderID());
                 if (couponRecord != null) {
@@ -86,6 +86,11 @@ public class HeHeNewOrderService extends CrudService<HeHeNewOrderDao, NewOrder>
                     newOrder.setHeheCouponRecord(couponRecord);
                 }
             }
+            // 获取订单分享减免记录
+            if (newOrder.getReductionAmount() != null && newOrder.getReductionAmount() > 0) {
+                Double reductionTouchPrice = heHeNewOrderDao.findReductionTouchPrice(newOrder.getOrderID());
+                newOrder.setReductionTouchPrice(reductionTouchPrice);
+            }
             //获取订单客户
             OrderUserInfo orderUserInfo = orderUserInfoService.findByOrderID(newOrder.getOrderID());
             if (null != orderUserInfo) {

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

@@ -142,6 +142,11 @@ public class NewOrder extends DataEntity<NewOrder> {
     private Double couponAmount;    //优惠券抵扣金额
     private CmCouponOrderRecord couponOrderRecord;    //优惠券信息
     private Double svipFullReduction;   //超级会员优惠
+    private Integer collageFlag;    // 拼团订单标识：1拼团订单，0不是
+    private Integer collageStatus;  // 拼团状态：1拼团中，2已拼成
+    private Double reductionAmount;    //分享减免金额
+    private Double reductionTouchPrice; //分享减免条件
+
 
     /**
      * 呵呵商城优惠券
@@ -1091,5 +1096,38 @@ public class NewOrder extends DataEntity<NewOrder> {
     public void setHeheCouponRecord(CmHeheCouponOrderRecord heheCouponRecord) {
         this.heheCouponRecord = heheCouponRecord;
     }
+
+    public Integer getCollageFlag() {
+        return collageFlag;
+    }
+
+    public void setCollageFlag(Integer collageFlag) {
+        this.collageFlag = collageFlag;
+    }
+
+    public Integer getCollageStatus() {
+        return collageStatus;
+    }
+
+    public void setCollageStatus(Integer collageStatus) {
+        this.collageStatus = collageStatus;
+    }
+
+
+    public Double getReductionAmount() {
+        return reductionAmount;
+    }
+
+    public void setReductionAmount(Double reductionAmount) {
+        this.reductionAmount = reductionAmount;
+    }
+
+    public Double getReductionTouchPrice() {
+        return reductionTouchPrice;
+    }
+
+    public void setReductionTouchPrice(Double reductionTouchPrice) {
+        this.reductionTouchPrice = reductionTouchPrice;
+    }
 }
 

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

@@ -1032,6 +1032,11 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
                     newOrder.setReceiveCouponId(heheCouponRecord.getReceiveCouponId());
                     newOrder.setHeheCouponRecord(heheCouponRecord);
                 }
+                // 获取订单分享减免记录
+                if (newOrder.getReductionAmount() != null && newOrder.getReductionAmount() > 0) {
+                    Double reductionTouchPrice = heHeNewOrderDao.findReductionTouchPrice(newOrder.getOrderID());
+                    newOrder.setReductionTouchPrice(reductionTouchPrice);
+                }
             }
             //获取订单客户
             OrderUserInfo orderUserInfo = orderUserInfoService.findByOrderID(newOrder.getOrderID());
@@ -1153,6 +1158,16 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
                     newOrder.setClubCouponId(couponRecord.getClubCouponId());
                     newOrder.setCouponOrderRecord(couponRecord);
                 }
+                CmHeheCouponOrderRecord heheCouponRecord = heHeNewOrderDao.findOrderCouponRecord(newOrder.getOrderID());
+                if (heheCouponRecord != null) {
+                    newOrder.setReceiveCouponId(heheCouponRecord.getReceiveCouponId());
+                    newOrder.setHeheCouponRecord(heheCouponRecord);
+                }
+                // 获取订单分享减免记录
+                if (newOrder.getReductionAmount() != null && newOrder.getReductionAmount() > 0) {
+                    Double reductionTouchPrice = heHeNewOrderDao.findReductionTouchPrice(newOrder.getOrderID());
+                    newOrder.setReductionTouchPrice(reductionTouchPrice);
+                }
             }
             //获取订单客户
             OrderUserInfo orderUserInfo = orderUserInfoService.findByOrderID(cmReturnedPurchase.getOrderID());

src/main/java/com/caimei/modules/product/entity/Product.java

@@ -126,7 +126,6 @@ public class Product extends DataEntity<Product> {
     private Integer trainingType; //售价是否包含：1售价未包含，2售价已包含
     private BigDecimal trainingFee; //培训费用(售价未包含)
     private Integer svipFlag;	//超级会员商品标识：1是，2不是
-    private List<Integer> productIdList;//商品id列表
 
     //以下参数是搜索回显参数
     private String searchName;
@@ -1843,12 +1842,4 @@ public class Product extends DataEntity<Product> {
     public void setSearchType(Integer searchType) {
         this.searchType = searchType;
     }
-
-    public List<Integer> getProductIdList() {
-        return productIdList;
-    }
-
-    public void setProductIdList(List<Integer> productIdList) {
-        this.productIdList = productIdList;
-    }
 }

src/main/resources/config/beta/caimei.properties

@@ -3,7 +3,7 @@
 #============================#
 
 #oracle database settings
-#jdbc.type=oracle
+#jdbc.type=oraclere
 #jdbc.driver=oracle.jdbc.driver.OracleDriver
 #jdbc.url=jdbc:oracle:thin:@127.0.0.1:1521:orcl
 #jdbc.username=root

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

@@ -35,7 +35,7 @@
 		FROM cm_hehe_collage a
 		<include refid="cmHeheCollageJoins"/>
 		<where>
-			
+			status != 0
 			<if test="id != null and id != ''">
 				AND a.id = #{id}
 			</if>
@@ -76,7 +76,8 @@
 		</choose>
 	</select>
 	<select id="getCollageOrderIds" resultType="java.lang.Integer">
-		select orderId from cm_hehe_collage_member where collageId = #{collageId}
+		select chcm.orderId from cm_hehe_collage_member chcm left join cm_order co on chcm.orderId = co.orderID
+		where collageId = #{collageId} and co.receiptStatus = 3
 	</select>
 	<select id="findMemberList" resultType="com.caimei.modules.hehe.entity.CmHeheCollageMember">
 		select chu.nickName,cm.launchFlag,chu.mobile,chu.userIdentity,co.orderTime,co.orderNo
@@ -84,7 +85,7 @@
 		left join user u on cm.userId = u.userID
 		left join cm_hehe_user chu on u.userID = chu.userId
 		left join cm_order co on cm.orderId = co.orderID
-		where collageId = #{collageId}
+		where collageId = #{collageId} and co.receiptStatus = 3
 		<if test="nickName != null and nickName != ''">
 			and chu.nickName like concat('%',#{nickName},'%')
 		</if>

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

@@ -75,12 +75,19 @@
 			</otherwise>
 		</choose>
 	</select>
-	<select id="findExistProductIds" resultType="java.lang.String">
-		select productId from cm_hehe_collage_product;
+	<select id="findExistProductIds" resultType="java.lang.Integer">
+		select chp.id from cm_hehe_collage_product chcp left join cm_hehe_product chp on chcp.productId = chp.productId
+		where chp.id is not null;
 	</select>
 	<select id="findActivityProductIds" resultType="java.lang.Integer">
 		select chp.id
 		from cm_hehe_activity_product chap
+				 left join cm_hehe_product chp on chap.productId = chp.productId
+		where chp.id is not null;
+	</select>
+	<select id="findReductionProductIds" resultType="java.lang.Integer">
+		select chp.id
+		from cm_hehe_reduction chap
 				 left join cm_hehe_product chp on chap.productId = chp.productId;
 	</select>
 

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

@@ -115,12 +115,6 @@
 					#{id}
 				</foreach>
 			</if>
-			<if test="productIdList != null and productIdList.size() > 0 ">
-				AND p.productID NOT IN
-				<foreach collection="productIdList" open="(" close=")" item="id" separator=",">
-					#{id}
-				</foreach>
-			</if>
 		</where>
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">

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

@@ -54,12 +54,17 @@
 		a.affirmPaymentFlag AS affirmPaymentFlag,
 		a.rebateFlag AS rebateFlag,
 		a.zeroCostFlag AS zeroCostFlag,
-        a.couponAmount
+        a.couponAmount,
+        a.reductionAmount,
+        if(chcm.id is not null,1,0) as collageFlag,
+        chc.status as collageStatus
 	</sql>
 
     <select id="get" resultType="newOrder">
         SELECT <include refid="columns"/>
         FROM cm_order a
+        LEFT JOIN cm_hehe_collage_member chcm on a.orderID = chcm.orderId
+        LEFT JOIN cm_hehe_collage chc on chcm.collageId = chc.id
         WHERE a.orderID = #{id}
     </select>
 
@@ -106,22 +111,28 @@
         co.sendOutStatus AS sendOutStatus,
         co.receiptStatus AS receiptStatus,
         co.productCount AS productCount,
-        (SELECT IFNULL(sum(cop.shouldPayFee),0) FROM cm_order_product cop WHERE cop.orderId=co.orderID) AS "shouldPayProduct",
+        (SELECT IFNULL(sum(cop.shouldPayFee),0) FROM cm_order_product cop WHERE cop.orderId=co.orderID) AS
+        "shouldPayProduct",
         co.status AS status,
         co.splitFlag AS splitFlag,
         co.postageOrderFlag AS postageOrderFlag,
         (case when co.orderType = '0' then
-        (select case status when 91 then '采美默认协销经理(官方账号)' else linkMan end from serviceprovider where serviceProviderID = co.spID)
+        (select case status when 91 then '采美默认协销经理(官方账号)' else linkMan end from serviceprovider where serviceProviderID
+        = co.spID)
         else
         ''
         end) AS spName,
-        co.rebateFlag AS rebateFlag
+        co.rebateFlag AS rebateFlag,
+        if(chcm.id is not null,1,0) as collageFlag,
+        chc.status as collageStatus
         FROM cm_order co
         LEFT JOIN bp_order_userinfo bou ON bou.orderId = co.orderID
         LEFT JOIN user u ON u.userID = co.userID
         LEFT JOIN cm_hehe_user c ON u.userID = c.userId
         LEFT JOIN cm_order_product cop ON co.orderID = cop.orderID
         LEFT JOIN product p ON cop.productID = p.productID
+        LEFT JOIN cm_hehe_collage_member chcm on co.orderID = chcm.orderId
+        LEFT JOIN cm_hehe_collage chc on chcm.collageId = chc.id
         <where>
             co.orderType = 2
             <if test="orderID != null and orderID != ''">
@@ -258,5 +269,8 @@
         WHERE
             orderId = #{orderID}
     </select>
+    <select id="findReductionTouchPrice" resultType="java.lang.Double">
+        select touchPrice from cm_hehe_reduction_user where orderId = #{orderID}
+    </select>
 
 </mapper>

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

@@ -57,12 +57,16 @@
 		a.zeroCostFlag AS zeroCostFlag,
 		a.organizeStoreId as organizeStoreId,
 		a.couponAmount as couponAmount,
-        a.svipFullReduction as svipFullReduction
+        a.svipFullReduction as svipFullReduction,
+        if(chcm.id is not null,1,0) as collageFlag,
+        chc.status as collageStatus
 	</sql>
 
     <select id="get" resultType="newOrder">
 		SELECT <include refid="columns"/>
 		FROM cm_order a
+		LEFT JOIN cm_hehe_collage_member chcm on a.orderID = chcm.orderId
+		LEFT JOIN cm_hehe_collage chc on chcm.collageId = chc.id
 		WHERE a.orderID = #{id}
 	</select>
 

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

@@ -334,6 +334,11 @@
             <td>
                 下单时间：${order.orderTime}
             </td>
+            <c:if test="${order.orderType eq 2}">
+                <td>
+                    订单类型：${order.collageFlag eq 1?'拼团订单':'独立订单'}
+                </td>
+            </c:if>
             <td colspan="2">
                 订单状态：
                 <c:if test="${order.status eq 11 || order.status eq 12 || order.status eq 13 ||order.status eq 21 ||order.status eq 22 ||
@@ -368,6 +373,9 @@
                         </font>
                     </a>
                 </c:if>
+                <c:if test="${order.reductionAmount > 0}">
+                    （分享减免￥${order.reductionAmount},满${order.reductionTouchPrice}减${order.reductionAmount}）
+                </c:if>
             </td>
             <td>
                 应收总额：￥<fmt:formatNumber type="number" value="${order.payableAmount}" pattern="0.00" maxFractionDigits="2" />(账户余额抵扣：${order.balancePayFee})
@@ -408,6 +416,21 @@
                     <font color="green">已收款</font>
                 </c:if></td>
             </td>
+            <c:if test="${order.orderType eq 2}">
+                <td>
+                    拼团状态：
+                    <c:choose>
+                        <c:when test="${order.collageFlag eq 1 && (order.status eq 31 || order.status eq 32 || order.status eq 33)}">
+                            <font color="${order.collageStatus eq 1?'#00CC66':(order.collageStatus eq 2?'red':'')}">
+                                    ${order.collageStatus eq 1?'拼团中':(order.collageStatus eq 2?'已拼成':'-')}
+                            </font>
+                        </c:when>
+                        <c:otherwise>
+                            -
+                        </c:otherwise>
+                    </c:choose>
+                </td>
+            </c:if>
             <td>
                 发货状态：
                 <c:if test="${order.sendOutStatus == 1}">
@@ -492,6 +515,7 @@
                                         </td>
                                         <td style="width: 275px;">
                                             单价：￥<fmt:formatNumber type="number" value="${newOrderProduct.price}"  pattern="0.00" maxFractionDigits="2" />
+                                            <c:if test="${order.collageFlag eq 1}"><font color="red">（拼团价）</font></c:if>
                                         </td>
                                         <td >
                                             折扣 ：${newOrderProduct.discount}%

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

@@ -345,6 +345,11 @@
                 <td>
                     下单时间：${order.orderTime}
                 </td>
+                <c:if test="${order.orderType eq 2}">
+                    <td>
+                        订单类型：${order.collageFlag eq 1?'拼团订单':'独立订单'}
+                    </td>
+                </c:if>
                 <td colspan="2">
                     订单状态：
                     <c:if test="${order.status eq 11 || order.status eq 12 || order.status eq 13 ||order.status eq 21 ||order.status eq 22 ||
@@ -379,6 +384,9 @@
                             </font>
                         </a>
                     </c:if>
+                    <c:if test="${order.reductionAmount > 0}">
+                        （分享减免￥${order.reductionAmount},满${order.reductionTouchPrice}减${order.reductionAmount}）
+                    </c:if>
                 </td>
                 <td>
                     应收总额：￥<fmt:formatNumber type="number" value="${order.payableAmount}" pattern="0.00" maxFractionDigits="2" />(账户余额抵扣：${order.balancePayFee})
@@ -420,6 +428,21 @@
                         <font color="green">已收款</font>
                     </c:if></td>
                 </td>
+                <c:if test="${order.orderType eq 2}">
+                    <td>
+                        拼团状态：
+                        <c:choose>
+                            <c:when test="${order.collageFlag eq 1 && (order.status eq 31 || order.status eq 32 || order.status eq 33)}">
+                                <font color="${order.collageStatus eq 1?'#00CC66':(order.collageStatus eq 2?'red':'')}">
+                                        ${order.collageStatus eq 1?'拼团中':(order.collageStatus eq 2?'已拼成':'-')}
+                                </font>
+                            </c:when>
+                            <c:otherwise>
+                                -
+                            </c:otherwise>
+                        </c:choose>
+                    </td>
+                </c:if>
                 <td>
                     发货状态：
                     <c:if test="${order.sendOutStatus == 1}">
@@ -501,7 +524,7 @@
                                             <img style="width: 100px;height: 100px"  src="${cmReturnedPurchaseProduct.mainImage}">
                                             <font title="${cmReturnedPurchaseProduct.name}">${fns:abbr(cmReturnedPurchaseProduct.name,30)}</font>
                                         </td>
-                                        <td>单价：￥${cmReturnedPurchaseProduct.price}</td>
+                                        <td>单价：￥${cmReturnedPurchaseProduct.price}<c:if test="${order.collageFlag eq 1}"><font color="red">（拼团价）</font></c:if></td>                                            <c:if test="${order.collageFlag eq 1}"><font color="red">（拼团价）</font></c:if>
                                         <td>折扣：${cmReturnedPurchaseProduct.discount}</td>
                                         <td>折后单价：￥${cmReturnedPurchaseProduct.discountPrice}</td>
                                         <td>购买数量（赠品数）X${cmReturnedPurchaseProduct.num}(${cmReturnedPurchaseProduct.presentNum})</td>

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

@@ -125,6 +125,9 @@
         <td>
             <c:if test="${order.organizeID != 1}">
                 订单类型：${fns:getDictLabel(order.orderType,'order_type' ,'' )}
+                <c:if test="${order.orderType eq 2}">
+                    ${order.collageFlag eq 1?'拼团订单':'独立订单'}
+                </c:if>
             </c:if>
         </td>
         <td>
@@ -143,6 +146,21 @@
         <td>
             收款状态：${fns:getDictLabel(order.receiptStatus,'receiptStatus' ,'' )}
         </td>
+        <c:if test="${order.orderType eq 2}">
+            <td>
+                拼团状态：
+                <c:choose>
+                    <c:when test="${order.collageFlag eq 1 && (order.status eq 31 || order.status eq 32 || order.status eq 33)}">
+                        <font color="${order.collageStatus eq 1?'#00CC66':(order.collageStatus eq 2?'red':'')}">
+                                ${order.collageStatus eq 1?'拼团中':(order.collageStatus eq 2?'已拼成':'-')}
+                        </font>
+                    </c:when>
+                    <c:otherwise>
+                        -
+                    </c:otherwise>
+                </c:choose>
+            </td>
+        </c:if>
         <td>
             付款状态：${fns:getDictLabel(order.payStatus,'payStatus' ,'' )}
             <c:if test="${order.zeroCostFlag eq 1}">
@@ -198,6 +216,9 @@
                     </font>
                 </a>
             </c:if>
+            <c:if test="${order.reductionAmount > 0}">
+                （分享减免￥${order.reductionAmount},满${order.reductionTouchPrice}减${order.reductionAmount}）
+            </c:if>
         </td>
         <td>
             应收总额：￥${order.payableAmount}

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

@@ -86,7 +86,7 @@
         <td>返佣订单: ${(order.rebateOrder ne '0' || order.rebateFlag eq '1')?'是':'否'}</td>
     </tr>
     <tr>
-        <td>订单类型: <c:if test="${order.orderType == 1}">自主订单</c:if><c:if test="${order.orderType == 0}">协销订单</c:if></td>
+        <td>订单类型: ${order.collageFlag eq 1?'拼团订单':'独立订单'}</td>
         <td>订单来源: ${fns:getDictLabel(order.orderSource,"bp_orderSource","" )}</td>
         <td>订单状态:
             <c:if test="${order.status eq 11 || order.status eq 12 || order.status eq 13 ||order.status eq 21 ||order.status eq 22 ||
@@ -100,6 +100,18 @@
                 </c:if>
             </c:if>
         </td>
+        <td>拼团状态：
+            <c:choose>
+                <c:when test="${order.collageFlag eq 1 && (order.status eq 31 || order.status eq 32 || order.status eq 33)}">
+                    <font color="${order.collageStatus eq 1?'#00CC66':(order.collageStatus eq 2?'red':'')}">
+                            ${order.collageStatus eq 1?'拼团中':(order.collageStatus eq 2?'已拼成':'-')}
+                    </font>
+                </c:when>
+                <c:otherwise>
+                    -
+                </c:otherwise>
+            </c:choose>
+        </td>
     </tr>
     <tr>
         <c:if test="${order.status ne 0}">
@@ -201,6 +213,11 @@
                     </font>
                 </a>
             </c:if>
+            <c:if test="${order.reductionAmount > 0}">
+                <font color="red">
+                    （分享减免￥${order.reductionAmount},满${order.reductionTouchPrice}减${order.reductionAmount}）
+                </font>
+            </c:if>
         </td>
     </tr>
     <tr>
@@ -480,6 +497,7 @@
                                         </c:if>
                                     </a>
                                 </c:if>
+                                <c:if test="${order.collageFlag eq 1}"><font color="red">（拼团价）</font></c:if>
                             </span>
                             <span>折扣: ${op.discount}%</span>
                             <span>折后单价:

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

@@ -769,11 +769,13 @@
 <div class="data-title">
     <ul>
         <li>订单ID</li>
+        <li>订单类型</li>
         <li>订单编号</li>
         <li>买家</li>
         <li>收货人</li>
         <li>订单状态</li>
         <li>收款状态</li>
+        <li>拼团状态</li>
         <li>付款状态</li>
         <li>发货状态</li>
         <li>退款状态</li>
@@ -786,6 +788,9 @@
         <%--颜色区分分期不分期订单以及终止订单--%>
         <ul class="spileOrder" data-id="${order.orderNo}">
             <li>${order.orderID}</li>
+            <li>
+                ${order.collageFlag eq 1?'拼团订单':'独立订单'}
+            </li>
             <li style="position: relative">${order.orderNo}
             </li>
             <li>
@@ -848,6 +853,18 @@
                     </c:if>
                 </c:if>
             </li>
+            <li>
+                <c:choose>
+                    <c:when test="${order.collageFlag eq 1 && (order.status eq 31 || order.status eq 32 || order.status eq 33)}">
+                        <font color="${order.collageStatus eq 1?'#00CC66':(order.collageStatus eq 2?'red':'')}">
+                            ${order.collageStatus eq 1?'拼团中':(order.collageStatus eq 2?'已拼成':'-')}
+                        </font>
+                    </c:when>
+                    <c:otherwise>
+                        -
+                    </c:otherwise>
+                </c:choose>
+            </li>
             <li>
                 <c:if test="${order.payStatus == 1}">
                     待付款