积分记录，会员信息

tooth-common-core/src/main/java/com/iamberry/wechat/core/entity/coupon/CouponItemDto.java

@@ -16,6 +16,7 @@ public class CouponItemDto implements java.io.Serializable{
 	private Integer couponId; 					//优惠券类型id
 	private String couponName;					//优惠券类型名称
 	private String useropenid;					//领取券的openid
+	private String couponItemCurrentUserOpenid; //如有转赠，转赠人的openid
 	private Integer couponUseStatus;			//使用状态
 	private Integer couponType;                 //优惠券类型
 	
@@ -35,7 +36,15 @@ public class CouponItemDto implements java.io.Serializable{
 	private Date endDate;						//结束时间
 	private String couponItemRemark;			//优惠券详情备注
 	private PageBean page;						//分页
-	
+
+	public String getCouponItemCurrentUserOpenid() {
+		return couponItemCurrentUserOpenid;
+	}
+
+	public void setCouponItemCurrentUserOpenid(String couponItemCurrentUserOpenid) {
+		this.couponItemCurrentUserOpenid = couponItemCurrentUserOpenid;
+	}
+
 	public String getCouponItemId() {
 		return couponItemId;
 	}

tooth-common-core/src/main/java/com/iamberry/wechat/core/entity/integral/MemberIntegral.java

@@ -22,6 +22,15 @@ public class MemberIntegral implements Serializable {
     private Date memberUpdateTime;          //更新时间
 
     private String rankRuleName;            //会员等级名称
+    private String rankIco;                 //图标
+
+    public String getRankIco() {
+        return rankIco;
+    }
+
+    public void setRankIco(String rankIco) {
+        this.rankIco = rankIco;
+    }
 
     public String getRankRuleName() {
         return rankRuleName;

tooth-common-core/src/main/java/com/iamberry/wechat/core/entity/integral/RankRule.java

@@ -65,4 +65,16 @@ public class RankRule implements Serializable{
     public void setRankRuleUpdateTime(Date rankRuleUpdateTime) {
         this.rankRuleUpdateTime = rankRuleUpdateTime;
     }
+
+    @Override
+    public String toString() {
+        return "RankRule{" +
+                "rankRuleId=" + rankRuleId +
+                ", rankRuleName='" + rankRuleName + '\'' +
+                ", rankRuleIntegral=" + rankRuleIntegral +
+                ", rankRuleStatus=" + rankRuleStatus +
+                ", rankRuleCreateTime=" + rankRuleCreateTime +
+                ", rankRuleUpdateTime=" + rankRuleUpdateTime +
+                '}';
+    }
 }

tooth-common-core/src/main/java/com/iamberry/wechat/core/entity/integral/UseIntegral.java

@@ -20,12 +20,30 @@ public class UseIntegral implements Serializable {
     private Integer useIntegralNumber;      //使用积分数量
     private Integer useConfigId;            //积分来源类型
     private String useIntegralRemarks;      //备注
+    private Integer integralBeforeNumber;   //变动前可用积分总额
+    private Integer integralEndNumber;      //变动后可用积分总额
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
     private Data useIntegralCreateTime;     //创建时间
 
     private String integralConfigName;      //来源名称
-    private PageBean page;                  //分页
+    private PageBean page=new PageBean();   //分页
+
+    public Integer getIntegralBeforeNumber() {
+        return integralBeforeNumber;
+    }
+
+    public void setIntegralBeforeNumber(Integer integralBeforeNumber) {
+        this.integralBeforeNumber = integralBeforeNumber;
+    }
+
+    public Integer getIntegralEndNumber() {
+        return integralEndNumber;
+    }
+
+    public void setIntegralEndNumber(Integer integralEndNumber) {
+        this.integralEndNumber = integralEndNumber;
+    }
 
     public PageBean getPage() {
         return page;

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

@@ -51,6 +51,7 @@ public class Product implements java.io.Serializable{
 
 	private Integer configAmount;  //代理商的采购价
 
+
 	public Integer getColorId() {
 		return colorId;
 	}

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

@@ -27,12 +27,31 @@ public class ProductColor implements java.io.Serializable{
 	private Integer colorPrice;			//产品市场价
 	private String color69Code;			//产品69码
 	private Date colorCretaeTime;		//创建时间
-	private Date colorUpdateTime;	//修改时间
+	private Date colorUpdateTime;		//修改时间
 
-	private String colorImg;		//封面图
-	private Integer colorStatus;	//状态
+	private String colorImg;			//封面图
+	private Integer colorStatus;		//状态
 	private PageBean page = new PageBean();		//分页
-	
+	private String productName;			//商品名称
+
+	private Integer productType;		//产品类型
+
+	public Integer getProductType() {
+		return productType;
+	}
+
+	public void setProductType(Integer productType) {
+		this.productType = productType;
+	}
+
+	public String getProductName() {
+		return productName;
+	}
+
+	public void setProductName(String productName) {
+		this.productName = productName;
+	}
+
 	public Integer getColorProductType() {
 		return colorProductType;
 	}
@@ -129,6 +148,22 @@ public class ProductColor implements java.io.Serializable{
 		this.page = page;
 	}
 
+	public String getColorImg() {
+		return colorImg;
+	}
+
+	public void setColorImg(String colorImg) {
+		this.colorImg = colorImg;
+	}
+
+	public Integer getColorStatus() {
+		return colorStatus;
+	}
+
+	public void setColorStatus(Integer colorStatus) {
+		this.colorStatus = colorStatus;
+	}
+
 	@Override
 	public String toString() {
 		return "ProductColor [colorId=" + colorId + ", colorProductId="

tooth-wechat-interface/src/main/java/com/iamberry/wechat/face/cart/ProductInfoService.java

@@ -111,20 +111,14 @@ public interface ProductInfoService {
 	 */
 	List<ProductColor> selectColorList(Integer colorProductId);
 
-	/**
-	 * 根据colorId查询产品信息
-	 * @param colorId
-	 * @return
-	 */
-	Product selectProductByColorId(Integer colorId);
 
 	/**
 	 * 根据产品类型id查询产品颜色信息
-	 * @param product
+	 * @param productColor
 	 * @return
 	 */
 
-	List<Product> listProductColorByTypeId(Product product);
+	List<ProductColor> listProductColorByTypeId(ProductColor productColor);
 
 	/**
 	 * 查询正在使用的产品类型

tooth-wechat-interface/src/main/java/com/iamberry/wechat/face/coupon/CouponItemService.java

@@ -61,10 +61,4 @@ public interface CouponItemService {
 	 */
 	public Integer updateCouponItemList(List<CouponItem> couponItemList);
 
-	/**
-	 * 查询待用的优惠卷
-	 * @param openid
-	 * @return
-	 */
-	List<CouponItem> getStandByCoupon(String openid );
 }

tooth-wechat-interface/src/main/java/com/iamberry/wechat/face/integral/UseIntegralService.java

@@ -4,6 +4,7 @@ import com.iamberry.wechat.core.entity.PageBean;
 import com.iamberry.wechat.core.entity.ResultMsg;
 import com.iamberry.wechat.core.entity.integral.IntegralConfig;
 import com.iamberry.wechat.core.entity.integral.MemberIntegral;
+import com.iamberry.wechat.core.entity.integral.RankRule;
 import com.iamberry.wechat.core.entity.integral.UseIntegral;
 
 import java.util.List;
@@ -31,6 +32,13 @@ public interface UseIntegralService {
     int getUseIntegralCount(String openid);
 
     /**
+     * 待入账的总积分数
+     * @param userOpenId
+     * @return
+     */
+    int getStayIntegralCount(String userOpenId);
+
+    /**
      * 查询积分来源信息
      * @param integralConfig
      * @return
@@ -43,4 +51,10 @@ public interface UseIntegralService {
      * @return
      */
     MemberIntegral getMemberInfoAndRankName(String openId);
+
+    /**
+     * 查询会员等级信息
+     * @return
+     */
+    List<RankRule> getRankRule();
 }

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/cart/ProductInfoServiceImpl.java

@@ -140,18 +140,10 @@ public class ProductInfoServiceImpl implements ProductInfoService {
 	public List<ProductType> listProductType() {
 		return productInfoDao.listProductType();
 	}
-	@Override
-	public List<Product> listProductColorByTypeId(Product product) {
-		return productInfoDao.listProductColorByTypeId(product);
-	}
 
-	/**
-	 * 根据colorId查询产品信息
-	 * @param colorId
-	 * @return
-	 */
 	@Override
-	public Product selectProductByColorId(Integer colorId) {
-		return productInfoDao.selectProductByColorId(colorId);
+	public List<ProductColor> listProductColorByTypeId(ProductColor productColor) {
+		return productInfoDao.listProductColorByTypeId(productColor);
 	}
+
 }

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/cart/dao/ProductInfoDao.java

@@ -113,17 +113,11 @@ public interface ProductInfoDao {
 	 */
 	List<ProductType> listProductType();
 
-	/**
-	 * 根据colorId查询产品信息
-	 * @param colorId
-	 * @return
-	 */
-	Product selectProductByColorId(Integer colorId);
 
 	/**
 	 * 根据产品类型id查询产品颜色信息
-	 * @param product
+	 * @param productColor
 	 * @return
 	 */
-	List<Product> listProductColorByTypeId(Product product);
+	List<ProductColor> listProductColorByTypeId(ProductColor productColor);
 }

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/cart/dao/impl/ProductInfoDaoImpl.java

@@ -113,24 +113,22 @@ public class ProductInfoDaoImpl implements ProductInfoDao {
 	public List<ProductColor> selectColorList(Integer colorProductId) {
 		return productInfoMapper.selectColorList(colorProductId);
 	}
-
 	/**
 	 * 根据产品类型id查询产品颜色信息
-	 * @param product
+	 * @param productColor
 	 * @return
 	 */
 	@Override
-	public List<Product> listProductColorByTypeId(Product product) {
-		return productInfoMapper.listProductColorByTypeId(product);
+	public List<ProductColor> listProductColorByTypeId(ProductColor productColor) {
+		return productInfoMapper.listProductColorByTypeId(productColor);
 	}
 
+
+
+
 	@Override
 	public List<ProductType> listProductType() {
 		return productInfoMapper.listProductType();
 	}
 
-	@Override
-	public Product selectProductByColorId(Integer colorId) {
-		return productInfoMapper.selectProductByColorId(colorId);
-	}
 }

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/coupon/CouponItemServiceImpl.java

@@ -57,13 +57,5 @@ public class CouponItemServiceImpl implements CouponItemService {
 		// TODO Auto-generated method stub
 		return couponItemMapper.updateCouponItemList(couponItemList);
 	}
-	/**
-	 * 查询待用的优惠卷
-	 * @param openid
-	 * @return
-	 */
-	@Override
-	public List<CouponItem> getStandByCoupon(String openid) {
-		return couponItemMapper.getStandByCoupon(openid);
-	}
+
 }

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/integral/UseIntegralServiceImpl.java

@@ -4,6 +4,7 @@ import com.iamberry.wechat.core.entity.PageBean;
 import com.iamberry.wechat.core.entity.ResultMsg;
 import com.iamberry.wechat.core.entity.integral.IntegralConfig;
 import com.iamberry.wechat.core.entity.integral.MemberIntegral;
+import com.iamberry.wechat.core.entity.integral.RankRule;
 import com.iamberry.wechat.core.entity.integral.UseIntegral;
 import com.iamberry.wechat.face.integral.UseIntegralService;
 import com.iamberry.wechat.service.mapper.UseIntegralMapper;
@@ -49,6 +50,16 @@ public class UseIntegralServiceImpl implements UseIntegralService {
     }
 
     /**
+     * 待入账的总积分数
+     * @param userOpenId
+     * @return
+     */
+    @Override
+    public int getStayIntegralCount(String userOpenId) {
+        return useIntegralMapper.getStayIntegralCount(userOpenId);
+    }
+
+    /**
      * 全部积分记录
      * @param useIntegral
      * @return
@@ -62,4 +73,13 @@ public class UseIntegralServiceImpl implements UseIntegralService {
     public List<IntegralConfig> listIntegralConfig(IntegralConfig integralConfig) {
         return useIntegralMapper.listIntegralConfig(integralConfig);
     }
+
+    /**
+     * 查询会员等级信息
+     * @return
+     */
+    @Override
+    public List<RankRule> getRankRule() {
+        return useIntegralMapper.getRankRule();
+    }
 }

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

@@ -62,17 +62,4 @@ public interface CouponItemMapper {
 	 */
 	public Integer updateCouponItemList(List<CouponItem> couponItemList);
 
-	/**
-	 * 查询待用的优惠卷
-	 * @param openid
-	 * @return
-	 */
-	List<CouponItem> getStandByCoupon(String openid );
-
-	/**
-	 * 查询已使用的优惠卷
-	 * @param openid
-	 * @return
-	 */
-	List<CouponItem> getUseCoupon(String openid);
 }

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

@@ -116,16 +116,9 @@ public interface ProductInfoMapper {
 	List<ProductType> listProductType();
 
 	/**
-	 * 根据colorId查询产品信息
-	 * @param colorId
-	 * @return
-	 */
-	Product selectProductByColorId(Integer colorId);
-
-	/**
 	 * 根据产品类型id查询产品颜色信息
-	 * @param product
+	 * @param productColor
 	 * @return
 	 */
-	List<Product> listProductColorByTypeId(Product product);
+	List<ProductColor> listProductColorByTypeId(ProductColor productColor);
 }

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

@@ -32,6 +32,13 @@ public interface UseIntegralMapper {
     int getUseIntegralCount(String openid);
 
     /**
+     * 待入账的总积分数
+     * @param userOpenId
+     * @return
+     */
+    int getStayIntegralCount(String userOpenId);
+
+    /**
      * 查询积分来源信息
      * @param integralConfig
      * @return
@@ -66,4 +73,10 @@ public interface UseIntegralMapper {
      */
     MemberIntegral getMemberInfoAndRankName(String openId);
 
+    /**
+     * 查询会员等级信息
+     * @return
+     */
+    List<RankRule> getRankRule();
+
 }

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

@@ -14,9 +14,9 @@
 		CI.COUPON_USE_STATUS couponUseStatus,
 		CI.COUPON_USE_DATE couponUseDate,
 		CI.COUPON_ITEM_REMARK couponItemRemark,
+		CI.COUPON_ITEM_CURRENT_USER_OPENID itemCurrentUserOpenid,
 
-		CI.ITEM_CURRENT_USER_OPENID itemCurrentUserOpenid,
-		CT.COU coupon_is_give
+		CT.COUPON_IS_GIVE coupon_is_give,
 		CT.COUPON_NAME couponName,
  		CT.COUPON_REDUCE couponReduce,
  		CT.COUPON_CONSUME_ENOUGH couponConsumeEnough
@@ -25,7 +25,7 @@
  	<select id="getCouponItemDtoList" resultType="CouponItemDto" parameterType="CouponItemDto">
  		SELECT 
  			<include refid="allField"></include>,
- 		CT.COUPON_TYPE couponType	
+ 		  CT.COUPON_TYPE couponType
  		FROM TB_IAMBERRY_COUPON_ITEM CI
  		JOIN TB_IAMBERRY_COUPON_TYPE CT ON CI.COUPON_ID=CT.COUPON_ID
 		<where>
@@ -58,7 +58,7 @@
 	     LIMIT ${page.pageSize}
 	    </if>
  	</select>
- 	
+
  	<!-- 查询优惠券详情总数 -->
  	<select id="getCouponItemCount" resultType="Integer" parameterType="CouponItemDto">
  		SELECT COUNT(COUPON_ITEM_ID) FROM TB_IAMBERRY_COUPON_ITEM
@@ -81,27 +81,6 @@
 		</where>
  	</select>
 
-	<!--查询待用的优惠卷-->
- 	<select id="getStandByCoupon" resultType="CouponItem">
-		SELECT CT.COUPON_NAME,CI.COUPON_USE_END_DATE ,CI.COUPON_RECEIVE_DATE
-		FROM TB_IAMBERRY_COUPON_ITEM CI
-		LEFT JOIN TB_IAMBERRY_COUPON_TYPE CT
- 		ON CI.COUPON_ID=CT.COUPON_ID
- 		WHERE CI.ITEM_CURRENT_USER_OPENID=#{openid} AND CI.COUPON_USE_STATUS=1
- 		ORDER BY CI.COUPON_ITEM_ID
-	</select>
-
-	<!--查询已使用的优惠卷-->
-	<select id="getUseCoupon" resultType="CouponItem">
-		SELECT CT.COUPON_NAME,CI.COUPON_USE_END_DATE ,CI.COUPON_RECEIVE_DATE
-		FROM TB_IAMBERRY_COUPON_ITEM CI
-		LEFT JOIN TB_IAMBERRY_COUPON_TYPE CT
- 		ON CI.COUPON_ID=CT.COUPON_ID
- 		WHERE CI.ITEM_CURRENT_USER_OPENID=#{openid} AND CI.COUPON_USE_STATUS=2
- 		ORDER BY CI.COUPON_ITEM_ID
-	</select>
-
-	<!--查询全部的优惠券-->
 
  	<!-- 添加一张优惠券 -->
  	<insert id="insertCouponItem" parameterType="CouponItem"

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

@@ -39,11 +39,9 @@
 	</sql>
 	<!-- 获取个人信息-->
 	<select id="getMyMemberInfo"  parameterType="String" resultType="Member" >
-		SELECT user_name,
-		user_sex,
-		user_tel,
-		user_birth_date
-		FROM 	TB_IAMBERRY_USER_USERINFO
+		SELECT
+			<include refid="allField"></include>
+		FROM TB_IAMBERRY_USER_USERINFO
 		WHERE user_openid = #{userOpenid}
 	</select>
 	<!-- 匹配查询会员信息 -->

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

@@ -29,7 +29,9 @@
 		COLOR_NAME colorName,
 		COLOR_DISCOUNT colorDiscount,
 		COLOR_PRICE colorPrice,
-		COLOR_69CODE color69Code 
+		COLOR_69CODE color69Code,
+		COLOR_IMG color_img,
+		COLOR_STATUS color_status
 	</sql>
 	<!-- 产品类型 -->
 	<sql id="allTypeField">
@@ -41,23 +43,23 @@
 		TYPE_STATE typeState
 	</sql>
 	<!--根据产品类型id查询产品信息-->
-	<select id="listProductColorByTypeId" resultType="Product" parameterType="Product">
+	<select id="listProductColorByTypeId" resultType="ProductColor" parameterType="ProductColor">
 		SELECT
-		COLOR_ID "colorList.colorId",
-		COLOR_PRODUCT_ID "colorList.colorProductId",
-		COLOR_NAME "colorList.colorName",
-		COLOR_DISCOUNT "colorList.colorDiscount",
-		COLOR_PRICE "colorList.colorPrice",
-		COLOR_IMG "colorList.colorImg",
-		COLOR_STATUS "colorList.colorStatus",
-		COLOR_69CODE "colorList.color69Code",
-		COLOR_CRETAE_TIME "colorList.colorCretaeTime",
-		COLOR_UPDATE_TIME "colorList.colorUpdateTime",
-		<include refid="product"></include>
+		COLOR_ID colorId,
+		COLOR_PRODUCT_ID colorProductId,
+		COLOR_NAME colorName,
+		COLOR_DISCOUNT colorDiscount,
+		COLOR_PRICE colorPrice,
+		COLOR_IMG colorImg,
+		COLOR_STATUS colorStatus,
+		COLOR_69CODE color69Code,
+		COLOR_CRETAE_TIME colorCretaeTime,
+		COLOR_UPDATE_TIME colorUpdateTime,
+		PRODUCT_NAME productName
 		FROM tb_iamberry_product_info PI
 		LEFT JOIN tb_iamberry_product_color PC ON PC.color_product_id=PI.PRODUCT_ID
-		WHERE PI.PRODUCT_TYPE=#{productType.typeId}
-		ORDER BY product_sort_num
+		WHERE PI.PRODUCT_TYPE=#{productType}
+		ORDER BY PI.product_sort_num
 		<if test="page!=null and page.recordBegin>0 and page.pageSize>0 ">
 			limit ${page.recordBegin},${page.pageSize}
 		</if>
@@ -66,16 +68,6 @@
 		</if>
 	</select>
 
-	<!--根据产品颜色id查询产品信息-->
-	<select id="selectProductByColorId"  resultType="Product">
-		SELECT
-		<include refid="product"></include>,
-		PC.COLOR_NAME
-		FROM tb_iamberry_product_info PI
-		LEFT JOIN tb_iamberry_product_color PC ON PC.color_product_id=PI.PRODUCT_ID
-		WHERE PC.color_id=#{colorId}
-	</select>
-
 	<!--查询正在使用的产品类型-->
 	<select id="listProductType" resultType="ProductType">
 		SELECT

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

@@ -10,25 +10,23 @@
         use_type useType,
         use_config_id useConfigId,
         use_integral_remarks useIntegralRemarks,
-        use_integral_create_time useIntegralCreateTime
+        use_integral_create_time useIntegralCreateTime,
+        integral_before_number integralBeforeNumber,
+        integral_end_number integralEndNumber
     </sql>
     <!--全部积分记录-->
     <select id="listIntegralInfo" resultType="UseIntegral" parameterType="UseIntegral">
         SELECT
-          i.*,
+          <include refid="AllUseField"></include>,
           c.integral_config_name integralConfigName
         FROM
           tb_iamberry_use_integral i
         LEFT JOIN tb_iamberry_integral_config c ON i.use_config_id = c.integral_config_id
-        <where>
-            <if test="openid!=null">
-                user_openid=#{userOpenId}
-            </if>
-            <if test="useType != null">
-               AND use_type = #{useType}
+        WHERE i.user_openid=#{userOpenId}
+            <if test="useType != null||useType != ''">
+               AND i.use_type = #{useType}
             </if>
-        </where>
-        ORDER BY UI.use_integral_id DESC
+        ORDER BY i.use_integral_id DESC
         <if test="page!=null and page.recordBegin>0 and page.pageSize>0 ">
             limit ${page.recordBegin},${page.pageSize}
         </if>
@@ -49,14 +47,16 @@
         FROM tb_iamberry_use_integral
         WHERE user_openid=#{userOpenid} AND use_type=2
     </select>
-
-    <!--查询会员信息和会员等级名称-->
-    <select id="getMemberInfoAndRankName" parameterType="String" resultType="MemberIntegral">
-        SELECT m.*,r.rank_rule_name rankRuleName
-        FROM tb_iamberry_member_integral m
-        LEFT JOIN tb_iamberry_rank_rule r
-        ON m.rank_rule_id=r.rank_rule_id
-        WHERE m.user_openid=#{openId}
+    <!--待入账的总积分数-->
+    <select id="getStayIntegralCount" parameterType="String" resultType="int">
+        SELECT avg(stay_number)
+        FROM tb_iamberry_stay_integral
+        WHERE user_openid=#{userOpenid} AND stay_status=1
+    </select>
+    <!--查询积分等级信息-->
+    <select id="getRankRule" resultType="RankRule">
+        SELECT *
+        FROM tb_iamberry_rank_rule
     </select>
     <!-- 查询积分来源信息 -->
     <select id="listIntegralConfig" parameterType="IntegralConfig" resultType="IntegralConfig">

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

@@ -692,29 +692,6 @@ public class ProductInfoHandler {
 		rm.setStatus(true);
 		return rm;
 	}
-	/**
-	 * 根据colorId查询产品信息
-	 * @param colorId
-	 * @return
-	 */
-	@RequestMapping("/getProductByColorId")
-	@ResponseBody
-	public ResultMsg getProductByColorId(Integer colorId){
-		ResultMsg rm=new ResultMsg();
-		if(colorId<0){
-			rm.setStatus(false);
-			rm.setResultCode(ResultInfo.ERRORCODE);
-			rm.setMessage(NameUtils.getConfig("ERRORINFO"));
-			return  rm ;
-		}
-		Product product=productInfoService.selectProductByColorId(colorId);
-
-		rm.setStatus(true);
-		rm.setResultCode(ResultInfo.SUCCESSCODE);
-		rm.setMessage(NameUtils.getConfig("SUCCESSINFO"));
-		rm.setData(product);
-		return rm ;
-	}
 
 	/**
 	 * 根据产品类型id查询产品颜色信息
@@ -725,7 +702,7 @@ public class ProductInfoHandler {
 	 */
 	@ResponseBody
 	@RequestMapping("/listProductColorByTypeId")
-	public  ResultMsg listProductColorByTypeId(Integer typeId,
+	public  ResultMsg listProductColorByTypeId( @RequestParam(value= "typeId",defaultValue= "" ,required=false) Integer typeId,
 											   @RequestParam(value= "pageSize",defaultValue= "6" ,required=false) Integer pageSize,
 											   @RequestParam(value = "pageNO", defaultValue = "1",required=false) Integer pageNO){
 		ResultMsg rm=new ResultMsg();
@@ -735,11 +712,13 @@ public class ProductInfoHandler {
 			rm.setMessage(NameUtils.getConfig("ERRORINFO"));
 			return rm;
 		}
-		Product product=new Product();
-		product.getProductType().setTypeId(typeId);
-		product.getPage().setPageSize(pageSize);
-		product.getPage().setPageNumber(pageNO);
-		List<Product> list=productInfoService.listProductColorByTypeId(product);
+
+		ProductColor productColor=new ProductColor();
+		productColor.setProductType(typeId);
+		productColor.getPage().setPageSize(pageSize);
+		productColor.getPage().setPageNumber(pageNO);
+		productColor.getPage().initRecordBegin();
+		List<ProductColor> list=productInfoService.listProductColorByTypeId(productColor);
 		if(list==null||list.size()<=0){
 			rm.setStatus(false);
 			rm.setResultCode(ResultInfo.ERRORCODE);
@@ -747,7 +726,7 @@ public class ProductInfoHandler {
 		}
 		Map<String,Object> map=new HashMap<String, Object>();
 		map.put("productColorList",list);
-		map.put("typeId",product.getProductType().getTypeId());
+		map.put("typeId",typeId);
 		rm.setStatus(true);
 		rm.setResultCode(ResultInfo.SUCCESSCODE);
 		rm.setMessage(NameUtils.getConfig("SUCCESSINFO"));

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/coupon/AdminCouponTypeHandler.java

@@ -185,21 +185,5 @@ public class AdminCouponTypeHandler {
 		}
 		return mv;
 	}
-	/**
-	 * 查询待用的优惠卷
-	 * @param openid
-	 * @return
-	 */
-	public ResultMsg getStandByCoupon(HttpServletRequest req,
-									  @RequestParam(value = "openid",required = false)String openid){
-		ResultMsg rm=new ResultMsg();
-		Member m= WechatUtils.getUserBySession(req);
-		List<CouponItem> list=couponItemService.getStandByCoupon(m.getUserOpenid());
 
-		rm.setStatus(true);
-		rm.setResultCode(ResultInfo.SUCCESSCODE);
-		rm.setMessage(NameUtils.getConfig("SUCCESSINFO"));
-		rm.setData(list);
-		return rm;
-	}
 }

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

@@ -5,9 +5,11 @@ package com.iamberry.wechat.handles.integral;
 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.integral.RankRule;
 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.tools.NameUtils;
 import com.iamberry.wechat.tools.ResultInfo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,6 +20,8 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 
 import javax.servlet.http.HttpServletRequest;
+import java.lang.reflect.Array;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -31,7 +35,8 @@ public class UseIntegralHandler {
 
     @Autowired
     private UseIntegralService useIntegralService;
-
+    @Autowired
+    private MemberService memberService;
     /**
      * 收入记录 use_type=1
      * @param req
@@ -40,14 +45,18 @@ public class UseIntegralHandler {
      * @param pageNO
      * @return
      */
-    @RequestMapping("/listGainIntegralInfo")
+        @RequestMapping("/listGainIntegralInfo")
     @ResponseBody
     public ResultMsg listGainIntegralInfo(HttpServletRequest req,
                                     @RequestParam(value="useType",defaultValue= "1", required=false)Integer useType,
-                                     @RequestParam(value="pageSize",defaultValue= "6", required=false)String pageSize,
-                                     @RequestParam(value="pageNO",defaultValue= "1", required=false)String pageNO){
+                                    @RequestParam(value= "pageSize",defaultValue= "6" ,required=false) Integer pageSize,
+                                    @RequestParam(value = "pageNO", defaultValue = "1",required=false) Integer pageNO){
         ResultMsg rm=new ResultMsg();
         Member m= WechatUtils.getUserBySession(req);
+        if (m == null || m.getUserOpenid() == null) {
+            rm.setMessage(ResultInfo.loginOutError);
+            return rm;
+        }
         int gainIntegralCount=useIntegralService.getGainIntegralCount(m.getUserOpenid());
         if(gainIntegralCount<0){
             rm.setStatus(false);
@@ -58,10 +67,11 @@ public class UseIntegralHandler {
         UseIntegral useIntegral=new UseIntegral();
         useIntegral.setUserOpenId(m.getUserOpenid());
         useIntegral.setUseType(useType);
-        useIntegral.getPage().setPageSize(Integer.parseInt(pageSize));
-        useIntegral.getPage().setPageNumber(Integer.parseInt(pageNO));
+        useIntegral.getPage().setPageSize(pageSize);
+        useIntegral.getPage().setPageNumber(pageNO);
+        useIntegral.getPage().initRecordBegin();
         List<UseIntegral> listGainIntegralInfo=useIntegralService.listIntegralInfo(useIntegral);
-
+        System.out.println(listGainIntegralInfo);
         Map<String,Object> map=new HashMap<String, Object>();
         map.put("listGainIntegralInfo",listGainIntegralInfo);
         map.put("gainIntegralCount",gainIntegralCount);
@@ -74,6 +84,51 @@ public class UseIntegralHandler {
     }
 
     /**
+     * 待入账记录 use_type=3
+     * @param req
+     * @param useType
+     * @param pageSize
+     * @param pageNO
+     * @return
+     */
+    @RequestMapping("/listStayIntegral")
+    @ResponseBody
+    public ResultMsg listStayIntegral(HttpServletRequest req,
+                                      @RequestParam(value="useType",defaultValue= "3", required=false)Integer useType,
+                                      @RequestParam(value= "pageSize",defaultValue= "6" ,required=false)Integer pageSize,
+                                      @RequestParam(value = "pageNO", defaultValue = "1",required=false)Integer pageNO){
+        ResultMsg rm=new ResultMsg();
+        Member m= WechatUtils.getUserBySession(req);
+        if (m == null || m.getUserOpenid() == null) {
+            rm.setMessage(ResultInfo.loginOutError);
+            return rm;
+        }
+        int stayIntegralCount=useIntegralService.getStayIntegralCount(m.getUserOpenid());
+        if(stayIntegralCount<0){
+            rm.setStatus(false);
+            rm.setResultCode(ResultInfo.ERRORCODE);
+            rm.setMessage(NameUtils.getConfig("ERRORINFO"));
+            return rm;
+        }
+        UseIntegral useIntegral=new UseIntegral();
+        useIntegral.setUserOpenId(m.getUserOpenid());
+        useIntegral.setUseType(useType);
+        useIntegral.getPage().setPageSize(pageSize);
+        useIntegral.getPage().setPageNumber(pageNO);
+        useIntegral.getPage().initRecordBegin();
+        List<UseIntegral> listStayIntegral=useIntegralService.listIntegralInfo(useIntegral);
+
+        Map<String,Object> map=new HashMap<String, Object>();
+        map.put("listStayIntegralInfo",listStayIntegral);
+        map.put("stayIntegralCount",stayIntegralCount);
+
+        rm.setStatus(true);
+        rm.setResultCode(ResultInfo.SUCCESSCODE);
+        rm.setMessage(NameUtils.getConfig("SUCCESSINFO"));
+        rm.setData(map);
+        return rm;
+    }
+    /**
      * 全部记录 use_type=null
      * @param req
      * @param useType
@@ -84,30 +139,38 @@ public class UseIntegralHandler {
     @RequestMapping("/listAllIntegralInfo")
     @ResponseBody
     public ResultMsg listAllIntegralInfo(HttpServletRequest req,
-                                   @RequestParam(value="useType",defaultValue= "null", required=false)Integer useType,
-                                   @RequestParam(value="pageSize",defaultValue= "6", required=false)String pageSize,
-                                   @RequestParam(value="pageNO",defaultValue= "1", required=false)String pageNO){
+                                   @RequestParam(value="useType",defaultValue= "", required=false)Integer useType,
+                                   @RequestParam(value= "pageSize",defaultValue= "6" ,required=false)Integer pageSize,
+                                   @RequestParam(value = "pageNO", defaultValue = "1",required=false)Integer pageNO){
         ResultMsg rm=new ResultMsg();
         Member m=WechatUtils.getUserBySession(req);
-        int useIntegralCount=useIntegralService.getUseIntegralCount(m.getUserOpenid());
-        int gainIntegralCount=useIntegralService.getGainIntegralCount(m.getUserOpenid());
-        if(useIntegralCount<0||gainIntegralCount<0){
+        String openid=m.getUserOpenid();
+        if (m == null || openid == null) {
+            rm.setMessage(ResultInfo.loginOutError);
+            return rm;
+        }
+        int useIntegralCount=useIntegralService.getUseIntegralCount(openid);
+        int gainIntegralCount=useIntegralService.getGainIntegralCount(openid);
+        int stayIntegralCount=useIntegralService.getStayIntegralCount(openid);
+        if(useIntegralCount<0||gainIntegralCount<0||stayIntegralCount<0){
             rm.setStatus(false);
             rm.setResultCode(ResultInfo.ERRORCODE);
             rm.setMessage(NameUtils.getConfig("ERRORINFO"));
             return rm;
         }
         UseIntegral useIntegral=new UseIntegral();
-        useIntegral.setUserOpenId(m.getUserOpenid());
+        //useIntegral.setUserOpenId(m.getUserOpenid());
         useIntegral.setUseType(useType);
-        useIntegral.getPage().setPageSize(Integer.parseInt(pageSize));
-        useIntegral.getPage().setPageNumber(Integer.parseInt(pageNO));
+        useIntegral.getPage().setPageSize(pageSize);
+        useIntegral.getPage().setPageNumber(pageNO);
+        useIntegral.getPage().initRecordBegin();
         List<UseIntegral> listAllIntegralInfo=useIntegralService.listIntegralInfo(useIntegral);
 
         Map<String,Object> map=new HashMap<String, Object>();
         map.put("listAllIntegralInfo",listAllIntegralInfo);
         map.put("useIntegralCount",useIntegralCount);
         map.put("gainIntegralCount",gainIntegralCount);
+        map.put("stayIntegralCount",stayIntegralCount);
 
         rm.setStatus(true);
         rm.setResultCode(ResultInfo.SUCCESSCODE);
@@ -116,6 +179,39 @@ public class UseIntegralHandler {
         return rm;
     }
 
-
+    /**
+     * 获取会员信息、会员等级信息
+     * @param req
+     * @return
+     */
+    @RequestMapping("/getRankRule")
+    @ResponseBody
+    public ResultMsg getRankRule(HttpServletRequest req){
+        ResultMsg rm=new ResultMsg();
+        Map<String,Object> map=new HashMap<String, Object>();
+        Member member=WechatUtils.getUserBySession(req);
+        if (member == null || member.getUserOpenid() == null) {
+            rm.setMessage(ResultInfo.loginOutError);
+            return rm;
+        }
+        member=memberService.getMyMemberInfo(member.getUserOpenid());
+        int userIntegralCount=member.getUserIntegral();
+
+        List<RankRule> list=useIntegralService.getRankRule();
+        RankRule rankRule=null;
+        for(RankRule r:list){
+            if(r.getRankRuleIntegral()>=userIntegralCount){
+                rankRule=r;
+                break;
+            }
+        }
+        map.put("rankRule",rankRule);
+        map.put("memberInfo",member);
+        rm.setStatus(true);
+        rm.setResultCode(ResultInfo.SUCCESSCODE);
+        rm.setMessage(NameUtils.getConfig("SUCCESSINFO"));
+        rm.setData(map);
+        return rm;
+    }
 
 }

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

@@ -366,54 +366,5 @@ public class MemberHandler {
 			}
 		}
 	}
-	/**
-	 * 获取个人信息
-	 * @param req
-	 * @return
-	 */
-	@RequestMapping("/getMyMemberInfo")
-	@ResponseBody
-	public ResultMsg getMyMemberInfo(HttpServletRequest req){
-		ResultMsg rm = new ResultMsg();
-		Member member = WechatUtils.getUserBySession(req);
-		member = memberService.getMyMemberInfo(member.getUserOpenid());
-		if(member==null){
-			rm.setStatus(false);
-			rm.setResultCode(ResultInfo.ERRORCODE);
-			rm.setMessage(NameUtils.getConfig("待完善"));
-			return rm;
-		}
-		rm.setStatus(true);
-		rm.setResultCode(ResultInfo.SUCCESSCODE);
-		rm.setMessage(NameUtils.getConfig("SUCCESSINFO"));
-		rm.setData(member);
-		return rm;
-	}
-
-	/**
-	 * 获取会员信息.会员等级名称
-	 * @param req
-	 * @return
-	 */
-	@RequestMapping("/getMemberInfoAndRankName")
-	@ResponseBody
-	public ResultMsg getMemberInfoAndRankName(HttpServletRequest req){
-		ResultMsg rm=new ResultMsg();
-		Member m=WechatUtils.getUserBySession(req);
-		String openid=m.getUserOpenid();
-		MemberIntegral mi=useIntegralService.getMemberInfoAndRankName(openid);
-		if(mi==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(mi);
-		return rm;
-	}
 
 }

tooth-wechat-web/src/main/resources/iamberry-wechat-service-mybatis.xml

@@ -239,6 +239,7 @@
 		<typeAlias type="com.iamberry.wechat.core.entity.integral.IntegralConfig" alias="IntegralConfig"/>
 		<typeAlias type="com.iamberry.wechat.core.entity.integral.MemberIntegral" alias="MemberIntegral"/>
 		<typeAlias type="com.iamberry.wechat.core.entity.integral.RankRule" alias="RankRule"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.integral.StayIntegral" alias="StayIntegral"/>
 
 		<package name="com.iamberry.wechat.core.entity.rent"/>
 	</typeAliases>