Merge branch 'master' of http://git.iamberry.com/liuzhiwei/iamberry-common-tooth

# Conflicts:
#	tooth-common-core/src/main/java/com/iamberry/wechat/core/entity/coupon/CouponItemDto.java
#	tooth-common-core/src/main/java/com/iamberry/wechat/core/entity/integral/StayIntegral.java

tooth-wechat-interface/src/main/java/com/iamberry/wechat/face/member/MemberService.java

@@ -144,6 +144,13 @@ public interface MemberService{
 	Member getMyMemberInfo(String openId);
 
 	/**
+	 * 修改个人信息
+	 * @param member
+	 * @return
+	 */
+	Integer updateMyMember(Member member);
+
+	/**
 	 * 根据 openid 修改用户待入账积分
 	 * 2018年1月10日17:18:39
 	 * @param member

tooth-wechat-interface/src/main/java/com/iamberry/wechat/face/order/AdminOrderService.java

@@ -203,4 +203,11 @@ public interface AdminOrderService {
 	 */
 	Integer updateOrderRfund(Order order);
 
+	/**
+	 * 查询未发货数量
+	 * @param openid
+	 * @return
+	 */
+	Integer getNotSendCount(String openid);
+
 }

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/AdminOrderMapper.java

@@ -193,4 +193,10 @@ public interface AdminOrderMapper {
 	 */
 	Integer updateOrderRfund(Order order);
 
+	/**
+	 * 查询未发货数量
+	 * @param openid
+	 * @return
+	 */
+	Integer getNotSendCount(String openid);
 }

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/MemberMapper.java

@@ -144,4 +144,11 @@ public interface MemberMapper {
 	 * @return
 	 */
 	Integer insertStayIntegral(StayIntegral stayIntegral);
+
+	/**
+	 * 修改个人信息
+	 * @param member
+	 * @return
+	 */
+	Integer updateMyMember(Member member);
 }

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/OrderMapper.java

@@ -64,5 +64,4 @@ public interface OrderMapper {
 	 * @return
 	 */
 	public Order getOrderAddressInfo(String openid);
-	
 }

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

@@ -32,7 +32,16 @@ PUBLIC
 		AND cash_logs_res_type = 4 
 		
 	</select>
-	
+
+	<!--查询未发货数量-->
+	<select id="getNotSendCount" parameterType="String" resultType="Integer">
+		SELECT
+		COUNT (*)
+		FROM tb_iamberry_shop_sales_order
+		WHERE  sales_openid=#{openid}
+		AND sales_send_date is null
+	</select>
+
 	<!-- 后台订单列表查询 -->
 	<select id="selectShopOrder" parameterType="Order" resultType="Order">
 		SELECT O.SALES_ORDERID salesOrderid, O.SALES_ADDRESS_NAME salesAddressName, 

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

@@ -72,7 +72,7 @@ PUBLIC
 		WHERE
 			SALES_STATUS = 1 AND SALES_ORDERID = #{salesOrderid}
 	</update>
-	
+
 	<!-- 根据订单号，获取订单的详细信息 -->
 	<select id="selectOrderStatusByOrderId" parameterType="String" resultType="Integer">
 		SELECT

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

@@ -69,7 +69,7 @@
 	</select>
 
 	<!--查询正在使用的产品类型-->
-	<select id="listProductType" resultType="ProductType">
+	<select id="listProductType" resultType="ProductType" >
 		SELECT
 		<include refid="allTypeField"></include>
 		FROM TB_IAMBERRY_PRODUCT_TYPE

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/member/MemberServiceImpl.java

@@ -328,6 +328,11 @@ public class MemberServiceImpl implements MemberService {
 	}
 
 	@Override
+	public Integer updateMyMember(Member member) {
+		return memberDao.updateMyMember(member);
+	}
+
+	@Override
 	public Integer updateUserStayIntegralByOpenId(Member member) {
 		return memberDao.updateUserStayIntegralByOpenId(member);
 	}

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/member/dao/MemberDao.java

@@ -122,6 +122,13 @@ public interface MemberDao {
 	Member getMyMemberInfo(String openId);
 
 	/**
+	 * 修改个人信息
+	 * @param member
+	 * @return
+	 */
+	Integer updateMyMember(Member member);
+
+	/**
 	 * 根据 openid 修改用户待入账积分
 	 * 2018年1月10日17:18:39
 	 * @param member

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/member/dao/imp/MemberDaoImpl.java

@@ -143,6 +143,11 @@ public class MemberDaoImpl  implements MemberDao {
 	}
 
 	@Override
+	public Integer updateMyMember(Member member) {
+		return memberMapper.updateMyMember(member);
+	}
+
+	@Override
 	public Integer updateUserStayIntegralByOpenId(Member member) {
 		return memberMapper.updateUserStayIntegralByOpenId(member);
 	}

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/order/AdminOrderServiceImpl.java

@@ -769,4 +769,9 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 	public Integer updateOrderRfund(Order order) {
 		return adminOrderDao.updateOrderRfund(order);
 	}
+
+	@Override
+	public Integer getNotSendCount(String openid) {
+		return adminOrderDao.getNotSendCount(openid);
+	}
 }

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/order/dao/AdminOrderDao.java

@@ -210,4 +210,11 @@ public interface AdminOrderDao {
 	 */
 	Integer updateOrderRfund(Order order);
 
+	/**
+	 * 查询未发货数量
+	 * @param openid
+	 * @return
+	 */
+	Integer getNotSendCount(String openid);
+
 }

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/order/dao/impl/AdminOrderDaoImpl.java

@@ -309,4 +309,9 @@ public class AdminOrderDaoImpl implements AdminOrderDao {
 	public Integer updateOrderRfund(Order order) {
 		return adminOrderMapper.updateOrderRfund(order);
 	}
+
+	@Override
+	public Integer getNotSendCount(String openid) {
+		return adminOrderMapper.getNotSendCount(openid);
+	}
 }

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

@@ -680,7 +680,7 @@ public class ProductInfoHandler {
 	public ResultMsg listProductType(){
 		ResultMsg rm=new ResultMsg();
 		List<ProductType> list=productInfoService.listProductType();
-		if(list.size()<0){
+		if(list.size()<0||list==null){
 			rm.setStatus(false);
 			rm.setResultCode(ResultInfo.ERRORCODE);
 			rm.setMessage(NameUtils.getConfig("ERRORINFO"));
@@ -694,7 +694,7 @@ public class ProductInfoHandler {
 	}
 
 	/**
-	 * 根据产品类型id查询产品颜色信息
+	 * 根据产品类型id查询产品列表
 	 * @param typeId
 	 * @param pageSize
 	 * @param pageNO
@@ -706,7 +706,7 @@ public class ProductInfoHandler {
 											   @RequestParam(value= "pageSize",defaultValue= "6" ,required=false) Integer pageSize,
 											   @RequestParam(value = "pageNO", defaultValue = "1",required=false) Integer pageNO){
 		ResultMsg rm=new ResultMsg();
-		if(typeId<=0){
+		if(typeId!=null&&typeId<=0){
 			rm.setStatus(false);
 			rm.setResultCode(ResultInfo.ERRORCODE);
 			rm.setMessage(NameUtils.getConfig("ERRORINFO"));

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/integral/UseIntegralHandler.java

@@ -10,6 +10,7 @@ import com.iamberry.wechat.core.entity.integral.UseIntegral;
 import com.iamberry.wechat.core.entity.member.Member;
 import com.iamberry.wechat.face.integral.UseIntegralService;
 import com.iamberry.wechat.face.member.MemberService;
+import com.iamberry.wechat.face.order.AdminOrderService;
 import com.iamberry.wechat.tools.NameUtils;
 import com.iamberry.wechat.tools.ResultInfo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,6 +38,8 @@ public class UseIntegralHandler {
     private UseIntegralService useIntegralService;
     @Autowired
     private MemberService memberService;
+    @Autowired
+    private AdminOrderService adminOrderService;
     /**
      * 收入记录 use_type=1
      * @param req
@@ -192,7 +195,7 @@ public class UseIntegralHandler {
     }
 
     /**
-     * 获取会员信息、会员等级信息
+     * 会员中心
      * @param req
      * @return
      */
@@ -202,19 +205,14 @@ public class UseIntegralHandler {
         ResultMsg rm=new ResultMsg();
         Map<String,Object> map=new HashMap<String, Object>();
         Member member=WechatUtils.getUserBySession(req);
-        if (member == null || member.getUserOpenid() == null) {
+        String openid=member.getUserOpenid();
+        if (member == null || openid == null) {
             rm.setMessage(ResultInfo.loginOutError);
             return rm;
         }
-        member=memberService.getMyMemberInfo(member.getUserOpenid());
-        if(member==null){
-            rm.setStatus(false);
-            rm.setResultCode(ResultInfo.ERRORCODE);
-            rm.setMessage(NameUtils.getConfig("ERRORINFO"));
-            return rm;
-        }
+        /*************会员等级***************/
+        member=memberService.getMyMemberInfo(openid);
         int userIntegralCount=member.getUserIntegral();
-
         List<RankRule> list=useIntegralService.getRankRule();
         RankRule rankRule=null;
         for(RankRule r:list){
@@ -223,8 +221,11 @@ public class UseIntegralHandler {
                 break;
             }
         }
+        /**************未发货数量*****************/
+        Integer notSendCount=adminOrderService.getNotSendCount(openid);
+
+        map.put("notSendCount",notSendCount);
         map.put("rankRule",rankRule);
-        map.put("memberInfo",member);
         rm.setStatus(true);
         rm.setResultCode(ResultInfo.SUCCESSCODE);
         rm.setMessage(NameUtils.getConfig("SUCCESSINFO"));

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/member/MemberHandler.java

@@ -2,6 +2,7 @@ package com.iamberry.wechat.handles.member;
 
 import java.io.IOException;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import javax.servlet.ServletException;
@@ -9,6 +10,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import com.iamberry.wechat.core.entity.integral.MemberIntegral;
+import com.iamberry.wechat.core.entity.integral.RankRule;
 import com.iamberry.wechat.face.integral.UseIntegralService;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -367,4 +369,62 @@ public class MemberHandler {
 		}
 	}
 
+	/**
+	 * 修改个人信息
+	 * @param req
+	 * @param member
+	 * @return
+	 */
+	@RequestMapping("/updateMyMember")
+	@ResponseBody
+	public ResultMsg updateMyMember(HttpServletRequest req,Member member){
+		ResultMsg rm=new ResultMsg();
+		Member memberInfo=WechatUtils.getUserBySession(req);
+		if (memberInfo == null || memberInfo.getUserOpenid() == null) {
+			rm.setMessage(ResultInfo.loginOutError);
+			return rm;
+		}
+		member.setUserOpenid(memberInfo.getUserOpenid());
+		Integer i=memberService.updateMyMember(member);
+		if(i<0){
+			rm.setResultCode(ResultInfo.ERRORCODE);
+			rm.setMessage(NameUtils.getConfig("ERRORINFO"));
+			rm.setStatus(false);
+			return rm;
+		}
+		rm.setStatus(true);
+		rm.setResultCode(ResultInfo.SUCCESSCODE);
+		rm.setMessage(NameUtils.getConfig("SUCCESSINFO"));
+		rm.setData(i);
+		return rm;
+	}
+	/**
+	 * 获取个人信息
+	 * @param req
+	 * @return
+	 */
+	@RequestMapping("/getMember")
+	@ResponseBody
+	public ResultMsg getMember(HttpServletRequest req){
+		ResultMsg rm=new ResultMsg();
+		Member member=WechatUtils.getUserBySession(req);
+		String openid=member.getUserOpenid();
+		if (member == null || openid == null) {
+			rm.setMessage(ResultInfo.loginOutError);
+			return rm;
+		}
+		member=memberService.getMyMemberInfo(openid);
+		if(member==null){
+			rm.setStatus(false);
+			rm.setResultCode(ResultInfo.ERRORCODE);
+			rm.setMessage(NameUtils.getConfig("ERRORINFO"));
+			return rm;
+		}
+		rm.setStatus(true);
+		rm.setResultCode(ResultInfo.SUCCESSCODE);
+		rm.setMessage(NameUtils.getConfig("SUCCESSINFO"));
+		rm.setData(member);
+		return rm;
+	}
+
 }