From 4c107badc8bee7cb1d1d970e8738ac5fef90d982 Mon Sep 17 00:00:00 2001 From: wuchunlei Date: Mon, 13 May 2024 14:39:18 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E8=AE=B0=E5=BD=95=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/utils/DataMigrationUtil.java | 6 +- .../JfTransactionDetailsController.java | 42 ++++++++++++ .../service/JfTransactionDetailsService.java | 2 - .../common/service/MedicaldesBookService.java | 1 - .../MedicaldesInheritRelationService.java | 1 - .../service/MedicaldesInheritService.java | 1 - .../service/MedicaldesLightService.java | 1 - .../JfTransactionDetailsController.java | 66 +++++++++++++++++++ .../service/JfTransactionDetailsService.java | 7 ++ .../impl/JfTransactionDetailsServiceImpl.java | 13 ++++ 10 files changed, 132 insertions(+), 8 deletions(-) create mode 100644 src/main/java/com/peanut/modules/common/controller/JfTransactionDetailsController.java create mode 100644 src/main/java/com/peanut/modules/master/controller/JfTransactionDetailsController.java create mode 100644 src/main/java/com/peanut/modules/master/service/JfTransactionDetailsService.java create mode 100644 src/main/java/com/peanut/modules/master/service/impl/JfTransactionDetailsServiceImpl.java diff --git a/src/main/java/com/peanut/common/utils/DataMigrationUtil.java b/src/main/java/com/peanut/common/utils/DataMigrationUtil.java index 11fe08fb..0d04ab20 100644 --- a/src/main/java/com/peanut/common/utils/DataMigrationUtil.java +++ b/src/main/java/com/peanut/common/utils/DataMigrationUtil.java @@ -378,10 +378,10 @@ public class DataMigrationUtil extends Thread { BigDecimal userBalanceJf = new BigDecimal(0); PreparedStatement oidStatements = fzdsconn.prepareStatement("select * from user_copy1 where del_flag = 0 and yljk_oid = '"+map.get("oid")+"' "); ResultSet oidResultSet = oidStatements.executeQuery(); - userBalanceCoin = oidResultSet.getBigDecimal("peanut_coin").add(new BigDecimal(map.get("point").toString())); - userBalanceJf = oidResultSet.getBigDecimal("jf").add(new BigDecimal(map.get("pointByJF").toString())); //已绑定过id if (oidResultSet.next()){ + userBalanceCoin = oidResultSet.getBigDecimal("peanut_coin").add(new BigDecimal(map.get("point").toString())); + userBalanceJf = oidResultSet.getBigDecimal("jf").add(new BigDecimal(map.get("pointByJF").toString())); String sql = "update user_copy1 set " + "name = if(isnull(name),'"+map.get("nameCN")+"',name) , nickname = if(isnull(nickname),'"+map.get("nickName")+"',nickname) ," + "tel = if(isnull(tel),'"+map.get("cellPhone")+"',tel) ," + @@ -398,6 +398,8 @@ public class DataMigrationUtil extends Thread { if (telResultSet.getRow()>1){//这里需要检查 System.out.println(map.get("oid").toString()+"---"+map.get("nameCN").toString()+"有多账号"); }else { + userBalanceCoin = telResultSet.getBigDecimal("peanut_coin").add(new BigDecimal(map.get("point").toString())); + userBalanceJf = telResultSet.getBigDecimal("jf").add(new BigDecimal(map.get("pointByJF").toString())); String sql = "update user_copy1 set yljk_oid = '" + map.get("oid") +"',"+ " name = if(isnull(name),'"+map.get("nameCN")+"',name) , nickname = if(isnull(nickname),'"+map.get("nickName")+"',nickname) ," + "vip= "+map.get("payStatus")+" ,peanut_coin = peanut_coin + "+map.get("point")+" , jf = jf + "+map.get("pointByJF")+" where tel = '"+map.get("cellPhone")+"'"; diff --git a/src/main/java/com/peanut/modules/common/controller/JfTransactionDetailsController.java b/src/main/java/com/peanut/modules/common/controller/JfTransactionDetailsController.java new file mode 100644 index 00000000..0350c13a --- /dev/null +++ b/src/main/java/com/peanut/modules/common/controller/JfTransactionDetailsController.java @@ -0,0 +1,42 @@ +package com.peanut.modules.common.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.peanut.common.utils.R; +import com.peanut.modules.common.entity.JfTransactionDetails; +import com.peanut.modules.common.service.JfTransactionDetailsService; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import java.util.List; +import java.util.Map; + +/** + * @Description: 积分记录 + */ +@Slf4j +@RestController("commonJfTransactionDetails") +@RequestMapping("common/jfTransactionDetails") +public class JfTransactionDetailsController { + + @Autowired + private JfTransactionDetailsService jfService; + + /** + * 获取记录列表 + * @return + */ + @RequestMapping("/getJfTransactionDetailsList") + public R getTransactionDetailsList(@RequestBody Map params){ + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + if (params.containsKey("userId")&& StringUtils.isNotEmpty(params.get("userId").toString())){ + wrapper.eq(JfTransactionDetails::getUserId,params.get("userId")); + } + wrapper.orderByDesc(JfTransactionDetails::getCreateTime); + List list = jfService.list(wrapper); + return R.ok().put("transactionDetailsList",list); + } + +} diff --git a/src/main/java/com/peanut/modules/common/service/JfTransactionDetailsService.java b/src/main/java/com/peanut/modules/common/service/JfTransactionDetailsService.java index 0d1593de..09f44921 100644 --- a/src/main/java/com/peanut/modules/common/service/JfTransactionDetailsService.java +++ b/src/main/java/com/peanut/modules/common/service/JfTransactionDetailsService.java @@ -2,8 +2,6 @@ package com.peanut.modules.common.service; import com.baomidou.mybatisplus.extension.service.IService; import com.peanut.modules.common.entity.JfTransactionDetails; -import org.springframework.stereotype.Service; -@Service public interface JfTransactionDetailsService extends IService { } diff --git a/src/main/java/com/peanut/modules/common/service/MedicaldesBookService.java b/src/main/java/com/peanut/modules/common/service/MedicaldesBookService.java index a950849e..63f1af09 100644 --- a/src/main/java/com/peanut/modules/common/service/MedicaldesBookService.java +++ b/src/main/java/com/peanut/modules/common/service/MedicaldesBookService.java @@ -4,6 +4,5 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.peanut.modules.common.entity.MedicaldesBook; import org.springframework.stereotype.Service; -@Service public interface MedicaldesBookService extends IService { } diff --git a/src/main/java/com/peanut/modules/common/service/MedicaldesInheritRelationService.java b/src/main/java/com/peanut/modules/common/service/MedicaldesInheritRelationService.java index 2bb457fd..e8065207 100644 --- a/src/main/java/com/peanut/modules/common/service/MedicaldesInheritRelationService.java +++ b/src/main/java/com/peanut/modules/common/service/MedicaldesInheritRelationService.java @@ -4,6 +4,5 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.peanut.modules.common.entity.MedicaldesInheritRelation; import org.springframework.stereotype.Service; -@Service public interface MedicaldesInheritRelationService extends IService { } diff --git a/src/main/java/com/peanut/modules/common/service/MedicaldesInheritService.java b/src/main/java/com/peanut/modules/common/service/MedicaldesInheritService.java index 298d9e2b..fbe366b5 100644 --- a/src/main/java/com/peanut/modules/common/service/MedicaldesInheritService.java +++ b/src/main/java/com/peanut/modules/common/service/MedicaldesInheritService.java @@ -4,6 +4,5 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.peanut.modules.common.entity.MedicaldesInherit; import org.springframework.stereotype.Service; -@Service public interface MedicaldesInheritService extends IService { } diff --git a/src/main/java/com/peanut/modules/common/service/MedicaldesLightService.java b/src/main/java/com/peanut/modules/common/service/MedicaldesLightService.java index 8e689d87..8f9eb988 100644 --- a/src/main/java/com/peanut/modules/common/service/MedicaldesLightService.java +++ b/src/main/java/com/peanut/modules/common/service/MedicaldesLightService.java @@ -4,6 +4,5 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.peanut.modules.common.entity.MedicaldesLight; import org.springframework.stereotype.Service; -@Service public interface MedicaldesLightService extends IService { } diff --git a/src/main/java/com/peanut/modules/master/controller/JfTransactionDetailsController.java b/src/main/java/com/peanut/modules/master/controller/JfTransactionDetailsController.java new file mode 100644 index 00000000..5e8b23fd --- /dev/null +++ b/src/main/java/com/peanut/modules/master/controller/JfTransactionDetailsController.java @@ -0,0 +1,66 @@ +package com.peanut.modules.master.controller; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.peanut.common.utils.R; +import com.peanut.modules.common.entity.JfTransactionDetails; +import com.peanut.modules.master.service.JfTransactionDetailsService; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.Map; + +/** + * @Description: 积分记录 + */ +@Slf4j +@RestController("masterJfTransactionDetails") +@RequestMapping("master/jfTransactionDetails") +public class JfTransactionDetailsController { + + @Autowired + private JfTransactionDetailsService jfService; + + /** + * 列表 + */ + @RequestMapping("/listByPage") + public R listByPage(@RequestBody Map params) { + MPJLambdaWrapper wrapper = new MPJLambdaWrapper(); + if (params.containsKey("userId")&& StringUtils.isNotEmpty(params.get("userId").toString())) { + wrapper.eq(JfTransactionDetails::getUserId,params.get("userId")); + } + if (params.containsKey("actType")&&StringUtils.isNotEmpty(params.get("actType").toString())) { + wrapper.eq(JfTransactionDetails::getActType,params.get("actType")); + } + if (params.containsKey("remark")&&StringUtils.isNotEmpty(params.get("remark").toString())) { + wrapper.like(JfTransactionDetails::getRemark,params.get("remark")); + } + wrapper.orderByDesc(JfTransactionDetails::getCreateTime); + Page records = jfService.page(new Page<>( + Long.parseLong(params.get("current").toString()), Long.parseLong(params.get("limit").toString())), wrapper); + return R.ok().put("result", records); + } + + @RequestMapping("/getJfTransactionDetailsById") + public R getJfTransactionDetailsById(String id) { + return R.ok().put("result", jfService.getById(id)); + } + + @RequestMapping("/saveOrUpdateJfTransactionDetails") + public R saveOrUpdateJfTransactionDetails(@RequestBody JfTransactionDetails jf) { + jfService.saveOrUpdate(jf); + return R.ok(); + } + + @RequestMapping("/delJfTransactionDetails") + public R delJfTransactionDetails(String id) { + jfService.removeById(id); + return R.ok(); + } + +} diff --git a/src/main/java/com/peanut/modules/master/service/JfTransactionDetailsService.java b/src/main/java/com/peanut/modules/master/service/JfTransactionDetailsService.java new file mode 100644 index 00000000..2e713dd9 --- /dev/null +++ b/src/main/java/com/peanut/modules/master/service/JfTransactionDetailsService.java @@ -0,0 +1,7 @@ +package com.peanut.modules.master.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.peanut.modules.common.entity.JfTransactionDetails; + +public interface JfTransactionDetailsService extends IService { +} diff --git a/src/main/java/com/peanut/modules/master/service/impl/JfTransactionDetailsServiceImpl.java b/src/main/java/com/peanut/modules/master/service/impl/JfTransactionDetailsServiceImpl.java new file mode 100644 index 00000000..ff80e898 --- /dev/null +++ b/src/main/java/com/peanut/modules/master/service/impl/JfTransactionDetailsServiceImpl.java @@ -0,0 +1,13 @@ +package com.peanut.modules.master.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.peanut.modules.common.dao.JfTransactionDetailsDao; +import com.peanut.modules.common.entity.JfTransactionDetails; +import com.peanut.modules.master.service.JfTransactionDetailsService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +@Slf4j +@Service("masterJfTransactionDetailsService") +public class JfTransactionDetailsServiceImpl extends ServiceImpl implements JfTransactionDetailsService { +}