fix 学时推送

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/TokenService.java

@@ -85,6 +85,7 @@ public class TokenService
         String token = getToken(request);
         if (Validator.isNotEmpty(token))
         {
+            System.out.println(token+"令牌");
             String uuid = "";
             Claims claims = parseToken(token);
             // 解析对应的权限以及用户信息

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/bo/UserProfileAddBo.java

@@ -66,4 +66,8 @@ public class UserProfileAddBo {
     /**  1 为资料审核  2为盖章审核 */
     @ApiModelProperty(" 1 为资料审核  2为盖章审核")
     private Integer typeStatus;
+
+    /** 订单商品ID */
+    @ApiModelProperty("订单商品ID")
+    private Long orderGoodsId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/bo/UserProfileEditBo.java

@@ -73,4 +73,7 @@ public class UserProfileEditBo {
     @ApiModelProperty(" 1 为资料审核  2为盖章审核")
     private Integer typeStatus;
 
+    /** 订单商品ID */
+    @ApiModelProperty("订单商品ID")
+    private Long orderGoodsId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/bo/UserProfileQueryBo.java

@@ -114,4 +114,8 @@ public class UserProfileQueryBo extends BaseEntity implements Serializable {
 
 	@ApiModelProperty("查询结束时间")
 	private Long searchEndTime;
+
+	/** 订单商品ID */
+	@ApiModelProperty("订单商品ID")
+	private Long orderGoodsId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/vo/UserProfileVo.java

@@ -110,4 +110,6 @@ public class UserProfileVo {
 
 	/**  1 为资料审核  2为盖章审核 */
 	private Integer typeStatus;
+	/** 订单商品ID */
+	private Long orderGoodsId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/vo/OrderListVo.java

@@ -167,4 +167,6 @@ public class OrderListVo {
 	@Excel(name = "0 非复购 1复购 针对业务层次配了【下单前需要  选择班级")
 	@ApiModelProperty("0 非复购 1复购 针对业务层次配了【下单前需要  选择班级")
 	private Integer rebuy;
+	@ApiModelProperty("是否学时推送 0未推送 1推送")
+	private Integer periodPlush;
 }

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

@@ -70,6 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="refundStatus" column="refund_status"/>
         <result property="payStatus" column="pay_status"/>
         <result property="orderGoodsId" column="order_goods_id"/>
+        <result property="periodPlush" column="period_plush"/>
     </resultMap>
 
     <select id="selectList" parameterType="com.zhongzheng.modules.order.bo.OrderQueryBo" resultMap="OrderResultVo">
@@ -95,7 +96,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             m.category_name,
             og.goods_received,
             og.refund_status,
-            og.pay_status
+            og.pay_status,
+            cgu.period_plush
         FROM
             `order` o
                 LEFT JOIN order_goods og ON o.order_sn = og.order_sn
@@ -106,6 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 LEFT JOIN course_business cb ON g.business_id = cb.id
                 LEFT JOIN school s ON s.id = g.school_id
                 LEFT JOIN major m ON g.major_id = m.id
+                LEFT JOIN class_grade_user cgu ON cgu.grade_id = og.grade_id
         WHERE 1=1
 
         <if test="educationTypeId != null and educationTypeId != ''">