修改主键不是id用getById问题
This commit is contained in:
@ -76,7 +76,7 @@ public class YxWechatMenuServiceImpl extends BaseServiceImpl<YxWechatMenuMapper,
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Boolean isExist(String wechat_menus) {
|
public Boolean isExist(String wechat_menus) {
|
||||||
YxWechatMenu yxWechatMenu = this.getOne(new QueryWrapper<YxWechatMenu>().eq("key",wechat_menus));
|
YxWechatMenu yxWechatMenu = this.getOne(new QueryWrapper<YxWechatMenu>().eq("`key`",wechat_menus));
|
||||||
if(yxWechatMenu == null){
|
if(yxWechatMenu == null){
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -9,7 +9,9 @@ import co.yixiang.exception.BadRequestException;
|
|||||||
import co.yixiang.modules.activity.domain.YxUserExtract;
|
import co.yixiang.modules.activity.domain.YxUserExtract;
|
||||||
import co.yixiang.modules.activity.service.YxUserExtractService;
|
import co.yixiang.modules.activity.service.YxUserExtractService;
|
||||||
import co.yixiang.modules.activity.service.dto.YxUserExtractQueryCriteria;
|
import co.yixiang.modules.activity.service.dto.YxUserExtractQueryCriteria;
|
||||||
|
import co.yixiang.modules.shop.domain.YxUser;
|
||||||
import co.yixiang.modules.shop.domain.YxUserBill;
|
import co.yixiang.modules.shop.domain.YxUserBill;
|
||||||
|
import co.yixiang.modules.shop.domain.YxWechatUser;
|
||||||
import co.yixiang.modules.shop.service.YxUserBillService;
|
import co.yixiang.modules.shop.service.YxUserBillService;
|
||||||
import co.yixiang.modules.shop.service.YxUserService;
|
import co.yixiang.modules.shop.service.YxUserService;
|
||||||
import co.yixiang.modules.shop.service.YxWechatUserService;
|
import co.yixiang.modules.shop.service.YxWechatUserService;
|
||||||
@ -17,6 +19,7 @@ import co.yixiang.modules.shop.service.dto.YxUserDto;
|
|||||||
import co.yixiang.modules.shop.service.dto.YxWechatUserDto;
|
import co.yixiang.modules.shop.service.dto.YxWechatUserDto;
|
||||||
import co.yixiang.mp.service.YxPayService;
|
import co.yixiang.mp.service.YxPayService;
|
||||||
import co.yixiang.utils.OrderUtil;
|
import co.yixiang.utils.OrderUtil;
|
||||||
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||||
import com.github.binarywang.wxpay.exception.WxPayException;
|
import com.github.binarywang.wxpay.exception.WxPayException;
|
||||||
import io.swagger.annotations.Api;
|
import io.swagger.annotations.Api;
|
||||||
import io.swagger.annotations.ApiOperation;
|
import io.swagger.annotations.ApiOperation;
|
||||||
@ -82,7 +85,7 @@ public class UserExtractController {
|
|||||||
throw new BadRequestException("请填写失败原因");
|
throw new BadRequestException("请填写失败原因");
|
||||||
}
|
}
|
||||||
String mark = "提现失败,退回佣金"+resources.getExtractPrice()+"元";
|
String mark = "提现失败,退回佣金"+resources.getExtractPrice()+"元";
|
||||||
YxUserDto userDTO = generator.convert(yxUserService.getById(resources.getUid()),YxUserDto.class);
|
YxUserDto userDTO = generator.convert(yxUserService.getOne(new QueryWrapper<YxUser>().eq("uid",resources.getUid())),YxUserDto.class);
|
||||||
|
|
||||||
//增加流水
|
//增加流水
|
||||||
YxUserBill userBill = new YxUserBill();
|
YxUserBill userBill = new YxUserBill();
|
||||||
@ -109,7 +112,7 @@ public class UserExtractController {
|
|||||||
//todo 此处为企业付款,没经过测试
|
//todo 此处为企业付款,没经过测试
|
||||||
boolean isTest = true;
|
boolean isTest = true;
|
||||||
if(!isTest){
|
if(!isTest){
|
||||||
YxWechatUserDto wechatUser = generator.convert(wechatUserService.getById(resources.getUid()),YxWechatUserDto.class);
|
YxWechatUserDto wechatUser = generator.convert(wechatUserService.getOne(new QueryWrapper<YxWechatUser>().eq("uid",resources.getUid())),YxWechatUserDto.class);
|
||||||
if(ObjectUtil.isNotNull(wechatUser)){
|
if(ObjectUtil.isNotNull(wechatUser)){
|
||||||
try {
|
try {
|
||||||
payService.entPay(wechatUser.getOpenid(),resources.getId().toString(),
|
payService.entPay(wechatUser.getOpenid(),resources.getId().toString(),
|
||||||
|
@ -6,9 +6,11 @@ import co.yixiang.modules.activity.service.YxStoreCouponUserService;
|
|||||||
import co.yixiang.modules.activity.service.dto.YxStoreCouponUserDTO;
|
import co.yixiang.modules.activity.service.dto.YxStoreCouponUserDTO;
|
||||||
import co.yixiang.modules.activity.service.dto.YxStoreCouponUserQueryCriteria;
|
import co.yixiang.modules.activity.service.dto.YxStoreCouponUserQueryCriteria;
|
||||||
import co.yixiang.modules.activity.service.mapper.YxStoreCouponUserMapper;
|
import co.yixiang.modules.activity.service.mapper.YxStoreCouponUserMapper;
|
||||||
|
import co.yixiang.modules.shop.domain.YxUser;
|
||||||
import co.yixiang.modules.shop.service.YxUserService;
|
import co.yixiang.modules.shop.service.YxUserService;
|
||||||
import co.yixiang.utils.QueryHelp;
|
import co.yixiang.utils.QueryHelp;
|
||||||
import co.yixiang.utils.ValidationUtil;
|
import co.yixiang.utils.ValidationUtil;
|
||||||
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||||
import org.springframework.data.domain.Page;
|
import org.springframework.data.domain.Page;
|
||||||
import org.springframework.data.domain.Pageable;
|
import org.springframework.data.domain.Pageable;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
@ -49,7 +51,7 @@ public class YxStoreCouponUserServiceImpl implements YxStoreCouponUserService {
|
|||||||
List<YxStoreCouponUserDTO> storeOrderDTOS = yxStoreCouponUserMapper
|
List<YxStoreCouponUserDTO> storeOrderDTOS = yxStoreCouponUserMapper
|
||||||
.toDto(page.getContent());
|
.toDto(page.getContent());
|
||||||
for (YxStoreCouponUserDTO couponUserDTO : storeOrderDTOS) {
|
for (YxStoreCouponUserDTO couponUserDTO : storeOrderDTOS) {
|
||||||
couponUserDTO.setNickname(userService.getById(couponUserDTO.getUid()).getNickname());
|
couponUserDTO.setNickname(userService.getOne(new QueryWrapper<YxUser>().eq("uid",couponUserDTO.getUid())).getNickname());
|
||||||
}
|
}
|
||||||
Map<String,Object> map = new LinkedHashMap<>(2);
|
Map<String,Object> map = new LinkedHashMap<>(2);
|
||||||
map.put("content",storeOrderDTOS);
|
map.put("content",storeOrderDTOS);
|
||||||
|
@ -15,6 +15,7 @@ import co.yixiang.express.dao.ExpressInfo;
|
|||||||
import co.yixiang.modules.activity.service.YxStorePinkService;
|
import co.yixiang.modules.activity.service.YxStorePinkService;
|
||||||
import co.yixiang.modules.shop.domain.YxStoreOrder;
|
import co.yixiang.modules.shop.domain.YxStoreOrder;
|
||||||
import co.yixiang.modules.shop.domain.YxStoreOrderStatus;
|
import co.yixiang.modules.shop.domain.YxStoreOrderStatus;
|
||||||
|
import co.yixiang.modules.shop.domain.YxWechatUser;
|
||||||
import co.yixiang.modules.shop.service.*;
|
import co.yixiang.modules.shop.service.*;
|
||||||
import co.yixiang.modules.shop.service.dto.*;
|
import co.yixiang.modules.shop.service.dto.*;
|
||||||
import co.yixiang.modules.shop.service.param.ExpressParam;
|
import co.yixiang.modules.shop.service.param.ExpressParam;
|
||||||
@ -23,6 +24,7 @@ import co.yixiang.utils.OrderUtil;
|
|||||||
import com.alibaba.fastjson.JSON;
|
import com.alibaba.fastjson.JSON;
|
||||||
import com.alibaba.fastjson.JSONArray;
|
import com.alibaba.fastjson.JSONArray;
|
||||||
import com.alibaba.fastjson.JSONObject;
|
import com.alibaba.fastjson.JSONObject;
|
||||||
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||||
import io.swagger.annotations.Api;
|
import io.swagger.annotations.Api;
|
||||||
import io.swagger.annotations.ApiOperation;
|
import io.swagger.annotations.ApiOperation;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
@ -220,7 +222,7 @@ public class StoreOrderController {
|
|||||||
|
|
||||||
//模板消息通知
|
//模板消息通知
|
||||||
try {
|
try {
|
||||||
YxWechatUserDto wechatUser = generator.convert(wechatUserService.getById(resources.getUid()),YxWechatUserDto.class);
|
YxWechatUserDto wechatUser = generator.convert(wechatUserService.getOne(new QueryWrapper<YxWechatUser>().eq("uid",resources.getUid())),YxWechatUserDto.class);
|
||||||
if (ObjectUtil.isNotNull(wechatUser)) {
|
if (ObjectUtil.isNotNull(wechatUser)) {
|
||||||
//公众号与小程序打通统一公众号模板通知
|
//公众号与小程序打通统一公众号模板通知
|
||||||
if (StrUtil.isNotBlank(wechatUser.getOpenid())) {
|
if (StrUtil.isNotBlank(wechatUser.getOpenid())) {
|
||||||
@ -291,7 +293,7 @@ public class StoreOrderController {
|
|||||||
|
|
||||||
//模板消息通知
|
//模板消息通知
|
||||||
try {
|
try {
|
||||||
YxWechatUserDto wechatUser = generator.convert(wechatUserService.getById(resources.getUid()),YxWechatUserDto.class);
|
YxWechatUserDto wechatUser = generator.convert(wechatUserService.getOne(new QueryWrapper<YxWechatUser>().eq("uid",resources.getUid())),YxWechatUserDto.class);
|
||||||
if (ObjectUtil.isNotNull(wechatUser)) {
|
if (ObjectUtil.isNotNull(wechatUser)) {
|
||||||
//公众号与小程序打通统一公众号模板通知
|
//公众号与小程序打通统一公众号模板通知
|
||||||
if (StrUtil.isNotBlank(wechatUser.getOpenid())) {
|
if (StrUtil.isNotBlank(wechatUser.getOpenid())) {
|
||||||
|
@ -106,17 +106,17 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<YxStoreOrderMapper,
|
|||||||
.beginOfMonth(new Date()));
|
.beginOfMonth(new Date()));
|
||||||
OrderTimeDataDTO orderTimeDataDTO = new OrderTimeDataDTO();
|
OrderTimeDataDTO orderTimeDataDTO = new OrderTimeDataDTO();
|
||||||
|
|
||||||
// orderTimeDataDTO.setTodayCount(yxStoreOrderMapper.countByPayTimeGreaterThanEqual(today));
|
// todo orderTimeDataDTO.setTodayCount(yxStoreOrderMapper.countByPayTimeGreaterThanEqual(today));
|
||||||
// //orderTimeDataDTO.setTodayPrice(yxStoreOrderMapper.sumPrice(today));
|
// //orderTimeDataDTO.setTodayPrice(yxStoreOrderMapper.sumPrice(today));
|
||||||
//
|
//
|
||||||
// orderTimeDataDTO.setProCount(yxStoreOrderMapper
|
// todo orderTimeDataDTO.setProCount(yxStoreOrderMapper
|
||||||
// .countByPayTimeLessThanAndPayTimeGreaterThanEqual(today,yesterday));
|
// .countByPayTimeLessThanAndPayTimeGreaterThanEqual(today,yesterday));
|
||||||
// //orderTimeDataDTO.setProPrice(yxStoreOrderMapper.sumTPrice(today,yesterday));
|
// //orderTimeDataDTO.setProPrice(yxStoreOrderMapper.sumTPrice(today,yesterday));
|
||||||
//
|
//
|
||||||
// orderTimeDataDTO.setLastWeekCount(yxStoreOrderMapper.countByPayTimeGreaterThanEqual(lastWeek));
|
// todo orderTimeDataDTO.setLastWeekCount(yxStoreOrderMapper.countByPayTimeGreaterThanEqual(lastWeek));
|
||||||
// //orderTimeDataDTO.setLastWeekPrice(yxStoreOrderMapper.sumPrice(lastWeek));
|
// //orderTimeDataDTO.setLastWeekPrice(yxStoreOrderMapper.sumPrice(lastWeek));
|
||||||
//
|
//
|
||||||
// orderTimeDataDTO.setMonthCount(yxStoreOrderMapper.countByPayTimeGreaterThanEqual(nowMonth));
|
// todo orderTimeDataDTO.setMonthCount(yxStoreOrderMapper.countByPayTimeGreaterThanEqual(nowMonth));
|
||||||
// //orderTimeDataDTO.setMonthPrice(yxStoreOrderMapper.sumPrice(nowMonth));
|
// //orderTimeDataDTO.setMonthPrice(yxStoreOrderMapper.sumPrice(nowMonth));
|
||||||
|
|
||||||
orderTimeDataDTO.setUserCount(userMapper.selectCount(new QueryWrapper<YxUser>()));
|
orderTimeDataDTO.setUserCount(userMapper.selectCount(new QueryWrapper<YxUser>()));
|
||||||
@ -344,7 +344,7 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<YxStoreOrderMapper,
|
|||||||
cartInfoDTOS.add(cartInfoDTO);
|
cartInfoDTOS.add(cartInfoDTO);
|
||||||
}
|
}
|
||||||
yxStoreOrderDTO.setCartInfoList(cartInfoDTOS);
|
yxStoreOrderDTO.setCartInfoList(cartInfoDTOS);
|
||||||
yxStoreOrderDTO.setUserDTO(generator.convert(userService.getById(yxStoreOrder.getUid()), YxUserDto.class));
|
yxStoreOrderDTO.setUserDTO(generator.convert(userService.getOne(new QueryWrapper<YxUser>().eq("uid",yxStoreOrder.getUid())), YxUserDto.class));
|
||||||
|
|
||||||
storeOrderDTOS.add(yxStoreOrderDTO);
|
storeOrderDTOS.add(yxStoreOrderDTO);
|
||||||
|
|
||||||
@ -405,7 +405,7 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<YxStoreOrderMapper,
|
|||||||
this.save(resources);
|
this.save(resources);
|
||||||
|
|
||||||
//退款到余额
|
//退款到余额
|
||||||
YxUserDto userDTO = generator.convert(userService.getById(resources.getUid()),YxUserDto.class);
|
YxUserDto userDTO = generator.convert(userService.getOne(new QueryWrapper<YxUser>().eq("uid",resources.getUid())),YxUserDto.class);
|
||||||
userMapper.updateMoney(resources.getPayPrice().doubleValue(),
|
userMapper.updateMoney(resources.getPayPrice().doubleValue(),
|
||||||
resources.getUid());
|
resources.getUid());
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user