fix 服务期

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderServiceImpl.java

@@ -300,10 +300,10 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                 }
 
                 Long gradeId = null;
-                //判断是否购买历史班级都过期
-                canRepeatBuy = this.canBuyRepeatGoods(g.getGoodsId(), bo.getUserId());
                 //判断是否有购买过，服务期是否过期
                 Long oldOrderGoodsId = getHaveBuyGoods(g.getGoodsId(), bo.getUserId());
+                //判断是否购买历史班级都过期
+                canRepeatBuy = this.canBuyRepeatGoods(g.getGoodsId(), bo.getUserId());
                 if (g.getGoodsInputData() != null) {
                     gradeId = g.getGoodsInputData().getGradeId();
                     if (Validator.isNotEmpty(oldOrderGoodsId)) {
@@ -432,12 +432,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                 }
 
                 Long gradeId = null;
+                //判断是否有购买过
+                Long oldOrderGoodsId = getHaveBuyGoods(g.getGoodsId(), bo.getUserId());
                 //判断是否购买历史班级都过期
                 canRepeatBuy = this.canBuyRepeatGoods(g.getGoodsId(), bo.getUserId());
                 if (g.getGoodsInputData() != null) {
                     gradeId = g.getGoodsInputData().getGradeId();
-                    //判断是否有购买过
-                    Long oldOrderGoodsId = getHaveBuyGoods(g.getGoodsId(), bo.getUserId());
                     if (Validator.isNotEmpty(oldOrderGoodsId)) {
                         //有指定选班模板且视频商品班级已过期,记录复购状态
                         orderGoods.setRebuyOrderGoodsId(oldOrderGoodsId);
@@ -608,12 +608,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                     orderGoods.setStudyCount(0L);//没配置则为0
                 }
                 Long gradeId = null;
+                //判断是否有购买过
+                Long oldOrderGoodsId = getHaveBuyGoods(g.getGoodsId(), bo.getUserId());
                 //判断是否购买历史班级都过期
                 canRepeatBuy = this.canBuyRepeatGoods(g.getGoodsId(), bo.getUserId());
                 if (g.getGoodsInputData() != null) {
                     gradeId = g.getGoodsInputData().getGradeId();
-                    //判断是否有购买过
-                    Long oldOrderGoodsId = getHaveBuyGoods(g.getGoodsId(), bo.getUserId());
                     if (Validator.isNotEmpty(oldOrderGoodsId)) {
                         //有指定选班模板且视频商品班级已过期,记录复购状态
                         orderGoods.setRebuyOrderGoodsId(oldOrderGoodsId);
@@ -751,12 +751,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                     orderGoods.setStudyCount(0L);//没配置则为0
                 }
                 Long gradeId = null;
+                //判断是否有购买过
+                Long oldOrderGoodsId = getHaveBuyGoods(g.getGoodsId(), bo.getUserId());
                 //判断是否购买历史班级都过期
                 canRepeatBuy = this.canBuyRepeatGoods(g.getGoodsId(), bo.getUserId());
                 if (g.getGoodsInputData() != null) {
                     gradeId = g.getGoodsInputData().getGradeId();
-                    //判断是否有购买过
-                    Long oldOrderGoodsId = getHaveBuyGoods(g.getGoodsId(), bo.getUserId());
                     if (Validator.isNotEmpty(oldOrderGoodsId)) {
                         //有指定选班模板且视频商品班级已过期,记录复购状态
                         orderGoods.setRebuyOrderGoodsId(oldOrderGoodsId);

zhongzheng-system/src/main/resources/mapper/modules/base/ShoppingCartMapper.xml

@@ -46,5 +46,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 LEFT JOIN order_input_template ot ON cb.template_status = ot.id
         WHERE
             s.user_id =  #{userId}
+        order by s.update_time desc
     </select>
 </mapper>