From 9cda5674ad0be4590565e44c0eb01623d176ce7f Mon Sep 17 00:00:00 2001 From: huangqizhen Date: Tue, 25 Mar 2025 13:32:34 +0800 Subject: [PATCH] =?UTF-8?q?3.25=E6=B6=88=E8=B4=B9=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E5=A4=84=E7=90=86=E5=AE=8C=E6=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/example/demo/domain/vo/DetailExport.java | 4 ++++ src/main/java/com/example/demo/mapper/AdminMapper.java | 4 ++-- .../com/example/demo/serviceImpl/AdminServiceImpl.java | 10 +++++----- .../com/example/demo/serviceImpl/AuditServiceImpl.java | 4 ++-- .../com/example/demo/serviceImpl/ConsumeServiceImpl.java | 4 +++- .../com/example/demo/serviceImpl/OtherServiceImpl.java | 14 ++++++++++++++ 6 files changed, 30 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/example/demo/domain/vo/DetailExport.java b/src/main/java/com/example/demo/domain/vo/DetailExport.java index 74b3e8b..615fe73 100644 --- a/src/main/java/com/example/demo/domain/vo/DetailExport.java +++ b/src/main/java/com/example/demo/domain/vo/DetailExport.java @@ -1,22 +1,26 @@ package com.example.demo.domain.vo; import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; +import java.util.List; @Data @AllArgsConstructor @NoArgsConstructor +@JsonIgnoreProperties(ignoreUnknown = true) public class DetailExport { private Integer updateType; private String jwcode; private String token; private String area; + private List areas; @JsonFormat(pattern = "yyyy-MM-dd", timezone = "Asia/Shanghai") @DateTimeFormat(pattern = "yyyy-MM-dd") private Date startDate; diff --git a/src/main/java/com/example/demo/mapper/AdminMapper.java b/src/main/java/com/example/demo/mapper/AdminMapper.java index 5004a09..45ba51c 100644 --- a/src/main/java/com/example/demo/mapper/AdminMapper.java +++ b/src/main/java/com/example/demo/mapper/AdminMapper.java @@ -13,7 +13,7 @@ public interface AdminMapper { "insert into admin", "(name,jwcode,password,permission,area,store,admin_flag,create_time,remark,status1,machineId)", "values", - "(#{name},#{jwcode},,#{password},#{permission},#{area},#{store},#{admin_flag},now(),#{remark},#{status1},#{machineId})" + "(#{name},#{jwcode},#{password},#{permission},#{area},#{store},#{adminFlag},now(),#{remark},#{status1},#{machineId})" }) @Options(useGeneratedKeys = true,keyColumn = "admin_id",keyProperty = "adminId") int insert(Admin admin); @@ -85,6 +85,6 @@ public interface AdminMapper { "and", "admin_flag = 1" }) - Admin selectByJwcode(Admin admin); + Admin selectByJwcode(String jwcode); } diff --git a/src/main/java/com/example/demo/serviceImpl/AdminServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/AdminServiceImpl.java index fd08ee7..a1922a1 100644 --- a/src/main/java/com/example/demo/serviceImpl/AdminServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/AdminServiceImpl.java @@ -42,15 +42,15 @@ public class AdminServiceImpl implements AdminService { @Override public int add(Admin admin) { //判断jwcode是否已存在 - Admin admin1=adminMapper.selectByJwcode(admin); + Admin admin1=adminMapper.selectByJwcode(admin.getJwcode()); if(!ObjectUtils.isEmpty(admin1)){ throw new RuntimeException("用户已存在"); } //设置密码 if(ObjectUtils.isEmpty(admin.getPassword())){ - admin.setPassword(passwordEncoder.encode("$2a$10$jKrLD.8RTPzk4oe6c27b0ec9QP4DodbCVQLrLIEXS0xeT2vsp9cJK")); + admin.setPassword("$2a$10$jKrLD.8RTPzk4oe6c27b0ec9QP4DodbCVQLrLIEXS0xeT2vsp9cJK"); }else { - admin.setPassword(passwordEncoder.encode(admin.getPassword())); + admin.setPassword(admin.getPassword()); } return adminMapper.insert(admin); } @@ -85,7 +85,7 @@ public class AdminServiceImpl implements AdminService { @Override public Admin login(Admin admin) throws Exception { - Admin admin1=adminMapper.selectByJwcode(admin); + Admin admin1=adminMapper.selectByJwcode(admin.getJwcode()); String[] machineIds = admin1.getMachineId().split(","); boolean flag = false; for(String machineId:machineIds) { @@ -122,7 +122,7 @@ public class AdminServiceImpl implements AdminService { @Override public List selectNo(Admin admin) { - Admin admin1 = adminMapper.selectByJwcode(admin); + Admin admin1 = adminMapper.selectByJwcode(admin.getJwcode()); if (ObjectUtils.isEmpty(admin1)) { throw new RuntimeException("用户不存在"); } diff --git a/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java index 5e812f9..7e3c55f 100644 --- a/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java @@ -145,10 +145,10 @@ public class AuditServiceImpl implements AuditService { System.out.println(detailY); // result = detailYMapper.add(detailY); if(paidGold != null && paidGold.compareTo(BigDecimal.ZERO) != 0) { - GoldTistV2.addCoinNew(jwcode, 55, paidGold.doubleValue(), remark, 0, username, "金币"); + GoldTistV2.addCoinNew(jwcode, 64, paidGold.doubleValue(), remark, 0, username, "金币充值"); } if(freeGold != null && freeGold.compareTo(BigDecimal.ZERO) != 0) { - GoldTistV2.addCoinNew(jwcode, 55, freeGold.doubleValue(), remark, 0, username, "金币"); + GoldTistV2.addCoinNew(jwcode, 63, freeGold.doubleValue(), remark, 0, username, "金币充值 "); } } return auditMapper.update(audit); diff --git a/src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java index 099f17a..64467e2 100644 --- a/src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java @@ -2,6 +2,7 @@ package com.example.demo.serviceImpl; +import com.example.demo.Util.GoldTistV2; import com.example.demo.domain.entity.*; import com.example.demo.domain.vo.ConsumeDetail; import com.example.demo.domain.vo.DetailVo; @@ -57,6 +58,7 @@ public class ConsumeServiceImpl implements ConsumeService { String username =detailY.getUsername(); String area = detailY.getArea(); String jwcode = detailY.getJwcode(); + String product = detailY.getProductName(); UserGold userGold = userMapper.selectGold(jwcode); BigDecimal buyJb =userGold.getBuyJb(); BigDecimal coreJb=userGold.getCoreJb(); @@ -95,7 +97,7 @@ public class ConsumeServiceImpl implements ConsumeService { // 更新用户对象以反映新的余额 result = userMapper.updateGold(userGold); - + GoldTistV2.addCoinNew(jwcode, 65, (paidGold1.add(freeGold1).add(taskGold1)).doubleValue(), "购买商品", paidGold1.doubleValue(),username,product); return result; diff --git a/src/main/java/com/example/demo/serviceImpl/OtherServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/OtherServiceImpl.java index 47c9573..c55d313 100644 --- a/src/main/java/com/example/demo/serviceImpl/OtherServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/OtherServiceImpl.java @@ -19,6 +19,9 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.client.RestTemplate; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.math.BigDecimal; import java.time.LocalDate; import java.time.Month; @@ -33,6 +36,7 @@ import java.util.Map; @CacheConfig(cacheNames = "other") public class OtherServiceImpl implements OtherService { + private static final Logger log = LoggerFactory.getLogger(OtherServiceImpl.class); @Autowired private RestTemplate restTemplate; @@ -40,6 +44,7 @@ public class OtherServiceImpl implements OtherService { private static final Set typesToUpdateOne = new HashSet<>(); private static final Set typesToUpdateTwo = new HashSet<>(); private static final Set typesToUpdateThree = new HashSet<>(); + private static final Set typesToUpdateFour = new HashSet<>(); private final OtherMapper otherMapper; private final DetailYMapper detailYMapper; private final UserMapper userMapper; @@ -110,6 +115,9 @@ public class OtherServiceImpl implements OtherService { typesToUpdateThree.add("39"); typesToUpdateThree.add("44"); + + typesToUpdateFour.add("65"); + } @Override @@ -198,6 +206,12 @@ public class OtherServiceImpl implements OtherService { userMapper.addUserGold(userGold); } + + if (typesToUpdateFour.contains(type)) { + log.info("类型为 65，不写入数据"); + return 0; // 返回默认值 + } + if (typesToUpdateZero.contains(type)) { System.out.println("充值------------------------------------------------------"); detailY.setUpdateType(0);// 设置 updateType 为 0