Skip to content

X
xinrenli
Commit 8ee20c97 by 郑云飞
Options

Merge remote-tracking branch 'origin/master'

parents f2610a79 643909c7
Showing with 195 additions and 166 deletions
yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/controller/DbOrderController.java
......@@ -5,6 +5,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Arrays;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.github.binarywang.wxpay.exception.WxPayException;
import com.yongqi.common.core.domain.model.LoginUser;
import com.yongqi.common.helper.LoginHelper;
......@@ -58,7 +59,16 @@ public class DbOrderController extends BaseController {
public TableDataInfo<DbOrderVo> list(DbOrderBo bo, PageQuery pageQuery) {
return iDbOrderService.homeList(bo, pageQuery);
}
/**
* 查询订单列表
*/
@SaCheckPermission("xinrenli:order:listUser")
@GetMapping("/listUser")
public TableDataInfo<DbOrderVo> listUser(DbOrderBo bo, PageQuery pageQuery) {
LoginUser loginUser = getLoginUser();
bo.setUserId(loginUser.getUserId());
return iDbOrderService.homeList(bo, pageQuery);
}
/**
* 用户需求广场
*/
......@@ -74,9 +84,8 @@ public class DbOrderController extends BaseController {
@SaCheckPermission("xinrenli:order:MyNeeds")
@GetMapping("/MyNeeds")
public TableDataInfo<DbOrderVo> MyNeeds(DbOrderBo bo, PageQuery pageQuery) {
// LoginUser loginUser = getLoginUser();
LoginUser loginUser = new LoginUser();
loginUser.setUserId(1L);
LoginUser loginUser = getLoginUser();
bo.setUserId(loginUser.getUserId());
return iDbOrderService.myNeeds(bo, pageQuery, loginUser);
}
......@@ -119,10 +128,12 @@ public class DbOrderController extends BaseController {
@RepeatSubmit()
@PostMapping("/add")
public R<Void> add(@Validated(AddGroup.class) @RequestBody DbOrderBo bo) {
LoginUser loginUser = getLoginUser();
LoginUser user = new LoginUser();
user.setUserId(bo.getUserId());
return toAjax(iDbOrderService.insertByBo(bo, user));
LoginUser loginUser = getLoginUser();
bo.setUserId(loginUser.getUserId());
if (ObjectUtils.isEmpty(bo.getPictureList()) && ObjectUtils.isEmpty(bo.getVideoList()) && ObjectUtils.isEmpty(bo.getVoiceList())) {
return R.fail("图片，视频，语音必须上传其中一个");
}
return toAjax(iDbOrderService.insertByBo(bo, loginUser));
}
/**
......@@ -132,10 +143,12 @@ public class DbOrderController extends BaseController {
@Log(title = "订单", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PostMapping("/edit")
public R<Void> edit(@Validated(EditGroup.class)@RequestBody DbOrderEditBo bo) {
// LoginUser loginUser = getLoginUser();
LoginUser loginUser = new LoginUser();
loginUser.setUserId(bo.getUserId());
public R<Void> edit(@Validated(EditGroup.class) @RequestBody DbOrderEditBo bo) {
LoginUser loginUser = getLoginUser();
bo.setUserId(loginUser.getUserId());
if (ObjectUtils.isEmpty(bo.getPictureList()) && ObjectUtils.isEmpty(bo.getVideoList()) && ObjectUtils.isEmpty(bo.getVoiceList())) {
return R.fail("图片，视频，语音必须上传其中一个");
}
return toAjax(iDbOrderService.updateByBo(bo, loginUser));
}
......@@ -149,14 +162,15 @@ public class DbOrderController extends BaseController {
@GetMapping("/remove")
public R<Void> remove(@NotNull(message = "主键不能为空")
@RequestParam("id") Long id) {
LoginUser loginUser = new LoginUser();
LoginUser loginUser = getLoginUser();
return toAjax(iDbOrderService.deleteWithValidByIds(id, loginUser));
}
/**
* 下单
* @param orderId 订单id
* @param couponId 优惠券id
*
* @param orderId 订单id
* @param couponId 优惠券id
* @param request
* @return
*/
......@@ -183,15 +197,16 @@ public class DbOrderController extends BaseController {
/**
* 退款
* @param orderId 订单id
* @param refundAmount 退款金额
*
* @param orderId 订单id
* @param refundAmount 退款金额
* @return
*/
@SaCheckPermission("xinrenli:order:refund")
@Log(title = "退款", businessType = BusinessType.OTHER)
@GetMapping("/refund")
public R refund(@NotNull(message = "订单id不能为空") @RequestParam("orderId") Long orderId,
@NotNull(message = "退款金额不能为空")@RequestParam("refundeAmount") BigDecimal refundAmount) {
@NotNull(message = "退款金额不能为空") @RequestParam("refundeAmount") BigDecimal refundAmount) {
LoginUser loginUser = LoginHelper.getLoginUser();
return iDbOrderService.refund(orderId, refundAmount, loginUser);
}
......@@ -215,6 +230,7 @@ public class DbOrderController extends BaseController {
public R<ReportFormsVo> reportForms() {
return R.ok(iDbOrderService.reportForms());
}
/**
* 导出报表
*/
......@@ -231,9 +247,9 @@ public class DbOrderController extends BaseController {
return toAjax(false);
}
return toAjax(true);
}
/**
* 生成支付订单和发起退款接口，驳回接口
*/
......
yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/controller/DbUserCommentController.java
......@@ -3,6 +3,7 @@ package com.yongqi.xinrenli.controller;
import java.util.List;
import java.util.Arrays;
import com.yongqi.common.core.domain.model.LoginUser;
import lombok.RequiredArgsConstructor;
import javax.servlet.http.HttpServletResponse;
......@@ -79,6 +80,8 @@ public class DbUserCommentController extends BaseController {
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody DbUserCommentBo bo) {
LoginUser loginUser = getLoginUser();
bo.setUserId(loginUser.getUserId());
return toAjax(iDbUserCommentService.insertByBo(bo));
}
......
yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/controller/DbUserCouponController.java
......@@ -3,6 +3,7 @@ package com.yongqi.xinrenli.controller;
import java.util.List;
import java.util.Arrays;
import com.yongqi.common.core.domain.model.LoginUser;
import com.yongqi.xinrenli.domain.DbCoupon;
import com.yongqi.xinrenli.domain.bo.DbCouponBo;
import com.yongqi.xinrenli.domain.vo.DbCouponVo;
......@@ -48,6 +49,8 @@ public class DbUserCouponController extends BaseController {
@SaCheckPermission("xinrenli:userCoupon:list")
@GetMapping("/list")
public TableDataInfo<DbCouponVo> list(DbUserCouponBo bo, PageQuery pageQuery) {
LoginUser loginUser = getLoginUser();
bo.setUserId(loginUser.getUserId());
return iDbUserCouponService.queryPageList(bo, pageQuery);
}
/**
......@@ -56,6 +59,8 @@ public class DbUserCouponController extends BaseController {
@SaCheckPermission("xinrenli:userCoupon:listLose")
@GetMapping("/listLose")
public TableDataInfo<DbCouponVo> listLose(DbUserCouponBo bo, PageQuery pageQuery) {
LoginUser loginUser = getLoginUser();
bo.setUserId(loginUser.getUserId());
return iDbUserCouponService.queryPageListLose(bo, pageQuery);
}
......@@ -79,6 +84,7 @@ public class DbUserCouponController extends BaseController {
@GetMapping("/{id}")
public R<DbUserCouponVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
return R.ok(iDbUserCouponService.queryById(id));
}
......
yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/controller/DbWxUserController.java
......@@ -3,6 +3,7 @@ package com.yongqi.xinrenli.controller;
import java.util.List;
import java.util.Arrays;
import com.yongqi.common.core.domain.model.LoginUser;
import lombok.RequiredArgsConstructor;
import javax.servlet.http.HttpServletResponse;
......@@ -90,6 +91,8 @@ public class DbWxUserController extends BaseController {
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody DbWxUserBo bo) {
LoginUser loginUser = getLoginUser();
bo.setId(loginUser.getUserId());
return toAjax(iDbWxUserService.updateByBo(bo));
}
......
yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/domain/bo/DbOrderBo.java
......@@ -3,6 +3,7 @@ package com.yongqi.xinrenli.domain.bo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.yongqi.common.core.validate.AddGroup;
import com.yongqi.common.core.validate.EditGroup;
import com.yongqi.xinrenli.domain.vo.DbFileVo;
import lombok.Data;
import lombok.EqualsAndHashCode;
......@@ -82,7 +83,7 @@ public class DbOrderBo extends BaseEntity {
/**
* 备注说明
*/
@NotBlank(message = "备注说明不能为空", groups = {AddGroup.class, EditGroup.class})
//@NotBlank(message = "备注说明不能为空", groups = {AddGroup.class, EditGroup.class})
private String remark;
/**
......@@ -118,8 +119,19 @@ public class DbOrderBo extends BaseEntity {
/**
* 文件列表
*/
@NotNull(message = "图片，视频，语音必须上传其中一个", groups = {AddGroup.class, EditGroup.class})
@NotNull(message = "图片，视频，语音必须上传其中一个", groups = {EditGroup.class})
private List<DbFileBo> fileVos;
/**
* 图片列表
*/
private List<DbFileBo> pictureList;
/**
* 视频列表
*/
private List<DbFileBo> videoList;
/**
* 语言列表
*/
private List<DbFileBo> voiceList;
}
yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/domain/bo/DbOrderEditBo.java
......@@ -78,7 +78,7 @@ public class DbOrderEditBo extends BaseEntity {
/**
* 备注说明
*/
@NotBlank(message = "备注说明不能为空", groups = {AddGroup.class, EditGroup.class})
//@NotBlank(message = "备注说明不能为空", groups = {AddGroup.class, EditGroup.class})
private String remark;
/**
......@@ -114,8 +114,19 @@ public class DbOrderEditBo extends BaseEntity {
/**
* 文件列表
*/
@NotNull(message = "图片，视频，语音必须上传其中一个", groups = {AddGroup.class, EditGroup.class})
//@NotNull(message = "图片，视频，语音必须上传其中一个", groups = {AddGroup.class, EditGroup.class})
private List<DbFileBo> fileBoList;
/**
* 图片列表
*/
private List<DbFileBo> pictureList;
/**
* 视频列表
*/
private List<DbFileBo> videoList;
/**
* 语言列表
*/
private List<DbFileBo> voiceList;
}
yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/domain/bo/DbWxUserBo.java
......@@ -27,7 +27,7 @@ public class DbWxUserBo extends BaseEntity {
/**
* 主键标识
*/
@NotNull(message = "主键标识不能为空", groups = {EditGroup.class})
@NotNull(message = "主键标识不能为空", groups = {})
private Long id;
/**
......@@ -36,11 +36,7 @@ public class DbWxUserBo extends BaseEntity {
@NotBlank(message = "微信用户的唯一标识不能为空", groups = {AddGroup.class})
private String openId;
/**
* 是否是团长：1：是，2：否
*/
@NotNull(message = "是否是团长：1：是，2：否不能为空", groups = {AddGroup.class})
private Integer headOrNot;
/**
* 用户昵称
......@@ -96,17 +92,6 @@ public class DbWxUserBo extends BaseEntity {
@NotBlank(message = "授权手机号不能为空", groups = {AddGroup.class})
private String authMobile;
/**
* 商场编码
*/
@NotBlank(message = "商场编码不能为空", groups = {AddGroup.class})
private String mallCode;
/**
* 会员卡号
*/
@NotBlank(message = "会员卡号不能为空", groups = {AddGroup.class})
private String userCode;
/**
*
......@@ -132,29 +117,13 @@ public class DbWxUserBo extends BaseEntity {
@NotBlank(message = "微信原始ID不能为空", groups = {AddGroup.class})
private String wechatOriginalId;
/**
* 下单次数
*/
@NotNull(message = "下单次数不能为空", groups = {AddGroup.class})
private Long orderNum;
/**
* 累计消费
*/
@NotNull(message = "累计消费不能为空", groups = {AddGroup.class})
private BigDecimal cumulativeConsumption;
/**
* 最近消费时间
*/
@NotNull(message = "最近消费时间不能为空", groups = {AddGroup.class})
private Date lastConsumptionTime;
/**
* 创建人Code
*/
@NotBlank(message = "创建人Code不能为空", groups = {AddGroup.class})
private String createCode;
/**
* 更新时间
......@@ -168,11 +137,6 @@ public class DbWxUserBo extends BaseEntity {
@NotBlank(message = "更新者不能为空", groups = {AddGroup.class})
private String modifyBy;
/**
* 更新者code
*/
@NotBlank(message = "更新者code不能为空", groups = {AddGroup.class})
private String modifyCode;
/**
* 删除状态 0：未删除 1：删除
......
yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/domain/vo/DbOrderVo.java
......@@ -119,14 +119,14 @@ public class DbOrderVo {
/**
* 图片列表
*/
private List<DbFileVo> picture;
private List<DbFileVo> pictureList;
/**
* 视频列表
*/
private List<DbFileVo> video;
private List<DbFileVo> videoList;
/**
* 语言列表
*/
private List<DbFileVo> voice;
private List<DbFileVo> voiceList;
}
yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/domain/vo/DbWxUserVo.java
......@@ -32,11 +32,6 @@ public class DbWxUserVo {
@ExcelProperty(value = "微信用户的唯一标识")
private String openId;
/**
* 是否是团长：1：是，2：否
*/
@ExcelProperty(value = "是否是团长：1：是，2：否")
private Integer headOrNot;
/**
* 用户昵称
......@@ -93,18 +88,6 @@ public class DbWxUserVo {
private String authMobile;
/**
* 商场编码
*/
@ExcelProperty(value = "商场编码")
private String mallCode;
/**
* 会员卡号
*/
@ExcelProperty(value = "会员卡号")
private String userCode;
/**
*
*/
@ExcelProperty(value = "")
......@@ -126,31 +109,15 @@ public class DbWxUserVo {
* 微信原始ID
*/
@ExcelProperty(value = "微信原始ID")
private String wechatOriginalId;
/**
* 下单次数
*/
@ExcelProperty(value = "下单次数")
private Long orderNum;
/**
* 累计消费
*/
@ExcelProperty(value = "累计消费")
private BigDecimal cumulativeConsumption;
/**
* 最近消费时间
private String wechatOriginalId;/**
* 微信原始ID
*/
@ExcelProperty(value = "最近消费时间")
private Date lastConsumptionTime;
/**
* 创建人Code
@ExcelProperty(value = "创建时间")
private String createTime;/**
* 微信原始ID
*/
@ExcelProperty(value = "创建人Code")
private String createCode;
@ExcelProperty(value = "创建人")
private String createBy;
/**
* 更新时间
......@@ -164,11 +131,7 @@ public class DbWxUserVo {
@ExcelProperty(value = "更新者")
private String modifyBy;
/**
* 更新者code
*/
@ExcelProperty(value = "更新者code")
private String modifyCode;
/**
* 删除状态 0：未删除 1：删除
......
yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/mapper/DbFileMapper.java
......@@ -4,6 +4,8 @@ import com.yongqi.xinrenli.domain.DbFile;
import com.yongqi.xinrenli.domain.vo.DbFileVo;
import com.yongqi.common.core.mapper.BaseMapperPlus;
import java.util.List;
/**
* 文件Mapper接口
*
......@@ -12,4 +14,5 @@ import com.yongqi.common.core.mapper.BaseMapperPlus;
*/
public interface DbFileMapper extends BaseMapperPlus<DbFileMapper, DbFile, DbFileVo> {
List<DbFileVo> selectFileList();
}
yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/service/impl/DbOrderServiceImpl.java
......@@ -86,14 +86,14 @@ public class DbOrderServiceImpl implements IDbOrderService {
.eq(DbFile::getDeleteStatus, DeleteStatusEnum.OK.getCode()));
Map<String, List<DbFileVo>> groupMap = dbFileVos.stream().collect(Collectors.groupingBy(u -> u.getFileType()));
groupMap.forEach((k, v) -> {
if(k.equals("picture")){
dbOrderVo.setPicture(v);
if (k.equals("picture")) {
dbOrderVo.setPictureList(v);
}
if(k.equals("video")){
dbOrderVo.setPicture(v);
if (k.equals("video")) {
dbOrderVo.setPictureList(v);
}
if(k.equals("voice")){
dbOrderVo.setPicture(v);
if (k.equals("voice")) {
dbOrderVo.setPictureList(v);
}
});
dbOrderVo.setFileVos(dbFileVos);
......@@ -143,6 +143,8 @@ public class DbOrderServiceImpl implements IDbOrderService {
@Override
@Transactional
public Boolean insertByBo(DbOrderBo bo, LoginUser user) {
DbOrder add = BeanUtil.toBean(bo, DbOrder.class);
validEntityBeforeSave(add, user);
add.setUserId(user.getUserId());
......@@ -151,13 +153,35 @@ public class DbOrderServiceImpl implements IDbOrderService {
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setId(add.getId());
List<DbFile> files = BeanUtil.copyToList(bo.getFileVos(), DbFile.class);
files.forEach(file->{
file.setDeleteStatus(DeleteStatusEnum.OK.getCode());
file.setServiceId(add.getId());
file.setServiceType(FileEnumServiceType.ORDER.getServiceTyp());
});
fileMapper.insertBatch(files);
if (!ObjectUtils.isEmpty(bo.getPictureList())) {
List<DbFile> files = BeanUtil.copyToList(bo.getPictureList(), DbFile.class);
files.forEach(file -> {
file.setDeleteStatus(DeleteStatusEnum.OK.getCode());
file.setServiceId(add.getId());
file.setServiceType(FileEnumServiceType.ORDER.getServiceTyp());
});
fileMapper.insertBatch(files);
}
if (!ObjectUtils.isEmpty(bo.getVoiceList())) {
List<DbFile> files = BeanUtil.copyToList(bo.getVoiceList(), DbFile.class);
files.forEach(file -> {
file.setDeleteStatus(DeleteStatusEnum.OK.getCode());
file.setServiceId(add.getId());
file.setServiceType(FileEnumServiceType.ORDER.getServiceTyp());
});
fileMapper.insertBatch(files);
}
if (!ObjectUtils.isEmpty(bo.getVideoList())) {
List<DbFile> files = BeanUtil.copyToList(bo.getVideoList(), DbFile.class);
files.forEach(file -> {
file.setDeleteStatus(DeleteStatusEnum.OK.getCode());
file.setServiceId(add.getId());
file.setServiceType(FileEnumServiceType.ORDER.getServiceTyp());
});
fileMapper.insertBatch(files);
}
}
return flag;
}
......@@ -177,13 +201,35 @@ public class DbOrderServiceImpl implements IDbOrderService {
.eq(DbFile::getServiceType, FileEnumServiceType.ORDER.getServiceTyp())
.eq(DbFile::getServiceId, update.getId())
);
List<DbFile> files = BeanUtil.copyToList(update.getFileBoList(), DbFile.class);
files.forEach(file -> {
file.setServiceId(update.getId());
file.setServiceType(FileEnumServiceType.ORDER.getServiceTyp());
file.setDeleteStatus(DeleteStatusEnum.OK.getCode());
});
fileMapper.insertBatch(files);
if (!ObjectUtils.isEmpty(update.getPictureList())) {
List<DbFile> files = BeanUtil.copyToList(update.getPictureList(), DbFile.class);
files.forEach(file -> {
file.setServiceId(update.getId());
file.setServiceType(FileEnumServiceType.ORDER.getServiceTyp());
file.setDeleteStatus(DeleteStatusEnum.OK.getCode());
});
fileMapper.insertBatch(files);
}
if (!ObjectUtils.isEmpty(update.getVoiceList())) {
List<DbFile> files = BeanUtil.copyToList(update.getVoiceList(), DbFile.class);
files.forEach(file -> {
file.setServiceId(update.getId());
file.setServiceType(FileEnumServiceType.ORDER.getServiceTyp());
file.setDeleteStatus(DeleteStatusEnum.OK.getCode());
});
fileMapper.insertBatch(files);
}
if (!ObjectUtils.isEmpty(update.getVideoList())) {
List<DbFile> files = BeanUtil.copyToList(update.getVideoList(), DbFile.class);
files.forEach(file -> {
file.setServiceId(update.getId());
file.setServiceType(FileEnumServiceType.ORDER.getServiceTyp());
file.setDeleteStatus(DeleteStatusEnum.OK.getCode());
});
fileMapper.insertBatch(files);
}
}
return true;
}
......@@ -261,6 +307,7 @@ public class DbOrderServiceImpl implements IDbOrderService {
});
return TableDataInfo.build(result);
}
private LambdaQueryWrapper<DbOrder> homeListWrapper(DbOrderBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<DbOrder> lqw = Wrappers.lambdaQuery();
......@@ -279,8 +326,10 @@ public class DbOrderServiceImpl implements IDbOrderService {
lqw.eq(bo.getDeleteStatus() != null, DbOrder::getDeleteStatus, bo.getDeleteStatus());
return lqw;
}
/**
* 首页查询
*
* @param bo
* @param pageQuery
* @return
......@@ -290,27 +339,26 @@ public class DbOrderServiceImpl implements IDbOrderService {
LambdaQueryWrapper<DbOrder> lqw = homeListWrapper(bo);
Page<DbOrderVo> result = baseMapper.homeList(pageQuery.build(), lqw);
result.getRecords().forEach(record -> {
DbFileVo dbFileVo = fileMapper.selectVoOne(Wrappers.<DbFile>lambdaQuery()
List<DbFileVo> dbFileVo = fileMapper.selectVoList(Wrappers.<DbFile>lambdaQuery()
.eq(DbFile::getServiceId, record.getId())
.eq(DbFile::getServiceType, FileEnumServiceType.ORDER.getServiceTyp())
.eq(DbFile::getDeleteStatus, DeleteStatusEnum.OK.getCode()));
List<DbFileVo> vos = new ArrayList<>();
if (ObjectUtils.isNotEmpty(dbFileVo)) {
vos.add(dbFileVo);
if (ObjectUtils.isEmpty(dbFileVo)) {
// throw new RuntimeException("这个订单没有文件");
}
Map<String, List<DbFileVo>> groupMap = vos.stream().collect(Collectors.groupingBy(u -> u.getFileType()));
Map<String, List<DbFileVo>> groupMap = dbFileVo.stream().collect(Collectors.groupingBy(u -> u.getFileType()));
groupMap.forEach((k, v) -> {
if(k.equals("picture")){
record.setPicture(v);
if (k.equals("picture")) {
record.setPictureList(v);
}
if(k.equals("video")){
record.setPicture(v);
if (k.equals("video")) {
record.setPictureList(v);
}
if(k.equals("voice")){
record.setPicture(v);
if (k.equals("voice")) {
record.setPictureList(v);
}
});
record.setFileVos(vos);
record.setFileVos(dbFileVo);
});
return TableDataInfo.build(result);
}
......@@ -332,7 +380,7 @@ public class DbOrderServiceImpl implements IDbOrderService {
// 2.根据卡券id获取卡券信息
DbCoupon dbCoupon = couponMapper.selectById(couponId);
// 3.计算应支付金额
if (dbCoupon.getMinUsed().compareTo(dbOrder.getActualAmount()) > 0){
if (dbCoupon.getMinUsed().compareTo(dbOrder.getActualAmount()) > 0) {
throw new RuntimeException("未达到此优惠券的最低消费金额");
}
// 查询用户优惠券关联信息
......@@ -341,11 +389,11 @@ public class DbOrderServiceImpl implements IDbOrderService {
.eq(DbUserCoupon::getUserId, loginUser.getUserId()));
// 判断用户是否有此优惠券
if (ObjectUtils.isEmpty(userCoupon)) {
log.error("该用户没有此优惠券：userId:{},couponId:{}",loginUser.getUserId(), couponId);
log.error("该用户没有此优惠券：userId:{},couponId:{}", loginUser.getUserId(), couponId);
return R.fail("没有此优惠券");
}
if (Objects.equals(userCoupon.getUseStatus(), DeleteStatusEnum.DELETED.getCode())){
log.error("此优惠券已经使用过了：userId:{},couponId:{}",loginUser.getUserId(), couponId);
if (Objects.equals(userCoupon.getUseStatus(), DeleteStatusEnum.DELETED.getCode())) {
log.error("此优惠券已经使用过了：userId:{},couponId:{}", loginUser.getUserId(), couponId);
return R.fail("此优惠券已经使用过了");
}
BigDecimal payAmount = dbOrder.getActualAmount().subtract(dbCoupon.getFullSubtraction());
......@@ -392,6 +440,7 @@ public class DbOrderServiceImpl implements IDbOrderService {
/**
* 支付回调
*
* @param xmlData
* @return
*/
......@@ -406,7 +455,7 @@ public class DbOrderServiceImpl implements IDbOrderService {
}
// 1.查询订单信息 修改订单状态为已接单
DbOrder dbOrder = baseMapper.selectOne(Wrappers.<DbOrder>lambdaQuery().eq(DbOrder::getOrderNo, notifyResult.getOutTradeNo()));
if (ObjectUtils.isEmpty(dbOrder)){
if (ObjectUtils.isEmpty(dbOrder)) {
return WxPayNotifyResponse.fail("订单不存在");
}
dbOrder.setStatus(OrderStatusEnum.RECEIVED_ORDER.getCode());
......@@ -417,11 +466,11 @@ public class DbOrderServiceImpl implements IDbOrderService {
.eq(DbUserCoupon::getCouponId, dbOrder.getUseCouponId())
.eq(DbUserCoupon::getUserId, dbOrder.getUserId()));
if (ObjectUtils.isEmpty(userCoupon)) {
log.error("该用户没有此优惠券：userId:{},couponId:{}",dbOrder.getUserId(), dbOrder.getUseCouponId());
log.error("该用户没有此优惠券：userId:{},couponId:{}", dbOrder.getUserId(), dbOrder.getUseCouponId());
return WxPayNotifyResponse.fail("失败");
}
if (Objects.equals(userCoupon.getUseStatus(), DeleteStatusEnum.DELETED.getCode())){
log.error("此优惠券已经使用过了：userId:{},couponId:{}",dbOrder.getUserId(), dbOrder.getUseCouponId());
if (Objects.equals(userCoupon.getUseStatus(), DeleteStatusEnum.DELETED.getCode())) {
log.error("此优惠券已经使用过了：userId:{},couponId:{}", dbOrder.getUserId(), dbOrder.getUseCouponId());
return WxPayNotifyResponse.fail("失败");
}
userCoupon.setUseStatus(DeleteStatusEnum.DELETED.getCode());
......@@ -431,6 +480,7 @@ public class DbOrderServiceImpl implements IDbOrderService {
/**
* 退款
*
* @param orderId
* @param refundAmount
* @param loginUser
......@@ -471,6 +521,7 @@ public class DbOrderServiceImpl implements IDbOrderService {
/**
* 退款回调
*
* @param xmlData
* @return
*/
......@@ -481,10 +532,10 @@ public class DbOrderServiceImpl implements IDbOrderService {
// 查询订单
DbOrder order = baseMapper.selectOne(Wrappers.<DbOrder>lambdaQuery().eq(DbOrder::getRefundNo, result.getReqInfo().getOutRefundNo()));
if (ObjectUtils.isEmpty(order)) {
log.error("订单不存在：{}",result.getReqInfo().getOutRefundNo());
log.error("订单不存在：{}", result.getReqInfo().getOutRefundNo());
return WxPayNotifyResponse.fail("订单不存在");
}
if (Objects.equals(order.getStatus(), OrderStatusEnum.REFUNDED.getCode())){
if (Objects.equals(order.getStatus(), OrderStatusEnum.REFUNDED.getCode())) {
log.error("订单已退款：{}", result.getReqInfo().getOutRefundNo());
return WxPayNotifyResponse.fail("订单已退款");
}
......@@ -496,6 +547,7 @@ public class DbOrderServiceImpl implements IDbOrderService {
/**
* 报表
*
* @return
*/
@Override
......@@ -507,8 +559,10 @@ public class DbOrderServiceImpl implements IDbOrderService {
public Boolean createPay(DbOrderEditBo bo) {
return baseMapper.createPay(bo) > 0;
}
/**
*待支付job
* 待支付job
*
* @return
*/
@Override
......
yongqi-xinrenli/src/main/resources/mapper/DbFileMapper.xml
......@@ -16,6 +16,8 @@
<result property="modifyTime" column="modify_time"/>
<result property="modifyName" column="modify_name"/>
</resultMap>
<select id="">
</select>
</mapper>
yongqi-xinrenli/src/main/resources/mapper/DbWxUserMapper.xml
......@@ -7,7 +7,6 @@
<resultMap type="com.yongqi.xinrenli.domain.DbWxUser" id="DbWxUserResult">
<result property="id" column="id"/>
<result property="openId" column="open_id"/>
<result property="headOrNot" column="head_or_not"/>
<result property="nickname" column="nickname"/>
<result property="sex" column="sex"/>
<result property="province" column="province"/>
......@@ -17,21 +16,14 @@
<result property="unionId" column="union_id"/>
<result property="mobile" column="mobile"/>
<result property="authMobile" column="auth_mobile"/>
<result property="mallCode" column="mall_code"/>
<result property="userCode" column="user_code"/>
<result property="sessionKey" column="session_key"/>
<result property="wechatSubscribe" column="wechat_subscribe"/>
<result property="cancelSubscribe" column="cancel_subscribe"/>
<result property="wechatOriginalId" column="wechat_original_id"/>
<result property="orderNum" column="order_num"/>
<result property="cumulativeConsumption" column="cumulative_consumption"/>
<result property="lastConsumptionTime" column="last_consumption_time"/>
<result property="createTime" column="create_time"/>
<result property="createBy" column="create_by"/>
<result property="createCode" column="create_code"/>
<result property="modifyTime" column="modify_time"/>
<result property="modifyBy" column="modify_by"/>
<result property="modifyCode" column="modify_code"/>
<result property="deleteFlag" column="delete_flag"/>
</resultMap>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment