订单发票列表

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/domain/ClassGrade.java

@@ -22,6 +22,7 @@ import com.zhongzheng.common.annotation.Excel;
 @TableName("class_grade")
 public class ClassGrade implements Serializable {
     public static final Integer INIT_UPPER = 300;  //初始人数
+    public static final Integer INIT_UPPER2 = 1000000;  //初始人数
 
 private static final long serialVersionUID=1L;
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeUserServiceImpl.java

@@ -190,7 +190,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
         redisLockEntity.setRequestId(requestId);
         if(redisCache.lock(redisLockEntity)){
             //分新班
-            Long newGradeId = iOrderService.changeGrade(goodsVo.getGoodsName(),bo.getGoodsId(),bo.getOrderGoodsId(),bo.getGradeId(),bo.getUserId());
+            Long newGradeId = iOrderService.changeGrade(goodsVo.getGoodsName(),bo.getGoodsId(),bo.getOrderGoodsId(),bo.getGradeId(),bo.getUserId(),goodsVo.getBusinessId());
             if(newGradeId>0){
                 //老班修改换班状态
                 ClassGradeUser classGradeUser =  getOne(new LambdaQueryWrapper< ClassGradeUser>().eq(ClassGradeUser::getUserId,bo.getUserId())
@@ -252,7 +252,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
             redisLockEntity.setRequestId(requestId);
             if(redisCache.lock(redisLockEntity)){
                 //分新班
-                Long newGradeId = iOrderService.sysChangeGrade(goodsVo.getGoodsName(),item.getGoodsId(),item.getOrderGoodsId(),item.getGradeId(),item.getUserId());
+                Long newGradeId = iOrderService.sysChangeGrade(goodsVo.getGoodsName(),item.getGoodsId(),item.getOrderGoodsId(),item.getGradeId(),item.getUserId(),goodsVo.getBusinessId());
                 if(newGradeId>0){
                     //老班修改换班状态
                     ClassGradeUser classGradeUser =  getOne(new LambdaQueryWrapper< ClassGradeUser>().eq(ClassGradeUser::getUserId,item.getUserId())

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

@@ -25,9 +25,9 @@ public interface IOrderService extends IService<Order> {
 	 */
 	OrderVo queryById(Long orderId);
 
-	Long changeGrade(String goodsName,Long goodsId,Long orderGoodsId,Long gradeId,Long userId);
+	Long changeGrade(String goodsName,Long goodsId,Long orderGoodsId,Long gradeId,Long userId,Long businessId);
 
-	Long sysChangeGrade(String goodsName,Long goodsId,Long orderGoodsId,Long gradeId,Long userId);
+	Long sysChangeGrade(String goodsName,Long goodsId,Long orderGoodsId,Long gradeId,Long userId,Long businessId);
 	/**
 	 * 查询列表
 	 */

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

@@ -643,12 +643,13 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             isConfigTp = true;
         }
         ClassGrade classGrade = new ClassGrade();
-        classGrade.setStudentUpper(ClassGrade.INIT_UPPER); //上限300
         classGrade.setCreateTime(DateUtils.getNowTime());
         if(isConfigTp){
             classGrade.setLearningStatus(2);//待定
+            classGrade.setStudentUpper(ClassGrade.INIT_UPPER); //上限300
         }else{
             classGrade.setLearningStatus(1);//即刻
+            classGrade.setStudentUpper(ClassGrade.INIT_UPPER2); //上限1000000
         }
         classGrade.setUpdateTime(DateUtils.getNowTime());
         classGrade.setStatus(1);
@@ -670,7 +671,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
     //选择新的班级
     @Override
-    public Long changeGrade(String goodsName,Long goodsId,Long orderGoodsId,Long gradeId,Long userId){
+    public Long changeGrade(String goodsName,Long goodsId,Long orderGoodsId,Long gradeId,Long userId,Long businessId){
         //查询该学员有没有有效期内同商品班级 有就不允许添加
        /* Integer classNum = baseMapper.selectUserClass(goodsId,userId);
         if (classNum > 0){
@@ -729,11 +730,21 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             }
         }
 
+        CourseBusinessVo businessVo = iCourseBusinessService.queryById(businessId);
+        boolean isConfigTp = false; //商品是否有配置选班模板
+        if(Validator.isNotEmpty(businessVo)&&Validator.isNotEmpty(businessVo.getTemplateStatus())&&businessVo.getTemplateStatus()==1){
+            isConfigTp = true;
+        }
         //创建新班级
         ClassGrade classGrade = new ClassGrade();
-        classGrade.setStudentUpper(ClassGrade.INIT_UPPER); //上限300
+        if(isConfigTp){
+            classGrade.setLearningStatus(2);//待定
+            classGrade.setStudentUpper(ClassGrade.INIT_UPPER); //上限300
+        }else{
+            classGrade.setLearningStatus(1);//即刻
+            classGrade.setStudentUpper(ClassGrade.INIT_UPPER2); //上限1000000
+        }
         classGrade.setCreateTime(DateUtils.getNowTime());
-        classGrade.setLearningStatus(2);//待定
         classGrade.setUpdateTime(DateUtils.getNowTime());
         classGrade.setStatus(1);
         String gradeCode = ServletUtils.getEncoded("BJ");
@@ -762,7 +773,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
      * @return
      */
     @Override
-    public Long sysChangeGrade(String goodsName, Long goodsId, Long orderGoodsId, Long gradeId, Long userId) {
+    public Long sysChangeGrade(String goodsName, Long goodsId, Long orderGoodsId, Long gradeId, Long userId,Long businessId) {
         //指定班级
         if(gradeId!=null&&gradeId>0){
             ClassGradeVo classGradeVo = iClassGradeService.queryById(gradeId);

zhongzheng-system/src/main/resources/mapper/modules/order/OrderInvoiceMapper.xml

@@ -120,6 +120,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="searchKey != null and searchKey != ''">
             and (u.realname like concat('%', #{searchKey}, '%') or u.id_card like concat('%', #{searchKey}, '%') or u.invoice_code like concat('%', #{searchKey}, '%') or u.invoice_num like concat('%', #{searchKey}, '%'))
         </if>
+        ORDER BY oi.invoice_id DESC
     </select>
 
     <select id="checkHave" parameterType="Long" resultType="Long">