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

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

@@ -1,5 +1,8 @@
 package com.iamberry.wechat.core.entity.integral;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -18,7 +21,11 @@ public class MemberIntegral implements Serializable {
     private Integer memberAllIntegral;      //总积分
     private Integer memberSurplusIntegral;  //剩余积分
     private Integer memberUsedIntegral;     //已用积分
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
     private Date memberCreateTime;          //创建时间
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
     private Date memberUpdateTime;          //更新时间
 
     private String rankRuleName;            //会员等级名称

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

@@ -1,5 +1,8 @@
 package com.iamberry.wechat.core.entity.integral;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -13,11 +16,24 @@ public class RankRule implements Serializable{
 
     private Integer rankRuleId;         //id
     private String rankRuleName;        //等级名称
+    private String rankIco;             //图标
     private Integer rankRuleIntegral;   //需满足积分
     private Integer rankRuleStatus;     //状态  1:使用中;  2:未使用;
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
     private Date rankRuleCreateTime;    //创建时间
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
     private Date rankRuleUpdateTime;    //更新时间
 
+    public String getRankIco() {
+        return rankIco;
+    }
+
+    public void setRankIco(String rankIco) {
+        this.rankIco = rankIco;
+    }
+
     public Integer getRankRuleId() {
         return rankRuleId;
     }

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

@@ -16,6 +16,7 @@ public class UseIntegral implements Serializable {
     private Integer integralId;          //ID
     private String userOpenId;              //用户openid
     private Integer integralType;                //积分类型
+    private Integer stayId;                //待入账积分ID
     private Integer integralNumber;      //使用积分数量
     private Integer configId;            //积分来源类型
     private Integer integralBeforeNumber;//变动前可用积分总额
@@ -115,4 +116,12 @@ public class UseIntegral implements Serializable {
     public void setPage(PageBean page) {
         this.page = page;
     }
+
+    public Integer getStayId() {
+        return stayId;
+    }
+
+    public void setStayId(Integer stayId) {
+        this.stayId = stayId;
+    }
 }

tooth-common-core/src/main/java/com/iamberry/wechat/core/entity/member/Member.java

@@ -29,7 +29,11 @@ public class Member implements Serializable{
 	
 	private Integer userSex;				//用户性别		default 1; 1:男   2:女   0:未知
 	private String userAccountNum;			//用户账号
+	@DateTimeFormat(pattern="yyyy-MM-dd")
+	@JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
 	private Date userBirthDate;				//生日
+	@DateTimeFormat(pattern="yyyy-MM-dd")
+	@JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
 	private Date userCreateDate;			//创建时间
 	
 	private Integer userIdentity;			//会员身份			1:会员   2:微信用户    用于判断是否为上朵会员
@@ -41,6 +45,8 @@ public class Member implements Serializable{
 	private String userQrcode;				//二维码
 	private Integer userResType;			//来源       		1:默认  	 2:会员	3:商户
 	private Integer userStatus;				//用户状态		1:未关注，默认  2:已关注     0:已取消关注
+	@DateTimeFormat(pattern="yyyy-MM-dd")
+	@JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
 	private Date userSubDate;				//关注/取消时间	（每次扫二维码都会更新）
 	private Integer userSurplusIntegral;	//剩余积分
 	

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

@@ -4,7 +4,9 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.iamberry.wechat.core.entity.PageBean;
+import org.springframework.format.annotation.DateTimeFormat;
 
 
 /**
@@ -32,7 +34,8 @@ public class Product implements java.io.Serializable{
 	private String productIntroduceImg;		//介绍图(列表显示图)
 	private String productParameterImg;		//产品参数图(暂不使用)
 	private Integer productRentType;		//产品销售类型  1:销售产品    2:租赁产品
-	
+	@DateTimeFormat(pattern="yyyy-MM-dd")
+	@JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
 	private Date productCreateDate;			//创建时间
 	private Integer productSortNum;			//排序
 	private String productColorDes;			//产品颜色释义
@@ -46,7 +49,11 @@ public class Product implements java.io.Serializable{
 	private Integer minMoney;		//页面显示   最小金额
 	
 	private Integer maxMoney;		//页面显示  最大金额
+	@DateTimeFormat(pattern="yyyy-MM-dd")
+	@JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
 	private Date beginDate;			//页面显示  开始时间
+	@DateTimeFormat(pattern="yyyy-MM-dd")
+	@JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
 	private Date endDate;				//页面显示  结束时间
 
 	private Integer configAmount;  //代理商的采购价

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

@@ -2,7 +2,9 @@ package com.iamberry.wechat.core.entity.product;
 
 import java.util.Date;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.iamberry.wechat.core.entity.PageBean;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * @author liuzhiwei
@@ -26,7 +28,11 @@ public class ProductColor implements java.io.Serializable{
 	
 	private Integer colorPrice;			//产品市场价
 	private String color69Code;			//产品69码
+	@DateTimeFormat(pattern="yyyy-MM-dd")
+	@JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
 	private Date colorCretaeTime;		//创建时间
+	@DateTimeFormat(pattern="yyyy-MM-dd")
+	@JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
 	private Date colorUpdateTime;		//修改时间
 
 	private String colorImg;			//封面图

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

@@ -1,5 +1,8 @@
 package com.iamberry.wechat.core.entity.product;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -18,6 +21,8 @@ public class ProductImageText implements java.io.Serializable{
 	private Integer imagetextId;		
 	private Integer imagetextProduectId;
 	private String imagetextContext;
+	@DateTimeFormat(pattern="yyyy-MM-dd")
+	@JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
 	private Date imagetextCreateDate;
 	
 	private List<ProductPicture> pictureList = new ArrayList<ProductPicture>();	//图片类信息

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

@@ -1,5 +1,8 @@
 package com.iamberry.wechat.core.entity.product;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
 import java.util.Date;
 
 /**
@@ -16,6 +19,8 @@ public class ProductPicture implements java.io.Serializable{
 	private Integer pictureId;
 	private Integer pictureProductId;
 	private String pictureUrl;
+	@DateTimeFormat(pattern="yyyy-MM-dd")
+	@JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
 	private Date pictureCreateDate;
 	
 	public Integer getPictureId() {

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

@@ -1,5 +1,8 @@
 package com.iamberry.wechat.core.entity.product;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -20,9 +23,11 @@ public class ProductType implements Serializable {
 	private String typeName;							// 类型名称
 	
 	private String typeDetilas;							// 简介
-	
+	@DateTimeFormat(pattern="yyyy-MM-dd")
+	@JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
 	private Date typeCreateDate;						// 创建时间
-	
+	@DateTimeFormat(pattern="yyyy-MM-dd")
+	@JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
 	private Date typeUpdateDate;						// 更新时间
 	
 	private Integer typeState;							// 状态 默认 1：使用中 2：停用 3：删除

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

@@ -3,10 +3,7 @@ package com.iamberry.wechat.face.cart;
 import java.util.List;
 
 import com.iamberry.wechat.core.entity.cart.UserGiftDto;
-import com.iamberry.wechat.core.entity.product.Product;
-import com.iamberry.wechat.core.entity.product.ProductColor;
-import com.iamberry.wechat.core.entity.product.ProductType;
-import com.iamberry.wechat.core.entity.product.QrcodeGift;
+import com.iamberry.wechat.core.entity.product.*;
 
 public interface ProductInfoService {
 
@@ -125,4 +122,18 @@ public interface ProductInfoService {
 	 * @return
 	 */
 	List<ProductType> listProductType();
+
+	/**
+	 * 根据colorId查询产品信息
+	 * @param colorId
+	 * @return
+	 */
+	Product selectProductByColorId(Integer colorId);
+
+	/**
+	 * 根据产品id查询产品简介
+	 * @param productId
+	 * @return
+	 */
+	ProductImageText selectProductImagetext(Integer productId);
 }

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/apparatus/ApparatusServiceImpl.java

@@ -123,9 +123,6 @@ public class ApparatusServiceImpl implements ApparatusService {
             return false;
         }
         IntegralConfig integralConfig = null;
-        IntegralConfig registeredConfig = null;
-        IntegralConfig buyConfig = null;
-        IntegralConfig newConfig = null;
         StayIntegral stayIntegral = new StayIntegral();
         Integer stayNumber = 0;
         Calendar calendar = Calendar.getInstance();
@@ -135,8 +132,8 @@ public class ApparatusServiceImpl implements ApparatusService {
                 integralConfig = getIntegralId(247);
                 stayNumber = integralConfig.getIntegralConfigNumber();
                 //规则表查询新注册会员和新增牙刷积分到账时间（多少天到账）
-                registeredConfig = getIntegralId(251);
-                calendar.set(Calendar.DAY_OF_MONTH,calendar.get(Calendar.DAY_OF_MONTH)+registeredConfig.getIntegralConfigNumber());
+                ShopSystemRule registeredSystemRule=systemMapper.selectOneShopRuleById(251);
+                calendar.set(Calendar.DAY_OF_MONTH,calendar.get(Calendar.DAY_OF_MONTH)+registeredSystemRule.getRuleNum().intValue());
                 stayIntegral.setStayRecordedTime(calendar.getTime());
                 break;
             case 2:
@@ -144,8 +141,8 @@ public class ApparatusServiceImpl implements ApparatusService {
                 integralConfig = getIntegralId(248);
                 stayNumber = integralConfig.getIntegralConfigNumber();
                 //规则表查询新注册会员和新增牙刷积分到账时间（多少天到账）
-                newConfig = getIntegralId(251);
-                calendar.set(Calendar.DAY_OF_MONTH,calendar.get(Calendar.DAY_OF_MONTH)+newConfig.getIntegralConfigNumber());
+                ShopSystemRule addToothRule=systemMapper.selectOneShopRuleById(251);
+                calendar.set(Calendar.DAY_OF_MONTH,calendar.get(Calendar.DAY_OF_MONTH)+addToothRule.getRuleNum().intValue());
                 stayIntegral.setStayRecordedTime(calendar.getTime());
                 break;
             case 3:
@@ -156,7 +153,6 @@ public class ApparatusServiceImpl implements ApparatusService {
                 stayNumber = orderAllIntegral;
                 stayIntegral.setOrderId(orderId);
                 //规则表查询新注册会员和新增牙刷积分到账时间（多少天到账）
-                buyConfig = getIntegralId(252);
                 ShopSystemRule shopSystemRule=systemMapper.selectOneShopRuleById(252);
                 Integer day = shopSystemRule.getRuleNum().intValue();
                 calendar.set(Calendar.DAY_OF_MONTH,calendar.get(Calendar.DAY_OF_MONTH)+day);
@@ -184,6 +180,7 @@ public class ApparatusServiceImpl implements ApparatusService {
                 useIntegral.setConfigId(integralConfig.getIntegralConfigId());
                 useIntegral.setUserOpenId(openId);
                 useIntegral.setIntegralType(3);
+                useIntegral.setStayId(stayIntegral.getStayId());
                 useIntegral.setIntegralNumber(stayNumber);
                 useIntegral.setIntegralBeforeNumber(memberInfo.getUserSurplusIntegral());
                 useIntegral.setIntegralEndNumber(memberInfo.getUserSurplusIntegral());

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

@@ -3,15 +3,12 @@ package com.iamberry.wechat.service.cart;
 import java.util.List;
 
 import com.iamberry.wechat.core.entity.PageBean;
-import com.iamberry.wechat.core.entity.product.ProductColor;
-import com.iamberry.wechat.core.entity.product.ProductType;
-import com.iamberry.wechat.core.entity.product.QrcodeGift;
+import com.iamberry.wechat.core.entity.product.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.iamberry.wechat.core.entity.cart.ShopOrderItemDto;
 import com.iamberry.wechat.core.entity.cart.UserGiftDto;
-import com.iamberry.wechat.core.entity.product.Product;
 import com.iamberry.wechat.face.cart.ProductInfoService;
 import com.iamberry.wechat.service.cart.dao.CartDao;
 import com.iamberry.wechat.service.cart.dao.ProductInfoDao;
@@ -132,6 +129,17 @@ public class ProductInfoServiceImpl implements ProductInfoService {
 	public List<ProductColor> selectColorList(Integer colorProductId) {
 		return productInfoDao.selectColorList(colorProductId);
 	}
+
+	@Override
+	public ProductImageText selectProductImagetext(Integer productId) {
+		return productInfoDao.selectProductImagetext(productId);
+	}
+
+	@Override
+	public Product selectProductByColorId(Integer colorId) {
+		return productInfoDao.selectProductByColorId(colorId);
+	}
+
 	/**
 	 * 查询正在使用的产品类型
 	 * @return

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

@@ -4,10 +4,7 @@ import java.util.List;
 
 import com.iamberry.wechat.core.entity.cart.ShopOrderItemDto;
 import com.iamberry.wechat.core.entity.cart.UserGiftDto;
-import com.iamberry.wechat.core.entity.product.Product;
-import com.iamberry.wechat.core.entity.product.ProductColor;
-import com.iamberry.wechat.core.entity.product.ProductType;
-import com.iamberry.wechat.core.entity.product.QrcodeGift;
+import com.iamberry.wechat.core.entity.product.*;
 
 public interface ProductInfoDao {
 
@@ -120,4 +117,18 @@ public interface ProductInfoDao {
 	 * @return
 	 */
 	List<ProductColor> listProductColorByTypeId(ProductColor productColor);
+
+	/**
+	 * 根据colorId查询产品信息
+	 * @param colorId
+	 * @return
+	 */
+	Product selectProductByColorId(Integer colorId);
+
+	/**
+	 * 根据产品id查询产品简介
+	 * @param productId
+	 * @return
+	 */
+	ProductImageText selectProductImagetext(Integer productId);
 }

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

@@ -2,15 +2,12 @@ package com.iamberry.wechat.service.cart.dao.impl;
 
 import java.util.List;
 
-import com.iamberry.wechat.core.entity.product.ProductColor;
-import com.iamberry.wechat.core.entity.product.ProductType;
-import com.iamberry.wechat.core.entity.product.QrcodeGift;
+import com.iamberry.wechat.core.entity.product.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 
 import com.iamberry.wechat.core.entity.cart.ShopOrderItemDto;
 import com.iamberry.wechat.core.entity.cart.UserGiftDto;
-import com.iamberry.wechat.core.entity.product.Product;
 import com.iamberry.wechat.service.cart.dao.ProductInfoDao;
 import com.iamberry.wechat.service.mapper.ProductInfoMapper;
 
@@ -124,7 +121,15 @@ public class ProductInfoDaoImpl implements ProductInfoDao {
 	}
 
 
+	@Override
+	public ProductImageText selectProductImagetext(Integer productId) {
+		return productInfoMapper.selectProductImagetext(productId);
+	}
 
+	@Override
+	public Product selectProductByColorId(Integer colorId) {
+		return productInfoMapper.selectProductByColorId(colorId);
+	}
 
 	@Override
 	public List<ProductType> listProductType() {

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

@@ -4,10 +4,7 @@ import java.util.List;
 import com.iamberry.wechat.core.entity.PaperBean;
 import com.iamberry.wechat.core.entity.cart.ShopOrderItemDto;
 import com.iamberry.wechat.core.entity.cart.UserGiftDto;
-import com.iamberry.wechat.core.entity.product.Product;
-import com.iamberry.wechat.core.entity.product.ProductColor;
-import com.iamberry.wechat.core.entity.product.ProductType;
-import com.iamberry.wechat.core.entity.product.QrcodeGift;
+import com.iamberry.wechat.core.entity.product.*;
 
 public interface ProductInfoMapper {
 	
@@ -121,4 +118,18 @@ public interface ProductInfoMapper {
 	 * @return
 	 */
 	List<ProductColor> listProductColorByTypeId(ProductColor productColor);
+
+	/**
+	 * 根据colorId查询产品信息
+	 * @param colorId
+	 * @return
+	 */
+	Product selectProductByColorId(Integer colorId);
+
+	/**
+	 * 根据产品id查询产品简介
+	 * @param productId
+	 * @return
+	 */
+	ProductImageText selectProductImagetext(Integer productId);
 }

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

@@ -36,7 +36,7 @@ PUBLIC
 	<!--查询未发货数量-->
 	<select id="getNotSendCount" parameterType="String" resultType="Integer">
 		SELECT
-		COUNT (*)
+		COUNT(*)
 		FROM tb_iamberry_shop_sales_order
 		WHERE  sales_openid=#{openid}
 		AND sales_send_date is null

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

@@ -123,7 +123,7 @@
 		VALUES 
 		(
 			#{couponItemId},#{couponId},#{couponItemUseropenid},#{couponItemCurrentUserOpenid},#{couponUseEndDate},
-			NOW(),#{couponUseStatus},#{couponUseDate},#{couponIsDonation},#{couponItemRemark}
+			NOW(),#{couponUseStatus},#{couponIsDonation},#{couponUseDate},#{couponItemRemark}
 		)
  	</insert>
  	

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

@@ -34,13 +34,16 @@
 		user_template_id templateId,
 		user_dealers userDealers,
 		user_is_bought userIsBought,
+
 		user_email userEmail,
-		user_qrcode_type userQrcodeType
+		user_qrcode_type userQrcodeType,
+		user_stay_integral userStayIntegral
 	</sql>
 	<!-- 获取个人信息-->
 	<select id="getMyMemberInfo"  parameterType="String" resultType="Member" >
 		SELECT
-			user_name,user_tel,user_sex,user_birth_date,user_integral
+			user_head,user_nickname,user_sex,user_name,user_birth_date,user_tel,user_age_stage,user_identity
+			user_integral,user_stay_integral,user_use_integral,user_surplus_integral
 		FROM TB_IAMBERRY_USER_USERINFO
 		WHERE user_openid = #{userOpenid}
 	</select>
@@ -364,7 +367,7 @@
 		</if>
 	</select>
 
-	<insert id="insertStayIntegral" parameterType="StayIntegral">
+	<insert id="insertStayIntegral" parameterType="StayIntegral"  useGeneratedKeys="true" keyProperty="stayId">
         INSERT INTO tb_iamberry_stay_integral (user_openid,config_id,sales_orderid,stay_number,stay_recorded_time,stay_status,stay_remark)
         VALUES
          (#{userOpenId},#{configId},#{orderId},#{stayNumber},#{stayRecordedTime},#{stayStatus},#{stayRemark})

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

@@ -42,6 +42,13 @@
 		TYPE_UPDATE_DATE typeUpdateDate,
 		TYPE_STATE typeState
 	</sql>
+	<!--产品简介-->
+	<sql id="imageText">
+		imagetext_id imagetextId,
+		imagetext_produect_id imagetextProduectId,
+		imagetext_context imagetextContext,
+		imagetext_create_date imagetextCreateDate
+	</sql>
 	<!--根据产品类型id查询产品信息-->
 	<select id="listProductColorByTypeId" resultType="ProductColor" parameterType="ProductColor">
 		SELECT
@@ -68,6 +75,15 @@
 		</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} AND color_status=1
+    </select>
 	<!--查询正在使用的产品类型-->
 	<select id="listProductType" resultType="ProductType" >
 		SELECT
@@ -75,6 +91,7 @@
 		FROM TB_IAMBERRY_PRODUCT_TYPE
 		WHERE TYPE_STATE=1
 	</select>
+
 	<!-- 分页查询商品信息 -->
 	<select id="selectPageProduct" parameterType="Product" resultType="Product">
 		SELECT
@@ -205,7 +222,13 @@
 		AND 
 			COLOR_ID = #{1} 
 	</select>
-
+	<!--根据产品id查询产品简介-->
+	<select id="selectProductImagetext" parameterType="Integer" resultType="ProductImageText">
+		SELECT
+		<include refid="imageText"></include>
+		FROM tb_iamberry_product_imagetext
+		WHERE imagetext_produect_id=#{productId}
+	</select>
 	<!-- 根据商品名称查询商品信息 -->
 	<select id="getProductByProductName" parameterType="java.lang.String" resultType="Product">
 		SELECT

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

@@ -22,7 +22,7 @@
           tb_iamberry_use_integral i
         LEFT JOIN tb_iamberry_integral_config c ON i.config_id = c.integral_config_id
         WHERE i.user_openid=#{userOpenId}
-            <if test="integralType != null||integralType != ''">
+            <if test="integralType != null and integralType != ''">
                AND i.integral_type = #{integralType}
             </if>
         ORDER BY i.integral_id DESC
@@ -36,19 +36,19 @@
 
     <!--获得的总积分数-->
     <select id="getGainIntegralCount" parameterType="String" resultType="Integer">
-        SELECT avg(integral_number)
+        SELECT SUM(integral_number)
         FROM tb_iamberry_use_integral
         WHERE user_openid=#{userOpenid} AND integral_type=1
     </select>
     <!--使用的总积分数-->
     <select id="getUseIntegralCount" parameterType="String" resultType="Integer">
-        SELECT avg(integral_number)
+        SELECT SUM(integral_number)
         FROM tb_iamberry_use_integral
         WHERE user_openid=#{userOpenid} AND integral_type=2
     </select>
     <!--待入账的总积分数-->
     <select id="getStayIntegralCount" parameterType="String" resultType="Integer">
-        SELECT avg(stay_number)
+        SELECT SUM(stay_number)
         FROM tb_iamberry_stay_integral
         WHERE user_openid=#{userOpenid} AND stay_status=1
     </select>
@@ -76,6 +76,7 @@
         (
           user_openid,
           integral_type,
+          stay_id,
           config_id,
           integral_number,
           integral_before_number,
@@ -85,7 +86,7 @@
         )
         VALUES
         (
-          #{userOpenId},#{integralType},#{configId},#{integralNumber},
+          #{userOpenId},#{integralType},#{stayId},#{configId},#{integralNumber},
           #{integralBeforeNumber},#{integralEndNumber},#{integralRemark},NOW()
         )
     </insert>

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/apparatus/ApparatusHandler.java

@@ -119,7 +119,7 @@ public class ApparatusHandler {
         }
         JSONObject machineJson = JSONObject.fromObject(json);
         JSONObject message = machineJson.getJSONObject("message");
-        String isBeing = message.getString("message");
+        String isBeing = message.getString("isBeing");
         if(isBeing.equals("1")){
             String productId = message.getString("productId");//产品id
             productColorId = apparatusService.getColorIdByProductId(productId);
@@ -133,7 +133,7 @@ public class ApparatusHandler {
         apparatus.setUserOpenid(memberInfo.getUserOpenid());
         apparatus.setApparatusBuyDate(format.parse(buyDate));
         apparatus.setApparatusWarrantyDate(updateDate(format.parse(buyDate),renewRule.getRuleNum().intValue()));
-        apparatus.setApparatusStore(Integer.getInteger(apparatusStore));
+        apparatus.setApparatusStore(Integer.valueOf(apparatusStore));
         //注册会员
         boolean flag = apparatusService.registerMember(apparatus,member);
         if (flag) {

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

@@ -187,7 +187,7 @@ public class ProductInfoHandler {
 	@ResponseBody
 	@RequestMapping("/getProductByProductId")
 	public ResultMsg getProductByProductId(HttpServletRequest request,HttpServletResponse response,
-										   @RequestParam(value = "productId",defaultValue = "") String productId,
+//										   @RequestParam(value = "productId",defaultValue = "") String productId,
 										   @RequestParam("colorId") Integer colorId
 	) throws Exception {
 
@@ -203,12 +203,9 @@ public class ProductInfoHandler {
 			remsg.setMessage(ResultInfo.loginOutError);
 			return remsg;
 		}
-		if (productId == null) {
-			remsg.setStatus(false);
-			remsg.setResultCode(ResultInfo.ERRORCODE);
-			remsg.setMessage(NameUtils.getConfig("ERRORINFO"));
-			return remsg;
-		}
+
+		Product productInfo=productInfoService.selectProductByColorId(colorId);
+		String productId=productInfo.getProductId().toString();
 
 		if (StaticInfo.pattern.matcher(productId).find()) {
 			//获取产品详情
@@ -307,15 +304,17 @@ public class ProductInfoHandler {
 			}
 			List<ProductPicture> pictureList = productPictureService.getProductPictureByproductId(Integer.parseInt(productId));
 			product.setPictureList(pictureList);
+			ProductImageText productImageText=productInfoService.selectProductImagetext(Integer.parseInt(productId));
+			product.setProductImageText(productImageText);
 			/*
 			 * 组装数据
 			 */
-			map = new HashMap<String, Object>();
 
 			/*if ((boolean)qrCodeMap.get("flag")) {
 				map.put("qrCode", qrCodeMap.get("qrCode"));
 				map.put("shopQrCode", qrCodeMap.get("shopQrCode"));
-			}*/
+			}*/map = new HashMap<String, Object>();
+
 			map.put("flag", false);	//判断是否有商户个人二维码
 			map.put("isShow", ResultInfo.ISSHOW);
 			map.put("cartDesc", ResultInfo.CARTDESC);
@@ -702,7 +701,7 @@ public class ProductInfoHandler {
 	 */
 	@ResponseBody
 	@RequestMapping("/listProductColorByTypeId")
-	public  ResultMsg listProductColorByTypeId( @RequestParam(value= "typeId",defaultValue= "" ,required=false) Integer typeId,
+	public  ResultMsg listProductColorByTypeId( @RequestParam(value= "typeId",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();
@@ -733,4 +732,27 @@ public class ProductInfoHandler {
 		rm.setData(map);
 		return rm ;
 	}
+	/**
+	 * 根据colorId查询产品信息
+	 * @param colorId
+	 * @return
+	 */
+	@RequestMapping("/getProductByColorId")
+	@ResponseBody
+	public ResultMsg getProductByColorId(@RequestParam(value= "colorId",required=false)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 ;
+	}
 }

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

@@ -516,6 +516,7 @@ public class CouponTypeHandler {
 	 * @param request
 	 * @return
 	 */
+	@ResponseBody
 	@RequestMapping("/getIsReceive")
 	public ResultMsg getIsReceive(HttpServletRequest request){
 		ResultMsg resultMsg = new ResultMsg();
@@ -538,12 +539,15 @@ public class CouponTypeHandler {
 	 * @param request
 	 * @return
 	 */
+
+	@ResponseBody
 	@RequestMapping("/addAewPeople")
 	public ResultMsg addAewPeople(HttpServletRequest request){
 		ResultMsg resultMsg = new ResultMsg();
 		Member memberInfo = WechatUtils.getUserBySession(request);
 		CouponType couponType = new CouponType();
 		couponType.setCouponIsNewPeople(1);
+		couponType.setPage(new PageBean());
 		List<CouponType> couponTypeList = couponTypeService.getCouponTypeList(couponType);
 		if(couponTypeList == null || couponTypeList.size() < 1){
 			resultMsg.setResultCode(ResultInfo.ERRORCODE);
@@ -554,8 +558,7 @@ public class CouponTypeHandler {
 		CouponItem couponItem = new CouponItem();
 		couponItem.setCouponId(couponTypeList.get(0).getCouponId());
 		Calendar calendar = Calendar.getInstance();
-		calendar.setTime(new Date());
-		calendar.set(Calendar.YEAR,1);
+		calendar.add(Calendar.YEAR,1);
 		couponItem.setCouponUseEndDate(calendar.getTime());//领取后一年有效
 		couponItem.setCouponReceiveDate(new Date());
 		couponItem.setCouponItemUseropenid(memberInfo.getUserOpenid());

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

@@ -2,10 +2,12 @@ package com.iamberry.wechat.handles.integral;
 
 
 
+import com.github.pagehelper.PageHelper;
 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.StayIntegral;
 import com.iamberry.wechat.core.entity.integral.UseIntegral;
 import com.iamberry.wechat.core.entity.member.Member;
 import com.iamberry.wechat.face.integral.UseIntegralService;
@@ -13,6 +15,7 @@ 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.apache.poi.ss.formula.functions.Rank;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -56,11 +59,12 @@ public class UseIntegralHandler {
                                     @RequestParam(value = "pageNO", defaultValue = "1",required=false) Integer pageNO){
         ResultMsg rm=new ResultMsg();
         Member m= WechatUtils.getUserBySession(req);
-        if (m == null || m.getUserOpenid() == null) {
+        String openid=m.getUserOpenid();
+        if (m == null || openid == null) {
             rm.setMessage(ResultInfo.loginOutError);
             return rm;
         }
-        Integer gainIntegralCount=useIntegralService.getGainIntegralCount(m.getUserOpenid());
+        Integer gainIntegralCount=useIntegralService.getGainIntegralCount(openid);
             if(gainIntegralCount != null && gainIntegralCount<0){
                 rm.setStatus(false);
                 rm.setResultCode(ResultInfo.ERRORCODE);
@@ -68,7 +72,7 @@ public class UseIntegralHandler {
                 return rm;
             }
         UseIntegral useIntegral=new UseIntegral();
-        useIntegral.setUserOpenId(m.getUserOpenid());
+        useIntegral.setUserOpenId(openid);
         useIntegral.setIntegralType(useType);
         useIntegral.getPage().setPageSize(pageSize);
         useIntegral.getPage().setPageNumber(pageNO);
@@ -89,7 +93,6 @@ public class UseIntegralHandler {
     /**
      * 待入账记录 use_type=3
      * @param req
-     * @param useType
      * @param pageSize
      * @param pageNO
      * @return
@@ -102,11 +105,12 @@ public class UseIntegralHandler {
                                       @RequestParam(value = "pageNO", defaultValue = "1",required=false)Integer pageNO){
         ResultMsg rm=new ResultMsg();
         Member m= WechatUtils.getUserBySession(req);
-        if (m == null || m.getUserOpenid() == null) {
+        String openid=m.getUserOpenid();
+        if (m == null || openid == null) {
             rm.setMessage(ResultInfo.loginOutError);
             return rm;
         }
-        Integer stayIntegralCount=useIntegralService.getStayIntegralCount(m.getUserOpenid());
+        Integer stayIntegralCount=useIntegralService.getStayIntegralCount(openid);
         if(stayIntegralCount != null && stayIntegralCount<0){
             rm.setStatus(false);
             rm.setResultCode(ResultInfo.ERRORCODE);
@@ -114,7 +118,7 @@ public class UseIntegralHandler {
             return rm;
         }
         UseIntegral useIntegral=new UseIntegral();
-        useIntegral.setUserOpenId(m.getUserOpenid());
+        useIntegral.setUserOpenId(openid);
         useIntegral.setIntegralType(useType);
         useIntegral.getPage().setPageSize(pageSize);
         useIntegral.getPage().setPageNumber(pageNO);
@@ -174,11 +178,12 @@ public class UseIntegralHandler {
             return rm;
         }
         UseIntegral useIntegral=new UseIntegral();
-        useIntegral.setUserOpenId(m.getUserOpenid());
+        useIntegral.setUserOpenId(openid);
         useIntegral.setIntegralType(useType);
         useIntegral.getPage().setPageSize(pageSize);
         useIntegral.getPage().setPageNumber(pageNO);
         useIntegral.getPage().initRecordBegin();
+        useIntegral.setIntegralType(null);
         List<UseIntegral> listAllIntegralInfo=useIntegralService.listIntegralInfo(useIntegral);
 
         Map<String,Object> map=new HashMap<String, Object>();
@@ -211,8 +216,8 @@ public class UseIntegralHandler {
             return rm;
         }
         /*************会员等级***************/
-        member=memberService.getMyMemberInfo(openid);
-        int userIntegralCount=member.getUserIntegral();
+        Member memberInfo=memberService.getMyMemberInfo(openid);
+        int userIntegralCount=memberInfo.getUserIntegral();
         List<RankRule> list=useIntegralService.getRankRule();
         RankRule rankRule=null;
         for(RankRule r:list){
@@ -226,6 +231,7 @@ public class UseIntegralHandler {
 
         map.put("notSendCount",notSendCount);
         map.put("rankRule",rankRule);
+        map.put("member",memberInfo);
         rm.setStatus(true);
         rm.setResultCode(ResultInfo.SUCCESSCODE);
         rm.setMessage(NameUtils.getConfig("SUCCESSINFO"));

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/wx/QrCodeHandler.java

@@ -19,6 +19,7 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -36,8 +37,8 @@ public class QrCodeHandler {
     public void getQrCode(@PathVariable("qrCode") String qrCode, HttpServletRequest req, HttpServletResponse res)throws ServletException, IOException {
         res.sendRedirect("http://w.iamberry.com/tooth/view/default.html?qrCode="+qrCode);
     }
-
-    @RequestMapping("/getMember")
+    @ResponseBody
+    @RequestMapping("/getActivationAndMember")
     public ResultMsg getMember(HttpServletRequest req, HttpServletResponse res)throws ServletException, IOException {
         ResultMsg msg = new ResultMsg();
         String qrCode = req.getParameter("qrCode");
@@ -58,7 +59,7 @@ public class QrCodeHandler {
         }
         //查询用户信息
         memberInfo = memberService.getMemberByUserOpenId(memberInfo.getUserOpenid());
-        Map<String,Object> map = null;
+        Map<String,Object> map = new HashMap<String, Object>();
         map.put("memberInfo",memberInfo);
         map.put("isActivation",isActivation);
         msg.setData(map);