submit

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/common/CommonController.java

@@ -282,9 +282,9 @@ public class CommonController extends BaseController {
     @ApiOperation("获取订单商品信息")
     @PostMapping("/order/goods/list")
     public AjaxResult<TopOrderOrgVo> getOrderGoodsList(@RequestBody TopOldOrderQueryBo bo) {
-//        if(!ToolsUtils.checkSignFromOldSys(bo.getStamp().toString(),bo.getSign())){
-//            throw new CustomException("签名错误");
-//        }
+        if(!ToolsUtils.checkSignFromOldSys(bo.getStamp().toString(),bo.getSign())){
+            throw new CustomException("签名错误");
+        }
         return AjaxResult.success(iTopOldOrderService.getTopOrderGoodsList(bo));
     }
 }

zhongzheng-admin/src/main/java/com/zhongzheng/controller/common/CommonController.java

@@ -158,7 +158,8 @@ public class CommonController extends BaseController {
     private IUserSubscribeService iUserSubscribeService;
     @Autowired
     private IClassGradeUserService iClassGradeUserService;
-
+    @Autowired
+    private IQuestionService iQuestionService;
 
     @Autowired
     private ICertificateTpService iCertificateTpService;
@@ -809,5 +810,12 @@ public class CommonController extends BaseController {
         return AjaxResult.success(iClassGradeUserService.sendClientPost(bo));
     }
 
+    @ApiOperation("新考题库导入")
+    @PostMapping("/common/question/import")
+    public AjaxResult<Void> questionImport(@RequestBody String param) {
+        iQuestionService.questionImport(param);
+        return AjaxResult.success();
+    }
+
 
 }

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

@@ -108,4 +108,6 @@ public interface IQuestionService extends IService<Question> {
 	String insertByAddBoImport(QuestionAddBo bo, Integer no);
 
 	Long insertByAddBoImportBackId(QuestionAddBo bo, Integer no);
+
+    void questionImport(String param);
 }

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

@@ -3089,6 +3089,11 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
         return add.getQuestionId();
     }
 
+    @Override
+    public void questionImport(String param) {
+
+    }
+
     private boolean checkNameUnique(Question entity) {
         Question info = getOne(new LambdaQueryWrapper<Question>()
                 .eq(Question::getPrefixName, entity.getPrefixName()).eq(Question::getContent, entity.getContent()).ne(Question::getStatus, -1).last("limit 1"));

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopOldOrderServiceImpl.java

@@ -300,6 +300,10 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
         if (ObjectUtils.isNull(orderVo)) {
             throw new CustomException("订单号错误！");
         }
+        //订单金额
+        if (ObjectUtils.isNotNull(orderVo.getRepairMoneyTotal())){
+            orderVo.setOrderPrice(orderVo.getOrderPrice().add(orderVo.getRepairMoneyTotal()));
+        }
         //订单附件
         if (orderVo.getOrderFrom() != 1) {
             //旧系统订单
@@ -461,7 +465,10 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                 } else {
                     item.setStudentCheckStatus(1);
                 }
-
+                //订单金额
+                if (ObjectUtils.isNotNull(item.getRepairMoneyTotal())){
+                    item.setOrderPrice(item.getOrderPrice().add(item.getRepairMoneyTotal()));
+                }
             });
         }
         return orderVoList;
@@ -1148,6 +1155,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
             //旧系统订单
             list = topOrderGoodsService.getListByQuery(query);
             if (CollectionUtils.isNotEmpty(list)) {
+                list = list.stream().filter(x -> x.getCheckStatus() == 0 || x.getCheckStatus() == 1).collect(Collectors.toList());
                 List<TopOldOrderGoods> goodsList = topOrderGoodsService
                         .list(new LambdaQueryWrapper<TopOldOrderGoods>().eq(TopOldOrderGoods::getOrderSn, query.getOrderSn())
                                 .eq(TopOldOrderGoods::getStatus, 1)

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

@@ -256,8 +256,7 @@ public class TopOldOrderVo {
 		if (ObjectUtils.isNull(pretax)){
 			return "0";
 		}
-		BigDecimal multiply = pretax.multiply(new BigDecimal("100.00"));
-		return multiply.intValue()+"%";
+		return pretax.intValue()+"%";
 	}
 
 	@ApiModelProperty("税率")

zhongzheng-system/src/main/resources/mapper/modules/settle/ExamActivityMapper.xml

@@ -103,11 +103,13 @@
             </if>
             <if test="checkStatus != null and checkStatus != ''and checkStatus == 7">
                 AND tis.check_status = 2
-                AND ((SELECT tcl.role_id FROM top_old_order_check_log tcl
-                WHERE tis.settle_sn = tcl.order_sn AND tcl.check_sign = 1 AND tcl.`status` = 1 LIMIT 1) IN
-                <foreach collection="roleIds" item="item" index="index" open="(" close=")" separator=",">
-                    #{item}
-                </foreach>)
+                <if test="roleIds != null and roleIds.size()!=0">
+                    AND ((SELECT tcl.role_id FROM top_old_order_check_log tcl
+                    WHERE tis.settle_sn = tcl.order_sn AND tcl.check_sign = 1 AND tcl.`status` = 1 LIMIT 1) IN
+                    <foreach collection="roleIds" item="item" index="index" open="(" close=")" separator=",">
+                        #{item}
+                    </foreach>)
+                </if>
             </if>
             <if test="checkStatus != null and checkStatus != '' and checkStatus != 7">
                 AND tis.check_status = #{checkStatus}

zhongzheng-system/src/main/resources/mapper/modules/top/TopOldOrderMapper.xml

@@ -160,7 +160,7 @@
             OR vto.create_no LIKE CONCAT( '%', #{keyword}, '%' )
             OR vto.purchase_org LIKE CONCAT( '%', #{keyword}, '%' ))
         </if>
-        order by vto.create_time DESC
+        order by vto.check_time DESC ,vto.create_time DESC
     </select>