积分记录管理端
This commit is contained in:
@@ -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")+"'";
|
||||
|
||||
@@ -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<JfTransactionDetails> 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<JfTransactionDetails> list = jfService.list(wrapper);
|
||||
return R.ok().put("transactionDetailsList",list);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -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<JfTransactionDetails> {
|
||||
}
|
||||
|
||||
@@ -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<MedicaldesBook> {
|
||||
}
|
||||
|
||||
@@ -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<MedicaldesInheritRelation> {
|
||||
}
|
||||
|
||||
@@ -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<MedicaldesInherit> {
|
||||
}
|
||||
|
||||
@@ -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<MedicaldesLight> {
|
||||
}
|
||||
|
||||
@@ -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<String, Object> params) {
|
||||
MPJLambdaWrapper<JfTransactionDetails> 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<JfTransactionDetails> 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();
|
||||
}
|
||||
|
||||
}
|
||||
@@ -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<JfTransactionDetails> {
|
||||
}
|
||||
@@ -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<JfTransactionDetailsDao, JfTransactionDetails> implements JfTransactionDetailsService {
|
||||
}
|
||||
Reference in New Issue
Block a user