新增校验

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/VideoLessonPurchaseRecordDao.java

@@ -2,6 +2,7 @@ package com.yonge.cooleshow.biz.dal.dao;
 
 import com.yonge.cooleshow.biz.dal.entity.VideoLessonPurchaseRecord;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -19,5 +20,5 @@ public interface VideoLessonPurchaseRecordDao extends BaseMapper<VideoLessonPurc
     Long selectTeacherByDetail(Long videoId);
 
     //修改订单状态
-    void updateStatus(String orderNo);
+    void updateStatus(@Param("orderNo") String orderNo,@Param("status") String status);
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/VideoLessonPurchaseRecord.java

@@ -6,9 +6,9 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 视频课购买记录表
@@ -52,90 +52,78 @@ public class VideoLessonPurchaseRecord extends BaseEntity {
     private String orderNo;
 
     @TableField("order_status_")
-    @ApiModelProperty(value = "订单状态(1:已完成;0:取消/支付中)")
-    private Integer orderStatus;
+    @ApiModelProperty(value = "订单状态(WAIT_PAY待支付,PAYING支付中,PAID已付款,CLOSE已关闭,FAIL支付失败)")
+    private String orderStatus;
 
-	public BigDecimal getOriginalPrice() {
-		return originalPrice;
+	public Long getId() {
+		return id;
 	}
 
-	public void setOriginalPrice(BigDecimal originalPrice) {
-		this.originalPrice = originalPrice;
+	public void setId(Long id) {
+		this.id = id;
 	}
 
-	public BigDecimal getExpectPrice() {
-		return expectPrice;
-	}
-
-	public void setExpectPrice(BigDecimal expectPrice) {
-		this.expectPrice = expectPrice;
+	public Long getVideoLessonGroupId() {
+		return videoLessonGroupId;
 	}
 
-	public VideoLessonPurchaseRecord setId(Long id) {
-	    this.id = id;
-	    return this;
+	public void setVideoLessonGroupId(Long videoLessonGroupId) {
+		this.videoLessonGroupId = videoLessonGroupId;
 	}
 
-	public Long getId() {
-	    return this.id;
+	public Long getStudentId() {
+		return studentId;
 	}
 
-	public VideoLessonPurchaseRecord setVideoLessonGroupId(Long videoLessonGroupId) {
-	    this.videoLessonGroupId = videoLessonGroupId;
-	    return this;
+	public void setStudentId(Long studentId) {
+		this.studentId = studentId;
 	}
 
-	public Long getVideoLessonGroupId() {
-	    return this.videoLessonGroupId;
+	public Date getPurchaseTime() {
+		return purchaseTime;
 	}
 
-	public VideoLessonPurchaseRecord setStudentId(Long studentId) {
-	    this.studentId = studentId;
-	    return this;
+	public void setPurchaseTime(Date purchaseTime) {
+		this.purchaseTime = purchaseTime;
 	}
 
-	public Long getStudentId() {
-	    return this.studentId;
+	public BigDecimal getOriginalPrice() {
+		return originalPrice;
 	}
 
-	public VideoLessonPurchaseRecord setPurchaseTime(java.util.Date purchaseTime) {
-	    this.purchaseTime = purchaseTime;
-	    return this;
+	public void setOriginalPrice(BigDecimal originalPrice) {
+		this.originalPrice = originalPrice;
 	}
 
-	public java.util.Date getPurchaseTime() {
-	    return this.purchaseTime;
+	public BigDecimal getExpectPrice() {
+		return expectPrice;
 	}
 
-	public VideoLessonPurchaseRecord setPayMoney(java.math.BigDecimal payMoney) {
-	    this.payMoney = payMoney;
-	    return this;
+	public void setExpectPrice(BigDecimal expectPrice) {
+		this.expectPrice = expectPrice;
 	}
 
-	public java.math.BigDecimal getPayMoney() {
-	    return this.payMoney;
+	public BigDecimal getPayMoney() {
+		return payMoney;
 	}
 
-	public VideoLessonPurchaseRecord setOrderNo(String orderNo) {
-	    this.orderNo = orderNo;
-	    return this;
+	public void setPayMoney(BigDecimal payMoney) {
+		this.payMoney = payMoney;
 	}
 
 	public String getOrderNo() {
-	    return this.orderNo;
+		return orderNo;
 	}
 
-	public VideoLessonPurchaseRecord setOrderStatus(Integer orderStatus) {
-	    this.orderStatus = orderStatus;
-	    return this;
+	public void setOrderNo(String orderNo) {
+		this.orderNo = orderNo;
 	}
 
-	public Integer getOrderStatus() {
-	    return this.orderStatus;
+	public String getOrderStatus() {
+		return orderStatus;
 	}
 
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this);
-    }
+	public void setOrderStatus(String orderStatus) {
+		this.orderStatus = orderStatus;
+	}
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/VideoLessonPurchaseRecordServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.yonge.cooleshow.biz.dal.dao.UserOrderDao;
 import com.yonge.cooleshow.biz.dal.dao.VideoLessonGroupDao;
 import com.yonge.cooleshow.biz.dal.dto.UserAccountRecordDto;
 import com.yonge.cooleshow.biz.dal.dto.req.OrderReq;
@@ -13,6 +14,7 @@ import com.yonge.cooleshow.biz.dal.dao.VideoLessonPurchaseRecordDao;
 import com.yonge.cooleshow.biz.dal.enums.AccountBizTypeEnum;
 import com.yonge.cooleshow.biz.dal.enums.GoodTypeEnum;
 import com.yonge.cooleshow.biz.dal.enums.InOrOutEnum;
+import com.yonge.cooleshow.biz.dal.enums.OrderStatusEnum;
 import com.yonge.cooleshow.biz.dal.service.SysConfigService;
 import com.yonge.cooleshow.biz.dal.service.UserAccountService;
 import com.yonge.cooleshow.biz.dal.service.VideoLessonPurchaseRecordService;
@@ -55,6 +57,8 @@ public class VideoLessonPurchaseRecordServiceImpl extends ServiceImpl<VideoLesso
     private UserAccountService userAccountService;
     @Autowired
     private SysConfigService sysConfigService;
+    @Autowired
+    private UserOrderDao userOrderDao;
 
     public VideoLessonPurchaseRecordDao getDao() {
         return videoLessonPurchaseRecordDao;
@@ -94,7 +98,7 @@ public class VideoLessonPurchaseRecordServiceImpl extends ServiceImpl<VideoLesso
 
         purchaseRecord.setOrderNo(orderNo);
         purchaseRecord.setStudentId(studentId);
-        purchaseRecord.setOrderStatus(0);
+        purchaseRecord.setOrderStatus(OrderStatusEnum.WAIT_PAY.getCode());
         purchaseRecord.setOriginalPrice(lessonGroup.getLessonPrice());//原价
         purchaseRecord.setExpectPrice(lessonGroup.getLessonPrice());//预计价格
         videoLessonPurchaseRecordDao.insert(purchaseRecord);
@@ -130,8 +134,14 @@ public class VideoLessonPurchaseRecordServiceImpl extends ServiceImpl<VideoLesso
             throw new BizException("课程组购买记录不存在!");
         }
 
-        //支付状态改为1
-        videoLessonPurchaseRecordDao.updateStatus(orderNo);
+        //查询订单状态
+        UserOrder userOrder = userOrderDao.selectOne(Wrappers.<UserOrder>lambdaQuery()
+                .eq(UserOrder::getOrderNo, orderNo));
+        if (userOrder == null) {
+            throw new BizException("订单不存在!");
+        }
+        //修改支付状态
+        videoLessonPurchaseRecordDao.updateStatus(orderNo,userOrder.getStatus().getCode());
 
         //查询直播课服务费
         String videoServiceRateStr = sysConfigService.findConfigValue(SysConfigConstant.VIDEO_LESSON_SERVICE_FEE);
@@ -148,7 +158,7 @@ public class VideoLessonPurchaseRecordServiceImpl extends ServiceImpl<VideoLesso
         userAccountRecord.setTransAmount(payMoney.subtract(payMoney.multiply(liveServiceRate)).setScale(2, RoundingMode.HALF_UP));
         userAccountRecord.setInOrOut(InOrOutEnum.IN);
         userAccountRecord.setBizType(AccountBizTypeEnum.VIDEO);
-        userAccountRecord.setBizId(lessonGroup.getTeacherId());
+        userAccountRecord.setBizId(lessonGroup.getId());
         userAccountRecord.setBizName(lessonGroup.getLessonName());
         userAccountRecord.setOrderNo(orderNo);
         userAccountService.accountChange(userAccountRecord);

cooleshow-user/user-biz/src/main/resources/config/mybatis/VideoLessonPurchaseRecordMapper.xml

@@ -27,6 +27,6 @@
 		(SELECT video_lesson_group_id_ FROM video_lesson_group_detail WHERE id_=#{videoId})
 	</select>
 	<update id="updateStatus" parameterType="java.lang.String">
-		UPDATE video_lesson_purchase_record SET order_status_=1 WHERE order_no_=#{orderNo}
+		UPDATE video_lesson_purchase_record SET order_status_=#{status} WHERE order_no_=#{orderNo}
 	</update>
 </mapper>

toolset/thirdparty-component/src/main/java/com/yonge/toolset/thirdparty/storage/provider/KS3StoragePlugin.java

@@ -2,10 +2,10 @@ package com.yonge.toolset.thirdparty.storage.provider;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import com.alibaba.fastjson.JSON;
 import com.ksyun.ks3.dto.PostObjectFormFields;
 import com.yonge.toolset.thirdparty.entity.UploadSign;
 import org.apache.commons.io.FileUtils;
@@ -152,6 +152,9 @@ public class KS3StoragePlugin implements StoragePlugin, InitializingBean, Dispos
         Map<String, String> postData = uploadSign.getPostData();
         //无法确定值得表单项
         List<String> unknowValueField = uploadSign.getUnknowValueField();
+        if (unknowValueField==null){
+            unknowValueField=new ArrayList<>();
+        }
 
         Ks3ClientConfig config = new Ks3ClientConfig();
         // 设置域名