爱贝源bug修改

iamberry-common-core/src/main/java/com/iamberry/wechat/tools/SendMessageUtil.java

@@ -38,6 +38,20 @@ public class SendMessageUtil {
 			hashmap.put("01", "其他");
 			hashmap.put("02", "上门送货");
 		}
+
+
+	/**
+	 *  获取快递名称
+	 * @param firm
+	 * @return
+	 */
+		public static String getHashMap(String firm){
+			String escapeFirm = firm;
+			try{
+				escapeFirm = hashmap.get(firm);;
+			}catch (Exception e){}
+			return escapeFirm;
+		}
 		
 		/**
 		 * 发送模板通知给用户

iamberry-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/adminOrderMapper.xml

@@ -142,7 +142,9 @@ Reback_status  = 2) placeId
 	
 	<!-- 根据orderId获取订单项数据 -->
 	<select id="getShopOrderItemByOrderId" parameterType="String" resultType="OrderItem">
-		SELECT I.ITEM_PRODUCT_NAME itemProductName, I.ITEM_PRODUCT_PIC itemProductPic, I.ITEM_PRODUCT_PRICE itemProductPrice, 
+		SELECT
+			I.ITEM_PRODUCT_NAME itemProductName, i.item_product_color itemProductColor,
+			I.ITEM_PRODUCT_PIC itemProductPic, I.ITEM_PRODUCT_PRICE itemProductPrice,
 			I.ITEM_PRODUCT_DISCOUNT itemProductDiscount, I.ITEM_NUM itemNum, I.ITEM_TOTAL itemTotal, P.PRODUCT_COLOR productColor,
 			pc.color_69code produectRemark
 		FROM 

iamberry-wechat-web/src/main/java/com/iamberry/wechat/handles/admin/AdminOrderHandlers.java

@@ -403,7 +403,7 @@ public class AdminOrderHandlers {
 						sendMessageUtil.orderSendSuccess(
 								"尊敬的用户，您的订单已发货，物流信息:",
 								orderId,
-								SendMessageUtil.hashmap.get(newOrder.getSalesPostFirm()),
+								SendMessageUtil.getHashMap(newOrder.getSalesPostFirm()),
 								newOrder.getSalesPostNum(),
 								newOrder.getSalesAddressInfo(),
 								ResultInfo.sendRemark1,
@@ -674,7 +674,7 @@ public class AdminOrderHandlers {
 						sendMessageUtil.orderSendSuccess(
 								"尊敬的用户，您的订单已发货，物流信息:",
 								orderId,
-								SendMessageUtil.hashmap.get(newOrder.getSalesPostFirm()),
+								SendMessageUtil.getHashMap(newOrder.getSalesPostFirm()),
 								newOrder.getSalesPostNum(),
 								newOrder.getSalesAddressInfo(),
 								ResultInfo.sendRemark1,

iamberry-wechat-web/src/main/webapp/WEB-INF/views/admin/order/order.jsp

@@ -117,6 +117,7 @@
 				  <thead>
 				  	<tr  class="f-14" style="font-weight: bold;">
 				  		<th>商品名称</th>
+				  		<th>颜色名称</th>
 				  		<th>商品图片</th>
 				  		<th>原价（￥）</th>
 				  		<th>优惠价（￥）</th>
@@ -129,6 +130,7 @@
 				  <c:forEach items="${orderItemList }" var="list">
 				  	<tr>
 				  		<td>${list.itemProductName }</td>
+				  		<td>${list.itemProductColor }</td>
 				  		<td><img alt="图片" src="${list.itemProductPic}" style="width: 40px; height: 40px;"></td>
 				  		<td><fmt:formatNumber type="number" value="${list.itemProductPrice/100}" pattern="0.00" maxFractionDigits="2"/></td>
 				  		<td><fmt:formatNumber type="number" value="${list.itemProductDiscount/100}" pattern="0.00" maxFractionDigits="2"/></td>

iamberry-wechat-web/src/main/webapp/WEB-INF/views/admin/order/orderList.jsp

@@ -40,9 +40,9 @@
 			<div class="formControls col-5"> <span class="select-box" style="width:150px;">
 				<select class="select" name="postFirm" size="1">
 					<option value="">请选择物流公司</option>
-					<option value="shentong">申通快递</option>
-					<option value="yuantong">圆通快递</option>
-					<option value="shunfeng">顺丰快递</option>
+					<option value="sto">申通快递</option>
+					<option value="yto">圆通快递</option>
+					<option value="sf">顺丰快递</option>
 					<option value="longbanwuliu">龙邦快递</option>
 				</select>
 				</span> </div>