接口测试修改

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/cart/CartServiceImpl.java

@@ -1,9 +1,14 @@
 package com.iamberry.wechat.service.cart;
 
+import java.text.DecimalFormat;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import com.iamberry.app.tool.log.RatFWLogger;
+import com.iamberry.wechat.face.order.AdminOrderService;
+import com.iamberry.wechat.tools.ResultInfo;
+import com.iamberry.wechat.tools.SendMessageUtil;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -46,8 +51,13 @@ public class CartServiceImpl implements CartService {
 	private RebackServices rebackServices;
 	@Autowired
 	ProductInfoService productInfoService;
-	
-	
+	@Autowired
+	private SendMessageUtil sendMessageUtil;
+	@Autowired
+	private AdminOrderService adminOrderService;
+
+	@Autowired
+	private RatFWLogger logger;
 	@Override
 	public List<CartDto> selectCartByOpenId(String openId) {
 		// TODO Auto-generated method stub
@@ -299,6 +309,19 @@ public class CartServiceImpl implements CartService {
 					//修改订单状态
 					int num = cartDao.updateOrderByOrder(order);
 					if (num > 0) {
+						//推送微信发货消息
+						//给用户发送消息-已发货的通知
+						DecimalFormat df=new DecimalFormat("0.00");
+						Order order2 = adminOrderService.selectOrderStatusByOrderId(order.getSalesOrderid());
+						String payMoney = df.format((float)order2.getSalesYetAmount()/100) + "元";
+						//获取当前订单订单项
+						List<OrderItem> itemList = adminOrderService.getShopOrderItemByOrderId(orderId);
+						try {
+							sendMessageUtil.orderApplyRefund("尊敬的朵粉，您的退款申请被退回：",payMoney,itemList.get(0).getItemProductName(),orderId,
+									"请确认您的退款申请信息填写无误。\\n如有问题请致电400-678-1860或直接在微信留言，soodo上朵将第一时间为您服务！（点击查看订单详情）",order2.getSalesOpenid(),ResultInfo.ORDER_DETAIL+order2.getSalesOrderid());
+						} catch (Exception e) {
+							logger.info("订单号："+ orderId +"的订单驳回退款，发送微信消息失败!");
+						}
 						flag = true;
 					}
 				} else {
@@ -327,6 +350,23 @@ public class CartServiceImpl implements CartService {
 					//修改订单状态
 					int num = cartDao.updateOrderByOrder(order);
 					if (num > 0) {
+						DecimalFormat df=new DecimalFormat("0.00");
+						Order order2 = adminOrderService.selectOrderStatusByOrderId(order.getSalesOrderid());
+						//获取当前订单订单项
+						List<OrderItem> itemList = adminOrderService.getShopOrderItemByOrderId(orderId);
+						String payMoney = df.format((float)order2.getSalesYetAmount()/100) + "元";
+						int productNum = 0;
+						for (OrderItem item : itemList) {
+							productNum += item.getItemNum();
+						}
+						try {
+							sendMessageUtil.orderApplyReturn("尊敬的朵粉，已收到您的【退货申请】",orderId,payMoney,productNum+"件",order2.getSalesReturnDes(),
+									"点击查看退款退货详情。\\n如有问题请致电400-678-1860或直接在微信留言，soodo上朵将第一时间为您服务！",order2.getSalesOpenid(),ResultInfo.ORDER_DETAIL+order2.getSalesOrderid());
+						} catch (Exception e) {
+							logger.info("订单号："+ orderId +"的订单申请退货，发送微信消息失败!");
+						}
+
+
 						flag = true;
 					}
 				} else if (operation == 7) {	//申请换货
@@ -334,6 +374,16 @@ public class CartServiceImpl implements CartService {
 					//修改订单状态
 					int num = cartDao.updateOrderByOrder(order);
 					if (num > 0) {
+						Order order2 = adminOrderService.selectOrderStatusByOrderId(orderId);
+						//获取当前订单订单项
+						List<OrderItem> itemList = adminOrderService.getShopOrderItemByOrderId(orderId);
+						try {
+							sendMessageUtil.orderApplyBarter("尊敬的朵粉，已收到您的【换货申请】，我们正在确认换货信息。",orderId,itemList.get(0).getItemProductName(),
+									"对此结果，soodo上朵深表歉意，我们会继续提升，期待下一次相遇！\\n如有问题请致电400-678-1860或直接在微信留言，soodo上朵将第一时间为您服务！",order2.getSalesOpenid(),ResultInfo.ORDER_DETAIL+orderId);
+						} catch (Exception e) {
+							logger.info("订单号："+ orderId +"的订单申请换货，发送微信消息失败!");
+						}
+
 						flag = true;
 					}
 				} else {

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

@@ -11,6 +11,7 @@ import java.util.regex.Pattern;
 import com.iamberry.wechat.core.entity.agentInfo.AgentOrder;
 import com.iamberry.wechat.core.entity.agentInfo.AgentOrderItem;
 import com.iamberry.wechat.service.mapper.AgentPurchaseOrderMapper;
+import com.iamberry.wechat.tools.*;
 import net.sf.json.JSONObject;
 
 import org.apache.commons.lang3.StringEscapeUtils;
@@ -32,9 +33,6 @@ import com.iamberry.wechat.face.mq.EfastOrderService;
 import com.iamberry.wechat.face.order.AdminOrderService;
 import com.iamberry.wechat.face.order.AdminProbationOrderService;
 import com.iamberry.wechat.face.porduct.ProductColorService;
-import com.iamberry.wechat.tools.DateTimeUtil;
-import com.iamberry.wechat.tools.HttpClient431Util;
-import com.iamberry.wechat.tools.NameUtils;
 import com.iamberry.wechat.core.entity.admin.ShopSystemRule;
 
 @Service
@@ -57,6 +55,9 @@ public class EfastOrderServiceImpl implements EfastOrderService {
 	@Autowired
 	private AgentPurchaseOrderMapper agentPurchaseOrderMapper;
 
+	@Autowired
+	private SendMessageUtil sendMessageUtil;
+
 	@Override
 	public boolean selectEfastSendOrderInfo(MQMessage message) {
 		// TODO Auto-generated method stub
@@ -95,6 +96,16 @@ public class EfastOrderServiceImpl implements EfastOrderService {
 				order.setSalesPostFirm(respData.getString("shipping_name"));
 				order.setSalesPostNum(respData.getString("invoice_no"));
 				adminOrderService.updateOrderDeliver(order);
+				//推送微信发货消息
+				//给用户发送消息-已发货的通知
+				Order orderByaddress = adminOrderService.selectOrderStatusByOrderId(order.getSalesOrderid());
+				try {
+					sendMessageUtil.orderSendSuccess("尊敬的朵粉，您的订单已发货，物流信息:",order.getSalesOrderid(), SendMessageUtil.hashmap.get(respData.getString("shipping_name")),
+							respData.getString("invoice_no"),orderByaddress.getSalesAddressInfo(),"如有问题请致电400-678-1860或直接在微信留言，soodo上朵将第一时间为您服务！（点击查看订单详情）",orderByaddress.getSalesOpenid(), ResultInfo.ORDER_DETAIL+order.getSalesOrderid());
+				} catch (Exception e) {
+					logger.info("订单号："+ order.getSalesOrderid() +"的订单已发货，发送微信消息失败!");
+				}
+
 				return true;
 			}
 			logger.error(this, "get-订单号为:" + message.getServiceToMessage() + "的订单，百胜返回信息:" + resultJson);