积分商城

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

@@ -59,6 +59,13 @@ public interface UseIntegralService {
     List<RankRule> getRankRule();
 
     /**
+     * 查询会员等级信息
+     * @param  id
+     * @return  rankRule
+     */
+    RankRule  getRankRuleById(Integer  id);
+
+    /**
      * 定时任务
      * 待入账积分更改到已入账操作
      * @return

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

@@ -92,6 +92,16 @@ public class UseIntegralServiceImpl implements UseIntegralService {
     }
 
     /**
+     * 查询会员等级信息
+     * @param  id
+     * @return  rankRule
+     */
+    @Override
+    public  RankRule  getRankRuleById(Integer  id){
+        return  useIntegralMapper.getRankRuleById(id);
+    }
+
+    /**
      * 查询待入账积分的集合
      * @return
      */

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

@@ -83,6 +83,13 @@ public interface UseIntegralMapper {
      */
     List<RankRule> getRankRule();
 
+    /**
+     * 查询会员等级信息
+     * @param  id
+     * @return  rankRule
+     */
+    RankRule  getRankRuleById(Integer  id);
+
 
     /**
      * 修改待入账信息

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

@@ -63,6 +63,14 @@
         SELECT *
         FROM tb_iamberry_rank_rule
     </select>
+
+    <select id="getRankRuleById" resultType="RankRule" parameterType="Integer" >
+        select
+          *
+        from tb_iamberry_rank_rule t
+        where t.rank_rule_id= #{rankRuleId}
+    </select>
+
     <!-- 查询积分来源信息 -->
     <select id="listIntegralConfig" parameterType="IntegralConfig" resultType="IntegralConfig">
         SELECT

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

@@ -48,6 +48,31 @@ public class UseIntegralHandler {
     private AdminOrderService adminOrderService;
     @Autowired
     private CouponItemService couponItemService;
+
+    /**
+     * 获取等级积分
+     * @param req
+     * @return
+     */
+    @RequestMapping("/rankRule")
+    @ResponseBody
+    public ResultMsg rankRule(HttpServletRequest req){
+        ResultMsg rm=new ResultMsg();
+        Member m= WechatUtils.getUserBySession(req);
+        String openid=m.getUserOpenid();
+
+        List<RankRule> rankRuleList = useIntegralService.getRankRule();
+
+        Map<String,Object> map=new HashMap<String, Object>();
+        map.put("rankRuleList",rankRuleList);
+
+        rm.setStatus(true);
+        rm.setResultCode(ResultInfo.SUCCESSCODE);
+        rm.setMessage(NameUtils.getConfig("SUCCESSINFO"));
+        rm.setData(map);
+        return rm;
+    }
+
     /**
      * 收入记录 use_type=1
      * @param req
@@ -299,6 +324,10 @@ public class UseIntegralHandler {
             return rm;
         }
 
+        Integer  rr = memberService.getUserGrad(member.getUserId());
+        RankRule rankr  = useIntegralService.getRankRuleById(rr);
+
+        Integer distanceNextLevelIntegral = -1;
 //        List<RankRule> lists=new ArrayList<RankRule>();
         RankRule  rankRule = null;
         for(int i =0 ;i<list.size();i++){
@@ -311,8 +340,11 @@ public class UseIntegralHandler {
                 }
             }
         }
-
-        Integer distanceNextLevelIntegral = rankRule.getRankRuleIntegral() - userIntegralCount;
+        if(rankRule == null){
+            distanceNextLevelIntegral = -1;
+        }else{
+            distanceNextLevelIntegral = rankRule.getRankRuleIntegral() - userIntegralCount;
+        }
 
         /**************未发货数量*****************/
         Integer notSendCount= adminOrderService.getNotSendCount(openid);
@@ -323,6 +355,7 @@ public class UseIntegralHandler {
 //        couponItem.setCouponUseStatus(1);   //coupon_use_status
 //        Integer availableCoupons = couponItemService.userCouponNum(couponItem);
 
+        map.put("currentRankRule",rankr); //当前会员等级
         map.put("distanceNextLevelIntegral",distanceNextLevelIntegral); //距离升级所需要的积分
         map.put("notSendCount",notSendCount);
         map.put("memberInfo",memberInfo);

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

@@ -226,9 +226,9 @@ public class OrderHandler {
 				}
 				Date couponUseEndDate = couponItemDto.getCouponUseEndDate();
 				/*控制是否过期*/
-//				if((couponUseEndDate.getTime() < new Date().getTime())  ){
-//
-//				}
+				if((couponUseEndDate.getTime() < new Date().getTime())  ){
+					flag = false;
+				}
 			}else{
 				flag = false;
 			}