zm/nuttyreading-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

订单详情新增

Browse Source 
物流进度新增
用户合并修改
This commit is contained in:
wuchunlei
2024-06-03 17:03:23 +08:00
parent 6ed799cd3e
commit 8bec166fa6
8 changed files with 366 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/peanut/modules/master/controller/UserMergeController.java → src/main/java/com/peanut/modules/master/controller/UserManageController.java
View File

@@ -20,7 +20,7 @@ import java.util.Map;
@Slf4j
@RestController("masterUserManage")
@RequestMapping("master/userManage")
public class UserMergeController {
public class UserManageController {
@Autowired
private UserManageService mergeService;

173
src/main/java/com/peanut/modules/master/service/impl/UserManageServiceImpl.java
View File

@@ -2,16 +2,11 @@ package com.peanut.modules.master.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.peanut.common.utils.R;
import com.peanut.modules.common.dao.MyUserDao;
import com.peanut.modules.common.dao.UserContributionDao;
import com.peanut.modules.common.dao.UserContributionExchangeDao;
import com.peanut.modules.common.dao.UserCourseBuyDao;
import com.peanut.modules.common.entity.MyUserEntity;
import com.peanut.modules.common.entity.UserContribution;
import com.peanut.modules.common.entity.UserContributionExchange;
import com.peanut.modules.common.entity.UserCourseBuyEntity;
import com.peanut.modules.common.dao.*;
import com.peanut.modules.common.entity.*;
import com.peanut.modules.master.service.UserManageService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -24,11 +19,31 @@ public class UserManageServiceImpl implements UserManageService {
@Autowired
private MyUserDao userDao;
@Autowired
private UserVipDao userVipDao;
@Autowired
private UserContributionDao contributionDao;
@Autowired
private UserContributionExchangeDao exchangeDao;
@Autowired
private UserCourseBuyDao courseBuyDao;
@Autowired
private UserEbookBuyDao ebookBuyDao;
@Autowired
private UserAddressDao addressDao;
@Autowired
private UserBookClockDao clockDao;
@Autowired
private BuyOrderDao orderDao;
@Autowired
private PayZfbOrderDao zfbOrderDao;
@Autowired
private PayWechatOrderDao wechatOrderDao;
@Autowired
private PayPaymentOrderDao paymentOrderDao;
@Autowired
private TransactionDetailsDao detailsDao;
@Autowired
private JfTransactionDetailsDao jfDetailsDao;
@Override
public R userMerge(Map<String, Object> params) {
@@ -36,10 +51,108 @@ public class UserManageServiceImpl implements UserManageService {
MyUserEntity secondUser = userDao.selectById(params.get("secondAccountId").toString());
if (mainUser != null){
if (secondUser!=null){
//虚拟币、积分
//币、积分、权限
mainUser.setPeanutCoin(mainUser.getPeanutCoin().add(secondUser.getPeanutCoin()));
mainUser.setJf(mainUser.getJf().add(secondUser.getJf()));
if (mainUser.getPointPower()==0){
mainUser.setPointPower(secondUser.getPointPower());
}
if (mainUser.getTgdzPower()==0){
mainUser.setTgdzPower(secondUser.getTgdzPower());
}
if (mainUser.getWylqPower()==0){
mainUser.setWylqPower(secondUser.getWylqPower());
}
if (mainUser.getPrescriptAPower()==0){
mainUser.setPrescriptAPower(secondUser.getPrescriptAPower());
}
if (mainUser.getPrescriptBPower()==0){
mainUser.setPrescriptBPower(secondUser.getPrescriptBPower());
}
userDao.updateById(mainUser);
//删除次用户
userDao.deleteById(secondUser.getId());
//vip
//...
//vip记录
LambdaQueryWrapper<UserVip> userVipWrapper = new LambdaQueryWrapper<>();
// userVipWrapper.eq(UserVip::getUserId,secondUser.getId());
// List<UserVip> userVips = userVipDao.selectList(userVipWrapper);
// if (userVips != null&&userVips.size()>0) {
// for (UserVip userVip : userVips) {
// userVip.setUserId(mainUser.getId());
// userVipDao.updateById(userVip);
// }
// }
//币详情
LambdaQueryWrapper<TransactionDetailsEntity> detailsWrapper = new LambdaQueryWrapper<>();
detailsWrapper.eq(TransactionDetailsEntity::getUserId,secondUser.getId());
List<TransactionDetailsEntity> details = detailsDao.selectList(detailsWrapper);
if (details != null&&details.size()>0) {
for (TransactionDetailsEntity detail : details) {
detail.setUserId(mainUser.getId());
detailsDao.updateById(detail);
}
}
//积分详情
LambdaQueryWrapper<JfTransactionDetails> jfDetailsWrapper = new LambdaQueryWrapper<>();
jfDetailsWrapper.eq(JfTransactionDetails::getUserId,secondUser.getId());
List<JfTransactionDetails> jfdetails = jfDetailsDao.selectList(jfDetailsWrapper);
if (jfdetails != null&&jfdetails.size()>0) {
for (JfTransactionDetails jfdetail : jfdetails) {
jfdetail.setUserId(mainUser.getId());
jfDetailsDao.updateById(jfdetail);
}
}
//电子书
LambdaQueryWrapper<UserEbookBuyEntity> ebookWrapper = new LambdaQueryWrapper<>();
ebookWrapper.eq(UserEbookBuyEntity :: getUserId,secondUser.getId());
List<UserEbookBuyEntity> ebooks = ebookBuyDao.selectList(ebookWrapper);
if (ebooks != null&&ebooks.size()>0) {
for (UserEbookBuyEntity ebookBuyEntity : ebooks) {
LambdaQueryWrapper<UserEbookBuyEntity> mainebookWrapper = new LambdaQueryWrapper<>();
mainebookWrapper.eq(UserEbookBuyEntity::getUserId,mainUser.getId());
mainebookWrapper.eq(UserEbookBuyEntity::getBookId,ebookBuyEntity.getBookId());
List<UserEbookBuyEntity> mainebooks = ebookBuyDao.selectList(mainebookWrapper);
if (mainebooks != null&&mainebooks.size()==0){
ebookBuyEntity.setUserId(mainUser.getId());
ebookBuyDao.updateById(ebookBuyEntity);
}
}
}
//打卡
LambdaQueryWrapper<UserBookClockEntity> clockWrapper = new LambdaQueryWrapper<>();
clockWrapper.eq(UserBookClockEntity::getUserId,secondUser.getId());
List<UserBookClockEntity> clocks = clockDao.selectList(clockWrapper);
if (clocks != null&&clocks.size()>0) {
for (UserBookClockEntity clock : clocks) {
LambdaQueryWrapper<UserBookClockEntity> mainclockWrapper = new LambdaQueryWrapper<>();
mainclockWrapper.eq(UserBookClockEntity::getUserId,mainUser.getId());
mainclockWrapper.eq(UserBookClockEntity::getBookId,clock.getBookId());
List<UserBookClockEntity> mainclocks = clockDao.selectList(mainclockWrapper);
if (mainclocks != null&&mainclocks.size()>0){
clockDao.deleteBatchIds(mainclocks);
}
clock.setUserId(mainUser.getId());
clockDao.updateById(clock);
}
}
//收货地址
LambdaQueryWrapper<UserAddress> addressWrapper = new LambdaQueryWrapper<>();
addressWrapper.eq(UserAddress::getUserId,secondUser.getId());
List<UserAddress> address = addressDao.selectList(addressWrapper);
if (address != null&&address.size()>0) {
for (UserAddress addr : address) {
LambdaQueryWrapper<UserAddress> mainaddressWrapper = new LambdaQueryWrapper<>();
mainaddressWrapper.eq(UserAddress::getUserId,mainUser.getId());
List<UserAddress> mainebooks = addressDao.selectList(mainaddressWrapper);
if (mainebooks != null&&mainebooks.size()>0){
addr.setIsDefault(0);
}
addr.setUserId(mainUser.getId());
addressDao.updateById(addr);
}
}
//湖分
LambdaQueryWrapper<UserContribution> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(UserContribution :: getUserId,secondUser.getId());
@@ -76,8 +189,46 @@ public class UserManageServiceImpl implements UserManageService {
courseBuyDao.updateById(c);
}
}
//删除次用户
userDao.deleteById(secondUser.getId());
//订单
LambdaQueryWrapper<BuyOrder> orderWrapper = new LambdaQueryWrapper<>();
orderWrapper.eq(BuyOrder::getUserId,secondUser.getId());
List<BuyOrder> orders = orderDao.selectList(orderWrapper);
if (orders != null&&orders.size()>0) {
for (BuyOrder order : orders) {
order.setUserId(mainUser.getId());
orderDao.updateById(order);
}
}
//支付宝订单
LambdaQueryWrapper<PayZfbOrderEntity> zfbOrderWrapper = new LambdaQueryWrapper<>();
zfbOrderWrapper.eq(PayZfbOrderEntity::getCustomerid,secondUser.getId());
List<PayZfbOrderEntity> zfbOrders = zfbOrderDao.selectList(zfbOrderWrapper);
if (zfbOrders != null&&zfbOrders.size()>0) {
for (PayZfbOrderEntity zfbOrder : zfbOrders) {
zfbOrder.setCustomerid(mainUser.getId().toString());
zfbOrderDao.updateById(zfbOrder);
}
}
//微信订单
LambdaQueryWrapper<PayWechatOrderEntity> wechatOrderWrapper = new LambdaQueryWrapper<>();
wechatOrderWrapper.eq(PayWechatOrderEntity::getCustomerId,secondUser.getId());
List<PayWechatOrderEntity> wechatOrders = wechatOrderDao.selectList(wechatOrderWrapper);
if (wechatOrders != null&&wechatOrders.size()>0) {
for (PayWechatOrderEntity wechatOrder : wechatOrders) {
wechatOrder.setCustomerId(mainUser.getId());
wechatOrderDao.updateById(wechatOrder);
}
}
//paypaymentorder充值订单表
LambdaQueryWrapper<PayPaymentOrderEntity> paymentOrderWrapper = new LambdaQueryWrapper<>();
paymentOrderWrapper.eq(PayPaymentOrderEntity::getUserId,secondUser.getId());
List<PayPaymentOrderEntity> paymentOrders = paymentOrderDao.selectList(paymentOrderWrapper);
if (paymentOrders != null&&paymentOrders.size()>0) {
for (PayPaymentOrderEntity paymentOrder : paymentOrders) {
paymentOrder.setUserId(mainUser.getId());
paymentOrderDao.updateById(paymentOrder);
}
}
}else {
return R.error("次账号未找到");
}