From 7a5095c394467dacd285009ab88ccf46efcc4732 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期一, 04 十一月 2024 09:50:11 +0800
Subject: [PATCH] add: 还原支付版本到微信
---
src/main/java/com/mzl/flower/service/payment/OrderService.java | 25 ++++++++-----------------
1 files changed, 8 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/mzl/flower/service/payment/OrderService.java b/src/main/java/com/mzl/flower/service/payment/OrderService.java
index 75ffe19..d8a9c9d 100644
--- a/src/main/java/com/mzl/flower/service/payment/OrderService.java
+++ b/src/main/java/com/mzl/flower/service/payment/OrderService.java
@@ -44,7 +44,6 @@
import com.mzl.flower.mapper.supplier.StationMapper;
import com.mzl.flower.mapper.system.UserWechatMapper;
import com.mzl.flower.mapper.warehouse.WarehouseLocationMapper;
-import com.mzl.flower.pay.SybPayService;
import com.mzl.flower.service.BaseService;
import com.mzl.flower.service.comment.FlowerCommentService;
import com.mzl.flower.service.coupon.CouponRecordService;
@@ -100,9 +99,6 @@
@Autowired
private UserPaymentV3Service paymentV3Service;
-
- @Autowired
- private UserPaymentSybService paymentSybService;
@Autowired
private SequenceNo sequenceNo;
@@ -469,7 +465,6 @@
}
});
- /* 替换支付修改
WxMaJscode2SessionResult session = null;
try {
session = weChatService.getWxMaSessionInfo(dto.getWxcode());
@@ -480,7 +475,6 @@
if (StringUtils.isBlank(openId)) {
throw new ValidationException("微信登录失败");
}
- */
Address address = addressMapper.selectById(dto.getAddressId());
List<TransportOrderDTO> tLs = transportService.getPreOrderTransportList(address
@@ -611,7 +605,7 @@
}
order.setOrderNo(getOrderNo());
- //order.setPayOpenid(openId);替换支付修改
+ order.setPayOpenid(openId);
orderMapper.insert(order);
//处理积分商品兑换券
@@ -626,7 +620,9 @@
}
}
- return paymentSybService.prepay(order);
+ Map map = paymentV3Service.wxPrepay(order);
+ map.put("_testV2OrderId", order.getId());
+ return map;
}
private void usePointGoods(String orderId, List<Long> goodsRecordIdList){
@@ -779,7 +775,6 @@
if(orders == null || orders.size() == 0){
return;
}
- /*
for (Order o : orders) {
//set status_backend = 'RECEIVE', status = 'RECEIVE'
o.setStatusBackend("RECEIVE");
@@ -796,8 +791,7 @@
orderMapper.updateById(o);
}
- */
- orderMapper.setPartnerOrderReceive();
+ //orderMapper.setPartnerOrderReceive();
}
/**
@@ -818,7 +812,6 @@
o.setStatusBackend(Constants.ORDER_STATUS_BACKEND.RECEIVE.name());
o.update(SecurityUtils.getUserId());
- /*
//发送微信发货请求
JSONObject jsonObject = sendWxDeliveryGood(o);
if (jsonObject != null && (int) jsonObject.get("errcode") == 0) {
@@ -828,7 +821,7 @@
o.setWxDeliveryGood(false);
o.setWxDeliveryMsg(GsonUtil.toJson(jsonObject));
}
- */
+
orderMapper.updateById(o);
}
@@ -1242,7 +1235,6 @@
customerPointService.consumptionPoint(totalAmount, o.getOrderNo(), o.getCreateBy());
}
- /*
public JSONObject sendWxDeliveryGood(Order o) {
JSONObject json = new JSONObject();
List<OrderItem> items = orderItemMapper.selectList(new LambdaQueryWrapper<OrderItem>()
@@ -1281,7 +1273,6 @@
return json;
}
}
- */
public Order confirmOrderReceive(String id) {
Order o = orderMapper.selectById(id);
@@ -1475,7 +1466,7 @@
transferId = "NoNeedRefund";
if (deductAmount.doubleValue() > 0) {
- transferId = paymentSybService.refundOrderSub(o, deductAmount);
+ transferId = paymentV3Service.refundOrderSub(o, deductAmount);
}
o.setTransferId(transferId);
orderMapper.updateById(o);
@@ -1496,7 +1487,7 @@
}
BigDecimal amount = dto.getAmount();
- transferId = paymentSybService.refundOrderSub(o, amount);
+ transferId = paymentV3Service.refundOrderSub(o, amount);
o.setTransferId(transferId);
o.setTransferTime(LocalDateTime.now());
o.update(SecurityUtils.getUserId());
--
Gitblit v1.9.3