submit

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

@@ -4326,9 +4326,9 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
                 List<QuestionImportV4> questionImportV = questionList2.subList(i, i + a);
                 //第一个是内容
                 QuestionImportV4 v4 = questionImportV.get(0);
-                question.setContent(questionImage(v4.getQuestionName()));
+                question.setContent(replaceImagePaths(v4.getQuestionName()));
                 question.setType(1);
-                question.setAnalysisContent(v4.getDescribe());
+                question.setAnalysisContent(replaceImagePaths(v4.getDescribe()));
                 question.setCode(ServletUtils.getEncoded("TM"));
                 //正确选项
                 Integer index = 0;
@@ -4351,9 +4351,9 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
                 List<QuestionImportV4> questionImportV1 = questionList2.subList(i, i + a);
                 //第一个是内容
                 QuestionImportV4 v41 = questionImportV1.get(0);
-                question.setContent(questionImage(v41.getQuestionName()));
+                question.setContent(replaceImagePaths(v41.getQuestionName()));
                 question.setType(2);
-                question.setAnalysisContent(v41.getDescribe());
+                question.setAnalysisContent(replaceImagePaths(v41.getDescribe()));
                 //正确选项
                 List<Integer> index1 = new ArrayList<>();
                 //转换单选选项
@@ -4375,9 +4375,9 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
                 List<QuestionImportV4> questionImportV2 = questionList2.subList(i, i + a);
                 //第一个是内容
                 QuestionImportV4 v42 = questionImportV2.get(0);
-                question.setContent(questionImage(v42.getQuestionName()));
+                question.setContent(replaceImagePaths(v42.getQuestionName()));
                 question.setType(3);
-                question.setAnalysisContent(v42.getDescribe());
+                question.setAnalysisContent(replaceImagePaths(v42.getDescribe()));
                 //正确选项
                 Integer index2 = 0;
                 //转换单选选项
@@ -4417,7 +4417,7 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
                             List<QuestionImportV4> questionImportV5 = vv.subList(i1, i1 + y);
                             QuestionImportV4 questionImportV42 = questionImportV5.get(0);
                             QuestionInfoVo questionInfoVo = new QuestionInfoVo();
-                            questionInfoVo.setContent(questionImage(questionImportV42.getQuestionName()));
+                            questionInfoVo.setContent(replaceImagePaths(questionImportV42.getQuestionName()));
                             questionInfoVo.setType(1);
                             //正确选项
                             Integer index = 0;
@@ -4443,7 +4443,7 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
                             List<QuestionImportV4> questionImportV6 = vv.subList(i1, i1 + y);
                             QuestionImportV4 questionImportV42 = questionImportV6.get(0);
                             QuestionInfoVo questionInfoVo = new QuestionInfoVo();
-                            questionInfoVo.setContent(questionImage(questionImportV42.getQuestionName()));
+                            questionInfoVo.setContent(replaceImagePaths(questionImportV42.getQuestionName()));
                             questionInfoVo.setType(2);
                             //正确选项
                             List<Integer> index = new ArrayList<>();
@@ -4469,7 +4469,7 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
                             List<QuestionImportV4> questionImportV7 = vv.subList(i1, i1 + y);
                             QuestionImportV4 questionImportV42 = questionImportV7.get(0);
                             QuestionInfoVo questionInfoVo = new QuestionInfoVo();
-                            questionInfoVo.setContent(questionImage(questionImportV42.getQuestionName()));
+                            questionInfoVo.setContent(replaceImagePaths(questionImportV42.getQuestionName()));
                             questionInfoVo.setType(3);
                             //正确选项
                             Integer index2 = 0;

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

@@ -199,6 +199,11 @@ public class OrderGoodsRefundServiceImpl extends ServiceImpl<OrderGoodsRefundMap
         OrderGoods orderGoods = iOrderGoodsService.getOne(new LambdaQueryWrapper<OrderGoods>().eq(OrderGoods::getOrderSn,bo.getOrderSn())
                 .eq(OrderGoods::getGoodsId, bo.getGoodsId()).eq(OrderGoods::getOrderGoodsId, bo.getOrderGoodsId()));
         Order order = iOrderService.getOne(new LambdaQueryWrapper<Order>().eq(Order::getOrderSn, bo.getOrderSn()).last("limit 1"));
+
+        Long dayAfter = DateUtils.getDayAfter(orderGoods.getCreateTime(), 200);
+        if (orderGoods.getCreateTime() > dayAfter){
+            throw new CustomException("当前订单已超过半年时间，退款请联系管理员！");
+        }
         if (order.getOrderType() != 3 && order.getOrderFrom() != 7){
             if(orderGoods.getPayStatus()!=3){
                 throw new CustomException("订单商品尚未完全收费");

zhongzheng-system/src/main/resources/mapper/modules/goods/GoodsMapper.xml

@@ -325,6 +325,9 @@
         <if test="projectId != null and projectId != ''">
             AND g.project_id = #{projectId}
         </if>
+        <if test="goodsId != null and goodsId != ''">
+            AND g.goods_id = #{goodsId}
+        </if>
         <if test="schoolId != null and schoolId != ''">
             AND g.school_id = #{schoolId}
         </if>