From de91c84954157bb9f8b6d938cbe0b1b51fb6e65d Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期五, 07 五月 2021 15:23:57 +0800
Subject: [PATCH] bugfixed：新增便民服务商家 报错
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOrderServiceImpl.java | 422 +++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 380 insertions(+), 42 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOrderServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOrderServiceImpl.java
index e3b28ad..735e451 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOrderServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOrderServiceImpl.java
@@ -1,19 +1,17 @@
package com.panzhihua.service_community.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.PageDTO;
-import com.panzhihua.common.model.dtos.shop.PageComShopOrderSearchDTO;
+import com.panzhihua.common.model.dtos.shop.*;
import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.utlis.DateUtils;
+import com.panzhihua.common.utlis.WxPayUtils;
import com.panzhihua.service_community.dao.ComShopOrderDAO;
import com.panzhihua.service_community.model.dos.ComShopOrderDO;
-import com.panzhihua.common.model.dtos.shop.ComShopOrderCreateDTO;
-import com.panzhihua.common.model.dtos.shop.ComShopOrderCreateGoodsDTO;
-import com.panzhihua.common.model.dtos.shop.ComShopOrderPreviewDTO;
-import com.panzhihua.common.model.dtos.shop.PageComOrderListDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.shop.*;
import com.panzhihua.common.utlis.OrderNoUtils;
@@ -23,12 +21,15 @@
import com.panzhihua.service_community.service.ComShopOrderService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Calendar;
import java.util.Date;
import java.util.List;
@@ -55,11 +56,26 @@
private ComShopOrderOperateDAO comShopOrderOperateDAO;
@Resource
private ComShopOrderGoodsDAO comShopOrderGoodsDAO;
+ @Resource
+ private ComShopOrderDAO comShopOrderDAO;
+ @Resource
+ private ComShopOrderPayDAO comShopOrderPayDAO;
+ @Value("${min.app.isTest}")
+ private Boolean isTest;
+ @Value("${min.app.appid}")
+ private String appid;
+ @Value("${min.app.payKey}")
+ private String payKey;
+ @Value("${min.app.mchId}")
+ private String mchId;
+ @Value("${min.app.notifyUrl}")
+ private String notifyUrl;
/**
* 订单预览
- * @param orderPreviewDTO 请求参数
- * @return 订单预览数据
+ *
+ * @param orderPreviewDTO 请求参数
+ * @return 订单预览数据
*/
@Override
public R orderPreview(ComShopOrderPreviewDTO orderPreviewDTO){
@@ -134,7 +150,7 @@
//查询店铺信息
ComShopStoreDO storeDO = comShopStoreDAO.selectById(storeId);
if(storeDO != null){
- ComShopStoreVO shopStoreVO = new ComShopStoreVO();
+ PageShopStoreVO shopStoreVO = new PageShopStoreVO();
BeanUtils.copyProperties(storeDO,shopStoreVO);
orderPreviewVO.setShopStoreVO(shopStoreVO);
}
@@ -146,6 +162,7 @@
if(shopOrders.isEmpty()){//未查询到用户上一笔订单
//查询用户收货地址中的默认地址
ComShopUserAddressDO userAddressDO = comShopUserAddressDAO.selectOne(new QueryWrapper<ComShopUserAddressDO>()
+ .eq("delete_status", 2)
.eq("user_id",orderPreviewDTO.getUserId()).eq("is_default",ComShopUserAddressDO.isDefault.yes));
if(userAddressDO != null){
ComShopUserAddressVO userAddressVO = new ComShopUserAddressVO();
@@ -162,11 +179,14 @@
}
}else{//查询到用户上一笔订单
ComShopUserAddressDO userAddressDO = comShopUserAddressDAO.selectById(shopOrders.get(0).getReceiverId());
- ComShopUserAddressVO userAddressVO = new ComShopUserAddressVO();
- BeanUtils.copyProperties(userAddressDO,userAddressVO);
- orderPreviewVO.setUserAddressVO(userAddressVO);
+ if(userAddressDO != null){
+ if(userAddressDO.getDeleteStatus() == 2) {
+ ComShopUserAddressVO userAddressVO = new ComShopUserAddressVO();
+ BeanUtils.copyProperties(userAddressDO, userAddressVO);
+ orderPreviewVO.setUserAddressVO(userAddressVO);
+ }
+ }
}
-
return R.ok(orderPreviewVO);
}
@@ -180,10 +200,9 @@
public R orderCreate(ComShopOrderCreateDTO orderCreateDTO){
//创建返回参数
ComShopOrderVO shopOrderVO = new ComShopOrderVO();
-
//查询用户收货地址
ComShopUserAddressDO userAddressDO = comShopUserAddressDAO.selectById(orderCreateDTO.getReceiverId());
- if(userAddressDO == null){
+ if(userAddressDO == null||userAddressDO.getDeleteStatus()!=2){
return R.fail("收货地址不存在");
}
//用户id
@@ -194,10 +213,8 @@
String orderNo = OrderNoUtils.NextOrderNo(userId);
//配送方式
Integer deliveryType = 0;
-
//订单总金额
BigDecimal orderTotal = BigDecimal.ZERO;
-
//创建订单商品信息
List<ComShopOrderGoodsDO> orderGoodsDOList = new ArrayList<>();
if(!orderCreateDTO.getOrderGoodsList().isEmpty()){
@@ -233,12 +250,10 @@
orderTotal = orderTotal.add(orderGoodsDO.getGoodsAttrPrice().multiply(BigDecimal.valueOf(orderGoodsDO.getAmount())));
}
}
-
//如果是购物车提交，需要将购物车内商品移除
if(orderCreateDTO.getSubmitType().equals(ComShopOrderCreateDTO.submitType.cart)){
comShopCartDAO.deleteBatchIds(orderCreateDTO.getCartIds());
}
-
//创建订单信息
ComShopOrderDO shopOrderDO = new ComShopOrderDO();
shopOrderDO.setOrderNo(orderNo);
@@ -255,18 +270,15 @@
shopOrderDO.setRemark(orderCreateDTO.getRemark());
}
this.baseMapper.insert(shopOrderDO);
-
if(!orderGoodsDOList.isEmpty()){
orderGoodsDOList.forEach(orderGoods ->{
orderGoods.setOrderId(shopOrderDO.getId());
comShopOrderGoodsDAO.insert(orderGoods);
});
}
-
//创建订单操作记录
ComShopOrderOperateDO orderOperateDO = new ComShopOrderOperateDO();
orderOperateDO.setOrderNo(orderNo);
-
orderOperateDO.setOperationType(ComShopOrderOperateDO.operationType.create);
orderOperateDO.setOperationTime(new Date());
if(StringUtils.isNotEmpty(orderCreateDTO.getPhone())){
@@ -277,9 +289,22 @@
orderOperateDO.setOperationBy("用户");
}
comShopOrderOperateDAO.insert(orderOperateDO);
-
shopOrderVO.setOrderNo(orderNo);
shopOrderVO.setOrderTotal(orderTotal);
+ shopOrderVO.setOrderId(shopOrderDO.getId());
+
+ try {
+ BigDecimal money = orderTotal;
+ if(isTest){
+ money = BigDecimal.valueOf(0.01);
+ }
+ //调用wx支付
+ String xml = WxPayUtils.getUnifiedorder(appid,mchId,payKey,notifyUrl,"商品购买",orderCreateDTO.getOpenId(),orderNo,money);
+ log.info("微信支付返回参数:" + xml);
+ shopOrderVO.setPayResult(xml);
+ }catch (Exception e){
+ log.error("调用微信支付异常,异常原因：" + e.getMessage());
+ }
return R.ok(shopOrderVO);
}
@@ -302,6 +327,11 @@
orderGoodsDOList.forEach(orderGoods -> {
ComShopOrderGoodsVO orderGoodsVO = new ComShopOrderGoodsVO();
BeanUtils.copyProperties(orderGoods,orderGoodsVO);
+ //根据商品规格id查询商品规格
+ ComShopGoodsAttrDO goodsAttrDO = comShopGoodsAttrDAO.selectById(orderGoods.getGoodsAttrId());
+ if(goodsAttrDO != null){
+ orderGoodsVO.setGoodsAttr(goodsAttrDO.getGoodsAttr());
+ }
orderGoodsVO.setNum(orderGoods.getAmount());
orderGoodsVO.setGoodsPic(orderGoods.getGoodsAttrPic());
orderGoodsVO.setPrice(orderGoods.getGoodsAttrPrice());
@@ -310,7 +340,7 @@
}
orderVo.setOrderGoodsVOList(orderGoodsVOS);
- ComShopStoreVO shopStoreVO = new ComShopStoreVO();
+ PageShopStoreVO shopStoreVO = new PageShopStoreVO();
//查询店铺信息
ComShopStoreDO shopStoreDO = comShopStoreDAO.selectById(orderVo.getStoreId());
if(shopStoreDO != null){
@@ -339,7 +369,7 @@
BeanUtils.copyProperties(shopOrderDO,orderVO);
orderVO.setOrderTotal(shopOrderDO.getTotalAmount());
- ComShopStoreVO shopStoreVO = new ComShopStoreVO();
+ PageShopStoreVO shopStoreVO = new PageShopStoreVO();
//查询店铺信息
ComShopStoreDO shopStoreDO = comShopStoreDAO.selectById(shopOrderDO.getStoreId());
if(shopStoreDO != null){
@@ -351,6 +381,7 @@
//查询订单下商品信息
List<ComShopOrderGoodsDO> orderGoodsDOList = comShopOrderGoodsDAO.selectList(new QueryWrapper<ComShopOrderGoodsDO>()
.eq("order_no",shopOrderDO.getOrderNo()));
+ StringBuilder sbr = new StringBuilder("");
if(!orderGoodsDOList.isEmpty()){
orderGoodsDOList.forEach(orderGoods -> {
ComShopOrderGoodsVO orderGoodsVO = new ComShopOrderGoodsVO();
@@ -358,10 +389,17 @@
orderGoodsVO.setNum(orderGoods.getAmount());
orderGoodsVO.setGoodsPic(orderGoods.getGoodsAttrPic());
orderGoodsVO.setPrice(orderGoods.getGoodsAttrPrice());
+ //根据商品规格id查询商品规格
+ ComShopGoodsAttrDO goodsAttrDO = comShopGoodsAttrDAO.selectById(orderGoods.getGoodsAttrId());
+ if(goodsAttrDO != null){
+ orderGoodsVO.setGoodsAttr(goodsAttrDO.getGoodsAttr());
+ }
orderGoodsVOS.add(orderGoodsVO);
+ sbr.append(orderGoods.getGoodsName() + " " );
});
}
orderVO.setOrderGoodsVOList(orderGoodsVOS);
+ orderVO.setGoodsName(sbr.toString());
ComShopUserAddressVO userAddressVO = new ComShopUserAddressVO();
//查询用户收货地址
@@ -371,20 +409,28 @@
orderVO.setUserAddressVO(userAddressVO);
}
+ //操作日志
+ List<ComShopOrderOperateDO> listOperLog = comShopOrderOperateDAO.selectList(new LambdaQueryWrapper<ComShopOrderOperateDO>().eq(ComShopOrderOperateDO::getOrderNo, shopOrderDO.getOrderNo()));
+ List<ComShopOrderOperateVO> listOperLogVO = new ArrayList<>(listOperLog.size());
+ listOperLog.forEach(logDO ->{
+ ComShopOrderOperateVO copyVO = new ComShopOrderOperateVO();
+ BeanUtils.copyProperties(logDO,copyVO);
+ listOperLogVO.add(copyVO);
+ });
+ orderVO.setLogs(listOperLogVO);
return R.ok(orderVO);
}
/**
* 根据订单id取消订单
- * @param orderId 订单id
- * @param phone 操作用户手机号
+ * @param comShopOrderQueryDTO 订单信息
* @return 取消结果
*/
@Transactional(rollbackFor = Exception.class)
@Override
- public R orderCancel(Long orderId,String phone){
+ public R orderCancel(ComShopOrderQueryDTO comShopOrderQueryDTO){
//查询订单
- ComShopOrderDO shopOrderDO = this.baseMapper.selectById(orderId);
+ ComShopOrderDO shopOrderDO = this.baseMapper.selectById(comShopOrderQueryDTO.getOrderId());
if(shopOrderDO == null){
return R.fail("未查询到订单");
}
@@ -399,9 +445,9 @@
orderOperateDO.setOrderNo(shopOrderDO.getOrderNo());
orderOperateDO.setOperationType(ComShopOrderOperateDO.operationType.cancel);
orderOperateDO.setOperationTime(new Date());
- if(StringUtils.isNotEmpty(phone)){
- orderOperateDO.setOperationContent("用户" + phone + "取消订单");
- orderOperateDO.setOperationBy("用户" + phone);
+ if(comShopOrderQueryDTO.getIsAdmin()){
+ orderOperateDO.setOperationContent("管理员" + comShopOrderQueryDTO.getOperUserAccount() + "取消订单");
+ orderOperateDO.setOperationBy("用户" + comShopOrderQueryDTO.getOperUserAccount());
}else {
orderOperateDO.setOperationContent("用户取消订单");
orderOperateDO.setOperationBy("用户");
@@ -511,22 +557,314 @@
}
@Override
- public R pageShopOrder(PageComShopOrderSearchDTO pageComShopOrderSearchDTO) {
+ public R shipOrder(ComShopOrderShipDTO orderShipDTO) {
+ ComShopOrderDO comShopOrderDO = comShopOrderDAO.selectById(orderShipDTO.getOrderId());
+ if(comShopOrderDO==null){
+ return R.fail("订单不存在");
+ }
+ if(!(comShopOrderDO.getStatus()==2)
+ || !(comShopOrderDO.getDeliveryStatus()==1)){
+ return R.fail("订单发货失败,订单状态不允许发货");
+ }
+ ComShopStoreDO storeDO = comShopStoreDAO.selectById(comShopOrderDO.getStoreId());
+ if(storeDO.getDeliveryType()!=2){
+ return R.fail("该商家不支持通过快递物流发货");
+ }
+ comShopOrderDO.setDeliveryStatus(2);
+ comShopOrderDO.setDeliveryType(2);
+ comShopOrderDO.setStatus(3);
+ comShopOrderDO.setDeliveryTime(Calendar.getInstance().getTime());
+ comShopOrderDO.setLogisticsCompany(orderShipDTO.getLogisticsCompany());
+ comShopOrderDO.setLogisticsNo(orderShipDTO.getLogisticsNo());
+ int updated = comShopOrderDAO.updateById(comShopOrderDO);
+ if(updated==1){
+ //创建订单操作记录
+ ComShopOrderOperateDO orderOperateDO = new ComShopOrderOperateDO();
+ orderOperateDO.setOrderNo(comShopOrderDO.getOrderNo());
+ orderOperateDO.setOperationType(ComShopOrderOperateDO.operationType.deliver);
+ orderOperateDO.setOperationTime(new Date());
+ if(orderShipDTO.getIsAdmin()){
+ orderOperateDO.setOperationContent(orderShipDTO.getOperUserAccount()+"已发货");
+ orderOperateDO.setOperationBy(orderShipDTO.getOperUserAccount());
+ }else {
+ orderOperateDO.setOperationContent(orderShipDTO.getOperUserAccount() + "已发货");
+ orderOperateDO.setOperationBy(orderShipDTO.getOperUserAccount());
+ }
+ int inserted = comShopOrderOperateDAO.insert(orderOperateDO);
+ if(inserted!=1){
+ log.error("订单发货日志保存错误");
+ }
+ return R.ok("发货成功");
+ }
+ return R.fail("发货失败!");
+ }
+
+ @Override
+ public R deliverOrder(ComShopOrderDeliverDTO orderDeliverDTO) {
+ ComShopOrderDO comShopOrderDO = comShopOrderDAO.selectById(orderDeliverDTO.getOrderId());
+ if(comShopOrderDO==null){
+ return R.fail("订单不存在");
+ }
+ if(!(comShopOrderDO.getStatus()==2)
+ || !(comShopOrderDO.getDeliveryStatus()==1)){
+ return R.fail("当前订单不能配送");
+ }
+ ComShopStoreDO storeDO = comShopStoreDAO.selectById(comShopOrderDO.getStoreId());
+ if(storeDO.getDeliveryType()!=1){
+ return R.fail("该商家不支持通过商家配送");
+ }
+ comShopOrderDO.setDeliveryStatus(4);
+ comShopOrderDO.setDeliveryType(1);
+ comShopOrderDO.setStatus(3);
+ comShopOrderDO.setDeliveryTime(Calendar.getInstance().getTime());
+ int updated = comShopOrderDAO.updateById(comShopOrderDO);
+ if(updated==1){
+
+ //创建订单操作记录
+ ComShopOrderOperateDO orderOperateDO = new ComShopOrderOperateDO();
+ orderOperateDO.setOrderNo(comShopOrderDO.getOrderNo());
+ orderOperateDO.setOperationType(ComShopOrderOperateDO.operationType.deliver);
+ orderOperateDO.setOperationTime(new Date());
+ if(orderDeliverDTO.getIsAdmin()){
+ orderOperateDO.setOperationContent(orderDeliverDTO.getOperUserAccount() + "已发货");
+ orderOperateDO.setOperationBy(orderDeliverDTO.getOperUserAccount());
+ }else {
+ orderOperateDO.setOperationContent(orderDeliverDTO.getOperUserAccount() + "已发货");
+ orderOperateDO.setOperationBy(orderDeliverDTO.getOperUserAccount());
+ }
+ int inserted = comShopOrderOperateDAO.insert(orderOperateDO);
+ if(inserted!=1){
+ log.error("订单发货日志保存错误");
+ }
+ return R.ok("开始配送");
+ }
+ return R.fail("操作失败!");
+ }
+
+ @Override
+ public R finishDeliverOrder(ComShopOrderDeliverDTO orderDeliverDTO) {
+ ComShopOrderDO comShopOrderDO = comShopOrderDAO.selectById(orderDeliverDTO.getOrderId());
+ if(comShopOrderDO==null){
+ return R.fail("订单不存在");
+ }
+ if(comShopOrderDO.getDeliveryStatus() != 4 && comShopOrderDO.getDeliveryStatus() != 3){
+ return R.fail("订单还未开始配送");
+ }
+ if(!(comShopOrderDO.getStatus() == 3)){
+ return R.fail("订单还未发货");
+ }
+ //comShopOrderDO.setStatus(4);
+ comShopOrderDO.setDeliveryStatus(5);
+ int updated = comShopOrderDAO.updateById(comShopOrderDO);
+ if(updated==1){
+ //创建订单操作记录
+ ComShopOrderOperateDO orderOperateDO = new ComShopOrderOperateDO();
+ orderOperateDO.setOrderNo(comShopOrderDO.getOrderNo());
+ orderOperateDO.setOperationType(ComShopOrderOperateDO.operationType.complete);
+ orderOperateDO.setOperationTime(new Date());
+ if(orderDeliverDTO.getIsAdmin()){
+ orderOperateDO.setOperationContent("订单已完成");
+ orderOperateDO.setOperationBy(orderDeliverDTO.getOperUserAccount());
+ }else {
+ orderOperateDO.setOperationContent("订单已完成");
+ orderOperateDO.setOperationBy(orderDeliverDTO.getOperUserAccount());
+ }
+ int inserted = comShopOrderOperateDAO.insert(orderOperateDO);
+ if(inserted!=1){
+ log.error("订单发货日志保存错误");
+ }
+ return R.ok("配送完成");
+ }
+ return R.fail("操作失败!");
+ }
+
+ @Override
+ public R shopOrderExportData(ComShopOrderExportDTO comShopOrderExportDTO) {
+ Page page = new Page();
+ page.setSize(10000);
+ page.setCurrent(1);
+ IPage<ExcelShopOrderDTO> excelShopOrderDTO = comShopOrderDAO.selectOrderExport(page, comShopOrderExportDTO);
+ return R.ok(excelShopOrderDTO.getRecords());
+ }
+
+ @Override
+ public R shopOrderFundsExportData(ComShopFundsExportDTO comShopFundsExportDTO) {
+ Page page = new Page();
+ page.setSize(10000);
+ page.setCurrent(1);
+ IPage<ExcelShopFundsDTO> excelShopFundsDTO = comShopOrderDAO.selectFundsExport(page, comShopFundsExportDTO);
+ return R.ok(excelShopFundsDTO.getRecords());
+ }
+
+ @Override
+ public R getFundsStat(Long userId) {
+ ComShopFundsVO comShopFundsVO = comShopOrderDAO.queryStatis(userId);
+ if(comShopFundsVO==null){
+ comShopFundsVO = new ComShopFundsVO();
+ comShopFundsVO.setMonthTotal(new BigDecimal(0));
+ comShopFundsVO.setTodayTotal(new BigDecimal(0));
+ comShopFundsVO.setWeekTotal(new BigDecimal(0));
+ }
+ return R.ok(comShopFundsVO);
+ }
+
+ @Override
+ public R pageShopFunds(PageComShopFundsSearchDTO pageComShopFundsSearchDTO) {
+ Long pageNum = pageComShopFundsSearchDTO.getPageNum();
+ Long pageSize = pageComShopFundsSearchDTO.getPageSize();
+ Page page = new Page();
+ if(pageNum==null||0==pageNum.longValue()){
+ pageNum = 1l;
+ }
+ if(pageSize==null||0==pageSize.longValue()){
+ pageSize = 10l;
+ }
+ page.setCurrent(pageNum);
+ page.setSize(pageSize);
+ IPage<ComShopFundsOrderVO> comShopFundsOrderVOIPage = comShopOrderDAO.pageShopFunds(page, pageComShopFundsSearchDTO);
+ return R.ok(comShopFundsOrderVOIPage);
+ }
+
+ @Override
+ public R pageShopOrder(PageComShopOrderSearchDTO pageComShopOrderSearchDTO) {
Long pageNum = pageComShopOrderSearchDTO.getPageNum();
Long pageSize = pageComShopOrderSearchDTO.getPageSize();
- PageDTO page = new PageDTO();
+ Page page = new Page();
- page.setPageNum(pageNum);
- page.setPageSize(pageSize);
- if(pageNum==null||new Long(0).equals(pageNum.longValue())){
- page.setPageNum(1l);
+ page.setCurrent(pageNum);
+ page.setSize(pageSize);
+ if(pageNum==null||0==pageNum.longValue()){
+ page.setCurrent(1l);
}
- if(pageSize==null||new Long(0).equals(pageSize.longValue())){
- page.setPageSize(10l);
+ if(pageSize==null||0==pageSize.longValue()){
+ page.setSize(10l);
}
- this.baseMapper.pageOrderBy(page, pageComShopOrderSearchDTO);
- return null;
+ IPage<ComShopOrderSearchVO> ipage = this.baseMapper.pageOrderBy(page, pageComShopOrderSearchDTO);
+ return R.ok(ipage);
+ }
+
+ @Override
+ public R capitalDetailByStore(Long id) {
+ if(id==null){
+ R.fail("订单号不能为空！");
+ }
+ CapitalDetailVO vo = this.baseMapper.capitalDetailByStore(id);
+ return R.ok(vo);
+ }
+
+ /**
+ * 微信支付订单回调
+ * @param wxPayNotifyOrderDTO 订单支付回调参数
+ */
+ @Transactional(rollbackFor = Exception.class)
+ @Override
+ public void wxOrderPayNotify(WxPayNotifyOrderDTO wxPayNotifyOrderDTO){
+ log.info("微信订单支付回调开始处理逻辑");
+ if(StringUtils.isEmpty(wxPayNotifyOrderDTO.getOrderTradeNo())){
+ log.error("微信支付回调失败，订单号为空");
+ return;
+ }
+
+ log.info("微信订单支付回调开始查询订单");
+ //查询订单
+ ComShopOrderDO shopOrderDO = this.baseMapper.selectOne(new QueryWrapper<ComShopOrderDO>().lambda().eq(ComShopOrderDO::getOrderNo,wxPayNotifyOrderDTO.getOrderTradeNo()));
+ if(shopOrderDO == null){
+ log.error("未查询到支付订单,订单回调失败,订单号:" + wxPayNotifyOrderDTO.getOrderTradeNo());
+ return;
+ }
+ shopOrderDO.setStatus(ComShopOrderDO.status.dfh);
+ shopOrderDO.setPayType(ComShopOrderDO.payType.wx);
+ shopOrderDO.setPayStatus(ComShopOrderDO.payStatus.yes);
+ shopOrderDO.setPayAmount(BigDecimal.valueOf(Double.valueOf(wxPayNotifyOrderDTO.getCashFee()) / 100));
+ shopOrderDO.setWxTardeNo(wxPayNotifyOrderDTO.getWxTradeNo());
+ shopOrderDO.setPayTime(DateUtils.stringToDate(wxPayNotifyOrderDTO.getPayTime(),new SimpleDateFormat("yyyyMMddHHmmss")));
+ this.baseMapper.updateById(shopOrderDO);
+
+ //查询订单商品
+ List<ComShopOrderGoodsDO> orderGoodsList = comShopOrderGoodsDAO.selectList(new QueryWrapper<ComShopOrderGoodsDO>().lambda().eq(ComShopOrderGoodsDO ::getOrderNo,shopOrderDO.getOrderNo()));
+ if(!orderGoodsList.isEmpty()){
+ int goodsNub = 0;
+ for (ComShopOrderGoodsDO orderGood:orderGoodsList) {
+ goodsNub += orderGood.getAmount();
+ //更新商品信息
+ ComShopGoodsDO goodsDO = comShopGoodsDAO.selectById(orderGood.getGoodsId());
+ if(goodsDO != null){
+ goodsDO.setSale(goodsDO.getSale() + orderGood.getAmount());
+ comShopGoodsDAO.updateById(goodsDO);
+ }
+
+ //更新商品规格
+ ComShopGoodsAttrDO goodsAttrDO = comShopGoodsAttrDAO.selectById(orderGood.getGoodsAttrId());
+ if(goodsAttrDO != null){
+ goodsAttrDO.setSale(goodsAttrDO.getSale() + orderGood.getAmount());
+ comShopGoodsAttrDAO.updateById(goodsAttrDO);
+ }
+ }
+
+ //更新店铺销量以及销售额
+ ComShopStoreDO storeDO = comShopStoreDAO.selectById(shopOrderDO.getStoreId());
+ if(storeDO != null){
+ storeDO.setSale(storeDO.getSale() + goodsNub);
+ storeDO.setSaleVolume(storeDO.getSaleVolume().add(shopOrderDO.getTotalAmount()));
+ comShopStoreDAO.updateById(storeDO);
+ }
+ }
+
+ //添加订单操作记录
+ ComShopOrderOperateDO orderOperateDO = new ComShopOrderOperateDO();
+ orderOperateDO.setOrderNo(shopOrderDO.getOrderNo());
+ orderOperateDO.setOperationType(ComShopOrderOperateDO.operationType.pay);
+ orderOperateDO.setOperationTime(new Date());
+ orderOperateDO.setOperationContent("用户支付订单");
+ orderOperateDO.setOperationBy("用户");
+ comShopOrderOperateDAO.insert(orderOperateDO);
+
+ //添加订单支付记录表
+ ComShopOrderPayDO orderPayDO = new ComShopOrderPayDO();
+ orderPayDO.setOrderNo(shopOrderDO.getOrderNo());
+ orderPayDO.setOrderAmount(shopOrderDO.getTotalAmount());
+ orderPayDO.setWxTradeNo(wxPayNotifyOrderDTO.getWxTradeNo());
+ orderPayDO.setPayStatus(ComShopOrderPayDO.payStatus.yes);
+ orderPayDO.setPayAmount(shopOrderDO.getPayAmount());
+ orderPayDO.setPayTime(shopOrderDO.getPayTime());
+ comShopOrderPayDAO.insert(orderPayDO);
+ }
+
+ /**
+ * 订单去支付
+ * @param orderPayDTO 请求参数
+ * @return 支付对象
+ */
+ public R wxPay(OrderPayDTO orderPayDTO){
+ //创建返回参数
+ ComShopOrderVO shopOrderVO = new ComShopOrderVO();
+ //查询订单
+ ComShopOrderDO orderDO = comShopOrderDAO.selectOne(new QueryWrapper<ComShopOrderDO>().lambda().eq(ComShopOrderDO::getOrderNo,orderPayDTO.getOrderNo()));
+ if(orderDO == null){
+ return R.fail("订单不存在");
+ }
+ try {
+ BigDecimal money = orderDO.getTotalAmount();
+ if(isTest){
+ money = BigDecimal.valueOf(0.01);
+ }
+ //调用wx支付
+ String xml = WxPayUtils.getUnifiedorder(appid,mchId,payKey,notifyUrl,"商品购买",orderPayDTO.getOpenId(),orderDO.getOrderNo(),money);
+ log.info("微信支付返回参数:" + xml);
+ shopOrderVO.setPayResult(xml);
+ }catch (Exception e){
+ log.error("调用微信支付异常,异常原因：" + e.getMessage());
+ }
+ shopOrderVO.setOrderId(orderDO.getId());
+ shopOrderVO.setOrderNo(orderDO.getOrderNo());
+ shopOrderVO.setOrderTotal(orderDO.getTotalAmount());
+ return R.ok(shopOrderVO);
+ }
+
+ public static void main(String[] args) {
+ BigDecimal one = BigDecimal.valueOf(Double.valueOf("1") / 100);
+ System.out.println();
}
}
--
Gitblit v1.7.1