修改文案

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

@@ -244,6 +244,14 @@ public class CmPayShopService extends CrudService<CmPayShopDao, CmPayShop> {
                 NewOrder newOrder = newOrderDao.get(so.getOrderID().toString());
                 if (null != newOrder) {
                     so.setReceiptStatus(newOrder.getReceiptStatus());
+                    if ("2".equals(newOrder.getOrderType())) {
+                        //呵呵商城订单
+                        so.setOrderType(2);
+                        if (StringUtils.isBlank(so.getClubName())) {
+                            String name = heHeNewOrderDao.findHeUser(newOrder.getUserID());
+                            so.setClubName(name);
+                        }
+                    }
                 } else {
                     so.setReceiptStatus("1");
                 }

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

@@ -151,7 +151,11 @@
 				</tr>
 				<tr>
 					<td>${s.shopName}</td>
-					<td colspan="3">${s.clubName}<c:if test="${s.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if></td>
+					<td colspan="3">
+							${s.clubName}
+						<c:if test="${s.orderType eq 2}"><font color="red">(呵呵商城)</font></c:if>
+						<c:if test="${s.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if>
+					</td>
 					<td>
                         <c:if test="${s.freight == 0}">
                             包邮