lzq
/
njzscloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

localizer
ljw 2025-10-27 16:40:50 +08:00
parent 1b2687a441
commit 4a902327e9
6 changed files with 12 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/contant/PaymentWay.java
View File

@ -1,19 +0,0 @@
package com.njzscloud.supervisory.order.contant;
import com.njzscloud.common.core.ienum.DictStr;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
/**
* 字典代码：payment_status
* 字典名称：支付状态
*/
@Getter
@RequiredArgsConstructor
public enum PaymentWay implements DictStr {
COMPANY("company", "公司支付"),
WX("wx", "微信"),
;
private final String val;
private final String txt;
}

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/pojo/entity/OrderInfoEntity.java
View File

@ -215,7 +215,7 @@ public class OrderInfoEntity {
/**
* 支付方式
*/
private String paymentCategory;
private String settlementWay;
/**
* 装车照片

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/pojo/result/PaymentContextResult.java
View File

@ -25,7 +25,7 @@ public class PaymentContextResult {
private String wechatOpenid;
private String paymentCategory;
private String oiPayWay;
private String outTradeNo;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java
View File

@ -823,7 +823,7 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
.setId(orderInfo.getId())
.setPaymentStatus(PaymentStatus.YiZhiFu)
.setOrderStatus(OrderStatus.YiWanCheng)
.setPaymentCategory(PaymentWay.COMPANY.getVal())
.setSettlementWay(ctx.getSettlementWay())
.setPayTime(LocalDateTime.now())
);

16
njzscloud-svr/src/main/java/com/njzscloud/supervisory/wxPay/controller/PaymentController.java
View File

@ -25,7 +25,7 @@ import com.njzscloud.supervisory.money.service.MoneyChangeDetailService;
import com.njzscloud.supervisory.order.contant.MoneyWay;
import com.njzscloud.supervisory.order.contant.OrderStatus;
import com.njzscloud.supervisory.order.contant.PaymentStatus;
import com.njzscloud.supervisory.order.contant.PaymentWay;
import com.njzscloud.supervisory.order.contant.SettlementWay;
import com.njzscloud.supervisory.order.pojo.entity.OrderGoodsEntity;
import com.njzscloud.supervisory.order.service.OrderGoodsService;
import com.njzscloud.supervisory.wxPay.dto.RefundRequestDto;
@ -139,7 +139,7 @@ public class PaymentController {
orderInfoService.lambdaUpdate()
.eq(OrderInfoEntity::getId, paymentParam.getOrderId())
.set(OrderInfoEntity::getPaymentStatus, PaymentStatus.WeiZhiFu)
.set(OrderInfoEntity::getPaymentCategory, PaymentWay.WX.getVal())
.set(OrderInfoEntity::getSettlementWay, SettlementWay.CASH.getVal())
.set(OrderInfoEntity::getOutTradeNo, outTradeNo)
.update();
@ -159,14 +159,14 @@ public class PaymentController {
*/
public String getCurrentUserOpenid(String wxCode) {
// 调用微信API获取openId和unionId
Code2SessionResult code2SessionResult = WechatUtil.code2Session(new Code2SessionParam().setJs_code(wxCode));
Integer errcode = code2SessionResult.getErrcode();
Code2SessionResult sessionResult = WechatUtil.code2Session(new Code2SessionParam().setJs_code(wxCode));
Integer errcode = sessionResult.getErrcode();
if (errcode != null && errcode != 0) {
log.error("微信登录失败, errcode: {}, errmsg: {}", errcode, code2SessionResult.getErrmsg());
log.error("微信登录失败, errcode: {}, errmsg: {}", errcode, sessionResult.getErrmsg());
throw new UserLoginException(ExceptionMsg.CLI_ERR_MSG, "微信登录失败");
}
return code2SessionResult.getOpenid();
return sessionResult.getOpenid();
}
/**
@ -262,7 +262,7 @@ public class PaymentController {
}
// 根据支付方式处理退款
if (PaymentWay.WX.getVal().equals(ctx.getPaymentCategory())) {
if (SettlementWay.CASH.getVal().equals(ctx.getOiPayWay())) {
// 微信退款
//生成退款单号
String orderSn = IdUtil.getSnowflake(0, 0).nextIdStr();
@ -271,7 +271,7 @@ public class PaymentController {
String notifyUrl = properties.getRefundNotifyUrl();
wechatPayService.refund(orderInfo.getOutTradeNo(), orderSn, money, money, notifyUrl);
return R.success("退款成功");
} else if (PaymentWay.COMPANY.getVal().equals(ctx.getPaymentCategory())) {
} else if (SettlementWay.MONTH.getVal().equals(ctx.getOiPayWay()) || SettlementWay.BALANCE.getVal().equals(ctx.getOiPayWay())) {
// 公司退款
return processCompanyRefund(refundRequest, ctx);
} else {

2
njzscloud-svr/src/main/resources/mapper/order/OrderInfoMapper.xml
View File

@ -274,7 +274,7 @@
a.id AS orderId,
a.trans_company_id AS transCompanyId,
a.sn,
a.payment_category,
a.settlement_way as oi_pay_way,
a.out_trade_no,
bc.user_id AS companyUserId,
ma1.id AS companyAccountId,