fix 学时

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsAddBo.java

@@ -97,7 +97,7 @@ public class GoodsAddBo {
     private String coverUrl;
     /** 学时 */
     @ApiModelProperty("学时")
-    private Integer classHours;
+    private BigDecimal classHours;
     /** 标准价格详情json */
     @ApiModelProperty("标准价格详情json")
     private String standPriceJson;

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsBankAddBo.java

@@ -94,7 +94,7 @@ public class GoodsBankAddBo {
     private String coverUrl;
     /** 学时 */
     @ApiModelProperty("学时")
-    private Integer classHours;
+    private BigDecimal classHours;
     /** 标准价格详情json */
     @ApiModelProperty("标准价格详情json")
     private String standPriceJson;

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsBankEditBo.java

@@ -119,7 +119,7 @@ public class GoodsBankEditBo {
 
     /** 学时 */
     @ApiModelProperty("学时")
-    private Integer classHours;
+    private BigDecimal classHours;
 
     /** 标准价格详情json */
     @ApiModelProperty("标准价格详情json")

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsEditBo.java

@@ -123,7 +123,7 @@ public class GoodsEditBo {
 
     /** 学时 */
     @ApiModelProperty("学时")
-    private Integer classHours;
+    private BigDecimal classHours;
 
     /** 标准价格详情json */
     @ApiModelProperty("标准价格详情json")

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsQueryBo.java

@@ -115,7 +115,7 @@ GoodsQueryBo extends BaseEntity {
 	private String coverUrl;
 	/** 学时 */
 	@ApiModelProperty("学时")
-	private Integer classHours;
+	private BigDecimal classHours;
 
 	/** 商品ID */
 	@ApiModelProperty("商品ID")

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/domain/Goods.java

@@ -79,7 +79,7 @@ private static final long serialVersionUID=1L;
     /** 封面地址 */
     private String coverUrl;
     /** 学时 */
-    private Integer classHours;
+    private BigDecimal classHours;
     /** 标准价格详情json */
     private String standPriceJson;
     /** 编码 */

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

@@ -119,7 +119,7 @@ public class GoodsUserQuestionVo {
 	/** 学时 */
 	@Excel(name = "学时")
 	@ApiModelProperty("学时")
-	private Integer classHours;
+	private BigDecimal classHours;
 	/** 标准价格详情json */
 	@Excel(name = "标准价格详情json")
 	@ApiModelProperty("标准价格详情json")

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

@@ -127,7 +127,7 @@ public class GoodsUserVo {
 	/** 学时 */
 	@Excel(name = "学时")
 	@ApiModelProperty("学时")
-	private Integer classHours;
+	private BigDecimal classHours;
 	/** 标准价格详情json */
 	@Excel(name = "标准价格详情json")
 	@ApiModelProperty("标准价格详情json")

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

@@ -128,7 +128,7 @@ public class GoodsVo {
 	/** 学时 */
 	@Excel(name = "学时")
 	@ApiModelProperty("学时")
-	private Integer classHours;
+	private BigDecimal classHours;
 	/** 标准价格详情json */
 	@Excel(name = "标准价格详情json")
 	@ApiModelProperty("标准价格详情json")

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassGradeStudentVo.java

@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 
@@ -71,7 +72,7 @@ public class ClassGradeStudentVo {
 
 	/** 学时 */
 	@ApiModelProperty("学时")
-	private Long classHours;
+	private BigDecimal classHours;
 
 	/** 推送次数 */
 	@ApiModelProperty("推送次数")

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassPeriodChapterVo.java

@@ -48,7 +48,7 @@ public class ClassPeriodChapterVo implements Comparable<ClassPeriodChapterVo> {
 	/** 学时 */
 	@Excel(name = "学时")
 	@ApiModelProperty("学时")
-	private Long classHours;
+	private BigDecimal classHours;
 
 
 	/** 学习开始时间 */

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassPeriodSectionVo.java

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 
@@ -63,7 +64,7 @@ public class ClassPeriodSectionVo implements Comparable<ClassPeriodSectionVo> {
 	/** 学时 */
 	@Excel(name = "学时")
 	@ApiModelProperty("学时")
-	private Long classHours;
+	private BigDecimal classHours;
 
 
 	/** 学习开始时间 */

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassPeriodStudentExportAllVo.java

@@ -52,7 +52,7 @@ public class ClassPeriodStudentExportAllVo {
 	/** 学时 */
 	@Excel(name = "学时")
 	@ApiModelProperty("学时")
-	private Long classHours;
+	private BigDecimal classHours;
 	@Excel(name = "服务有效期")
 	private String studyTimeStr;
 	@Excel(name = "所在班级")

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassPeriodStudentExportVo.java

@@ -53,7 +53,7 @@ public class ClassPeriodStudentExportVo {
 	/** 学时 */
 	@Excel(name = "学时")
 	@ApiModelProperty("学时")
-	private Long classHours;
+	private BigDecimal classHours;
 	@Excel(name = "服务有效期")
 	private String studyTimeStr;
 	@Excel(name = "所在班级")

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassPeriodStudentVo.java

@@ -69,7 +69,7 @@ public class ClassPeriodStudentVo {
 
 	/** 学时 */
 	@ApiModelProperty("学时")
-	private Long classHours;
+	private BigDecimal classHours;
 
 	/** 学时审批状态 0 未通过 1通过 */
 	@ApiModelProperty("学时审批状态 0 未通过 1通过 2待审核 -1 不可审核")

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassPeriodVo.java

@@ -74,7 +74,7 @@ public class ClassPeriodVo implements Comparable<ClassPeriodVo> {
 	/** 学时 */
 	@Excel(name = "学时")
 	@ApiModelProperty("学时")
-	private Long classHours;
+	private BigDecimal classHours;
 
 
 	/** 学习开始时间 */

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

@@ -210,9 +210,12 @@ public class OrderGoodsRefundServiceImpl extends ServiceImpl<OrderGoodsRefundMap
             if(orderGoods.getPayStatus()!=3&&orderGoods.getPayStatus()!=2){
                 throw new CustomException("订单商品尚未收费");
             }
-            if(orderGoods.getRefundStatus()!=0){
+            if(orderGoods.getRefundStatus()==1){
                 throw new CustomException("订单商品目前正在退款中");
             }
+            if(orderGoods.getRefundStatus()==2){
+                throw new CustomException("订单商品已退款");
+            }
             //订单商品
             Order order = iOrderService.getOne(new LambdaQueryWrapper<Order>().eq(Order::getOrderSn,bo.getOrderSn()));
             if(order.getStatus()==0){

zhongzheng-system/src/main/java/com/zhongzheng/modules/schedule/service/impl/ScheduleServiceImpl.java

@@ -549,7 +549,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
         bo.setOrderStatus(status);
         List<OrderListVo> list = iOrderService.selectListApp(bo);
         for (OrderListVo orderVo : list) {
-            if(orderVo.getCreateTime().longValue()<(new Long(DateUtils.getNowTime()-(24*3600))).longValue()){
+            if(orderVo.getCreateTime().longValue()<(new Long(DateUtils.getNowTime()-(120))).longValue()){ //24*3600
                 //超过24小时
                 Order order = new Order();
                 order.setOrderId(orderVo.getOrderId());

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserCertificateAddBo.java

@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+
+import java.math.BigDecimal;
 import java.util.Date;
 
 
@@ -47,7 +49,7 @@ public class UserCertificateAddBo {
     private Long trainEndTime;
     /** 学时 */
     @ApiModelProperty("学时")
-    private Integer classHours;
+    private BigDecimal classHours;
     /** 证书图片地址 */
     @ApiModelProperty("证书图片地址")
     private String certificatePath;

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserCertificateEditBo.java

@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+
+import java.math.BigDecimal;
 import java.util.Date;
 
 
@@ -56,7 +58,7 @@ public class UserCertificateEditBo {
 
     /** 学时 */
     @ApiModelProperty("学时")
-    private Integer classHours;
+    private BigDecimal classHours;
     /** 证书图片地址 */
     @ApiModelProperty("证书图片地址")
     private String certificatePath;

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserCertificateQueryBo.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.Map;
 import java.util.HashMap;
@@ -59,7 +60,7 @@ public class UserCertificateQueryBo extends BaseEntity {
 	private Long trainEndTime;
 	/** 学时 */
 	@ApiModelProperty("学时")
-	private Integer classHours;
+	private BigDecimal classHours;
 	/** 证书图片地址 */
 	@ApiModelProperty("证书图片地址")
 	private String certificatePath;

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/domain/UserCertificate.java

@@ -47,7 +47,7 @@ private static final long serialVersionUID=1L;
     /** 培训结束时间 */
     private Long trainEndTime;
     /** 学时 */
-    private Integer classHours;
+    private BigDecimal classHours;
     /** 证书图片地址 */
     private String certificatePath;
     /** 教育类型id */

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/ExamStudyRecordVo.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -43,7 +44,7 @@ public class ExamStudyRecordVo {
 
     /** 学时 */
     @ApiModelProperty("学时")
-    private Long classHours;
+    private BigDecimal classHours;
 
     /** 学习有效期开始 */
     @ApiModelProperty("学习有效期开始")

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/GoodsStudyRecordVo.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -46,7 +47,7 @@ public class GoodsStudyRecordVo {
 
     /** 学时 */
     @ApiModelProperty("学时")
-    private Long classHours;
+    private BigDecimal classHours;
 
     /** 学习有效期开始 */
     @ApiModelProperty("学习有效期开始")

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserCertificateVo.java

@@ -6,6 +6,8 @@ import com.zhongzheng.modules.course.vo.CourseChapterVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -56,7 +58,7 @@ public class UserCertificateVo {
 	/** 学时 */
 	@Excel(name = "学时")
 	@ApiModelProperty("学时")
-	private Integer classHours;
+	private BigDecimal classHours;
 	/** 证书图片地址 */
 	@Excel(name = "证书图片地址")
 	@ApiModelProperty("证书图片地址")