diff --git a/src/main/java/com/sqx/modules/orders/service/impl/OrdersServiceImpl.java b/src/main/java/com/sqx/modules/orders/service/impl/OrdersServiceImpl.java index 2c91d989..c34c7487 100644 --- a/src/main/java/com/sqx/modules/orders/service/impl/OrdersServiceImpl.java +++ b/src/main/java/com/sqx/modules/orders/service/impl/OrdersServiceImpl.java @@ -246,12 +246,14 @@ public class OrdersServiceImpl extends ServiceImpl implements BigDecimal v = new BigDecimal(value); if (courseDetailsId != null) { CourseDetails courseDetails = courseDetailsService.getById(courseDetailsId); - orders.setPayMoney(courseDetails.getPrice().multiply(v)); + orders.setPayMoney(courseDetails.getPrice()); + orders.setPayDiamond(courseDetails.getPrice().multiply(v)); } 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())); - orders.setPayDiamond(payDiamond); +// BigDecimal payDiamond = orders.getPayMoney().multiply(new BigDecimal(commonInfoService.findOne(892).getValue())); +// orders.setPayDiamond(payDiamond); //设置支付状态 orders.setStatus(0); //设置订单创建时间 @@ -339,13 +341,13 @@ public class OrdersServiceImpl extends ServiceImpl implements } } UserMoney userMoney = userMoneyService.selectUserMoneyByUserId(orders.getUserId()); - if (userMoney.getMoney().doubleValue() < orders.getPayMoney().doubleValue()) { + if (userMoney.getMoney().doubleValue() < orders.getPayDiamond().doubleValue()) { return Result.error("账户不足，请充值！"); } 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.setMoney(orders.getPayMoney()); + userMoneyDetails.setMoney(orders.getPayDiamond()); userMoneyDetails.setUserId(orders.getUserId()); userMoneyDetails.setContent("金豆支付订单"); userMoneyDetails.setTitle("下单成功，订单号：" + orders.getOrdersNo()); @@ -355,6 +357,7 @@ public class OrdersServiceImpl extends ServiceImpl implements userMoneyDetails.setCreateTime(simpleDateFormat.format(new Date())); userMoneyDetailsService.save(userMoneyDetails); orders.setPayWay(6); + orders.setDiamond(1); orders.setStatus(1); orders.setPayTime(DateUtils.format(new Date())); diff --git a/src/main/java/com/sqx/modules/taskCenter/controller/TaskCenterController.java b/src/main/java/com/sqx/modules/taskCenter/controller/TaskCenterController.java index 7c2a2f53..3a283903 100644 --- a/src/main/java/com/sqx/modules/taskCenter/controller/TaskCenterController.java +++ b/src/main/java/com/sqx/modules/taskCenter/controller/TaskCenterController.java @@ -1,6 +1,7 @@ package com.sqx.modules.taskCenter.controller; +import cn.hutool.core.date.DateUtil; import com.sqx.modules.app.annotation.Login; import com.sqx.modules.taskCenter.entity.TaskCenter; import com.sqx.modules.taskCenter.service.TaskCenterService; @@ -33,7 +34,7 @@ public class TaskCenterController { @PostMapping("/taskCenter/insertTaskCenter") @ApiOperation("添加任务中心") public Result insertTaskCenter(@RequestBody TaskCenter taskCenter) { - taskCenter.setCreateTime(DateUtils.format(new Date())); + taskCenter.setCreateTime(DateUtil.now()); taskCenterService.save(taskCenter); return Result.success(); } @@ -47,6 +48,7 @@ public class TaskCenterController { @PostMapping("/taskCenter/updateTaskCenter") @ApiOperation("修改任务中心") public Result updateTaskCenter(@RequestBody TaskCenter taskCenter) { + taskCenter.setUpdateTime(DateUtil.now()); taskCenterService.updateById(taskCenter); return Result.success(); } diff --git a/src/main/java/com/sqx/modules/taskCenter/entity/TaskCenter.java b/src/main/java/com/sqx/modules/taskCenter/entity/TaskCenter.java index 9abad388..143cb4d7 100644 --- a/src/main/java/com/sqx/modules/taskCenter/entity/TaskCenter.java +++ b/src/main/java/com/sqx/modules/taskCenter/entity/TaskCenter.java @@ -1,17 +1,22 @@ package com.sqx.modules.taskCenter.entity; +import java.util.Date; + import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; + +import java.io.Serializable; + import lombok.Data; /** * 任务中心(TaskCenter)表实体类 * * @author ww - * @since 2024-12-06 13:57:51 + * @since 2024-12-09 13:53:10 */ @Data @TableName("task_center") @@ -21,7 +26,7 @@ public class TaskCenter extends Model { private Long id; @ApiModelProperty("标题") private String title; - @ApiModelProperty("任务类型 1 普通任务 2 打卡任务 9 其它") + @ApiModelProperty("任务类型 1 普通任务 2 打卡任务 3 9 其它") private Integer type; @ApiModelProperty("详情描述") private String detail; @@ -43,9 +48,14 @@ public class TaskCenter extends Model { private String buttonUrl; private String createTime; private String updateTime; + @ApiModelProperty("排序") + private Integer sort; + @ApiModelProperty("是否开启 0否1是") + private Integer shows; @TableField(exist = false) private boolean disabled = true; + } diff --git a/src/main/java/com/sqx/modules/taskCenter/service/impl/TaskCenterServiceImpl.java b/src/main/java/com/sqx/modules/taskCenter/service/impl/TaskCenterServiceImpl.java index a2653c0c..4ff0ad56 100644 --- a/src/main/java/com/sqx/modules/taskCenter/service/impl/TaskCenterServiceImpl.java +++ b/src/main/java/com/sqx/modules/taskCenter/service/impl/TaskCenterServiceImpl.java @@ -47,7 +47,7 @@ public class TaskCenterServiceImpl extends ServiceImpl taskPage = baseMapper.selectPage(new Page<>(page, limit), new QueryWrapper().eq("show", 1).orderByDesc("sort")); + IPage taskPage = baseMapper.selectPage(new Page<>(page, limit), new QueryWrapper().eq("shows", 1).orderByDesc("sort")); boolean todaySign = true; //月 签到记录 QueryWrapper signWrapper = new QueryWrapper<>(); diff --git a/src/main/resources/mapper/tashCenter/TaskCenterDto.xml b/src/main/resources/mapper/tashCenter/TaskCenterDto.xml index a4b4ee2b..cdb6e2ce 100644 --- a/src/main/resources/mapper/tashCenter/TaskCenterDto.xml +++ b/src/main/resources/mapper/tashCenter/TaskCenterDto.xml @@ -8,7 +8,7 @@ SELECT task.*, reward.number as number 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 and user_id = #{userId}