爱贝源bug修改

iamberry-common-core/src/main/java/com/iamberry/wechat/core/entity/product/Product.java

@@ -45,7 +45,9 @@ public class Product implements java.io.Serializable{
 	private Integer productSortNum;			//排序
 	
 	private String productColorDes;			//产品颜色释义  -- 产品简介
-	
+
+	private String imagetextContext;			//产品  -- 产品详情图
+
 	private String productRemark;			//产品备注
 	
 	private String productColor;			//产品颜色		1：红色	2：橙色	3：黄色	4：绿色
@@ -311,6 +313,14 @@ public class Product implements java.io.Serializable{
 		this.productChildTypeName = productChildTypeName;
 	}
 
+	public String getImagetextContext() {
+		return imagetextContext;
+	}
+
+	public void setImagetextContext(String imagetextContext) {
+		this.imagetextContext = imagetextContext;
+	}
+
 	@Override
 	public String toString() {
 		return "Product [productId=" + productId + ", productName="

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

@@ -114,12 +114,12 @@ public class NameUtils {
 	/**
 	 * 百胜订单信息
 	 */
-	public static final String app_nick = "openapi";
-	public static final String app_key = "8888";
-	public static final String app_secret = "8888";
-	public static final String efast_base_url = "http://121.199.165.244/efast_test/efast_api/webservice/web/index.php";
+//	public static final String app_nick = "openapi";
+//	public static final String app_key = "8888";
+//	public static final String app_secret = "8888";
+	//public static final String efast_base_url = "http://121.199.165.244/efast_test/efast_api/webservice/web/index.php";
 //	public static final String efast_base_url = "http://121.199.165.244/efast/efast_api/webservice/web/index.php";
-	public static final String order_field = "order_sn,deal_code,order_status,shipping_status,pay_status,process_status,is_send,is_locked,is_separate,consignee,address,zipcode,tel,mobile,shipping_name,pay_name,invoice_no,order_amount ,money_paid,user_id ,orders.goods_sn,orders.goods_name,orders.goods_number,orders.goods_price,orders.goods_barcode,orders.payment_ft,pay_time,to_buyer,postscript,order_amount,user_nick,money_paid,shipping_fee";
+	//public static final String order_field = "order_sn,deal_code,order_status,shipping_status,pay_status,process_status,is_send,is_locked,is_separate,consignee,address,zipcode,tel,mobile,shipping_name,pay_name,invoice_no,order_amount ,money_paid,user_id ,orders.goods_sn,orders.goods_name,orders.goods_number,orders.goods_price,orders.goods_barcode,orders.payment_ft,pay_time,to_buyer,postscript,order_amount,user_nick,money_paid,shipping_fee";
 
 	/**App 绑定下载 **/
 	public static final String BINDINGDOWNLOD="/WEB-INF/views/other/index.html";

iamberry-common-web/src/main/java/com/iamberry/common/web/SimpleCORSFilter.java

@@ -1,8 +1,10 @@
 package com.iamberry.common.web;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.log4j.Logger;
 
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Vector;
 
@@ -20,8 +22,9 @@ import javax.servlet.http.HttpServletResponse;
  * @createDate:2016年5月26日
  */
 public class SimpleCORSFilter implements Filter {
-		
-	public static List<String> origins = new Vector<String>(6);
+	private static Logger logger = Logger.getLogger(SimpleCORSFilter.class);
+
+	public static List<String> origins = new ArrayList<String>(10);
 	
 	static {
 		origins.add("h5.iamberry.com");
@@ -45,7 +48,9 @@ public class SimpleCORSFilter implements Filter {
         HttpServletResponse response = (HttpServletResponse) servletResponse;
         HttpServletRequest request = (HttpServletRequest) servletRequest;
         String requestOrigin = request.getHeader("Origin");
-		String temp = requestOrigin == null ? null : (StringUtils.replace(StringUtils.replace(requestOrigin, "http://", ""), "https://", ""));
+
+		String temp = requestOrigin == null ? null : (StringUtils.replace(
+				StringUtils.replace(requestOrigin, "http://", ""), "https://", ""));
 		if (temp != null && origins.contains(temp)) {
 			response.setHeader("Access-Control-Allow-Origin", requestOrigin);
 			response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
@@ -57,4 +62,5 @@ public class SimpleCORSFilter implements Filter {
     }
 
     public void destroy() {}
+
 }

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

@@ -192,11 +192,13 @@
 			TB_IAMBERRY_PRODUCT_INFO.PRODUCT_COLOR_DES,
 			TB_IAMBERRY_PRODUCT_INFO.PRODUCT_REMARK,
 			TB_IAMBERRY_PRODUCT_INFO.PRODUCT_CHOICENESS,
-			TB_IAMBERRY_PRODUCT_INFO.product_choiceness_im
+			TB_IAMBERRY_PRODUCT_INFO.product_choiceness_im,
+			pri.imagetext_context
 		FROM 
 			TB_IAMBERRY_PRODUCT_INFO
 		LEFT JOIN TB_IAMBERRY_PRODUCT_COLOR
 		on TB_IAMBERRY_PRODUCT_INFO.product_id = TB_IAMBERRY_PRODUCT_COLOR.color_product_id
+		LEFT JOIN tb_iamberry_product_imagetext pri ON TB_IAMBERRY_PRODUCT_INFO.product_id = pri.imagetext_produect_id
 		WHERE 
 			PRODUCT_ID = #{productId}
 		  GROUP BY PRODUCT_ID
@@ -334,7 +336,7 @@
 			WHERE
 			PRODUCT_STATUS = 1
 			AND tb_iamberry_product_info.product_choiceness  = #{productChoiceness}
-			ORDER BY PRODUCT_CREATE_DATE DESC
+			ORDER BY product_choiceness_sort DESC
 		</select>
 
 

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

@@ -50,15 +50,15 @@ public class EfastOrderServiceImpl implements EfastOrderService {
 		
 		// 组装数据
 		Map<String, String> requestData = new HashMap<String, String>();
-		requestData.put("app_nick", NameUtils.app_nick);
-		requestData.put("app_key", NameUtils.app_key);
-		requestData.put("app_secret", NameUtils.app_secret);
+		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("app_act", message.getServiceOtherMessage());
 		requestData.put("timestamp",DateTimeUtil.format(new Date(),"yyyyMMddHHmmss"));
 		requestData.put("oid", message.getServiceToMessage());
-		requestData.put("feilds", NameUtils.order_field);
+		requestData.put("feilds",  NameUtils.getConfig("order_field"));
 		try {
-			String resultJson = HttpClient431Util.doPost(requestData, NameUtils.efast_base_url);
+			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");
@@ -127,9 +127,9 @@ public class EfastOrderServiceImpl implements EfastOrderService {
         String date = sim.format(rightNow.getTime()); 
 		// 组装数据
 				Map<String, String> requestData = new HashMap<String, String>();
-				requestData.put("app_nick", NameUtils.app_nick);
-				requestData.put("app_key", NameUtils.app_key);
-				requestData.put("app_secret", NameUtils.app_secret);
+				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("app_act", "efast.trade.list.get");
 				requestData.put("timestamp",DateTimeUtil.format(new Date(),"yyyyMMddHHmmss"));
 				requestData.put("shipping_status", "1");
@@ -140,7 +140,7 @@ public class EfastOrderServiceImpl implements EfastOrderService {
 				requestData.put("page_no", "1");
 				requestData.put("page_size", "100");
 				try {
-					String resultJson = HttpClient431Util.doPost(requestData, NameUtils.efast_base_url);
+					String resultJson = HttpClient431Util.doPost(requestData, NameUtils.getConfig("efast_base_url"));
 					resultJson = StringEscapeUtils.unescapeJava(resultJson); // unicode
 					logger.info("get-百胜订单列表，百胜返回信息:" + resultJson);
 					JSONObject jsonObject = JSONObject.fromObject(resultJson);
@@ -171,7 +171,7 @@ public class EfastOrderServiceImpl implements EfastOrderService {
 		List<OrderItem> items = adminOrderService.getShopOrderItemByOrderId(order.getSalesOrderid());
 		
 		// request url
-		String url = NameUtils.efast_base_url;
+		String url = NameUtils.getConfig("efast_base_url");
 		
 		// set Requeset Data
 		Map<String, String> requestData = new HashMap<String, String>();
@@ -198,9 +198,9 @@ public class EfastOrderServiceImpl implements EfastOrderService {
 		/**
 		 * 系统级参数
 		 */
-		requestData.put("app_nick", NameUtils.app_nick);
-		requestData.put("app_key", NameUtils.app_key);
-		requestData.put("app_secret", NameUtils.app_secret);
+		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()); // "efast.trade.new.add"
 		
@@ -280,6 +280,8 @@ public class EfastOrderServiceImpl implements EfastOrderService {
 		}
 		
 		requestData.put("info", orderDataStr);
+
+		logger.info("推送订单:" + requestData);
 		
 		try {
 			String result = HttpClient431Util.doGet(requestData, url);
@@ -318,8 +320,10 @@ public class EfastOrderServiceImpl implements EfastOrderService {
 				List<OrderItem> items = adminOrderService.getShopOrderItemByOrderId(order.getSalesOrderid());
 				
 				// request url
-				String url = NameUtils.efast_base_url;
-				
+//				String url = NameUtils.getConfig("efast_base_url");
+				String url = NameUtils.getConfig("efast_base_url");   //到配置文件查询
+
+
 				// set Requeset Data
 				Map<String, String> requestData = new HashMap<String, String>();
 				
@@ -345,9 +349,9 @@ public class EfastOrderServiceImpl implements EfastOrderService {
 				/**
 				 * 系统级参数
 				 */
-				requestData.put("app_nick", NameUtils.app_nick);
-				requestData.put("app_key", NameUtils.app_key);
-				requestData.put("app_secret", NameUtils.app_secret);
+				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()); // "efast.trade.new.add"
 				
@@ -445,18 +449,18 @@ public class EfastOrderServiceImpl implements EfastOrderService {
 		String[] posts = message.getServiceOtherMessage().split("-");
 		// 组装数据
 		Map<String, String> requestData = new HashMap<String, String>();
-		requestData.put("app_nick", NameUtils.app_nick);
-		requestData.put("app_key", NameUtils.app_key);
-		requestData.put("app_secret", NameUtils.app_secret);
+		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.trade.send");					// efast.trade.send
 		requestData.put("oid", message.getServiceToMessage());
-		requestData.put("feilds", NameUtils.order_field);
+		requestData.put("feilds", NameUtils.getConfig("order_field"));
 		String code = this.getExpressCode(posts[0]);
 		requestData.put("shipping_code", code);						// 快递代码
 		requestData.put("invoice_no", posts[1]);						// 快递单号
 		try {
-			String resultJson = HttpClient431Util.doPost(requestData, NameUtils.efast_base_url);
+			String resultJson = HttpClient431Util.doPost(requestData, NameUtils.getConfig("efast_base_url"));
 			resultJson = StringEscapeUtils.unescapeJava(resultJson); // unicode
 			logger.info("send-订单号为:" + message.getServiceToMessage() + "的订单，百胜返回信息:" + resultJson);
 			JSONObject jsonObject = JSONObject.fromObject(resultJson);
@@ -500,15 +504,15 @@ public class EfastOrderServiceImpl implements EfastOrderService {
 		}
 		// 百胜接口所需参数
 		Map<String, String> requestData = new HashMap<String, String>();
-		requestData.put("app_nick", NameUtils.app_nick);
-		requestData.put("app_key", NameUtils.app_key);
-		requestData.put("app_secret", NameUtils.app_secret);
+		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.efast_base_url);
+			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);
@@ -568,9 +572,9 @@ public class EfastOrderServiceImpl implements EfastOrderService {
 		requestData.put("return_shipping_name", code);		// 退单物流代码
 		requestData.put("kehu_return_invoice_no", posts[1]);	// 退单物流单号
 		requestData.put("return_type", "2");
-		requestData.put("app_nick", NameUtils.app_nick);
-		requestData.put("app_key", NameUtils.app_key);
-		requestData.put("app_secret", NameUtils.app_secret);
+		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.trade.return");
 		requestData.put("order_sn", orderSn);
@@ -583,7 +587,7 @@ public class EfastOrderServiceImpl implements EfastOrderService {
 		requestData.put("return_ck", "");
 		requestData.put("return_detail", returnDetail);
 		try {
-		String resultJson = HttpClient431Util.doPost(requestData, NameUtils.efast_base_url);
+		String resultJson = HttpClient431Util.doPost(requestData, NameUtils.getConfig("efast_base_url"));
 		resultJson = StringEscapeUtils.unescapeJava(resultJson);
 		logger.info("return-订单号为:" + message.getServiceToMessage() + "的订单，百胜返回信息:" + resultJson);
 		JSONObject jsonObject = JSONObject.fromObject(resultJson);
@@ -614,15 +618,15 @@ public class EfastOrderServiceImpl implements EfastOrderService {
 	public JSONObject getEfastOrderInfo(MQMessage message) {
 		// 组装数据
 				Map<String, String> requestData = new HashMap<String, String>();
-				requestData.put("app_nick", NameUtils.app_nick);
-				requestData.put("app_key", NameUtils.app_key);
-				requestData.put("app_secret", NameUtils.app_secret);
+				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.trade.detail.get");
 				requestData.put("oid", message.getServiceToMessage());
-				requestData.put("feilds", NameUtils.order_field);
+				requestData.put("feilds", NameUtils.getConfig("order_field"));
 				try {
-					String resultJson = HttpClient431Util.doPost(requestData, NameUtils.efast_base_url);
+					String resultJson = HttpClient431Util.doPost(requestData, NameUtils.getConfig("efast_base_url"));
 					resultJson = StringEscapeUtils.unescapeJava(resultJson); // unicode
 					logger.info("get-订单号为:" + message.getServiceToMessage() + "的订单，百胜返回信息:" + resultJson);
 					JSONObject jsonObject = JSONObject.fromObject(resultJson);
@@ -643,17 +647,17 @@ public class EfastOrderServiceImpl implements EfastOrderService {
 	public JSONObject getOrderFormEfast(String orderid) throws Exception {
 		if(StringUtils.isEmpty(orderid)) return null;
 		Map<String, String> requestData = new HashMap<String, String>();
-		requestData.put("app_nick", NameUtils.app_nick);
-		requestData.put("app_key", NameUtils.app_key);
-		requestData.put("app_secret", NameUtils.app_secret);
+		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.trade.detail.get");
 
 		requestData.put("oid", orderid);
-		requestData.put("feilds",NameUtils.order_field);   //1.order_status 订单状态:0(未确认)1(确认)2(挂起)3(作废)     2.shipping_status发货状态: 0(未发货)1(已发货,即已扫描出库)3(备货中)
+		requestData.put("feilds",NameUtils.getConfig("order_field"));   //1.order_status 订单状态:0(未确认)1(确认)2(挂起)3(作废)     2.shipping_status发货状态: 0(未发货)1(已发货,即已扫描出库)3(备货中)
 
 		try {
-			String result = HttpClient431Util.doGet(requestData, NameUtils.efast_base_url);
+			String result = HttpClient431Util.doGet(requestData, NameUtils.getConfig("efast_base_url"));
 			result = StringEscapeUtils.unescapeJava(result); // unicode 编码
 			Pattern p = Pattern.compile("\\s*|\t|\r|\n");
 			Matcher m = p.matcher(result);

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

@@ -197,15 +197,15 @@ public class ResponseWechatPayHandler {
 						//rebackServices.loadSingleOrderReward(order);
 						// 给百胜推送信息
 						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("addOrderInfoToEfast");
-							mQservice.insertMQMessage(message);
+								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("addOrderInfoToEfast");
+								mQservice.insertMQMessage(message);
 						} catch (Exception e) {
 						}
 

iamberry-wechat-web/src/main/java/com/iamberry/wechat/handles/wechat/config/ConfigHandler.java

@@ -5,8 +5,11 @@ import java.io.IOException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.iamberry.wechat.filters.WechatFilter;
 import net.sf.json.JSONObject;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -25,7 +28,9 @@ import com.iamberry.wechat.tools.NameUtils;
 @Controller
 @RequestMapping("/config")
 public class ConfigHandler {
-	
+
+	private static Logger logger = LoggerFactory.getLogger(ConfigHandler.class);
+
 	@Autowired
 	private ConfigService configService;
 	public void setConfigService(ConfigService configService) {
@@ -34,15 +39,24 @@ public class ConfigHandler {
 	
 	@RequestMapping(value="/get", method=RequestMethod.GET)
 	public void getConfig(HttpServletRequest request, HttpServletResponse response) throws IOException{
-		
+
+		logger.info("=============config-get=============");
+
 		// 如果数据不为空,拼装数据
 		String appid = NameUtils.appId, url = request.getParameter("url");
+
+
+		logger.info("=============appid："+ appid +"=============");
+
 		if(appid ==null || url ==null){
 			return;
 		}
 
 		// 拼装数据
 		JSONObject json = configService.selectConfig(appid, url);
+
+		logger.info("=============json："+ json +"=============");
+
 		if(json == null){
 			return;
 		}