fix 免费商品

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

@@ -45,4 +45,7 @@ public class GoodsPeriodStatusVo {
 	@ApiModelProperty("拍照详情")
 	private List<UserStudyRecordPhotoVo> userStudyRecordPhoto;
 
+	@ApiModelProperty("审核原因")
+	private String auditReason;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderQueryBo.java

@@ -103,7 +103,7 @@ public class OrderQueryBo extends BaseEntity {
 	private Long endTime;
 
 
-	@ApiModelProperty("支付状态 1未收费 2部分收费 3完全收费")
+	@ApiModelProperty("支付状态 0未收费，1部分付款  2完全付款 3免费")
 	private Integer payStatus;
 	@ApiModelProperty("退款状态 0无  1退款中 2已退款 3拒绝退款")
 	private Integer refundStatus;
@@ -125,4 +125,7 @@ public class OrderQueryBo extends BaseEntity {
 	private List<Long> orderGoodsIds;
 
 	private List<Integer> orderFroms;
+
+	@ApiModelProperty("支付状态 1未收费 2部分收费 3完全收费 4免费 (退款状态保持不变)")
+	private Integer goodsPayStatus;
 }

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

@@ -84,7 +84,7 @@ public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGo
             vo.setOrderGoodsStatus(2);
         } else if (vo.getOrderStatus() < 0) {
             vo.setOrderGoodsStatus(-1);
-        } else if (vo.getPayStatus() == 0) {
+        } else if (vo.getPayStatus() == 1) {
             vo.setOrderGoodsStatus(0);
         } else if (vo.getPayStatus() > 1) {
             vo.setOrderGoodsStatus(1);

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

@@ -149,7 +149,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                 vo.setOrderGoodsStatus(2);
             } else if (vo.getOrderStatus() < 0) {
                 vo.setOrderGoodsStatus(-1);
-            } else if (vo.getGoodsPayStatus() == 0) {
+            } else if (vo.getGoodsPayStatus() == 1) {
                 vo.setOrderGoodsStatus(0);
             } else if (vo.getGoodsPayStatus() > 1) {
                 vo.setOrderGoodsStatus(1);

zhongzheng-system/src/main/resources/mapper/modules/bank/QuestionMapper.xml

@@ -284,7 +284,7 @@
           AND g.goods_type = 2
           AND o.user_id=#{userId}
           AND og.`status` =1
-          and og.pay_status in (2,3)
+          and og.pay_status in (2,3,4)
           AND og.refund_status in (0,3,1)
         ORDER BY og.create_time DESC
     </select>

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

@@ -112,6 +112,7 @@
         <result property="name" column="name"/>
         <result property="periodId" column="period_id"/>
         <result property="sectionType" column="section_type"/>
+        <result property="auditReason" column="audit_reason"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.goods.vo.GoodsUserVo" id="GoodsUserVo">
@@ -408,7 +409,7 @@
             (case WHEN (SELECT COUNT(1) FROM exam_before_goods ebg LEFT JOIN exam_before eb on ebg.before_id = eb.before_id where ebg.goods_id = cgg.goods_id and eb.`status` = 1 and unix_timestamp(now()) BETWEEN eb.before_start_time and eb.before_end_time) >0 then 1 ELSE 0 end) as before_status,
             (SELECT ea.apply_name FROM exam_apply_goods eag LEFT JOIN exam_apply ea on eag.apply_id = ea.apply_id where eag.goods_id = cgg.goods_id and ea.`status` = 1 and unix_timestamp(now()) BETWEEN ea.apply_start_time and ea.apply_end_time) as apply_name,
             (SELECT eb.before_name FROM exam_before_goods ebg LEFT JOIN exam_before eb on ebg.before_id = eb.before_id where ebg.goods_id = cgg.goods_id and eb.`status` = 1 and unix_timestamp(now()) BETWEEN eb.before_start_time and eb.before_end_time) as before_name,
-            (SELECT og.order_goods_id FROM order_goods og LEFT JOIN `order` o ON og.order_sn = o.order_sn WHERE og.grade_id = cgu.grade_id AND o.user_id = #{userId} AND og.refund_status != 2 AND og.pay_status IN (2,3)) as order_goods_id
+            (SELECT og.order_goods_id FROM order_goods og LEFT JOIN `order` o ON og.order_sn = o.order_sn WHERE og.grade_id = cgu.grade_id AND o.user_id = #{userId} AND og.refund_status != 2 AND og.pay_status IN (2,3,4)) as order_goods_id
         FROM
             class_grade_user cgu
                 LEFT JOIN class_grade_goods cgg ON cgu.grade_id = cgg.grade_id
@@ -429,7 +430,8 @@
             ups.period_id,
             cs.`name`,
             1 as type,
-               cs.section_type as section_type
+               cs.section_type as section_type,
+               ups.audit_reason
         FROM
             user_period up
                 LEFT JOIN user_period_status ups ON up.id = ups.period_id
@@ -447,7 +449,8 @@
             ups.period_id,
             exam_name as name,
             2 as type,
-               0 as  section_type
+               0 as  section_type,
+            ups.audit_reason
         FROM
             user_period up
                 LEFT JOIN user_period_status ups ON up.id = ups.period_id
@@ -502,7 +505,7 @@
         where 1=1
         AND og.`status` = 1
         AND og.refund_status in (0,1,3)
-        AND og.pay_status in (2,3)
+        AND og.pay_status in (2,3,4)
         AND g.goods_type =1
         <if test="pageNum == null">
             and (SELECT count(*) from class_grade cg where (cg.class_end_time >  unix_timestamp(now()) or ISNULL(cg.class_end_time)) and cg.grade_id = og.grade_id ) >0

zhongzheng-system/src/main/resources/mapper/modules/exam/ExamNumberMapper.xml

@@ -102,7 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where en.`status` = 1
         and og.`status` = 1
         and og.refund_status in (0,1,3)
-        and og.pay_status in (2,3)
+        and og.pay_status in (2,3,4)
         and (SELECT COUNT(1) FROM user_exam_goods_supplement uegs LEFT JOIN user_exam_goods ueg on ueg.user_exam_goods_id = uegs.user_exam_goods_id where uegs.goods_id = eng.goods_id and ueg.user_id = od.user_id) < 1
     </select>
 
@@ -119,7 +119,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where en.`status` = 1
           and og.`status` = 1
           and og.refund_status in (0,1,3)
-          and og.pay_status in (2,3)
+          and og.pay_status in (2,3,4)
           and (SELECT COUNT(1) FROM user_exam_goods_supplement uegs LEFT JOIN user_exam_goods ueg on ueg.user_exam_goods_id = uegs.user_exam_goods_id where uegs.goods_id = eng.goods_id and ueg.user_id = od.user_id and (uegs.exam_number != en.exam_number or uegs.do_number != en.do_number)) > 0
     </select>
 

zhongzheng-system/src/main/resources/mapper/modules/inform/InformMapper.xml

@@ -132,7 +132,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE
             og.refund_status in (0,3)
           and og.status =1
-          and og.pay_status in (2,3)
+          and og.pay_status in (2,3,4)
           AND o.user_id =#{userId}
           AND og.goods_id = #{goodsId}
     </select>

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

@@ -159,7 +159,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND #{endTime} >= o.create_time
         </if>
         <if test="payStatus != null">
-            AND og.pay_status = #{payStatus}
+            AND o.pay_status = #{payStatus}
+        </if>
+        <if test="goodsPayStatus != null">
+            AND og.pay_status = #{goodsPayStatus}
         </if>
         <if test="refundStatus != null">
             AND og.refund_status = #{refundStatus}
@@ -169,7 +172,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
         <if test="userId != null">
             AND u.user_id = #{userId}
-            AND og.pay_status in (2,3)
+            AND og.pay_status in (2,3,4)
         </if>
         <if test="inputOrderSn != null">
             AND o.input_order_sn = #{inputOrderSn}

zhongzheng-system/src/main/resources/mapper/modules/user/UserMapper.xml

@@ -156,7 +156,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             LEFT JOIN goods g ON og.goods_id = g.goods_id
             WHERE o.`status` = 1
             AND og.refund_status in (0,1,3)
-            AND og.pay_status in (2,3)
+            AND og.pay_status in (2,3,4)
             GROUP BY
             o.user_id
             ) ou ON u.user_id = ou.user_id