接口修复

ruoyi-catdog/src/main/java/com/ruoyi/model/controller/AppletOrderController.java

@@ -9,6 +9,7 @@ import com.cyl.h5.service.H5OrderService;
 import com.cyl.manager.oms.service.OrderService;
 import com.ruoyi.applet.service.IMallOrderService;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.model.service.IAppletUsersService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -47,6 +48,8 @@ public class AppletOrderController extends BaseController
     private H5OrderService h5OrderService;
     @Autowired
     private OrderService service;
+    @Autowired
+    private IAppletUsersService appletUsersService;
 
     /**
      * 查询订单信息列表

ruoyi-catdog/src/main/java/com/ruoyi/model/controller/AppletUsersTeacherController.java

@@ -48,6 +48,11 @@ public class AppletUsersTeacherController extends BaseController
     {
         startPage();
         List<AppletUsersTeacher> list = appletUsersTeacherService.selectAppletUsersTeacherList(appletUsersTeacher);
+        //获取用户信息
+        for (AppletUsersTeacher teacher : list) {
+            AppUsers appUsers = appUsersService.selectAppUsersByUserId(teacher.getUserId());
+            teacher.setUserName(appUsers.getUserName());
+        }
         return getDataTable(list);
     }
 

ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletOrder.java

@@ -103,5 +103,6 @@ public class AppletOrder {
     @TableField(exist = false)
     private OrderPetH5Vo orderPetH5Vo;
 
-
+    @TableField(exist = false)
+    private String userName;
 }

ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletQuestion.java

@@ -38,10 +38,20 @@ public class AppletQuestion extends BaseEntity
     /** 删除标识 */
     private Integer delFlag;
 
+    /** 删除标识 */
+    private Integer numberWords;
+
 
     @TableField(exist = false)
     private List<AppletAnswer> answerList;
 
+
+    @TableField(exist = false)
+    private List<AppletAnswerBase> userAnswerBaseList;
+
+    @TableField(exist = false)
+    private AppletAnswerTrain userAppletAnswerTrain;
+
 //    public void setId(Long id)
 //    {
 //        this.id = id;

ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletUsersTeacher.java

@@ -1,5 +1,6 @@
 package com.ruoyi.model.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -7,6 +8,7 @@ import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 @Data
 public class AppletUsersTeacher {
@@ -101,5 +103,11 @@ public class AppletUsersTeacher {
     private Integer thumbsUp;
 
 
+    @TableField(exist = false)
+    private List<AppletQuestion> answerList;
+
+
+    @TableField(exist = false)
+    private String userName;
 
 }

ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletQuestionServiceImpl.java

@@ -2,6 +2,8 @@ package com.ruoyi.model.service.impl;
 
 import java.util.List;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.model.domain.AppletAnswer;
+import com.ruoyi.model.mapper.AppletAnswerMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.model.mapper.AppletQuestionMapper;
@@ -19,6 +21,8 @@ public class AppletQuestionServiceImpl implements IAppletQuestionService
 {
     @Autowired
     private AppletQuestionMapper appletQuestionMapper;
+    @Autowired
+    private AppletAnswerMapper appletAnswerMapper;
 
     /**
      * 查询考核题库
@@ -29,7 +33,11 @@ public class AppletQuestionServiceImpl implements IAppletQuestionService
     @Override
     public AppletQuestion selectAppletQuestionById(Long id)
     {
-        return appletQuestionMapper.selectAppletQuestionById(id);
+        AppletQuestion appletQuestion = appletQuestionMapper.selectAppletQuestionById(id);
+        AppletAnswer appletAnswer = new AppletAnswer();
+        appletAnswer.setQuestionId(id);
+        appletQuestion.setAnswerList(appletAnswerMapper.selectAppletAnswerList(appletAnswer));
+        return appletQuestion;
     }
 
     /**
@@ -54,7 +62,12 @@ public class AppletQuestionServiceImpl implements IAppletQuestionService
     public int insertAppletQuestion(AppletQuestion appletQuestion)
     {
         appletQuestion.setCreateTime(DateUtils.getNowDate());
-        return appletQuestionMapper.insertAppletQuestion(appletQuestion);
+        int i = appletQuestionMapper.insertAppletQuestion(appletQuestion);
+        for (AppletAnswer appletAnswer : appletQuestion.getAnswerList()) {
+            appletAnswer.setQuestionId(appletQuestion.getId());
+            appletAnswerMapper.insertAppletAnswer(appletAnswer);
+        }
+        return i;
     }
 
     /**
@@ -66,8 +79,22 @@ public class AppletQuestionServiceImpl implements IAppletQuestionService
     @Override
     public int updateAppletQuestion(AppletQuestion appletQuestion)
     {
+        //查询答案
+        AppletAnswer appletAnswer = new AppletAnswer();
+        appletAnswer.setQuestionId(appletQuestion.getId());
+        List<AppletAnswer> list = appletAnswerMapper.selectAppletAnswerList(appletAnswer);
+        for (AppletAnswer appletAnswer1 : list) {
+            //删除答案
+            appletAnswerMapper.deleteAppletAnswerById(appletAnswer1.getId());
+        }
         appletQuestion.setUpdateTime(DateUtils.getNowDate());
-        return appletQuestionMapper.updateAppletQuestion(appletQuestion);
+        int i = appletQuestionMapper.updateAppletQuestion(appletQuestion);
+        //添加答案
+        for (AppletAnswer appletAnswer1 : appletQuestion.getAnswerList()) {
+            appletAnswer1.setQuestionId(appletQuestion.getId());
+            appletAnswerMapper.insertAppletAnswer(appletAnswer1);
+        }
+        return i;
     }
 
     /**

ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletUsersTeacherServiceImpl.java

@@ -2,10 +2,10 @@ package com.ruoyi.model.service.impl;
 
 import java.util.List;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.model.domain.*;
+import com.ruoyi.model.mapper.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.ruoyi.model.mapper.AppletUsersTeacherMapper;
-import com.ruoyi.model.domain.AppletUsersTeacher;
 import com.ruoyi.model.service.IAppletUsersTeacherService;
 
 /**
@@ -19,7 +19,15 @@ public class AppletUsersTeacherServiceImpl implements IAppletUsersTeacherService
 {
     @Autowired
     private AppletUsersTeacherMapper appletUsersTeacherMapper;
+    @Autowired
+    private AppletQuestionMapper appletQuestionMapper;
+    @Autowired
+    private AppletAnswerMapper appletAnswerMapper;
 
+    @Autowired
+    private AppletAnswerBaseMapper appletAnswerBaseMapper;
+    @Autowired
+    private AppletAnswerTrainMapper appletAnswerTrainMapper;
     /**
      * 查询伴宠师认证
      * 
@@ -29,7 +37,36 @@ public class AppletUsersTeacherServiceImpl implements IAppletUsersTeacherService
     @Override
     public AppletUsersTeacher selectAppletUsersTeacherById(Long id)
     {
-        return appletUsersTeacherMapper.selectAppletUsersTeacherById(id);
+        AppletUsersTeacher appletUsersTeacher = appletUsersTeacherMapper.selectAppletUsersTeacherById(id);
+        if(appletUsersTeacher != null){
+            List<AppletQuestion> appletQuestions = appletQuestionMapper.selectAppletQuestionList(null);
+            //循环设置答案列表
+            for (AppletQuestion appletQuestion : appletQuestions){
+                //设置答案列表
+                AppletAnswer appletAnswer = new AppletAnswer();
+                appletAnswer.setQuestionId(appletQuestion.getId());
+                List<AppletAnswer> appletAnswers = appletAnswerMapper.selectAppletAnswerList(appletAnswer);
+                appletQuestion.setAnswerList(appletAnswers);
+
+                if(appletQuestion.getType().equals("基本")){
+                    AppletAnswerBase appletAnswerBase = new AppletAnswerBase();
+                    appletAnswerBase.setQuestionId(appletQuestion.getId());
+                    appletAnswerBase.setUserId(appletUsersTeacher.getUserId());
+                    List<AppletAnswerBase> appletAnswerBases = appletAnswerBaseMapper.selectAppletAnswerBaseList(appletAnswerBase);
+                    appletQuestion.setUserAnswerBaseList(appletAnswerBases);
+                }else{
+                    AppletAnswerTrain appletAnswerTrain = new AppletAnswerTrain();
+                    appletAnswerTrain.setQuestionId(appletQuestion.getId());
+                    appletAnswerTrain.setUserId(appletUsersTeacher.getUserId());
+                    List<AppletAnswerTrain> appletAnswerTrains = appletAnswerTrainMapper.selectAppletAnswerTrainList(appletAnswerTrain);
+                    appletQuestion.setUserAppletAnswerTrain(appletAnswerTrains.get(0));
+                }
+            }
+
+
+            appletUsersTeacher.setAnswerList(appletQuestions);
+        }
+        return appletUsersTeacher;
     }
 
     @Override

ruoyi-catdog/src/main/resources/mapper/model/AppletQuestionMapper.xml

@@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="title"    column="title"    />
         <result property="type"    column="type"    />
         <result property="orderNo"    column="order_no"    />
+        <result property="numberWords"    column="number_words"    />
         <result property="delFlag"    column="del_flag"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
@@ -17,7 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectAppletQuestionVo">
-        select id, title, type, order_no, del_flag, create_by, create_time, update_by, update_time from applet_question
+        select id, title, type, order_no, del_flag,number_words, create_by, create_time, update_by, update_time from applet_question
     </sql>
 
     <select id="selectAppletQuestionList" parameterType="AppletQuestion" resultMap="AppletQuestionResult">
@@ -26,6 +27,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="title != null  and title != ''"> and title = #{title}</if>
             <if test="type != null  and type != ''"> and type = #{type}</if>
             <if test="orderNo != null "> and order_no = #{orderNo}</if>
+            <if test="numberWords != null "> and number_words = #{numberWords}</if>
+
         </where>
     </select>
     
@@ -41,6 +44,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="type != null and type != ''">type,</if>
             <if test="orderNo != null">order_no,</if>
             <if test="delFlag != null">del_flag,</if>
+            <if test="numberWords != null">number_words,</if>
+
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
@@ -50,6 +55,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="title != null and title != ''">#{title},</if>
             <if test="type != null and type != ''">#{type},</if>
             <if test="orderNo != null">#{orderNo},</if>
+            <if test="numberWords != null">#{numberWords},</if>
+
             <if test="delFlag != null">#{delFlag},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
@@ -64,6 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="title != null and title != ''">title = #{title},</if>
             <if test="type != null and type != ''">type = #{type},</if>
             <if test="orderNo != null">order_no = #{orderNo},</if>
+            <if test="numberWords != null">number_words= #{numberWords},</if>
             <if test="delFlag != null">del_flag = #{delFlag},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>

ruoyi-mall/src/main/java/com/cyl/h5/service/H5OrderService.java

@@ -1077,7 +1077,7 @@ public class H5OrderService {
         //TODO
         String payAmount = order.getPayAmount().multiply(new BigDecimal(100)).stripTrailingZeros().toPlainString();
 
-        payAmount = "1";//支付一分钱
+//        payAmount = "1";//支付一分钱
         String prepayId = wechatPayService.jsapiPay(
                 String.valueOf(order.getPayId()),
                 orderDesc,