czg_team/video_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'test' into dev

Browse Source
This commit is contained in:
GYJ
2024-12-09 14:14:48 +08:00
parent 18cf4bd1c5 842cacd88e
commit fc0bb7795f
5 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/com/sqx/modules/orders/service/impl/OrdersServiceImpl.java
View File

@@ -246,12 +246,14 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
BigDecimal v = new BigDecimal(value); BigDecimal v = new BigDecimal(value);
if (courseDetailsId != null) { if (courseDetailsId != null) {
CourseDetails courseDetails = courseDetailsService.getById(courseDetailsId); CourseDetails courseDetails = courseDetailsService.getById(courseDetailsId);
orders.setPayMoney(courseDetails.getPrice().multiply(v)); orders.setPayMoney(courseDetails.getPrice());
orders.setPayDiamond(courseDetails.getPrice().multiply(v));
} else { } else {
orders.setPayMoney(course.getPrice().multiply(v)); orders.setPayMoney(course.getPrice());
orders.setPayDiamond(course.getPrice().multiply(v));
} }
BigDecimal payDiamond = orders.getPayMoney().multiply(new BigDecimal(commonInfoService.findOne(892).getValue())); // BigDecimal payDiamond = orders.getPayMoney().multiply(new BigDecimal(commonInfoService.findOne(892).getValue()));
orders.setPayDiamond(payDiamond); // orders.setPayDiamond(payDiamond);
//设置支付状态 //设置支付状态
orders.setStatus(0); orders.setStatus(0);
//设置订单创建时间 //设置订单创建时间
@@ -339,13 +341,13 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
} }
} }
UserMoney userMoney = userMoneyService.selectUserMoneyByUserId(orders.getUserId()); UserMoney userMoney = userMoneyService.selectUserMoneyByUserId(orders.getUserId());
if (userMoney.getMoney().doubleValue() < orders.getPayMoney().doubleValue()) { if (userMoney.getMoney().doubleValue() < orders.getPayDiamond().doubleValue()) {
return Result.error("账户不足，请充值！"); return Result.error("账户不足，请充值！");
} }
UserEntity userEntity = userService.selectUserById(orders.getUserId()); UserEntity userEntity = userService.selectUserById(orders.getUserId());
userMoneyService.updateMoney(2, orders.getUserId(), orders.getPayMoney().doubleValue()); userMoneyService.updateMoney(2, orders.getUserId(), orders.getPayDiamond().doubleValue());
UserMoneyDetails userMoneyDetails = new UserMoneyDetails(); UserMoneyDetails userMoneyDetails = new UserMoneyDetails();
userMoneyDetails.setMoney(orders.getPayMoney()); userMoneyDetails.setMoney(orders.getPayDiamond());
userMoneyDetails.setUserId(orders.getUserId()); userMoneyDetails.setUserId(orders.getUserId());
userMoneyDetails.setContent("金豆支付订单"); userMoneyDetails.setContent("金豆支付订单");
userMoneyDetails.setTitle("下单成功，订单号：" + orders.getOrdersNo()); userMoneyDetails.setTitle("下单成功，订单号：" + orders.getOrdersNo());
@@ -355,6 +357,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
userMoneyDetails.setCreateTime(simpleDateFormat.format(new Date())); userMoneyDetails.setCreateTime(simpleDateFormat.format(new Date()));
userMoneyDetailsService.save(userMoneyDetails); userMoneyDetailsService.save(userMoneyDetails);
orders.setPayWay(6); orders.setPayWay(6);
orders.setDiamond(1);
orders.setStatus(1); orders.setStatus(1);
orders.setPayTime(DateUtils.format(new Date())); orders.setPayTime(DateUtils.format(new Date()));

4
src/main/java/com/sqx/modules/taskCenter/controller/TaskCenterController.java
View File

@@ -1,6 +1,7 @@
package com.sqx.modules.taskCenter.controller; package com.sqx.modules.taskCenter.controller;
import cn.hutool.core.date.DateUtil;
import com.sqx.modules.app.annotation.Login; import com.sqx.modules.app.annotation.Login;
import com.sqx.modules.taskCenter.entity.TaskCenter; import com.sqx.modules.taskCenter.entity.TaskCenter;
import com.sqx.modules.taskCenter.service.TaskCenterService; import com.sqx.modules.taskCenter.service.TaskCenterService;
@@ -33,7 +34,7 @@ public class TaskCenterController {
@PostMapping("/taskCenter/insertTaskCenter") @PostMapping("/taskCenter/insertTaskCenter")
@ApiOperation("添加任务中心") @ApiOperation("添加任务中心")
public Result insertTaskCenter(@RequestBody TaskCenter taskCenter) { public Result insertTaskCenter(@RequestBody TaskCenter taskCenter) {
taskCenter.setCreateTime(DateUtils.format(new Date())); taskCenter.setCreateTime(DateUtil.now());
taskCenterService.save(taskCenter); taskCenterService.save(taskCenter);
return Result.success(); return Result.success();
} }
@@ -47,6 +48,7 @@ public class TaskCenterController {
@PostMapping("/taskCenter/updateTaskCenter") @PostMapping("/taskCenter/updateTaskCenter")
@ApiOperation("修改任务中心") @ApiOperation("修改任务中心")
public Result updateTaskCenter(@RequestBody TaskCenter taskCenter) { public Result updateTaskCenter(@RequestBody TaskCenter taskCenter) {
taskCenter.setUpdateTime(DateUtil.now());
taskCenterService.updateById(taskCenter); taskCenterService.updateById(taskCenter);
return Result.success(); return Result.success();
} }

16
src/main/java/com/sqx/modules/taskCenter/entity/TaskCenter.java
View File

@@ -1,17 +1,22 @@
package com.sqx.modules.taskCenter.entity; package com.sqx.modules.taskCenter.entity;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model; import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import lombok.Data; import lombok.Data;
/** /**
* 任务中心(TaskCenter)表实体类 * 任务中心(TaskCenter)表实体类
* *
* @author ww * @author ww
* @since 2024-12-06 13:57:51 * @since 2024-12-09 13:53:10
*/ */
@Data @Data
@TableName("task_center") @TableName("task_center")
@@ -21,7 +26,7 @@ public class TaskCenter extends Model<TaskCenter> {
private Long id; private Long id;
@ApiModelProperty("标题") @ApiModelProperty("标题")
private String title; private String title;
@ApiModelProperty("任务类型 1 普通任务 2 打卡任务 9 其它") @ApiModelProperty("任务类型 1 普通任务 2 打卡任务 3 9 其它")
private Integer type; private Integer type;
@ApiModelProperty("详情描述") @ApiModelProperty("详情描述")
private String detail; private String detail;
@@ -43,9 +48,14 @@ public class TaskCenter extends Model<TaskCenter> {
private String buttonUrl; private String buttonUrl;
private String createTime; private String createTime;
private String updateTime; private String updateTime;
@ApiModelProperty("排序")
private Integer sort;
@ApiModelProperty("是否开启 0否1是")
private Integer shows;
@TableField(exist = false) @TableField(exist = false)
private boolean disabled = true; private boolean disabled = true;
} }

2
src/main/java/com/sqx/modules/taskCenter/service/impl/TaskCenterServiceImpl.java
View File

@@ -47,7 +47,7 @@ public class TaskCenterServiceImpl extends ServiceImpl<TaskCenterDao, TaskCenter
@Override @Override
public Result queryTaskCenter(Integer page, Integer limit, Long userId) { public Result queryTaskCenter(Integer page, Integer limit, Long userId) {
//任务 //任务
IPage<TaskCenter> taskPage = baseMapper.selectPage(new Page<>(page, limit), new QueryWrapper<TaskCenter>().eq("show", 1).orderByDesc("sort")); IPage<TaskCenter> taskPage = baseMapper.selectPage(new Page<>(page, limit), new QueryWrapper<TaskCenter>().eq("shows", 1).orderByDesc("sort"));
boolean todaySign = true; boolean todaySign = true;
//月 签到记录 //月 签到记录
QueryWrapper<UserSignRecord> signWrapper = new QueryWrapper<>(); QueryWrapper<UserSignRecord> signWrapper = new QueryWrapper<>();

2
src/main/resources/mapper/tashCenter/TaskCenterDto.xml
View File

@@ -8,7 +8,7 @@
SELECT task.*, SELECT task.*,
reward.number as number reward.number as number
FROM task_center_reward reward FROM task_center_reward reward
INNER JOIN task_center task ON reward.task_id = task.id and task.show = 1 INNER JOIN task_center task ON reward.task_id = task.id and task.shows = 1
where reward.type = 9 where reward.type = 9
and user_id = #{userId} and user_id = #{userId}
</select> </select>