获取答题奖励信息（积分商品）

fs-company/src/main/java/com/fs/company/controller/company/CompanyVoiceRoboticCallLogAddwxController.java

@@ -1,41 +1,28 @@
 package com.fs.company.controller.company;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
+import com.fs.common.annotation.Log;
+import com.fs.common.core.controller.BaseController;
+import com.fs.common.core.domain.AjaxResult;
+import com.fs.common.core.page.TableDataInfo;
+import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.ServletUtils;
-import com.fs.common.utils.StringUtils;
-import com.fs.company.domain.CompanyVoiceRoboticCallLogCallphone;
+import com.fs.common.utils.poi.ExcelUtil;
+import com.fs.company.domain.CompanyVoiceRoboticCallLogAddwx;
 import com.fs.company.domain.CompanyWxClient;
+import com.fs.company.service.ICompanyVoiceRoboticCallLogAddwxService;
+import com.fs.company.service.impl.CompanyUserServiceImpl;
 import com.fs.company.vo.CompanyVoiceRoboticCallLogAddWxExportVO;
 import com.fs.company.vo.CompanyVoiceRoboticCallLogAddwxVO;
-import com.fs.company.vo.CompanyVoiceRoboticCallLogCallPhoneVO;
 import com.fs.company.vo.CompanyVoiceRoboticCallLogCount;
 import com.fs.framework.security.LoginUser;
 import com.fs.framework.service.TokenService;
 import org.springframework.beans.BeanUtils;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.enums.BusinessType;
-import com.fs.company.domain.CompanyVoiceRoboticCallLogAddwx;
-import com.fs.company.service.ICompanyVoiceRoboticCallLogAddwxService;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.common.core.page.TableDataInfo;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 调用日志_加微信Controller
@@ -53,6 +40,9 @@ public class CompanyVoiceRoboticCallLogAddwxController extends BaseController
     @Autowired
     private TokenService tokenService;
 
+    @Autowired
+    private CompanyUserServiceImpl companyUserService;
+
     /**
      * 查询调用日志_加微信列表
      */

fs-service/src/main/java/com/fs/his/mapper/FsUserIntegralLogsMapper.java

@@ -1,5 +1,7 @@
 package com.fs.his.mapper;
 
+import com.fs.common.annotation.DataSource;
+import com.fs.common.enums.DataSourceType;
 import com.fs.his.domain.FsUserIntegralLogs;
 import com.fs.his.param.FsUserIntegralLogsListUParam;
 import com.fs.his.param.FsUserIntegralLogsParam;
@@ -154,4 +156,10 @@ public interface FsUserIntegralLogsMapper
      * 查询用户最新的积分记录
      */
     FsUserIntegralLogs selectLatestIntegralLogByUserId(@Param("userId") Long userId);
+
+    /**
+     * 获取用户指定类型最后一条记录
+     */
+    @Select("select * from fs_user_integral_logs where user_id = #{userId} and log_type = #{logType} order by create_time desc limit 1")
+    FsUserIntegralLogs getLast1LogByUserIdAndLogType(@Param("userId") Long userId, @Param("logType") Integer logType);
 }

fs-service/src/main/java/com/fs/his/service/impl/FsIntegralGoodsServiceImpl.java

@@ -9,8 +9,10 @@ import com.fs.course.domain.FsCourseAnswerReward;
 import com.fs.his.domain.FsChineseMedicine;
 import com.fs.his.domain.FsIntegralGoods;
 import com.fs.his.domain.FsUser;
+import com.fs.his.domain.FsUserIntegralLogs;
 import com.fs.his.mapper.FsIntegralCartMapper;
 import com.fs.his.mapper.FsIntegralGoodsMapper;
+import com.fs.his.mapper.FsUserIntegralLogsMapper;
 import com.fs.his.mapper.FsUserMapper;
 import com.fs.his.param.FsIntegralGoodsListUParam;
 import com.fs.his.service.IFsIntegralGoodsService;
@@ -44,6 +46,9 @@ public class FsIntegralGoodsServiceImpl implements IFsIntegralGoodsService
     @Autowired
     private ISysConfigService configService;
 
+    @Autowired
+    private FsUserIntegralLogsMapper userIntegralLogsMapper;
+
     /**
      * 查询积分商品
      *
@@ -187,9 +192,10 @@ public class FsIntegralGoodsServiceImpl implements IFsIntegralGoodsService
     @Override
     public R getCourseIntegralGoods(Long userId) {
         log.info("获取答题奖励信息, userId:{}", userId);
-        String json = configService.selectConfigByKey("course.config");
-        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
+//        String json = configService.selectConfigByKey("course.config");
+//        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
         FsUser user = fsUserMapper.selectFsUserByUserId(userId);
+        FsUserIntegralLogs integralLog = userIntegralLogsMapper.getLast1LogByUserIdAndLogType(userId, 17);
 
         // 1. 创建返回对象
         FsCourseAnswerReward reward = new FsCourseAnswerReward();
@@ -238,7 +244,8 @@ public class FsIntegralGoodsServiceImpl implements IFsIntegralGoodsService
         int exchangeProgress = (int) ((currentPoints * 100.0) / minRequiredPoints);
         // 进度最大显示100%
         reward.setExchangeProgress(Math.min(exchangeProgress, 100));
-        reward.setAvailableCoins(config.getAnswerIntegral());
+        reward.setAvailableCoins(Objects.nonNull(integralLog) ? integralLog.getIntegral().intValue() : 0);
+//        reward.setAvailableCoins(config.getAnswerIntegral());
         log.info("答题奖励信息: {}", reward);
         return R.ok().put("data", reward);
     }

fs-user-app/src/main/java/com/fs/app/controller/CourseController.java

@@ -14,6 +14,7 @@ import com.fs.course.param.*;
 import com.fs.course.service.*;
 import com.fs.course.vo.*;
 import com.fs.course.vo.newfs.FsUserCourseVideoDetailsVO;
+import com.fs.his.service.IFsIntegralGoodsService;
 import com.fs.his.vo.OptionsVO;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -66,6 +67,9 @@ public class CourseController extends  AppBaseController{
     @Autowired
     private IFsCourseQuestionBankService fsCourseQuestionBankService;
 
+    @Autowired
+    private IFsIntegralGoodsService goodsService;
+
 //    @Cacheable(value="getCourseCate" )
     @ApiOperation("获取分类")
     @GetMapping("/getCourseCate")
@@ -458,6 +462,15 @@ public class CourseController extends  AppBaseController{
         return courseVideoService.sendAppReward(param);
     }
 
+    @Login
+    @ApiOperation("获取APP答题奖励信息（积分商品）")
+    @GetMapping("/getCourseIntegralGoods")
+    public R getCourseIntegralGoods() {
+
+        return goodsService.getCourseIntegralGoods(Long.parseLong(getUserId()));
+    }
+
+
     @ApiOperation("加密链接参数")
     @PostMapping("/encryptLink")
     @Login