爱贝源bug修改

iamberry-common-tool/src/main/java/com/iamberry/wechat/tools/ResultInfo.java

@@ -139,6 +139,8 @@ public class ResultInfo {
 	public static final String returnAgreeRemark =  "请您尽快联系客服人员处理，根据客服人员指引将机器寄回。如有问题请致电400-800-6692或直接在微信留言，Aiberle爱贝源将第一时间为您服务！";
 
 	public static final String exchangeRemark =  "请确认您的换货申请信息填写无误！如有问题请致电400-800-6692或直接在微信留言，Aiberle爱贝源将第一时间为您服务！";
+	public static final String exchangeRejectRemark =  "请确认您的换货申请信息填写无误！如有问题请致电400-800-6692或直接在微信留言，Aiberle爱贝源将第一时间为您服务！";
+	public static final String exchangeAgreeRemark =  "请您尽快联系客服人员处理，根据客服人员指引将机器寄回。如有问题请致电400-800-6692或直接在微信留言，Aiberle爱贝源将第一时间为您服务！";
 
 	/**
 	 * 订单详情连接

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

@@ -144,10 +144,11 @@ Reback_status  = 2) placeId
 	<select id="getShopOrderItemByOrderId" parameterType="String" resultType="OrderItem">
 		SELECT I.ITEM_PRODUCT_NAME itemProductName, 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,
-			P.PRODUCT_REMARK produectRemark 
+			pc.color_69code produectRemark
 		FROM 
-			TB_IAMBERRY_SHOP_ORDER_ITEM I LEFT JOIN TB_IAMBERRY_PRODUCT_INFO P 
-			ON I.ITEM_PRODUCT_ID = P.PRODUCT_ID 
+			TB_IAMBERRY_SHOP_ORDER_ITEM I
+			LEFT JOIN TB_IAMBERRY_PRODUCT_INFO P ON I.ITEM_PRODUCT_ID = P.PRODUCT_ID
+			LEFT JOIN tb_iamberry_product_color pc ON i.item_color_id = pc.color_id
 		WHERE 
 			ITEM_SALES_ORDERID = #{0} 
 		ORDER BY ITEM_ID DESC

iamberry-wechat-service/src/main/java/com/iamberry/wechat/service/mq/EfastOrderServiceImpl.java

@@ -89,7 +89,7 @@ public class EfastOrderServiceImpl implements EfastOrderService {
 				if(orderByaddress.getSalesStatus() == 2){
 					try {
 						sendMessageUtil.orderSendSuccess(
-								"尊敬的朵粉，您的订单已发货，物流信息:",
+								"尊敬的用户，您的订单已发货，物流信息:",
 								order.getSalesOrderid(),
 								SendMessageUtil.hashmap.get(respData.getString("shipping_name")),
 								respData.getString("invoice_no"),

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

@@ -332,7 +332,7 @@ public class AdminOrderHandlers {
 		// 判断当前的订单，是否支持希望进行的操作
 		Order currentOrder = adminOrderService.selectOrderStatusByOrderId(orderId);
 		//获取当前订单订单项
-		List<OrderItem> itemList = adminOrderService.getShopOrderItemByOrderId(currentOrder.getSalesOrderid());
+		List<OrderItem> itemList = adminOrderService.getShopOrderItemByOrderId(orderId);
 
 		Integer orderStatus = currentOrder.getSalesStatus();
 		order.setOldStatus(orderStatus);
@@ -660,6 +660,24 @@ public class AdminOrderHandlers {
 					} catch (Exception e) {
 						System.out.println("===========pay 201  插入返利到百胜失败==============");		
 					}
+
+					/*换货推送与发货一致*/
+					Order newOrder = adminOrderService.selectOrderStatusByOrderId(orderId);
+					try {
+						sendMessageUtil.orderSendSuccess(
+								"尊敬的用户，您的订单已发货，物流信息:",
+								orderId,
+								SendMessageUtil.hashmap.get(newOrder.getSalesPostFirm()),
+								newOrder.getSalesPostNum(),
+								newOrder.getSalesAddressInfo(),
+								ResultInfo.sendRemark1,
+								newOrder.getSalesOpenid(),
+								ResultInfo.ORDER_DETAIL+order.getSalesOrderid()
+						);
+					} catch (Exception e) {
+						logger.info("订单号："+ order.getSalesOrderid() +"的订单已发货，发送微信消息失败!");
+					}
+
 					return mv;
 				} else {
 					mv.addObject("msgObj", new MessageDto(false, "对不起，订单发货失败", "对不起，订单发货失败，请稍后重试！"));
@@ -697,12 +715,12 @@ public class AdminOrderHandlers {
 									"尊敬的用户，您的退货申请已通过。",
 									orderId,
 									itemList.get(0).getItemProductName(),
-									ResultInfo.exchangeRemark,
+									ResultInfo.exchangeAgreeRemark,
 									currentOrder.getSalesOpenid(),
 									ResultInfo.ORDER_DETAIL+orderId
 							);
 						} catch (Exception e) {
-							logger.info("订单号："+ orderId +"的订单申请换货，发送微信消息失败!");
+							logger.info("订单号："+ orderId +"的订单退货申请已通过，发送微信消息失败!");
 						}
 
 					}else{
@@ -712,12 +730,12 @@ public class AdminOrderHandlers {
 									"尊敬的用户，您的换货申请被退回。",
 									orderId,
 									itemList.get(0).getItemProductName(),
-									ResultInfo.exchangeRemark,
+									ResultInfo.exchangeRejectRemark,
 									currentOrder.getSalesOpenid(),
 									ResultInfo.ORDER_DETAIL+orderId
 							);
 						} catch (Exception e) {
-							logger.info("订单号："+ orderId +"的订单申请换货，发送微信消息失败!");
+							logger.info("订单号："+ orderId +"的订单换货申请被退回，发送微信消息失败!");
 						}
 
 					}

iamberry-wechat-web/src/main/resources/ResultInfo.properties

@@ -77,9 +77,4 @@ order_apply_refund=PbTdaDa4payS_Iq6PE7xQRSaG1S21HW0lncnU4dfbYI
 order_apply_return=pnxucPuUygE6epyyC3oPGhjxm2o7mK_B2vLzYxIYXRo
 order_apply_barter=qmj2m-BVyZtEKsKCSBbPlJVSykOr2YScr9pRkPA909w
 order_send_success=Nd6MapQ80Ye4PsQOwJdYljxyPGz6N5gfmGip_KztnhY
-
-order_refund_msg=KNMyO9uDRrXlhJtdQuqCwH1T_AoMFYBCQUhQrlR1EdQ
-
-
-
-
+order_refund_msg=KNMyO9uDRrXlhJtdQuqCwH1T_AoMFYBCQUhQrlR1EdQ