clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

加价单状态更新

This commit is contained in:
clunt 2022-09-25 18:57:18 +08:00
parent a0c414dbd0
commit fd4fafc12a
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ghy-admin/src/main/java/com/ghy/web/controller/pay/AlipayController.java
View File

@ -97,7 +97,7 @@ public class AlipayController extends BaseController {
payMoney = payMoney.add(financialChangeRecord.getChangeMoney()); payMoney = payMoney.add(financialChangeRecord.getChangeMoney());
} }
// 付款 // 付款
PayParam payParam = PayParam.delayPayParam(orderMaster.getCode() + "_" + System.currentTimeMillis(), payMoney.setScale(2, BigDecimal.ROUND_UNNECESSARY).toString(), "加价付款", "叮咚到家服务"); PayParam payParam = PayParam.delayPayParam(orderMaster.getCode() + "_" +financialChangeRecord.getId() + "_" + System.currentTimeMillis(), payMoney.setScale(2, BigDecimal.ROUND_UNNECESSARY).toString(), "加价付款", "叮咚到家服务");
try { try {
map = adapayService.alipayQrPay(orderMaster.getDeptId(), payParam, null, null, null); map = adapayService.alipayQrPay(orderMaster.getDeptId(), payParam, null, null, null);
} catch (BaseAdaPayException e) { } catch (BaseAdaPayException e) {

12
ghy-payment/src/main/java/com/ghy/payment/service/impl/PayCallbackService.java
View File

@ -6,8 +6,11 @@ import com.ghy.common.adapay.model.AdapayStatusEnum;
import com.ghy.common.adapay.model.Event; import com.ghy.common.adapay.model.Event;
import com.ghy.common.adapay.model.PayCallback; import com.ghy.common.adapay.model.PayCallback;
import com.ghy.common.adapay.model.PaymentDTO; import com.ghy.common.adapay.model.PaymentDTO;
import com.ghy.common.enums.PayStatus;
import com.ghy.payment.domain.FinancialChangeRecord;
import com.ghy.payment.domain.FinancialMaster; import com.ghy.payment.domain.FinancialMaster;
import com.ghy.payment.service.CallBackService; import com.ghy.payment.service.CallBackService;
import com.ghy.payment.service.FinancialChangeRecordService;
import com.ghy.payment.service.FinancialMasterService; import com.ghy.payment.service.FinancialMasterService;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -29,6 +32,9 @@ public class PayCallbackService implements CallBackService {
@Resource @Resource
FinancialMasterService financialMasterService; FinancialMasterService financialMasterService;
@Resource
FinancialChangeRecordService financialChangeRecordService;
@Override @Override
public void onCallback(Event event) { public void onCallback(Event event) {
logger.info("支付回调: {}", event); logger.info("支付回调: {}", event);
@ -69,6 +75,12 @@ public class PayCallbackService implements CallBackService {
update.setOrderMasterCode(payment.getOrderNo().split("_")[0]); update.setOrderMasterCode(payment.getOrderNo().split("_")[0]);
update.setPaymentId(payment.getId()); update.setPaymentId(payment.getId());
financialMasterService.updateFinancialMaster(update); financialMasterService.updateFinancialMaster(update);
if(payment.getOrderNo().split("_").length > 2){
FinancialChangeRecord financialChangeRecord = new FinancialChangeRecord();
financialChangeRecord.setId(payment.getOrderNo().split("_")[1]);
financialChangeRecord.setPayStatus(1L);
financialChangeRecordService.updateFinancialChangeRecord(financialChangeRecord);
}
} else { } else {
logger.warn("发起支付失败 : {}", response.toJSONString()); logger.warn("发起支付失败 : {}", response.toJSONString());
} }