From c436afe89419da51a5ce593ecd69d3a2f65c5faa Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 27 九月 2024 10:35:24 +0800
Subject: [PATCH] 对接邮箱 受理开票后发送
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java
index 5802610..6141449 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java
@@ -348,7 +348,7 @@
shoppingOrderRefund.setPayType(shoppingOrder.getPaymentType());
shoppingOrderRefund.setShoppingOrderId(shoppingOrder.getId());
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
- shoppingOrderRefund.setRefundCode("GDF" + sdf.format(new Date()) + (Math.random() * 1000));
+ shoppingOrderRefund.setRefundCode("GDF" + sdf.format(new Date()) + Double.valueOf((Math.random() * 1000)).intValue());
shoppingOrderRefund.setRefundAmount(refundAmount);
shoppingOrderRefund.setRefundStatus(1);
shoppingOrderRefund.setCode(shoppingOrder.getCode());
@@ -361,9 +361,10 @@
if(1 == paymentType){
WxPaymentRefundModel model = new WxPaymentRefundModel();
model.setOut_trade_no(shoppingOrder.getCode());
+ model.setTransaction_id(shoppingOrder.getSerialNumber());
model.setOut_refund_no(shoppingOrderRefund.getRefundCode());
model.setReason("取消订单");
- model.setNotify_url("http://127.0.0.1:9000/order/t-shopping-order/cancelShoppingOrderWxRefund");
+ model.setNotify_url("http://221.182.45.100:9000/order/t-shopping-order/cancelShoppingOrderWxRefund");
WxPaymentRefundModel.RefundAmount amount = new WxPaymentRefundModel.RefundAmount();
amount.setRefund(refundAmount.multiply(new BigDecimal(100)).intValue());
amount.setTotal(shoppingOrder.getPaymentAmount().multiply(new BigDecimal(100)).intValue());
@@ -406,6 +407,7 @@
public AjaxResult cancelShoppingOrderWxRefund(String out_refund_no, String refund_id, String refund_status, String success_time) {
if("SUCCESS".equals(refund_status)){
TShoppingOrderRefund one = shoppingOrderRefundService.getOne(new LambdaQueryWrapper<TShoppingOrderRefund>().eq(TShoppingOrderRefund::getRefundCode, out_refund_no));
+ one.setRefundStatus(2);
one.setRefundSerialNumber(refund_id);
one.setRefundTime(LocalDateTime.parse(success_time, DateTimeFormatter.ofPattern("yyyy-MM-DDTHH:mm:ss+TIMEZONE")));
shoppingOrderRefundService.updateById(one);
@@ -446,7 +448,8 @@
@Override
public List<MyShoppingOrderList> getNoInvoicedOrder(GetNoInvoicedOrder query) {
Long userId = tokenService.getLoginUserApplet().getUserId();
- List<TShoppingOrder> list = this.baseMapper.getNoInvoicedOrder(userId, query.getMonth(), query.getPageCurr(), query.getPageSize());
+ Integer pageCurr = (query.getPageCurr() - 1) * query.getPageSize();
+ List<TShoppingOrder> list = this.baseMapper.getNoInvoicedOrder(userId, query.getMonth(), pageCurr, query.getPageSize());
List<MyShoppingOrderList> pageList = new ArrayList<>();
for (TShoppingOrder tShoppingOrder : list) {
MyShoppingOrderList myShoppingOrderList = new MyShoppingOrderList();
@@ -458,7 +461,7 @@
name = goods.getName();
imgUrl = goods.getCoverPicture();
}else{
- TCoupon coupon = couponClient.getCouponById1(tShoppingOrder.getGoodsId()).getData();
+ TCoupon coupon = couponClient.getCouponById1(tShoppingOrder.getCouponId()).getData();
name = coupon.getName();
imgUrl = coupon.getCoverPicture();
}
@@ -481,6 +484,7 @@
TShoppingOrder shoppingOrder = this.baseMapper.selectOne(Wrappers.lambdaQuery(TShoppingOrder.class).eq(TShoppingOrder::getCode, code));
shoppingOrder.setPaymentStatus(2);
shoppingOrder.setSerialNumber(outTradeNo);
+ shoppingOrder.setPayTime(LocalDateTime.now());
this.updateById(shoppingOrder);
//如果是优惠券，赠送优惠券
if (shoppingOrder.getOrderType()==2){
@@ -521,6 +525,7 @@
if (data1!=null){
tShoppingOrder.setName(data1.getName());
}
+ tShoppingOrder.setStatus(3);
break;
}
if (tShoppingOrder.getAppUserId() != null){
@@ -545,5 +550,10 @@
return this.baseMapper.getSumAmount(sixBefore);
}
+ @Override
+ public List<Map<String, Object>> getData(ChargingStatisticsQueryDto statisticsQueryDto) {
+ return this.baseMapper.getData(statisticsQueryDto);
+ }
+
}
--
Gitblit v1.7.1