Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

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

@@ -24,7 +24,7 @@ PUBLIC
 			pc.color_id
 		FROM
 			TB_IAMBERRY_SHOP_CART C
-			LEFT JOIN TB_IAMBERRY_PRODUCT_INFO P ON C.CART_PRODUCT_ID = P.PRODUCT_ID
+			LEFT JOIN TB_IAMBERRY_PRODUCT_COLOR  pc on C.CART_PRODUCT_ID = pc.color_product_id and C.cart_color_id = pc.color_id
 			LEFT JOIN TB_IAMBERRY_PRODUCT_COLOR  pc on C.CART_PRODUCT_ID = pc.color_product_id
 		WHERE
 			C.CART_OPENID = #{openId} 
@@ -164,7 +164,7 @@ PUBLIC
 			O.SALES_AMOUNT, O.SALES_INTEGRAL_NUM, O.SALES_RATE_AMOUNT, 
 			O.SALES_ADDRESS_INFO, O.SALES_ADDRESS_NAME, 
 			O.SALES_USER_REMARK, O.SALES_POST_NUM, O.SALES_POST_FIRM, 
-			O.SALES_SEND_DATE, O.SALES_ADDRESS_POSTNUM, 
+			O.SALES_SEND_DATE, O.SALES_ADDRESS_POSTNUM, O.SALES_YET_AMOUNT,
 			O.SALES_ADDRESS_TEL ,  45*60-TIMESTAMPDIFF(SECOND,O.SALES_CREATE_DATE,NOW())   SALES_ADMIN_REMARK
 		FROM 
 			 TB_IAMBERRY_SHOP_SALES_ORDER O LEFT JOIN TB_IAMBERRY_SHOP_ORDER_ITEM I 
@@ -199,6 +199,7 @@ PUBLIC
 		<result column="SALES_SEND_DATE" property="salesSendDate"/>
 		<result column="SALES_ADMIN_REMARK" property="salesAdminRemark"/>
 		<result column="SALES_ADDRESS_POSTNUM" property="salesAddressPostnum"/>
+		<result column="SALES_YET_AMOUNT" property="salesYetAmount"/>
 		<result column="SALES_ADDRESS_TEL" property="salesAddressTel"/>
 		<collection property="orderItemList" column="SALES_ORDERID" ofType="OrderItem" select="getOrderItemByOrderId"/>
 	</resultMap>

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

@@ -70,6 +70,7 @@
 			<if test="otherInt != null and otherInt != ''">
 				AND tb_iamberry_product_child_type.type_id  = #{otherInt}
 			</if>
+			GROUP BY TB_IAMBERRY_PRODUCT_INFO.PRODUCT_ID
 			ORDER BY PRODUCT_CREATE_DATE DESC 
 		LIMIT 
 			#{minNum},#{maxNum}

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

@@ -93,7 +93,7 @@ public class CartHandlers {
 		ResultMsg remsg = new ResultMsg();
 		Member member =  wechatUtils.getUserBySession(request);
 		List<CartDto> cartList = cartService.selectCartByOpenId(member.getUserOpenid());
-		
+
 		/*
 		 * 金额统计
 		 */
@@ -917,7 +917,7 @@ public class CartHandlers {
 				remsg.setStatus(false);
 				return remsg;
 			}
-			if (Integer.parseInt(orderDto.getSalesStatus()) != 5) {
+			if (Integer.parseInt(orderDto.getSalesStatus()) != 2) {
 				remsg.setMessage(ResultInfo.ERRORINFO);
 				remsg.setResultCode(ResultInfo.ERRORCODE);
 				remsg.setStatus(false);

iamberry-wechat-web/src/main/java/com/iamberry/wechat/handles/logistics/LogisticsHandler.java

@@ -6,6 +6,7 @@ import com.iamberry.wechat.tools.ResultInfo;
 import com.iamberry.wechat.utils.KuaiDi100;
 import net.sf.json.JSONObject;
 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.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
@@ -15,6 +16,7 @@ import javax.servlet.http.HttpServletResponse;
 /**
  * Created by Administrator on 2017/12/26.
  */
+@Controller
 @RequestMapping("/logistics")
 public class LogisticsHandler {
 

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

@@ -116,8 +116,7 @@ public class OrderHandler {
 			return msg;
 		}
 		member=memberService.getMemberByUserId(member.getUserId());
-//System.out.println("-------member------2222----->>>" + member);
-		String cartIds = (String) request.getSession().getAttribute("cartIds");
+		String cartIds = request.getParameter("cartIds");
 		if (cartIds == null) {
 			msg.setMessage(ResultInfo.cartEmptyError);
 			return msg;

iamberry-wechat-web/src/main/java/com/iamberry/wechat/utils/KuaiDi100.java

@@ -1,6 +1,7 @@
 package com.iamberry.wechat.utils;
 
 import net.sf.json.JSONObject;
+import org.springframework.stereotype.Component;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -11,6 +12,7 @@ import java.net.URLConnection;
 /**
  * Created by Administrator on 2017/12/26.
  */
+@Component
 public class KuaiDi100 {
 
     private static String key = "29833628d495d7a5";//授权密匙key    百度的

iamberry-wechat-web/src/main/webapp/view/view_logistics.html

@@ -157,9 +157,9 @@
         暂无物流信息
     </div>
 </div>
-<script src="//s.iamberry.com/wateroPF/js/mui.min.js"></script>
-<script src="//s.iamberry.com/wateroPF/js/jquery-2.1.1.min.js"></script>
-<script src="//s.iamberry.com/wateroPF/js/shop/main.js"></script>
+<script src="//s.iamberry.com/wechat/aiberle/js/mui.min.js"></script>
+<script src="//s.iamberry.com/wechat/aiberle/js/jquery-2.1.1.min.js"></script>
+<script src="//s.iamberry.com/wechat/aiberle/js/main.js"></script>
 <!-- <script src="//s.iamberry.com/wateroPF/js/shop/wechat-utils-1.0.js"></script> -->
 <script type="text/javascript">
     function pullupRefresh() {