https修改

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

@@ -63,13 +63,13 @@ public class ResultInfo {
 	
 	//测试环境
 		// 商城首页，，，
-		public static String INDEX_PAGE = "http://test.iamberry.com/iamberry/wechat/index";
+		public static String INDEX_PAGE = "http://h5.iamberry.com/iamberry/wechat/index";
 		// 订单发货的界面
-		public static String PAGE_SHIPMENT = "http://test.iamberry.com/iamberry/pay/goOrderInfo?orderId=";
+		public static String PAGE_SHIPMENT = "http://h5.iamberry.com/iamberry/pay/goOrderInfo?orderId=";
 		//收益退回的界面
-		public static String TUIHUI_SHIPMENT = "http://test.iamberry.com/iamberry/wechat/agentWechat/reback";
+		public static String TUIHUI_SHIPMENT = "http://h5.iamberry.com/iamberry/wechat/agentWechat/reback";
 		//订单即将过期提醒
-		public static String ORDER_GUOQI = "http://test.iamberry.com/iamberry/pay/goOrderList";
+		public static String ORDER_GUOQI = "http://h5.iamberry.com/iamberry/pay/goOrderList";
 		//测试环境
 		public static String rewards_template_id="ji1cu0TBpo8inMB2lVv3IdyNoFo5aBfSKDiGAuX28v8";//返现到账通知模版id
 		public static String Income_template_id="3oJmW0XWy47RSdLwgjj1Iy2hs8JIivq-WWVPsWPAMMI";//收入提醒模版id

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

@@ -1,5 +1,7 @@
 package com.iamberry.common.web;
 
+import org.apache.commons.lang3.StringUtils;
+
 import java.io.IOException;
 import java.util.List;
 import java.util.Vector;
@@ -22,15 +24,16 @@ public class SimpleCORSFilter implements Filter {
 	public static List<String> origins = new Vector<String>(6);
 	
 	static {
-		origins.add("http://h5.iamberry.com");
-		origins.add("http://test.iamberry.com");
-		origins.add("http://m.iamberry.com");
-		origins.add("http://www.iamberry.com");
-		origins.add("http://www.watero.cn");
-		origins.add("http://m.watero.cn");
-		origins.add("http://static.watero.cn");
-		origins.add("http://static.iamberry.com");
-		origins.add("http://h5.iamberry.com:801");
+		origins.add("h5.iamberry.com");
+		origins.add("test.iamberry.com");
+		origins.add("m.iamberry.com");
+		origins.add("www.iamberry.com");
+		origins.add("www.watero.cn");
+		origins.add("m.watero.cn");
+		origins.add("static.watero.cn");
+		origins.add("static.iamberry.com");
+		origins.add("s.iamberry.com");
+		origins.add("h5.iamberry.com:801");
 	}
 	
     public void init(FilterConfig filterConfig) throws ServletException {
@@ -42,17 +45,16 @@ public class SimpleCORSFilter implements Filter {
         HttpServletResponse response = (HttpServletResponse) servletResponse;
         HttpServletRequest request = (HttpServletRequest) servletRequest;
         String requestOrigin = request.getHeader("Origin");
-        if (requestOrigin != null && origins.contains(requestOrigin)) {
+		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");
 			response.setHeader("Access-Control-Max-Age", "3600");
-			response.setHeader("Access-Control-Allow-Headers", "x-requested-with");
 			response.setHeader("Access-Control-Allow-Credentials", "true");
-        }
+			response.setHeader("Access-Control-Allow-Headers", "x-requested-with");
+		}
         filterChain.doFilter(servletRequest, servletResponse);
     }
 
-    public void destroy() {
-
-    }
+    public void destroy() {}
 }

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

@@ -155,15 +155,16 @@ Reback_status  = 2) placeId
 	
 	<!-- 根据orderId查询订单状态 -->
 	<select id="selectOrderStatusByOrderId" parameterType="String" resultType="Order">
-		SELECT 
-			SALES_STATUS salesStatus, SALES_PROXY_REWARD salesProxyReward, 
-			SALES_POST_FIRM salesPostFirm, SALES_POST_NUM salesPostNum ,
-			sales_openid salesOpenid
-			
-		FROM 
-			TB_IAMBERRY_SHOP_SALES_ORDER
-		WHERE 
-			SALES_ORDERID = #{salesOrderid}
+		SELECT
+		SALES_STATUS salesStatus, SALES_PROXY_REWARD salesProxyReward,
+		SALES_POST_FIRM salesPostFirm, SALES_POST_NUM salesPostNum ,
+		sales_openid salesOpenid,
+		SALES_YET_AMOUNT salesYetAmount, sales_return_des salesReturnDes,
+		SALES_ADDRESS_INFO salesAddressInfo
+		FROM
+		TB_IAMBERRY_SHOP_SALES_ORDER
+		WHERE
+		SALES_ORDERID = #{salesOrderid}
 	</select>
 	
 	<!-- 根据orderId修改订单状态 -->

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

@@ -175,28 +175,29 @@
 	<!-- 根据productId查询商品信息 -->
 	<select id="getProductByProductId" parameterType="java.lang.Integer" resultMap="productMap">
 		SELECT 
-			PRODUCT_ID,
-			PRODUCT_NAME,
-			PRODUCT_ABBREVIATION,
-			PRODUCT_DISCOUNT,
-			PRODUCT_PRICE,
-			PRODUCT_SALESNUM,
-			PRODUCT_ACCESSNUM,
-			PRODUCT_STATUS,
-			PRODUCT_INTRODUCE_IMG,
-			PRODUCT_PARAMETER_IMG,
-			PRODUCT_CREATE_DATE,
-			PRODUCT_SORT_NUM,
-			PRODUCT_COLOR_DES,
-			PRODUCT_REMARK,
-			PRODUCT_CHOICENESS,
-			product_choiceness_im
+			TB_IAMBERRY_PRODUCT_INFO.PRODUCT_ID,
+			TB_IAMBERRY_PRODUCT_INFO.PRODUCT_NAME,
+			TB_IAMBERRY_PRODUCT_INFO.PRODUCT_ABBREVIATION,
+			TB_IAMBERRY_PRODUCT_INFO.PRODUCT_DISCOUNT,
+			TB_IAMBERRY_PRODUCT_INFO.PRODUCT_PRICE,
+			TB_IAMBERRY_PRODUCT_INFO.PRODUCT_SALESNUM,
+			TB_IAMBERRY_PRODUCT_INFO.PRODUCT_ACCESSNUM,
+			TB_IAMBERRY_PRODUCT_INFO.PRODUCT_STATUS,
+			TB_IAMBERRY_PRODUCT_INFO.PRODUCT_INTRODUCE_IMG,
+			TB_IAMBERRY_PRODUCT_INFO.PRODUCT_PARAMETER_IMG,
+			TB_IAMBERRY_PRODUCT_INFO.PRODUCT_CREATE_DATE,
+			TB_IAMBERRY_PRODUCT_INFO.PRODUCT_SORT_NUM,
+			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
 		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
 		WHERE 
 			PRODUCT_ID = #{productId}
+		  GROUP BY PRODUCT_ID
 	</select>
 	
 	<!-- 根据商品名称查询商品信息 -->