学习计划

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/vo/GoodsPeriodVo.java

@@ -42,7 +42,7 @@ public class GoodsPeriodVo {
 	private Long periodStatus;
 
 	/** 重修节数目 */
-	@Excel(name = "重修节数目")
-	@ApiModelProperty("重修节数目")
+	@Excel(name = "需要重修节数目")
+	@ApiModelProperty("需要重修节数目")
 	private Long rebuild;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserSubscribeServiceImpl.java

@@ -103,6 +103,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
             update.setRemark(bo.getRemark());
             update.setBeforeId(bo.getBeforeId());
             update.setBeforeStatus(bo.getBeforeStatus());
+            update.setUpdateTime(DateUtils.getNowTime());
             boolean b = this.updateById(update);
         }
         return true;

zhongzheng-system/src/main/resources/mapper/modules/course/CourseMapper.xml

@@ -197,6 +197,21 @@
     </select>
 
     <select id="listGoodsPeriodVo" parameterType="com.zhongzheng.modules.user.bo.UserPlanQueryBo"  resultMap="GoodsPeriodVo">
-
+        SELECT
+            g.goods_id,
+            g.`year`,
+            g.goods_name,
+            (SELECT COUNT(1) FROM user_period up LEFT JOIN user_period_status ups on up.id = ups.period_id where up.goods_id = g.goods_id AND ups.period_status =1 and ups.`status` =0) as rebuild
+        FROM
+            goods g
+                LEFT JOIN order_goods og ON g.goods_id = og.goods_id
+                LEFT JOIN `order` o ON o.order_sn = og.order_sn
+        WHERE
+            1 =1
+          and o.user_id = #{userId}
+          AND og.refund_status in (0,3)
+          and og.`status`= 1
+          and og.pay_status in(2,3)
+          and g.goods_type =1
     </select>
 </mapper>