fix 导入

zhongzheng-api/src/main/java/com/zhongzheng/controller/order/OrderGoodsRefundController.java

@@ -3,11 +3,14 @@ package com.zhongzheng.controller.order;
 import java.util.List;
 import java.util.Arrays;
 
+import com.zhongzheng.common.utils.ServletUtils;
+import com.zhongzheng.framework.web.service.WxTokenService;
 import com.zhongzheng.modules.order.bo.OrderGoodsRefundAddBo;
 import com.zhongzheng.modules.order.bo.OrderGoodsRefundEditBo;
 import com.zhongzheng.modules.order.bo.OrderGoodsRefundQueryBo;
 import com.zhongzheng.modules.order.service.IOrderGoodsRefundService;
 import com.zhongzheng.modules.order.vo.OrderGoodsRefundVo;
+import com.zhongzheng.modules.user.entity.ClientLoginUser;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -41,6 +44,7 @@ import io.swagger.annotations.ApiOperation;
 public class OrderGoodsRefundController extends BaseController {
 
     private final IOrderGoodsRefundService iOrderGoodsRefundService;
+    private final WxTokenService wxTokenService;
 
 
     /**
@@ -51,6 +55,8 @@ public class OrderGoodsRefundController extends BaseController {
     @Log(title = "订单商品退款", businessType = BusinessType.INSERT)
     @PostMapping()
     public AjaxResult<Void> add(@RequestBody OrderGoodsRefundAddBo bo) {
+        ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setUserId(loginUser.getUser().getUserId());
         return toAjax(iOrderGoodsRefundService.insertByAddBo(bo) ? 1 : 0);
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/service/impl/QuestionServiceImpl.java

@@ -217,7 +217,7 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
         int i=10;
         for (QuestionImport question : questionList) {
             QuestionAddBo bo = new QuestionAddBo();
-            if(question.getKnowledge()!=null){
+            if(Validator.isNotEmpty(question.getKnowledge())){
                 List<String> knowledgeList = Arrays.asList(question.getKnowledge().split(","));
                 List<Long> kIdList = new ArrayList<>();
                 for (String knowledge : knowledgeList) {

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

@@ -19,9 +19,7 @@ import java.math.BigDecimal;
 @ApiModel("订单商品退款添加对象")
 public class OrderGoodsRefundAddBo {
 
-    /** 退款单号 */
-    @ApiModelProperty("退款单号")
-    private String refundSn;
+
     /** 用户ID */
     @ApiModelProperty("用户ID")
     private Long userId;
@@ -31,19 +29,7 @@ public class OrderGoodsRefundAddBo {
     /** 商品id */
     @ApiModelProperty("商品id")
     private Long goodsId;
-    /** 退款金额 */
-    @ApiModelProperty("退款金额")
-    private BigDecimal refundFee;
-    /** 添加时间 */
-    @ApiModelProperty("添加时间")
-    private Long createTime;
-    /** 修改时间 */
-    @ApiModelProperty("修改时间")
-    private Long updateTime;
-    /** 状态 1正常 0关闭 */
-    @ApiModelProperty("状态 1正常 0关闭")
-    private Integer status;
-    /** 微信退款单号 */
-    @ApiModelProperty("微信退款单号")
-    private String wxpayRefundId;
+
+
+
 }

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

@@ -334,6 +334,24 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
     @Override
     public boolean editCertificate(List<UserSubscribeCertificateEditBo> bo) {
         for (UserSubscribeCertificateEditBo userSubscribeCertificateEditBo : bo) {
+            /*UserSubscribe db = this.baseMapper.selectById(userSubscribeCertificateEditBo.getSubscribeId());
+            if(db.getExamStatus()!=1){
+                throw new IllegalArgumentException("请选择登记状态为正常的数据");
+            }
+            try{
+                Long times = db.getApplySiteExamTime()*1000;//时间戳
+                SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
+                String dateString = formatter.format(times);
+                String dateForma =null;
+                dateForma = dateString+" "+db.getApplySiteEndTime().replace("-", ":");
+                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+                Long time = sdf.parse(dateForma).getTime() / 1000;
+                if (System.currentTimeMillis()/1000 < time){
+                    throw new IllegalArgumentException("包含未结束考试的数据");
+                }
+            }catch (Exception e){
+
+            }*/
             UserSubscribe update = new UserSubscribe();
             update.setSubscribeId(userSubscribeCertificateEditBo.getSubscribeId());
             update.setPerformance(userSubscribeCertificateEditBo.getPerformance());