From 0da9fdc9becd11ece44dbd9087bb65829ad7318b Mon Sep 17 00:00:00 2001 From: huangqizhen Date: Tue, 17 Dec 2024 19:28:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E7=AB=AF=E6=95=B4=E5=90=88=E6=A8=A1?= =?UTF-8?q?=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/example/demo/domain/entity/Activity.java | 10 +++++----- src/main/java/com/example/demo/domain/entity/Rate.java | 4 ++-- src/main/java/com/example/demo/domain/entity/Recharge.java | 2 +- src/main/java/com/example/demo/mapper/ConsumeMapper.java | 4 ++-- src/main/java/com/example/demo/mapper/RateMapper.java | 1 + .../java/com/example/demo/serviceImpl/ConsumeServiceImpl.java | 9 +++++++-- 6 files changed, 18 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/example/demo/domain/entity/Activity.java b/src/main/java/com/example/demo/domain/entity/Activity.java index b424baa..7068f41 100644 --- a/src/main/java/com/example/demo/domain/entity/Activity.java +++ b/src/main/java/com/example/demo/domain/entity/Activity.java @@ -22,18 +22,18 @@ public class Activity implements Serializable { private Integer adminId; private String dept; - @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(shape = com.fasterxml.jackson.annotation.JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", timezone = "UTC") + private Date startTime; - @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(shape = com.fasterxml.jackson.annotation.JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", timezone = "UTC") + private Date endTime; private String activityName; private BigDecimal rechargeRatio; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @JsonFormat(shape = com.fasterxml.jackson.annotation.JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", timezone = "UTC") @DateTimeFormat(pattern = "yyyy-MM-dd") private Date createTime; diff --git a/src/main/java/com/example/demo/domain/entity/Rate.java b/src/main/java/com/example/demo/domain/entity/Rate.java index 1008dee..c0b42e9 100644 --- a/src/main/java/com/example/demo/domain/entity/Rate.java +++ b/src/main/java/com/example/demo/domain/entity/Rate.java @@ -11,10 +11,10 @@ import java.util.Date; @NoArgsConstructor public class Rate { private Integer rateId; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @DateTimeFormat(pattern = "yyyy-MM-dd") private Date startTime; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @DateTimeFormat(pattern = "yyyy-MM-dd") private Date endTime; private String currency; diff --git a/src/main/java/com/example/demo/domain/entity/Recharge.java b/src/main/java/com/example/demo/domain/entity/Recharge.java index ec3d6dd..b3279cd 100644 --- a/src/main/java/com/example/demo/domain/entity/Recharge.java +++ b/src/main/java/com/example/demo/domain/entity/Recharge.java @@ -23,7 +23,7 @@ public class Recharge { private String rechargeVoucher; private Integer adminId; private String area; - + private String rechargeRatio; private String remark; private Integer flag; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") diff --git a/src/main/java/com/example/demo/mapper/ConsumeMapper.java b/src/main/java/com/example/demo/mapper/ConsumeMapper.java index 2128d11..524252a 100644 --- a/src/main/java/com/example/demo/mapper/ConsumeMapper.java +++ b/src/main/java/com/example/demo/mapper/ConsumeMapper.java @@ -27,9 +27,9 @@ public interface ConsumeMapper { //新增消费记录 @Insert({ "insert into detail", - "(jwcode,activity_id,recharge_way,product_id,consume_platform,consume_type,refund_type,refund_goods,contact_id,remark,recharge_coin,fre z e_coin,task_coin,admin_id,update_type,detail_flag,create_time,refund_flag,order_code)", + "(jwcode,activity_id,recharge_way,product_id,consume_platform,consume_type,refund_type,refund_goods,contact_id,remark,recharge_coin,free_coin,task_coin,admin_id,update_type,detail_flag,create_time,refund_flag,order_code)", "values", - "(#{jwcode},#{activityId},#{rechargeWay},#{productId},'金币系统','购买商品',#{refundType},#{refundGoods},#{contactId},#{remark},#{rechargeCoin},#{freeCoin},#{taskCoin},#{adminId},#{updateType},1,now(),1，orderCode)" + "(#{jwcode},#{activityId},#{rechargeWay},#{productId},'金币系统','购买商品',#{refundType},#{refundGoods},#{contactId},#{remark},#{rechargeCoin},#{freeCoin},#{taskCoin},#{adminId},#{updateType},1,now(),1,#{orderCode})" }) // 获取自增主键 @Options(useGeneratedKeys = true,keyColumn = "detail_id",keyProperty = "detailId") diff --git a/src/main/java/com/example/demo/mapper/RateMapper.java b/src/main/java/com/example/demo/mapper/RateMapper.java index 6c2d4e9..b4b08d0 100644 --- a/src/main/java/com/example/demo/mapper/RateMapper.java +++ b/src/main/java/com/example/demo/mapper/RateMapper.java @@ -63,6 +63,7 @@ public interface RateMapper { "AND r.update_time LIKE CONCAT('%', #{updateTime}, '%')", "AND r.admin_id = #{adminId}", "AND r.update_id = #{updateId}", + "ORDER BY r.create_time DESC", "" }) diff --git a/src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java index 451cc2d..e8451dd 100644 --- a/src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java @@ -40,6 +40,11 @@ public class ConsumeServiceImpl implements ConsumeService { @Override //新增消费记录 public int insert(Detail detail) throws Exception { + int result =consumeMapper.insert(detail); + System.out.println(detail); + if (result != 1) { + throw new Exception("Failed to insert another entity"); + } BigDecimal paidGold1 =detail.getRechargeCoin(); BigDecimal freeGold1 =detail.getFreeCoin(); BigDecimal taskGold1 =detail.getTaskCoin(); @@ -73,7 +78,7 @@ public class ConsumeServiceImpl implements ConsumeService { // 设置更新后的Sumgold回到user对象 System.out.println(user+"----------------------------------------------------------"); - int result = userMapper.update(user); + result = userMapper.update(user); if (result != 1) { throw new Exception("Failed to insert another entity"); } @@ -81,7 +86,7 @@ public class ConsumeServiceImpl implements ConsumeService { String uuid = UUID.randomUUID().toString().replace("-", ""); // 去掉UUID中的'-' detail.setOrderCode(uuid); //添加表单数据 - result =consumeMapper.insert(detail); + //消费完成后需要将用户的三币从user表中去掉