watero母亲节活动

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

@@ -128,7 +128,7 @@ public final class ImageUtils {
         g.drawImage(image, 0, 0, width, height, null);
 
         //居中水印文字
-        customContenText(g,width,height,headText,"微软雅黑",xySizeNum,xyColorName,Font.PLAIN,x,y);
+        customContenText(g,width,height,headText,"黑体",xySizeNum,xyColorName,Font.PLAIN,x,y);
 
         //水印内容
         List<String> strList = new ArrayList<>();
@@ -137,7 +137,7 @@ public final class ImageUtils {
             strList.addAll(getStrArr(s,fontNumber));
         }
         for (String strCon :  strList) {    //循环行生成文本
-            customText(g,width,height,strCon,"微软雅黑",mnSizeNum,mnColorName,Font.PLAIN,m,n);
+            customText(g,width,height,strCon,"黑体",mnSizeNum,mnColorName,Font.PLAIN,m,n);
             n += fontLineSpacing;
         }
 
@@ -228,6 +228,7 @@ public final class ImageUtils {
     public static void customContenText(Graphics2D g, int width, int height,String pressText, String fontName, int fontSize, Color color,int fontStyle, int x, int y) {
         try {
             g.setFont(new Font(fontName, fontStyle, fontSize));
+            g.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING,RenderingHints.VALUE_TEXT_ANTIALIAS_LCD_HRGB); //消除锯齿状
             g.setColor(color);
             FontMetrics fm = g.getFontMetrics();
             int stringWidth = fm.stringWidth(pressText);
@@ -253,6 +254,7 @@ public final class ImageUtils {
         try {
             float alpha = 1;
             g.setFont(new Font(fontName, fontStyle, fontSize));
+            g.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING,RenderingHints.VALUE_TEXT_ANTIALIAS_LCD_HRGB); //消除锯齿状
             g.setColor(color);
             g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_ATOP, alpha));
 

watero-wechat-service/src/main/java/com/iamberry/wechat/service/mothMovable/MothMovableServiceImpl.java

@@ -82,7 +82,7 @@ public class MothMovableServiceImpl  implements MothMovableService {
         Integer allNum = mothMovableMapper.getNum(mm1);
         if(allNum < num){
             //创建优惠券
-            Integer couponId = 10000;
+            Integer couponId = 10001;
             CouponType couponType = couponTypeMapper.getCouponTypeById(couponId);
             Calendar calendar = Calendar.getInstance();
             calendar.add(Calendar.DATE, 7);  //有效期7天

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

@@ -58,49 +58,49 @@ public class EfastOrderServiceImpl implements EfastOrderService {
 	@Override
 	public boolean selectEfastSendOrderInfo(MQMessage message) {
 		// TODO Auto-generated method stub
-		
+
 		// 组装数据
-		Map<String, String> requestData = new HashMap<String, String>();
-		requestData.put("app_nick", NameUtils.getConfig("app_nick"));
-		requestData.put("app_key", NameUtils.getConfig("app_key"));
-		requestData.put("app_secret", NameUtils.getConfig("app_secret"));
-		requestData.put("timestamp",DateTimeUtil.format(new Date(),"yyyyMMddHHmmss"));
-		requestData.put("app_act", message.getServiceOtherMessage());
-		requestData.put("oid", message.getServiceToMessage());
-		requestData.put("feilds", NameUtils.getConfig("order_field"));
-		try {
-			String resultJson = HttpClient431Util.doPost(requestData, NameUtils.getConfig("efast_base_url"));
-			logger.info("订单号为:" + message.getServiceToMessage() + "的订单，百胜返回信息:" + resultJson);
-			resultJson = StringEscapeUtils.unescapeJava(resultJson); // unicode
-			Pattern p = Pattern.compile("\\s*|\t|\r|\n");
-			Matcher m = p.matcher(resultJson);
-			if (m.find()) {
-				resultJson = m.replaceAll("");
-			}
-			logger.info("get-订单号为:" + message.getServiceToMessage() + "的订单，百胜返回信息:" + resultJson);
-			JSONObject jsonObject = JSONObject.fromObject(resultJson);
-			
-			// default HTTP SUCCESS
-			JSONObject respData = JSONObject.fromObject(jsonObject.get("resp_data"));
-			// 发货状态 : shipping_status
-			String shippingStatus = respData.getString("shipping_status");
-			if ("1".equals(shippingStatus)) {
-				// 更新数据:将订单从已支付、代发货状态修改为已发货状态
-				Order order = new Order();
-				order.setOldStatus(2); 								// 已支付、待发货 
-				order.setSalesOrderid(message.getServiceToMessage());	// orderId
-				order.setSalesStatus(5);								// 已发货
-				order.setSalesPostFirm(respData.getString("shipping_name"));
-				order.setSalesPostNum(respData.getString("invoice_no"));
-				adminOrderService.updateOrderDeliver(order);
-				return true;
-			}
-			logger.error(this, "get-订单号为:" + message.getServiceToMessage() + "的订单，百胜返回信息:" + resultJson);
-			return false;
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			logger.error(this, "get-订单号为:" + message.getServiceToMessage() + "的订单，发生错误:" + e.getMessage());
-		}
+//		Map<String, String> requestData = new HashMap<String, String>();
+//		requestData.put("app_nick", NameUtils.getConfig("app_nick"));
+//		requestData.put("app_key", NameUtils.getConfig("app_key"));
+//		requestData.put("app_secret", NameUtils.getConfig("app_secret"));
+//		requestData.put("timestamp",DateTimeUtil.format(new Date(),"yyyyMMddHHmmss"));
+//		requestData.put("app_act", message.getServiceOtherMessage());
+//		requestData.put("oid", message.getServiceToMessage());
+//		requestData.put("feilds", NameUtils.getConfig("order_field"));
+//		try {
+//			String resultJson = HttpClient431Util.doPost(requestData, NameUtils.getConfig("efast_base_url"));
+//			logger.info("订单号为:" + message.getServiceToMessage() + "的订单，百胜返回信息:" + resultJson);
+//			resultJson = StringEscapeUtils.unescapeJava(resultJson); // unicode
+//			Pattern p = Pattern.compile("\\s*|\t|\r|\n");
+//			Matcher m = p.matcher(resultJson);
+//			if (m.find()) {
+//				resultJson = m.replaceAll("");
+//			}
+//			logger.info("get-订单号为:" + message.getServiceToMessage() + "的订单，百胜返回信息:" + resultJson);
+//			JSONObject jsonObject = JSONObject.fromObject(resultJson);
+//
+//			// default HTTP SUCCESS
+//			JSONObject respData = JSONObject.fromObject(jsonObject.get("resp_data"));
+//			// 发货状态 : shipping_status
+//			String shippingStatus = respData.getString("shipping_status");
+//			if ("1".equals(shippingStatus)) {
+//				// 更新数据:将订单从已支付、代发货状态修改为已发货状态
+//				Order order = new Order();
+//				order.setOldStatus(2); 								// 已支付、待发货
+//				order.setSalesOrderid(message.getServiceToMessage());	// orderId
+//				order.setSalesStatus(5);								// 已发货
+//				order.setSalesPostFirm(respData.getString("shipping_name"));
+//				order.setSalesPostNum(respData.getString("invoice_no"));
+//				adminOrderService.updateOrderDeliver(order);
+//				return true;
+//			}
+//			logger.error(this, "get-订单号为:" + message.getServiceToMessage() + "的订单，百胜返回信息:" + resultJson);
+//			return false;
+//		} catch (Exception e) {
+//			// TODO Auto-generated catch block
+//			logger.error(this, "get-订单号为:" + message.getServiceToMessage() + "的订单，发生错误:" + e.getMessage());
+//		}
 		return false;
 	}
 	
@@ -635,46 +635,46 @@ public class EfastOrderServiceImpl implements EfastOrderService {
 	@Override
 	public boolean selectEfastReturnOrderInfo(MQMessage message)throws Exception {
 		// TODO Auto-generated method stub
-		if (message == null) {
-			return false;
-		}
-		Order orderEfast = this.adminOrderService.getShopOrderByOrderId(message.getServiceToMessage());
-		if (orderEfast == null) {
-			return false;
-		}
-		if (!"8".equals(orderEfast.getSalesStatus().toString())) {
-			return false;
-		}
-		// 百胜接口所需参数
-		Map<String, String> requestData = new HashMap<String, String>();
-		requestData.put("app_nick", NameUtils.getConfig("app_nick"));
-		requestData.put("app_key", NameUtils.getConfig("app_key"));
-		requestData.put("app_secret", NameUtils.getConfig("app_secret"));
-		requestData.put("timestamp",DateTimeUtil.format(new Date(),"yyyyMMddHHmmss"));
-		requestData.put("app_act", "efast.order.return.info.fetch");
-		requestData.put("return_sn", orderEfast.getSalesAdminRemark());
-		
-		try {
-			String resultJson=HttpClient431Util.doPost(requestData, NameUtils.getConfig("efast_base_url"));
-			resultJson=StringEscapeUtils.unescapeJava(resultJson);
-			logger.info("get-订单号为:" + message.getServiceToMessage() + "的订单，百胜返回信息:" + resultJson);
-			JSONObject jsonObject=JSONObject.fromObject(resultJson);
-			JSONObject respData = JSONObject.fromObject(jsonObject.get("resp_data"));
-
-			String returnOrderStatus=respData.getString("return_order_status");			//退单状态
-			if("1".equals(returnOrderStatus)){//1表示已确认退单
-				Order order = new Order();
-				order.setSalesOpenid("7");
-				order.setSalesOrderid(message.getServiceToMessage());		// orderId
-				order.setSalesStatus(8);									// 订单退货，关闭
-				adminOrderService.updateOrderStatusByOrderIdAndToStatus(order);
-				return true;
-			}
-		} catch (Exception e) {
-			// TODO: handle exception
-			e.printStackTrace();
-			logger.error(this, "get-订单号为:" + message.getServiceToMessage() + "的订单，发生错误:" + e.getMessage());
-		}
+//		if (message == null) {
+//			return false;
+//		}
+//		Order orderEfast = this.adminOrderService.getShopOrderByOrderId(message.getServiceToMessage());
+//		if (orderEfast == null) {
+//			return false;
+//		}
+//		if (!"8".equals(orderEfast.getSalesStatus().toString())) {
+//			return false;
+//		}
+//		// 百胜接口所需参数
+//		Map<String, String> requestData = new HashMap<String, String>();
+//		requestData.put("app_nick", NameUtils.getConfig("app_nick"));
+//		requestData.put("app_key", NameUtils.getConfig("app_key"));
+//		requestData.put("app_secret", NameUtils.getConfig("app_secret"));
+//		requestData.put("timestamp",DateTimeUtil.format(new Date(),"yyyyMMddHHmmss"));
+//		requestData.put("app_act", "efast.order.return.info.fetch");
+//		requestData.put("return_sn", orderEfast.getSalesAdminRemark());
+//
+//		try {
+//			String resultJson=HttpClient431Util.doPost(requestData, NameUtils.getConfig("efast_base_url"));
+//			resultJson=StringEscapeUtils.unescapeJava(resultJson);
+//			logger.info("get-订单号为:" + message.getServiceToMessage() + "的订单，百胜返回信息:" + resultJson);
+//			JSONObject jsonObject=JSONObject.fromObject(resultJson);
+//			JSONObject respData = JSONObject.fromObject(jsonObject.get("resp_data"));
+//
+//			String returnOrderStatus=respData.getString("return_order_status");			//退单状态
+//			if("1".equals(returnOrderStatus)){//1表示已确认退单
+//				Order order = new Order();
+//				order.setSalesOpenid("7");
+//				order.setSalesOrderid(message.getServiceToMessage());		// orderId
+//				order.setSalesStatus(8);									// 订单退货，关闭
+//				adminOrderService.updateOrderStatusByOrderIdAndToStatus(order);
+//				return true;
+//			}
+//		} catch (Exception e) {
+//			// TODO: handle exception
+//			e.printStackTrace();
+//			logger.error(this, "get-订单号为:" + message.getServiceToMessage() + "的订单，发生错误:" + e.getMessage());
+//		}
 		
 		return false;
 	}

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

@@ -454,26 +454,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);
+//				}
 			}
 		}
 		
@@ -549,37 +549,37 @@ public class CartHandlers {
 		if (shopSalesOrderDto == null) {
 			shopSalesOrderDto = new ShopSalesOrderDto();
 		}
-		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
-			}
-		} 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
-			}
-		}
+//		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
+//			}
+//		} 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
+//			}
+//		}
 		remsg.setData(shopSalesOrderDto);
 		remsg.setMessage(NameUtils.getConfig("SUCCESSINFO"));
 		remsg.setResultCode(ResultInfo.SUCCESSCODE);

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

@@ -1,58 +1,51 @@
 package com.iamberry.wechat.handles.order;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import com.iamberry.wechat.core.entity.activity.ActivityDate;
-import com.iamberry.wechat.core.entity.coupon.*;
-import com.iamberry.wechat.core.entity.product.ProductColor;
-import com.iamberry.wechat.face.coupon.ExchangeService;
-import com.iamberry.wechat.face.porduct.ProductColorService;
-import com.iamberry.wechat.service.ActivityUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
 
 import com.iamberry.wechat.core.entity.PageBean;
 import com.iamberry.wechat.core.entity.ResultMsg;
 import com.iamberry.wechat.core.entity.WechatUtils;
-import com.iamberry.wechat.core.entity.cart.CartDto;
-import com.iamberry.wechat.core.entity.cart.OrderPayDto;
-import com.iamberry.wechat.core.entity.cart.SendPayDto;
-import com.iamberry.wechat.core.entity.cart.ShopSalesOrderDto;
-import com.iamberry.wechat.core.entity.cart.TempOrderDto;
-import com.iamberry.wechat.core.entity.cart.UserGiftDto;
-import com.iamberry.wechat.core.entity.member.CashLog;
+import com.iamberry.wechat.core.entity.activity.ActivityDate;
+import com.iamberry.wechat.core.entity.cart.*;
+import com.iamberry.wechat.core.entity.coupon.*;
 import com.iamberry.wechat.core.entity.member.Member;
+import com.iamberry.wechat.core.entity.mq.MQMessage;
 import com.iamberry.wechat.core.entity.order.Order;
 import com.iamberry.wechat.core.entity.order.OrderItem;
 import com.iamberry.wechat.core.entity.pay.PayResult;
-import com.iamberry.wechat.core.entity.product.Product;
+import com.iamberry.wechat.core.entity.product.ProductColor;
 import com.iamberry.wechat.face.admin.SystemService;
 import com.iamberry.wechat.face.cart.CartService;
 import com.iamberry.wechat.face.cart.ProductInfoService;
 import com.iamberry.wechat.face.coupon.CouponItemService;
 import com.iamberry.wechat.face.coupon.CouponTypeService;
+import com.iamberry.wechat.face.coupon.ExchangeService;
 import com.iamberry.wechat.face.home.HomeService;
 import com.iamberry.wechat.face.member.CashLogService;
 import com.iamberry.wechat.face.member.MemberService;
 import com.iamberry.wechat.face.pay.PayService;
+import com.iamberry.wechat.face.porduct.ProductColorService;
 import com.iamberry.wechat.face.qrcode.TemporaryQrcodeService;
 import com.iamberry.wechat.face.reback.RebackServices;
 import com.iamberry.wechat.handles.mq.MQServiceProxy;
+import com.iamberry.wechat.service.ActivityUtil;
 import com.iamberry.wechat.tools.NameUtils;
 import com.iamberry.wechat.tools.OrderNOUtil;
 import com.iamberry.wechat.tools.ResultInfo;
 import com.iamberry.wechat.tools.ValidatorUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
 
 /**
  * @author 何秀刚
@@ -482,39 +475,38 @@ public class OrderHandler {
 				return msg;
 			}
 
-			if(couponType.getCouponId() == 10001){
-				if(!isCludeT1ORT2){
-					msg.setMessage(ResultInfo.COUPON_T1_T2_NO_MSG); //未购买指定商品
-					return msg;
-				}
-			}
-
 			if(3 == couponType.getCouponType()){
-				//判断抵扣券的是否能够使用
-				Exchange exchange = new Exchange();
-				exchange.setCouponId(couponType.getCouponId());
-				List<Exchange>  exchangeList = exchangeService.getExchangeList(exchange);
-				boolean fl = false;
-				for (Exchange ex : exchangeList){
-					for (ExchangeItem exchangeItem : ex.getExchangeItemList()){
-						for (CartDto cartDto : cartDtos) {
-							if(cartDto.getCartColorId().equals(exchangeItem.getColorId())){
-								fl = true;
+				if(couponType.getCouponId() == 10001){
+					if(!isCludeT1ORT2){
+						msg.setMessage(ResultInfo.COUPON_T1_T2_NO_MSG); //未购买指定商品
+						return msg;
+					}
+				}else if(couponType.getCouponId() == 10000){
+					//判断抵扣券的是否能够使用
+					Exchange exchange = new Exchange();
+					exchange.setCouponId(couponType.getCouponId());
+					List<Exchange>  exchangeList = exchangeService.getExchangeList(exchange);
+					boolean fl = false;
+					for (Exchange ex : exchangeList){
+						for (ExchangeItem exchangeItem : ex.getExchangeItemList()){
+							for (CartDto cartDto : cartDtos) {
+								if(cartDto.getCartColorId().equals(exchangeItem.getColorId())){
+									fl = true;
+								}
 							}
 						}
+						if(fl){
+							break;
+						}
 					}
-					if(fl){
-						break;
+					if(!fl){
+						msg.setMessage(ResultInfo.COUPON_NO_MEET_DEMAND); //消费没有达到需求
+						return msg;
 					}
 				}
-				if(!fl){
-					msg.setMessage(ResultInfo.COUPON_NO_MEET_DEMAND); //消费没有达到需求
-					return msg;
-				}
 			}
 
-
-			//优惠券的类型，是直接减免额度 还是折扣价 
+			//优惠券的类型，是直接减免额度 还是折扣价
 			if(couponType.getCouponType()==1){
 				total=total-couponType.getCouponReduce();
 			}else if(couponType.getCouponType()==2){
@@ -631,41 +623,56 @@ public class OrderHandler {
 				couponItem.setCouponUseStatus(2);
 //				int i=couponItemService.updateCouponItemById(couponItem);
 			}
+
+			// 给rst推送订单
+			try {
+				MQMessage message = new MQMessage();
+				message.setServiceToMessage(order.getSalesOrderid());
+				message.setServiceOtherMessage("efast.trade.new.add");
+				message.setServiceIsSend(2);			// 没有推送的信息
+				message.setServiceStatus(1); 			// 推送成功
+				message.setServiceType(1); 				// 添加订单信息
+				message.setServiceHandlerObjectName("efastOrderServiceImpl");
+				message.setServiceHandlerMethodName("addOrderInfoToEfast");
+				mQservice.insertMQMessage(message);
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
 				
 			//更新账户余额
-			if(balancePayAmount>0){
-				member.setUserIncome(-balancePayAmount);
-				memberService.updateUserIncomeByOpenId(member);
-				
-				//修改用户购买记录为已购买
-				memberService.updateIsBaughtByOpenid(member.getUserOpenid(), 2);
-				//更新用户绑定状态
-				if (member.getUserIsFlag()!= null && member.getUserIsFlag() == 1) {
-					member.setUserIsFlag(2);//终身绑定
-					homeService.updateMemberIsFlagByOpenid(member);
-				}
-				try {
-					temporaryQrcodeService.applyTempQrcode(member.getUserOpenid());//为用户生成二维码
-				} catch (Exception e) {
-					System.out.println("为用户生成二维码失败!");
-				}
-				
-				//现金使用记录
-				CashLog log=new CashLog();
-				log.setCashLogsIntroduction("订单支出");
-				log.setCashLogsNum(balancePayAmount);
-				log.setCashLogsOpenid(member.getUserOpenid());
-				log.setCashLogsType(2);
-				log.setCashLogsResType(3);
-				log.setCashLogsOrderid(order.getSalesOrderid());
-				log.setCashLogsCreateDate(nowDate);
-				cashLogService.addCashLog(log);
-			
-			}
-			rebackServices.loadSingleOrderReward(order);
+//			if(balancePayAmount>0){
+//				member.setUserIncome(-balancePayAmount);
+//				memberService.updateUserIncomeByOpenId(member);
+//
+//				//修改用户购买记录为已购买
+//				memberService.updateIsBaughtByOpenid(member.getUserOpenid(), 2);
+//				//更新用户绑定状态
+//				if (member.getUserIsFlag()!= null && member.getUserIsFlag() == 1) {
+//					member.setUserIsFlag(2);//终身绑定
+//					homeService.updateMemberIsFlagByOpenid(member);
+//				}
+//				try {
+//					temporaryQrcodeService.applyTempQrcode(member.getUserOpenid());//为用户生成二维码
+//				} catch (Exception e) {
+//					System.out.println("为用户生成二维码失败!");
+//				}
+//
+//				//现金使用记录
+//				CashLog log=new CashLog();
+//				log.setCashLogsIntroduction("订单支出");
+//				log.setCashLogsNum(balancePayAmount);
+//				log.setCashLogsOpenid(member.getUserOpenid());
+//				log.setCashLogsType(2);
+//				log.setCashLogsResType(3);
+//				log.setCashLogsOrderid(order.getSalesOrderid());
+//				log.setCashLogsCreateDate(nowDate);
+//				cashLogService.addCashLog(log);
+//
+//			}
+//			rebackServices.loadSingleOrderReward(order);
 			productInfoService.updateProductNumList(order.getSalesOrderid());
-			
 		}
+
 		msg.setResultCode(ResultInfo.SUCCESSCODE);
 		msg.setMessage(NameUtils.getConfig("SUCCESSINFO"));
 		dto.setOrderId(order.getSalesOrderid());
@@ -733,7 +740,6 @@ public class OrderHandler {
 	/**
 	 * 校验一个购物车字符串
 	 * @param cartIds 购物车ID字符串
-	 * @param cartId 接受数据数组
 	 * @return
 	 * @throws Exception 
 	 */

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

@@ -201,7 +201,7 @@ public class ResponseWechatPayHandler {
 					if (count < 1) {
 						resXml = "<xml><return_code><![CDATA[FAIL]]></return_code><return_msg><![CDATA[报文有误]]></return_msg></xml>";
 					}
-//System.out.println("===========pay 168 快速插入=============="+count);
+
 					// 给订单的回调修改状态
 					try {
 						MQMessage message = new MQMessage();
@@ -216,12 +216,8 @@ public class ResponseWechatPayHandler {
 					} catch (Exception e) {
 						// TODO: handle exception
 					}
-//System.out.println("===========pay 182  插入返利到mq=============="+count);
-					//rebackServices.loadSingleOrderReward(order);
-					
-					//添加到返利表
-					//rebackServices.loadSingleOrderReward(order);
-					// 给百胜推送信息
+
+					// 给rst推送订单
 					try {
 						MQMessage message = new MQMessage();
 						message.setServiceToMessage(orderIdMD5);
@@ -233,9 +229,9 @@ public class ResponseWechatPayHandler {
 						message.setServiceHandlerMethodName("addOrderInfoToEfast");
 						mQservice.insertMQMessage(message);
 					} catch (Exception e) {
-//System.out.println("===========pay 201  插入返利到百胜失败==============");		
+						e.printStackTrace();
 					}
-//System.out.println("===========pay 201  插入返利到百胜完成==============");		
+
 					try {	//修改用户购买记录为已购买
 						memberService.updateIsBaughtByOpenid(wpr.getOpenid(), 2);
 						//更新用户绑定状态