新增优惠券

efast推送，全部作废

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

@@ -110,6 +110,6 @@ public interface EfastOrderService {
 	 * 将订单信息推送到百胜<pre>  测试
 	 * @return
 	 */
-	void addOrderInfoToEfastTest(Order order) throws Exception;
+//	void addOrderInfoToEfastTest(Order order) throws Exception;
 
 }

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

@@ -1,26 +1,10 @@
 package com.iamberry.wechat.service.mq;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Matcher;
-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;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.iamberry.app.tool.log.RatFWLogger;
+import com.iamberry.wechat.core.entity.agentInfo.AgentOrder;
+import com.iamberry.wechat.core.entity.agentInfo.AgentOrderItem;
 import com.iamberry.wechat.core.entity.coupon.CouponItem;
 import com.iamberry.wechat.core.entity.coupon.CouponType;
 import com.iamberry.wechat.core.entity.mq.MQMessage;
@@ -33,7 +17,16 @@ 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.core.entity.admin.ShopSystemRule;
+import com.iamberry.wechat.service.mapper.AgentPurchaseOrderMapper;
+import com.iamberry.wechat.tools.*;
+import net.sf.json.JSONObject;
+import org.apache.commons.lang3.StringEscapeUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 @Service
 public class EfastOrderServiceImpl implements EfastOrderService {
@@ -163,12 +156,12 @@ 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 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 {

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

@@ -327,34 +327,34 @@ public class AdminOrderHandlers {
             order.setOrderLinkStatus(orderUtil.orderStatusToString(order.getSalesStatus())); // 订单状态描述，中文
             if (order.getSalesStatus() == 2) {
                 // 给百胜推送信息
-                try {
-                    MQMessage message = new MQMessage();
-                    message.setServiceToMessage(orderId);
-                    message.setServiceOtherMessage("efast.trade.detail.get");
-                    message.setServiceIsSend(2);            // 没有推送的信息
-                    message.setServiceStatus(1);            // 推送成功
-                    message.setServiceType(1);                // 添加订单信息
-                    message.setServiceHandlerObjectName("efastOrderServiceImpl");
-                    message.setServiceHandlerMethodName("selectEfastSendOrderInfo");
-                    mQservice.insertMQMessage(message);
-                } catch (Exception e) {
-                    // TODO: handle exception
-                }
+//                try {
+//                    MQMessage message = new MQMessage();
+//                    message.setServiceToMessage(orderId);
+//                    message.setServiceOtherMessage("efast.trade.detail.get");
+//                    message.setServiceIsSend(2);            // 没有推送的信息
+//                    message.setServiceStatus(1);            // 推送成功
+//                    message.setServiceType(1);                // 添加订单信息
+//                    message.setServiceHandlerObjectName("efastOrderServiceImpl");
+//                    message.setServiceHandlerMethodName("selectEfastSendOrderInfo");
+//                    mQservice.insertMQMessage(message);
+//                } catch (Exception e) {
+//                    // TODO: handle exception
+//                }
             } else if (order.getSalesStatus() == 8) {
                 // 给百胜推送信息
-                try {
-                    MQMessage message = new MQMessage();
-                    message.setServiceToMessage(orderId);
-                    message.setServiceOtherMessage("efast.order.return.info.fetch");
-                    message.setServiceIsSend(2);            // 没有推送的信息
-                    message.setServiceStatus(1);            // 推送成功
-                    message.setServiceType(1);                // 添加订单信息
-                    message.setServiceHandlerObjectName("efastOrderServiceImpl");
-                    message.setServiceHandlerMethodName("selectEfastReturnOrderInfo");
-                    mQservice.insertMQMessage(message);
-                } catch (Exception e) {
-                    // TODO: handle exception
-                }
+//                try {
+//                    MQMessage message = new MQMessage();
+//                    message.setServiceToMessage(orderId);
+//                    message.setServiceOtherMessage("efast.order.return.info.fetch");
+//                    message.setServiceIsSend(2);            // 没有推送的信息
+//                    message.setServiceStatus(1);            // 推送成功
+//                    message.setServiceType(1);                // 添加订单信息
+//                    message.setServiceHandlerObjectName("efastOrderServiceImpl");
+//                    message.setServiceHandlerMethodName("selectEfastReturnOrderInfo");
+//                    mQservice.insertMQMessage(message);
+//                } catch (Exception e) {
+//                    // TODO: handle exception
+//                }
             }
             mv.addObject("order", order);
             mv.addObject("orderItemList", orderItemList);
@@ -779,19 +779,19 @@ public class AdminOrderHandlers {
 
                     mv.addObject("msgObj", new MessageDto(true, "确认订单退货成功", "恭喜您！同意订单：" + orderId + "退货，订单关闭!"));
                     updateRebate(order, 3);
-                    try {
-                        MQMessage message = new MQMessage();
-                        message.setServiceToMessage(orderId);
-                        message.setServiceOtherMessage(currentOrder.getSalesPostFirm() + "-" + currentOrder.getSalesPostNum());
-                        message.setServiceIsSend(2);            // 没有推送的信息
-                        message.setServiceStatus(1);            // 推送成功
-                        message.setServiceType(1);                // 添加订单信息
-                        message.setServiceHandlerObjectName("efastOrderServiceImpl");
-                        message.setServiceHandlerMethodName("returnOrderInfoToEfast");
-                        mQservice.insertMQMessage(message);
-                    } catch (Exception e) {
-                        // TODO: handle exception
-                    }
+//                    try {
+//                        MQMessage message = new MQMessage();
+//                        message.setServiceToMessage(orderId);
+//                        message.setServiceOtherMessage(currentOrder.getSalesPostFirm() + "-" + currentOrder.getSalesPostNum());
+//                        message.setServiceIsSend(2);            // 没有推送的信息
+//                        message.setServiceStatus(1);            // 推送成功
+//                        message.setServiceType(1);                // 添加订单信息
+//                        message.setServiceHandlerObjectName("efastOrderServiceImpl");
+//                        message.setServiceHandlerMethodName("returnOrderInfoToEfast");
+//                        mQservice.insertMQMessage(message);
+//                    } catch (Exception e) {
+//                        // TODO: handle exception
+//                    }
                     //推送金额变动消息
                     Member member = memberService.getMemberByUserOpenId(currentOrder.getSalesOpenid());
                     if (member != null || member.getUserResType() != null) {
@@ -864,19 +864,19 @@ public class AdminOrderHandlers {
                 }
                 if (adminOrderService.deliverOrderByOrderId(order)) {
                     mv.addObject("msgObj", new MessageDto(true, "订单发货成功", "恭喜您！订单：" + orderId + "订单发货成功!"));
-                    try {
-                        MQMessage message = new MQMessage();
-                        message.setServiceToMessage(orderId);
-                        message.setServiceOtherMessage("efast.trade.new.add");
-                        message.setServiceIsSend(2);            // 没有推送的信息
-                        message.setServiceStatus(1);            // 推送成功
-                        message.setServiceType(1);                // 添加订单信息
-                        message.setServiceHandlerObjectName("efastOrderServiceImpl");
-                        message.setServiceHandlerMethodName("exchangeOrderInfoToEfast");
-                        mQservice.insertMQMessage(message);
-                    } catch (Exception e) {
-                        System.out.println("===========pay 201  插入返利到百胜失败==============");
-                    }
+//                    try {
+//                        MQMessage message = new MQMessage();
+//                        message.setServiceToMessage(orderId);
+//                        message.setServiceOtherMessage("efast.trade.new.add");
+//                        message.setServiceIsSend(2);            // 没有推送的信息
+//                        message.setServiceStatus(1);            // 推送成功
+//                        message.setServiceType(1);                // 添加订单信息
+//                        message.setServiceHandlerObjectName("efastOrderServiceImpl");
+//                        message.setServiceHandlerMethodName("exchangeOrderInfoToEfast");
+//                        mQservice.insertMQMessage(message);
+//                    } catch (Exception e) {
+//                        System.out.println("===========pay 201  插入返利到百胜失败==============");
+//                    }
                     return mv;
                 } else {
                     mv.addObject("msgObj", new MessageDto(false, "对不起，订单发货失败", "对不起，订单发货失败，请稍后重试！"));

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/agent/AgentHandler.java

@@ -102,33 +102,33 @@ public class AgentHandler {
 		AgentMemberDto agentMember = agentMemberService.getMemberInfo(member);
 		
 		// TODO:此处不算会员中心业务，需要优化
-		ShopSalesOrderDto shopSalesOrderDto = new ShopSalesOrderDto();
-		shopSalesOrderDto.setSalesOpenid(member.getUserOpenid());
-		List<ShopSalesOrderDto> orderList = cartService.getOrderList(shopSalesOrderDto);
-		if (null != orderList && orderList.size() > 0) {
-			for (ShopSalesOrderDto orderDto : orderList) {
-				MQMessage message = new MQMessage();
-				if ("2".equals(orderDto.getSalesStatus())) {
-					message.setServiceToMessage(orderDto.getSalesOrderid());
-					message.setServiceOtherMessage("efast.trade.detail.get");
-					message.setServiceIsSend(2);			// 没有推送的信息
-					message.setServiceStatus(1); 			// 推送成功
-					message.setServiceType(1); 				// 添加订单信息
-					message.setServiceHandlerObjectName("efastOrderServiceImpl");
-					message.setServiceHandlerMethodName("selectEfastSendOrderInfo");
-					mQservice.insertMQMessage(message);
-				} else if ("8".equals(orderDto.getSalesStatus())) {
-					message.setServiceToMessage(orderDto.getSalesOrderid());
-					message.setServiceOtherMessage("efast.order.return.info.fetch");
-					message.setServiceIsSend(2);			// 没有推送的信息
-					message.setServiceStatus(1); 			// 推送成功
-					message.setServiceType(1); 				// 添加订单信息
-					message.setServiceHandlerObjectName("efastOrderServiceImpl");
-					message.setServiceHandlerMethodName("selectEfastReturnOrderInfo");
-					mQservice.insertMQMessage(message);
-				}
-			}
-		}
+//		ShopSalesOrderDto shopSalesOrderDto = new ShopSalesOrderDto();
+//		shopSalesOrderDto.setSalesOpenid(member.getUserOpenid());
+//		List<ShopSalesOrderDto> orderList = cartService.getOrderList(shopSalesOrderDto);
+//		if (null != orderList && orderList.size() > 0) {
+//			for (ShopSalesOrderDto orderDto : orderList) {
+//				MQMessage message = new MQMessage();
+//				if ("2".equals(orderDto.getSalesStatus())) {
+//					message.setServiceToMessage(orderDto.getSalesOrderid());
+//					message.setServiceOtherMessage("efast.trade.detail.get");
+//					message.setServiceIsSend(2);			// 没有推送的信息
+//					message.setServiceStatus(1); 			// 推送成功
+//					message.setServiceType(1); 				// 添加订单信息
+//					message.setServiceHandlerObjectName("efastOrderServiceImpl");
+//					message.setServiceHandlerMethodName("selectEfastSendOrderInfo");
+//					mQservice.insertMQMessage(message);
+//				} else if ("8".equals(orderDto.getSalesStatus())) {
+//					message.setServiceToMessage(orderDto.getSalesOrderid());
+//					message.setServiceOtherMessage("efast.order.return.info.fetch");
+//					message.setServiceIsSend(2);			// 没有推送的信息
+//					message.setServiceStatus(1); 			// 推送成功
+//					message.setServiceType(1); 				// 添加订单信息
+//					message.setServiceHandlerObjectName("efastOrderServiceImpl");
+//					message.setServiceHandlerMethodName("selectEfastReturnOrderInfo");
+//					mQservice.insertMQMessage(message);
+//				}
+//			}
+//		}
 
 		/*************判断是否有机器*************/
 		MachineNumber machineNumber = new MachineNumber();

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/cart/CartHandlers.java

@@ -420,26 +420,26 @@ public class CartHandlers {
 						}
 					}
 				}
-				MQMessage message = new MQMessage();
-				if ("2".equals(orderDto.getSalesStatus())) {
-					message.setServiceToMessage(orderDto.getSalesOrderid());
-					message.setServiceOtherMessage("efast.trade.detail.get");
-					message.setServiceIsSend(2);			// 没有推送的信息
-					message.setServiceStatus(1); 			// 推送成功
-					message.setServiceType(1); 				// 添加订单信息
-					message.setServiceHandlerObjectName("efastOrderServiceImpl");
-					message.setServiceHandlerMethodName("selectEfastSendOrderInfo");
-					mQservice.insertMQMessage(message);
-				} else if ("8".equals(orderDto.getSalesStatus())) {
-					message.setServiceToMessage(orderDto.getSalesOrderid());
-					message.setServiceOtherMessage("efast.order.return.info.fetch");
-					message.setServiceIsSend(2);			// 没有推送的信息
-					message.setServiceStatus(1); 			// 推送成功
-					message.setServiceType(1); 				// 添加订单信息
-					message.setServiceHandlerObjectName("efastOrderServiceImpl");
-					message.setServiceHandlerMethodName("selectEfastReturnOrderInfo");
-					mQservice.insertMQMessage(message);
-				}
+//				MQMessage message = new MQMessage();
+//				if ("2".equals(orderDto.getSalesStatus())) {
+//					message.setServiceToMessage(orderDto.getSalesOrderid());
+//					message.setServiceOtherMessage("efast.trade.detail.get");
+//					message.setServiceIsSend(2);			// 没有推送的信息
+//					message.setServiceStatus(1); 			// 推送成功
+//					message.setServiceType(1); 				// 添加订单信息
+//					message.setServiceHandlerObjectName("efastOrderServiceImpl");
+//					message.setServiceHandlerMethodName("selectEfastSendOrderInfo");
+//					mQservice.insertMQMessage(message);
+//				} else if ("8".equals(orderDto.getSalesStatus())) {
+//					message.setServiceToMessage(orderDto.getSalesOrderid());
+//					message.setServiceOtherMessage("efast.order.return.info.fetch");
+//					message.setServiceIsSend(2);			// 没有推送的信息
+//					message.setServiceStatus(1); 			// 推送成功
+//					message.setServiceType(1); 				// 添加订单信息
+//					message.setServiceHandlerObjectName("efastOrderServiceImpl");
+//					message.setServiceHandlerMethodName("selectEfastReturnOrderInfo");
+//					mQservice.insertMQMessage(message);
+//				}
 			}
 		}
 
@@ -516,34 +516,34 @@ public class CartHandlers {
 		}
 		if ("5".equals(shopSalesOrderDto.getSalesStatus())) {
 			// 给百胜推送信息
-			try {
-				MQMessage message = new MQMessage();
-				message.setServiceToMessage(orderId);
-				message.setServiceOtherMessage("efast.trade.detail.get");
-				message.setServiceIsSend(2);			// 没有推送的信息
-				message.setServiceStatus(1); 			// 推送成功
-				message.setServiceType(1); 				// 添加订单信息
-				message.setServiceHandlerObjectName("efastOrderServiceImpl");
-				message.setServiceHandlerMethodName("selectEfastSendOrderInfo");
-				mQservice.insertMQMessage(message);
-			} catch (Exception e) {
-				// TODO: handle exception
-			}
+//			try {
+//				MQMessage message = new MQMessage();
+//				message.setServiceToMessage(orderId);
+//				message.setServiceOtherMessage("efast.trade.detail.get");
+//				message.setServiceIsSend(2);			// 没有推送的信息
+//				message.setServiceStatus(1); 			// 推送成功
+//				message.setServiceType(1); 				// 添加订单信息
+//				message.setServiceHandlerObjectName("efastOrderServiceImpl");
+//				message.setServiceHandlerMethodName("selectEfastSendOrderInfo");
+//				mQservice.insertMQMessage(message);
+//			} catch (Exception e) {
+//				// TODO: handle exception
+//			}
 		} else if ("8".equals(shopSalesOrderDto.getSalesStatus())) {
 			// 给百胜推送信息
-			try {
-				MQMessage message = new MQMessage();
-				message.setServiceToMessage(orderId);
-				message.setServiceOtherMessage("efast.trade.detail.get");
-				message.setServiceIsSend(2);			// 没有推送的信息
-				message.setServiceStatus(1); 			// 推送成功
-				message.setServiceType(1); 				// 添加订单信息
-				message.setServiceHandlerObjectName("efastOrderServiceImpl");
-				message.setServiceHandlerMethodName("selectEfastReturnOrderInfo");
-				mQservice.insertMQMessage(message);
-			} catch (Exception e) {
-				// TODO: handle exception
-			}
+//			try {
+//				MQMessage message = new MQMessage();
+//				message.setServiceToMessage(orderId);
+//				message.setServiceOtherMessage("efast.trade.detail.get");
+//				message.setServiceIsSend(2);			// 没有推送的信息
+//				message.setServiceStatus(1); 			// 推送成功
+//				message.setServiceType(1); 				// 添加订单信息
+//				message.setServiceHandlerObjectName("efastOrderServiceImpl");
+//				message.setServiceHandlerMethodName("selectEfastReturnOrderInfo");
+//				mQservice.insertMQMessage(message);
+//			} catch (Exception e) {
+//				// TODO: handle exception
+//			}
 		}
 		remsg.setData(shopSalesOrderDto);
 		remsg.setMessage(NameUtils.getConfig("SUCCESSINFO"));

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/cart/ProbationOrderHandler.java

@@ -156,19 +156,19 @@ public class ProbationOrderHandler {
 		//将信息加入到试用订单表中
 		probationShopOrderService.addProbationOrder(probationOrderDto);
 		
-		try {
-			MQMessage message = new MQMessage();
-			message.setServiceToMessage(probationOrderDto.getProbationOrderid());
-			message.setServiceOtherMessage("efast.trade.new.add");
-			message.setServiceIsSend(2);			// 没有推送的信息
-			message.setServiceStatus(1); 			// 推送成功
-			message.setServiceType(1); 				// 添加订单信息
-			message.setServiceHandlerObjectName("efastOrderServiceImpl");
-			message.setServiceHandlerMethodName("addProbationOrderToEfast");
-			mQservice.insertMQMessage(message);
-		} catch (Exception e) {
-			System.out.println("===========试用订单插入mq表失败==============");		
-		}
+//		try {
+//			MQMessage message = new MQMessage();
+//			message.setServiceToMessage(probationOrderDto.getProbationOrderid());
+//			message.setServiceOtherMessage("efast.trade.new.add");
+//			message.setServiceIsSend(2);			// 没有推送的信息
+//			message.setServiceStatus(1); 			// 推送成功
+//			message.setServiceType(1); 				// 添加订单信息
+//			message.setServiceHandlerObjectName("efastOrderServiceImpl");
+//			message.setServiceHandlerMethodName("addProbationOrderToEfast");
+//			mQservice.insertMQMessage(message);
+//		} catch (Exception e) {
+//			System.out.println("===========试用订单插入mq表失败==============");
+//		}
 		
 		try {
 			//试用订单生成，给试用人推送消息

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/coupon/CouponTypeHandler.java

@@ -719,7 +719,7 @@ public class CouponTypeHandler {
 	 */
 	@ResponseBody
 	@RequestMapping("/receive_coupon")
-	public ResultMsg receive_coupon(HttpServletRequest request,Integer couponId){
+	public ResultMsg receiveCoupon(HttpServletRequest request,Integer couponId){
 		ResultMsg resultMsg = new ResultMsg();
 		Member memberInfo = WechatUtils.getUserBySession(request);
 		if(couponId == null || "".equals(couponId)){
@@ -771,5 +771,97 @@ public class CouponTypeHandler {
 	}
 
 
+	/**
+	 *  领取优惠券
+	 * @param request
+	 * @param couponId
+	 * @return
+	 */
+	@ResponseBody
+	@RequestMapping("/re_coupon")
+	public ResultMsg reCoupon(HttpServletRequest request,Integer couponId){
+		ResultMsg resultMsg = new ResultMsg();
+		Member memberInfo = WechatUtils.getUserBySession(request);
+		memberInfo = memberService.getMemberByUserOpenId(memberInfo.getUserOpenid());
+		if(couponId == null || "".equals(couponId)){
+			resultMsg.setResultCode("500");
+			resultMsg.setStatus(false);
+			resultMsg.setMessage("未查询到到优惠券");
+			return resultMsg;
+		}
+		/*获取优惠券类型*/
+		CouponType couponType = couponTypeService.getCouponTypeById(couponId);
+		if(couponType == null){
+			resultMsg.setResultCode("500");
+			resultMsg.setStatus(false);
+			resultMsg.setMessage("未查询到到优惠券");
+			return resultMsg;
+		}
+
+		if(memberInfo.getUserStatus() != 2){
+			resultMsg.setResultCode("501");
+			resultMsg.setStatus(false);
+			resultMsg.setMessage("本优惠券仅限关注之后使用，请搜索微信公众号“soodo上朵”并关注。");
+			return resultMsg;
+		}
+
+		Calendar c = Calendar.getInstance();//获取一个日历实例
+		c.set(2018, 7-1, 4,23,59);//设定日历的日期
+		Date endDate = c.getTime();
+
+		if(endDate.before(new Date())){   //endDate < new Date()  当前时间大于结束时间了，活动过期了
+			resultMsg.setResultCode("502");
+			resultMsg.setStatus(false);
+			resultMsg.setMessage("活动已过期");
+			return resultMsg;
+		}
+
+		CouponItem couponItem = new CouponItem();
+		couponItem.setCouponItemUseropenid(memberInfo.getUserOpenid());
+		couponItem.setCouponId(couponId);
+		Integer msg = couponItemService.isReceive(couponItem);
+
+		if(couponType.getCouponEndDate().before(new Date())){   //couponType.getCouponEndDate < new Date()
+			resultMsg.setResultCode("501");
+			resultMsg.setStatus(false);
+			resultMsg.setMessage("活动已过期！");
+			return resultMsg;
+		}
+
+		/* 比对每个人限领的张数 */
+		if(msg < couponType.getCouponGetLimit()){
+			CouponItem ci = new CouponItem();
+			ci.setCouponId(couponType.getCouponId());
+
+			Calendar calendar = Calendar.getInstance();
+			calendar.set(2018, 7-1, 4,23,59);//设定日历的日期
+
+			ci.setCouponUseEndDate(calendar.getTime());
+			ci.setCouponReceiveDate(new Date());
+			ci.setCouponItemUseropenid(memberInfo.getUserOpenid());
+			ci.setCouponUseStatus(1);
+			ci.setCouponIsDonation(2);
+			ci.setCouponItemRemark(couponType.getCouponRemark());
+			if(couponItemService.insertCouponItem(ci) > 0){
+				resultMsg.setResultCode(ResultInfo.SUCCESSCODE);
+				resultMsg.setStatus(true);
+				try{
+					couponTypeService.updateCouponTypeForItem(couponId);
+				}catch (Exception e){
+					e.printStackTrace();
+				}
+			}else{
+				resultMsg.setResultCode(ResultInfo.ERRORCODE);
+				resultMsg.setStatus(false);
+			}
+		}else{
+			resultMsg.setResultCode(ResultInfo.ERRORCODE);
+			resultMsg.setStatus(false);
+			resultMsg.setMessage("每人限领"+  couponType.getCouponGetLimit() +"张");
+			return resultMsg;
+		}
+		return resultMsg;
+	}
+
 
 }

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

@@ -305,20 +305,20 @@ public class OrderHandler {
 	 * @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;
-	}
+//	@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;
+//	}
 
 	/**
 	 * 发起支付请求
@@ -640,7 +640,7 @@ public class OrderHandler {
 		} else if(flag && mustPay==0){
 
 			// 给百胜推送信息
-			try {
+			/*try {
 				MQMessage message = new MQMessage();
 				message.setServiceToMessage(order.getSalesOrderid());
 				message.setServiceOtherMessage("efast.trade.new.add");
@@ -651,7 +651,7 @@ public class OrderHandler {
 				message.setServiceHandlerMethodName("addOrderInfoToEfast");
 				mQservice.insertMQMessage(message);
 			} catch (Exception e) {
-			}
+			}*/
 
 			dto.setInfo("isOK");
 			dto.setSuccess(true);

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/pay/ResponseWechatPayHandler.java

@@ -279,7 +279,7 @@ public class ResponseWechatPayHandler {
 						//添加到返利表
 						//rebackServices.loadSingleOrderReward(order);
 						// 给百胜推送信息
-						try {
+						/*try {
 							MQMessage message = new MQMessage();
 							message.setServiceToMessage(orderIdMD5);
 							message.setServiceOtherMessage("efast.trade.new.add");
@@ -290,8 +290,7 @@ public class ResponseWechatPayHandler {
 							message.setServiceHandlerMethodName("addOrderInfoToEfast");
 							mQservice.insertMQMessage(message);
 						} catch (Exception e) {
-	//System.out.println("===========pay 201  插入返利到百胜失败==============");
-						}
+						}*/
 						//推送消息到微信
 						DecimalFormat df = new DecimalFormat("0.00");
 						String payMoney = df.format((float) or.getSalesYetAmount() / 100) + "元";
@@ -710,7 +709,7 @@ public class ResponseWechatPayHandler {
 						//添加到返利表
 						//rebackServices.loadSingleOrderReward(order);
 						// 给百胜推送信息
-						try {
+						/*try {
 							MQMessage message = new MQMessage();
 							message.setServiceToMessage(orderIdMD5);
 							message.setServiceOtherMessage("efast.trade.new.add");
@@ -721,8 +720,7 @@ public class ResponseWechatPayHandler {
 							message.setServiceHandlerMethodName("addOrderInfoToEfast");
 							mQservice.insertMQMessage(message);
 						} catch (Exception e) {
-//System.out.println("===========pay 201  插入返利到百胜失败==============");		
-						}
+						}*/
 //System.out.println("===========pay 201  插入返利到百胜完成==============");		
 						try {	//修改用户购买记录为已购买
 							memberService.updateIsBaughtByOpenid(wpr.getOpenid(), 2);
@@ -1039,19 +1037,18 @@ public class ResponseWechatPayHandler {
 
 //System.out.println("===========pay 201  插入返利到百胜=============="+count);
 					// 给百胜推送信息
-					try {
-						MQMessage message = new MQMessage();
-						message.setServiceToMessage(orderIdMD5);
-						message.setServiceOtherMessage("efast.trade.new.add");
-						message.setServiceIsSend(2);			// 没有推送的信息
-						message.setServiceStatus(1); 			// 推送成功
-						message.setServiceType(1); 				// 添加订单信息
-						message.setServiceHandlerObjectName("efastOrderServiceImpl");
-						message.setServiceHandlerMethodName("addAgentOrderToEfast");
-						mQservice.insertMQMessage(message);
-					} catch (Exception e) {
-//System.out.println("===========pay 201  插入返利到百胜失败==============");
-					}
+//					try {
+//						MQMessage message = new MQMessage();
+//						message.setServiceToMessage(orderIdMD5);
+//						message.setServiceOtherMessage("efast.trade.new.add");
+//						message.setServiceIsSend(2);			// 没有推送的信息
+//						message.setServiceStatus(1); 			// 推送成功
+//						message.setServiceType(1); 				// 添加订单信息
+//						message.setServiceHandlerObjectName("efastOrderServiceImpl");
+//						message.setServiceHandlerMethodName("addAgentOrderToEfast");
+//						mQservice.insertMQMessage(message);
+//					} catch (Exception e) {
+//					}
 //System.out.println("===========pay 201  插入返利到百胜完成==============");
 				} else {
 					resXml = "<xml><return_code><![CDATA[FAIL]]></return_code><return_msg><![CDATA[报文有误]]></return_msg></xml>";