资料审核

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

@@ -249,7 +249,7 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
         }
     }
 
-   /* private void sendPeriodSevenSMS(UserPeriodEditBo bo) {
+    private void sendPeriodSevenSMS(UserPeriodEditBo bo) {
         GoodsVo goodsVo1 = iGoodsService.queryById(bo.getGoodsId());
         if (bo.getStatus().equals(1)){
             InformRemindVo informRemindVo = informRemindService.queryById(11L);
@@ -261,11 +261,11 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
                     informUserAddBo.setSendTime(DateUtils.getNowTime());
                     informUserAddBo.setCreateTime(DateUtils.getNowTime());
                     informUserAddBo.setUpdateTime(DateUtils.getNowTime());
-                    informUserAddBo.setRemindId(9L);
+                    informUserAddBo.setRemindId(11L);
                     informUserAddBo.setSystemStatus(1);
                     informUserAddBo.setRemind("学时机构审核通过提醒");
                     informUserAddBo.setGoodsId(bo.getGoodsId());
-                    informUserAddBo.setText("尊敬的用户：你已完成本课程的所有学时机构审核通过，马上点击“预约考试”进行预约考试。");
+                    informUserAddBo.setText("尊敬的用户：你已完成本课程的所有学时机构审核通过。");
                     iInformUserService.insertByAddBo(informUserAddBo);
                 }
                 if (informRemindVo.getNoteStatus().equals(1)) {
@@ -275,11 +275,11 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
                     informUserAddBo.setSendStatus(1);
                     informUserAddBo.setCreateTime(DateUtils.getNowTime());
                     informUserAddBo.setUpdateTime(DateUtils.getNowTime());
-                    informUserAddBo.setRemindId(9L);
+                    informUserAddBo.setRemindId(11L);
                     informUserAddBo.setSystemStatus(3);
                     informUserAddBo.setRemind("学时机构审核通过提醒");
                     informUserAddBo.setGoodsId(bo.getGoodsId());
-                    informUserAddBo.setText("尊敬的用户：你已完成本课程的所有学时学习，经机构审核通过，需注册中心复审后即可获得继续教育学时，审核时间约15个工作日。");
+                    informUserAddBo.setText("尊敬的用户：你已完成本课程的所有学时机构审核通过。");
                     iInformUserService.insertByAddBo(informUserAddBo);
                     UserVo userVo = iUserService.queryById(bo.getUserId());
                     Map<String, Object> param = new HashMap<>();
@@ -324,5 +324,5 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
                 }
             }
         }
-    }*/
+    }
 }

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

@@ -114,8 +114,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="majorId != null and majorId != ''">
             AND g.major_id = #{majorId}
         </if>
-        <if test="orderStatus != null">
-            AND o.order_status = #{orderStatus}
+        <if test="orderStatus != null and orderStatus.size()!=0 ">
+            AND o.order_status in
+            <foreach collection="orderStatus" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="status != null and status.size()!=0 ">
+            AND o.status in
+            <foreach collection="status" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
         </if>
         <if test="startTime != null">
             AND o.create_time >= #{startTime}
@@ -135,9 +144,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="userId != null">
             AND u.user_id = #{userId}
         </if>
-        <if test="status != null">
-            AND o.status = #{status}
-        </if>
         ORDER BY o.order_id DESC
     </select>
 
@@ -162,13 +168,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="userId != null">
             AND o.user_id = #{userId}
         </if>
-        <if test="orderStatus != null and orderStatus.size()!=0 ">
+        <if test="orderStatus != null">
             AND o.order_status in
             <foreach collection="orderStatus" item="item" index="index" open="(" close=")" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="status != null and status.size()!=0 ">
+        <if test="status != null">
             AND o.status in
             <foreach collection="status" item="item" index="index" open="(" close=")" separator=",">
                 #{item}
@@ -177,9 +183,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="startTime != null">
             AND o.create_time >= #{startTime}
         </if>
-        <if test="status != null">
-            AND o.status = #{status}
-        </if>
         ORDER BY o.order_id DESC
     </select>