Merge branch 'master' of http://git.iamberry.com/liuzhiwei/iamberry-common-tooth

# Conflicts:
#	tooth-common-core/src/main/java/com/iamberry/wechat/core/entity/coupon/CouponItemDto.java
#	tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/couponItemMapper.xml

tooth-wechat-interface/src/main/java/com/iamberry/wechat/face/mq/EfastOrderService.java

@@ -1,5 +1,6 @@
 package com.iamberry.wechat.face.mq;
 
+import com.iamberry.wechat.core.entity.order.Order;
 import net.sf.json.JSONObject;
 
 import com.iamberry.wechat.core.entity.mq.MQMessage;
@@ -103,4 +104,12 @@ public interface EfastOrderService {
 	 * @param openId 当前用户openid
 	 */
 	public boolean giftCard(String address, String id, Integer colorId, String addrName, String tel, String openId) throws Exception;
+
+
+	/**
+	 * 将订单信息推送到百胜<pre>  测试
+	 * @return
+	 */
+	void addOrderInfoToEfastTest(Order order) throws Exception;
+
 }

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

@@ -148,6 +148,14 @@ public class EfastOrderServiceImpl implements EfastOrderService {
 		}
 	}
 
+	@Override
+	public void addOrderInfoToEfastTest(Order or) throws Exception {
+
+		List<OrderItem> items = adminOrderService.getShopOrderItemByOrderId(or.getSalesOrderid());
+		or = adminOrderService.getShopOrderByOrderId(or.getSalesOrderid());
+
+
+	}
 
 	@Override
 	public boolean addOrderInfoToEfast(MQMessage message) throws Exception {
@@ -252,8 +260,6 @@ public class EfastOrderServiceImpl implements EfastOrderService {
 		orderData.put("money_paid", (money/100.0));										// 已付款
 		orderData.put("oid", order.getSalesOrderid());									// 订单号
 		orderData.put("order_amount", (money/100.0));									// 应付款,应付款金额要与已付款金额相同
-
-
 		/**
 		 * 产品信息
 		 */
@@ -271,7 +277,11 @@ public class EfastOrderServiceImpl implements EfastOrderService {
 		orderData.put("orders", maps);													// 订单产品
 		orderData.put("pay_name", "weixinpay");											// 支付方式
 		orderData.put("pay_time", DateTimeUtil.format(order.getSalesTransactionDate()));// 支付时间
-		orderData.put("postscript", order.getSalesUserRemark());						// 买家留言
+		if(order.getSalesUserRemark() == null){
+			orderData.put("postscript", " ");						// 买家留言
+		}else{
+			orderData.put("postscript", order.getSalesUserRemark());						// 买家留言
+		}
 		orderData.put("province_name", provinceName);									// 省份
 		orderData.put("sd_id", sd_id);													// 对应 efast 店铺 id
 		orderData.put("shipping_fee", 0);												// 快递费
@@ -282,7 +292,6 @@ public class EfastOrderServiceImpl implements EfastOrderService {
 		orderData.put("user_name", order.getSalesOpenid());							// 买家账户   百胜根据user_name来判断是否有重复，传openId是为了防止重复
 		orderData.put("zipcode", order.getSalesAddressPostnum());						// 邮编
 
-
 		com.fasterxml.jackson.databind.ObjectMapper mapper = new ObjectMapper();
 		String orderDataStr = null;;
 		try {
@@ -427,7 +436,6 @@ public class EfastOrderServiceImpl implements EfastOrderService {
 		orderData.put("user_name", agentOrder.getAgentId());							// 买家账户   百胜根据user_name来判断是否有重复，传openId是为了防止重复
 		orderData.put("zipcode", agentOrder.getAgentAddressPostnum());					// 邮编
 
-
 		com.fasterxml.jackson.databind.ObjectMapper mapper = new ObjectMapper();
 		String orderDataStr = null;;
 		try {

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/order/AdminOrderServiceImpl.java

@@ -157,13 +157,14 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 	public Integer updateOrderDeliver(Order order) {
 		// TODO Auto-generated method stub
 		int num = adminOrderDao.updateOrderDeliver(order);
+		return num;
 		//添加更换刷头提示信息
-		int count = adminOrderService.addAgentOrderHint(order);
-		if (num > 0 && count > 0) {
-			return 1;
-		} else {
-			return 0;
-		}
+//		int count = adminOrderService.addAgentOrderHint(order);
+//		if (num > 0 && count > 0) {
+//			return 1;
+//		} else {
+//			return 0;
+//		}
 	}
 
 	@Override

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/order/OrderHandler.java

@@ -14,6 +14,7 @@ import com.iamberry.wechat.core.entity.integral.StayIntegral;
 import com.iamberry.wechat.core.entity.product.ProductColor;
 import com.iamberry.wechat.core.entity.product.QrcodeGift;
 import com.iamberry.wechat.face.integral.UseIntegralService;
+import com.iamberry.wechat.face.mq.EfastOrderService;
 import com.iamberry.wechat.face.order.AdminOrderService;
 import com.iamberry.wechat.face.porduct.ProductColorService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -102,6 +103,10 @@ public class OrderHandler {
 
 	@Autowired
 	private UseIntegralService useIntegralService;
+
+	@Autowired
+	private EfastOrderService efastOrderService;
+
 	/**
 	 * 支付前，调用方法
 	 * @param request
@@ -229,6 +234,27 @@ public class OrderHandler {
 		return msg;
 	}
 
+
+	/**
+	 * 测试推送efast
+	 * @return
+	 * @throws Exception
+	 */
+	@ResponseBody
+	@RequestMapping(value = "/toEfast")
+	public ResultMsg toEfast(HttpServletRequest request) throws Exception {
+		ResultMsg msg = new ResultMsg();
+
+		Order order = new Order();
+		order.setSalesOrderid("0119173614I15563Z");
+		efastOrderService.addOrderInfoToEfastTest(order);
+
+		msg.setMessage(NameUtils.getConfig("SUCCESSINFO"));
+		msg.setData("");
+		msg.setStatus(true);
+		return msg;
+	}
+
 	/**
 	 * 发起支付请求
 	 * @return

tooth-wechat-web/src/main/resources/iamberry-wechat-service-orderTesk.xml

@@ -84,7 +84,7 @@
 		<property name="triggers">
 			<list>
 				<ref local="doTime3" />
-				<ref local="closeOrderTime"/>
+				<!--<ref local="closeOrderTime"/>-->
 				<!--<ref local="closeRentOrderTime"/>-->
 				<ref local="efastOrderTime" />
 			</list>