关闭考试次数同步

zhongzheng-admin/src/main/java/com/zhongzheng/controller/order/OrderController.java

@@ -134,8 +134,8 @@ public class OrderController extends BaseController {
     @ApiOperation("导出错误录入订单")
     @PreAuthorize("@ss.hasPermi('system:profile:export')")
     @Log(title = "导出错误录入订单", businessType = BusinessType.EXPORT)
-    @GetMapping("/exportWrongInputOrder")
-    public AjaxResult<Map<String,Object>> exportWrongInputOrder(List<OrderInputWrongImportBo> bo) {
+    @PostMapping("/exportWrongInputOrder")
+    public AjaxResult<Map<String,Object>> exportWrongInputOrder(@RequestBody List<OrderInputWrongImportBo> bo) {
         Map<String,Object> map = new HashMap<>();
         String timeStr= LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
         ExcelUtil<OrderInputWrongImportBo> util = new ExcelUtil<OrderInputWrongImportBo>(OrderInputWrongImportBo.class);

zhongzheng-system/src/main/java/com/zhongzheng/modules/collect/service/impl/CollectQuestionServiceImpl.java

@@ -120,6 +120,9 @@ public class CollectQuestionServiceImpl extends ServiceImpl<CollectQuestionMappe
 
     @Override
     public Boolean insertByAddBo(CollectQuestionAddBo bo) {
+        if(Validator.isEmpty(bo.getOrderGoodsId())){
+            throw new CustomException("缺失订单商品ID");
+        }
         CollectQuestion add = BeanUtil.toBean(bo, CollectQuestion.class);
         validEntityBeforeSave(add);
         add.setCreateTime(DateUtils.getNowTime());

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/service/impl/ExamNumberServiceImpl.java

@@ -130,8 +130,8 @@ public class ExamNumberServiceImpl extends ServiceImpl<ExamNumberMapper, ExamNum
             examNumberGoodsService.insertByAddBo(examNumberGoodsAddBo);
         }
         if(Validator.isNotEmpty(bo.getGoodsId())){
-            //修改已卖出去商品次数
-            long addExamNumber = bo.getExamNumber().longValue();
+            //修改已卖出去商品次数,第6版本调整不需要同步购买前的数据
+          /*  long addExamNumber = bo.getExamNumber().longValue();
             long addDoNumber = bo.getDoNumber().longValue();
             ExamNumberQueryBo queryBo = new ExamNumberQueryBo();
             queryBo.setGoodsIds(bo.getGoodsId());
@@ -145,7 +145,7 @@ public class ExamNumberServiceImpl extends ServiceImpl<ExamNumberMapper, ExamNum
                     objectLambdaUpdateWrapper.set(UserExamGoods::getUpdateTime,DateUtils.getNowTime());
                     iUserExamGoodsService.update(null, objectLambdaUpdateWrapper);
                 }
-            }
+            }*/
         }
         return save;
     }
@@ -211,8 +211,8 @@ public class ExamNumberServiceImpl extends ServiceImpl<ExamNumberMapper, ExamNum
                 examNumberGoodsAddBo.setUpdateTime(DateUtils.getNowTime());
                 examNumberGoodsService.insertByAddBo(examNumberGoodsAddBo);
             }
-            //修改已卖出去商品次数
-            long addExamNumber = bo.getExamNumber().longValue() - info.getExamNumber().longValue();
+            //修改已卖出去商品次数,第6版本调整不需要同步购买前的数据
+           /* long addExamNumber = bo.getExamNumber().longValue() - info.getExamNumber().longValue();
             long addDoNumber = bo.getDoNumber().longValue() - info.getDoNumber().longValue();
             ExamNumberQueryBo queryBo = new ExamNumberQueryBo();
             queryBo.setGoodsIds(bo.getGoodsId());
@@ -226,7 +226,7 @@ public class ExamNumberServiceImpl extends ServiceImpl<ExamNumberMapper, ExamNum
                     objectLambdaUpdateWrapper.set(UserExamGoods::getUpdateTime,DateUtils.getNowTime());
                     iUserExamGoodsService.update(null, objectLambdaUpdateWrapper);
                 }
-            }
+            }*/
         }
 
         LambdaQueryWrapper<ExamNumberGoods> example = Wrappers.lambdaQuery();

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderInputWrongImportBo.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;
 
 
@@ -30,9 +31,30 @@ public class OrderInputWrongImportBo {
     @ApiModelProperty("科目名称")
     private String subjectName;
 
-    @Excel(name = "商品列表")
+  /*  @Excel(name = "商品列表")
     @ApiModelProperty("商品列表")
-    private List<OrderInputGoodsImportBo> goodsList;
+    private List<OrderInputGoodsImportBo> goodsList;*/
+
+
+
+    @Excel(name = "商品名称")
+    @ApiModelProperty("商品名称")
+    private String goodsName;
+
+    /** 商品标准价格 */
+    @Excel(name = "商品标准价格")
+    @ApiModelProperty("商品标准价格")
+    private BigDecimal goodsPrice;
+
+    /** 商品成交价格 */
+    @Excel(name = "商品成交价格")
+    @ApiModelProperty("商品成交价格")
+    private BigDecimal goodsRealPrice;
+
+    /** 已收金额 */
+    @Excel(name = "已收金额")
+    @ApiModelProperty("已收金额")
+    private BigDecimal goodsReceived;
 
     @Excel(name = "失败原因")
     private String cause;

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

@@ -1,7 +1,9 @@
 package com.zhongzheng.modules.user.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.modules.collect.domain.CollectBank;
 import com.zhongzheng.modules.collect.domain.CollectQuestion;
@@ -117,6 +119,7 @@ public class UserExamRecordServiceImpl extends ServiceImpl<UserExamRecordMapper,
         lqw.eq(bo.getUserId() != null, UserExamRecord::getUserId, bo.getUserId());
         lqw.eq(bo.getStatus() != null, UserExamRecord::getStatus, bo.getStatus());
         lqw.eq(bo.getGoodsId() != null, UserExamRecord::getGoodsId, bo.getGoodsId());
+        lqw.eq(bo.getOrderGoodsId() != null, UserExamRecord::getOrderGoodsId, bo.getOrderGoodsId());
         return this.count(lqw);
     }
 
@@ -157,6 +160,9 @@ public class UserExamRecordServiceImpl extends ServiceImpl<UserExamRecordMapper,
 
     @Override
     public Long insertByAddBo(UserExamRecordAddBo bo) {
+        if(Validator.isEmpty(bo.getOrderGoodsId())){
+            throw new CustomException("缺失订单商品ID");
+        }
         UserExamRecord add = BeanUtil.toBean(bo, UserExamRecord.class);
         validEntityBeforeSave(add);
         add.setCreateTime(DateUtils.getNowTime());

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

@@ -1,6 +1,7 @@
 package com.zhongzheng.modules.user.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
 import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.DateUtils;
@@ -106,6 +107,9 @@ public class UserExamWrongRecordServiceImpl extends ServiceImpl<UserExamWrongRec
         if(bo.getQuestionIds()==null||bo.getQuestionIds().size()==0){
             throw new CustomException("题目数组错误");
         }
+        if(Validator.isEmpty(bo.getOrderGoodsId())){
+            throw new CustomException("缺失订单商品ID");
+        }
         boolean result = false;
         for (Long questionId : bo.getQuestionIds()) {
             UserExamWrongRecord add = BeanUtil.toBean(bo, UserExamWrongRecord.class);