老用户回馈页面

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

@@ -57,7 +57,7 @@
 			<if test="productRentType != null and productRentType != ''">
 				AND PRODUCT_RENT_TYPE = #{productRentType} 
 			</if>
-			ORDER BY PRODUCT_CREATE_DATE DESC 
+			ORDER BY color_sort
 			<if test="page!=null and page.recordBegin>0 and page.pageSize>0 ">
 		     	LIMIT ${page.recordBegin},${page.pageSize}
 		    </if>

watero-wechat-web/src/main/java/com/iamberry/wechat/handles/thanksgiving/ThanksGivingHandler.java

@@ -8,6 +8,7 @@ import com.iamberry.wechat.core.entity.member.Member;
 import com.iamberry.wechat.core.entity.thanksgiving.ThanksGiving;
 import com.iamberry.wechat.face.coupon.CouponItemService;
 import com.iamberry.wechat.face.coupon.CouponTypeService;
+import com.iamberry.wechat.face.home.HomeService;
 import com.iamberry.wechat.face.member.MemberService;
 import com.iamberry.wechat.face.order.CodeService;
 import com.iamberry.wechat.face.thanksgiving.ThanksGivingService;
@@ -43,7 +44,8 @@ public class ThanksGivingHandler {
     private ThanksGivingService thanksGivingService;
     @Autowired
     private MemberService memberService;
-
+    @Autowired
+    private HomeService homeService;
 
     /**
      * 免费送滤芯
@@ -82,8 +84,16 @@ public class ThanksGivingHandler {
         Member member =  WechatUtils.getUserBySession(requeste);
 
         member = memberService.getMemberByUserOpenId(member.getUserOpenid());
-        if(member.getUserStatus() != 2){
-            return new ResultMsg(false, ResultMsg.ERROR, "未关注不能领取!",null);
+        if(member == null){
+            // 创建新的用户
+            member = new Member();
+            member.setUserOpenid(member.getUserOpenid());
+            member.setUserSex(0);
+            member.setUserStatus(1);
+            int flag = homeService.insertMemberInfo(member);
+            if (flag < 1) {
+                return new ResultMsg(false, ResultMsg.ERROR, "请先关注“Watero水时代”公众号，并联系客服添加用户!",null);
+            }
         }
         rm.setMessage(ResultMsg.SUCCESS);
         rm.setStatus(true);
@@ -110,8 +120,16 @@ public class ThanksGivingHandler {
         }
 
         member = memberService.getMemberByUserOpenId(member.getUserOpenid());
-        if(member.getUserStatus() != 2){
-            return new ResultMsg(false, ResultMsg.ERROR, "请先关注“Watero水时代”公众号!",null);
+        if(member == null){
+            // 创建新的用户
+            member = new Member();
+            member.setUserOpenid(member.getUserOpenid());
+            member.setUserSex(0);
+            member.setUserStatus(1);
+            int flag = homeService.insertMemberInfo(member);
+            if (flag < 1) {
+                return new ResultMsg(false, ResultMsg.ERROR, "请先关注“Watero水时代”公众号，并联系客服添加用户!",null);
+            }
         }
 
         ThanksGiving thanksGiving = new ThanksGiving();
@@ -150,8 +168,16 @@ public class ThanksGivingHandler {
         ResultMsg rm = new ResultMsg();
         Member member =  WechatUtils.getUserBySession(request);
         member = memberService.getMemberByUserOpenId(member.getUserOpenid());
-        if(member.getUserStatus() != 2){
-            return new ResultMsg(false, ResultMsg.ERROR, "请先关注“Watero水时代”公众号!",null);
+        if(member == null){
+            // 创建新的用户
+            member = new Member();
+            member.setUserOpenid(member.getUserOpenid());
+            member.setUserSex(0);
+            member.setUserStatus(1);
+            int flag = homeService.insertMemberInfo(member);
+            if (flag < 1) {
+                return new ResultMsg(false, ResultMsg.ERROR, "请先关注“Watero水时代”公众号，并联系客服添加用户!",null);
+            }
         }
         //判断验证码
         //使用request对象的getSession()获取session，如果session不存在则创建一个