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

no message

This commit is contained in:
cb 2025-09-12 17:14:20 +08:00
parent c8825f1c16
commit 61dcb7b25c
5 changed files with 46 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
View File

@ -427,8 +427,13 @@ public class OrderController extends BaseController {
od.setOrderMasterCode(om.getCode());
od.setCustomerId(om.getCustomerId());
od.setOrderType(om.getOrderType());
if (request.getIsQuicklyDelivery() != null && request.getIsQuicklyDelivery() == 1) {
od.setOrderStatus(OrderStatus.SERVER.code());
od.setDeliveryImages(om.getDeliveryImages());
od.setDeliveryType(om.getDeliveryType());
od.setDeliveryRemark(om.getDeliveryRemark());
od.setTrackingNumber(om.getTrackingNumber());
// 立即发货时，计算确认截止时间并设置到confirmStartTime字段
Date now = new Date();

4
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java
View File

@ -709,6 +709,7 @@ public class OrderDetailController extends BaseController {
// 师傅信息
Worker worker = workerService.selectById(detail.getWorkerId());
Worker masterWorker = workerService.selectById(orderMaster.getWorkerId());
WorkerCertification workerRealInfo = null;
String workerName = "";
if (worker != null) {
@ -819,7 +820,10 @@ public class OrderDetailController extends BaseController {
orderListResponse.setDiscountMoney(financialDetail.getDiscountMoney());
orderListResponse.setTotalMoney(financialDetail.getTotalMoney());
orderListResponse.setWorkerName(workerName);
orderListResponse.setWorkerId(worker.getWorkerId());
orderListResponse.setMasterWorkerId(masterWorker.getWorkerId());
orderListResponse.setWorkerPhone(worker == null ? "" : worker.getPhone());
orderListResponse.setMasterWorkerName(masterWorker.getName());
orderListResponse.setCustomerName(org.apache.commons.lang3.StringUtils.isNotEmpty(orderMaster.getName())?orderMaster.getName():customerAddress.getName());
orderListResponse.setCustomerPhone(org.apache.commons.lang3.StringUtils.isNotEmpty(orderMaster.getPhone())?orderMaster.getPhone():customerAddress.getPhone());
orderListResponse.setOrderStatus(detail.getOrderStatus());

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

@ -78,8 +78,23 @@ public class AlipayController extends BaseController {
PayParam payParam = PayParam.delayPayParam(om.getCode() + "_" + System.currentTimeMillis(), payMoney, "商品标题", "商品描述信息");
try {
JSONObject response = adapayService.alipayQrPay(om.getDeptId(), payParam, null, null, null);
boolean status = AdapayStatusEnum.succeeded.code.equals(response.getString("status"));
if (!status) {
logger.error("创建支付失败: {}", response.toJSONString());
return AjaxResult.error("网络不佳 请稍后再试");
}
// 支付二维码创建成功 保存一下paymentId
String paymentId = response.getString("id");
// 更新财务主单的paymentId
FinancialMaster fm2update = new FinancialMaster();
fm2update.setId(fm.getId());
fm2update.setPaymentId(paymentId);
fm2update.setPayType(PayTypeEnum.ALIPAY_QR.getCode());
financialMasterService.updateFinancialMaster(fm2update);
// 保存支付ID与主财务单ID到关系表
paymentRelationService.insert(new PaymentRelation(null, fm.getId(), PaymentRelation.FINANCIAL_MASTER, fm.getPayMoney()));
PaymentRelation relation = new PaymentRelation(null, fm.getId(), PaymentRelation.FINANCIAL_MASTER, fm.getPayMoney());
relation.setPaymentId(paymentId);
paymentRelationService.insert(relation);
return AjaxResult.success(response);
} catch (BaseAdaPayException e) {
logger.error("创建支付失败", e);

19
ghy-admin/src/main/java/com/ghy/web/controller/pay/WxPayController.java
View File

@ -107,6 +107,25 @@ public class WxPayController extends BaseController {
String.valueOf(payMoney), "工圈子居家设备", "工圈子居家设备购买付费");
JSONObject response = adapayService.wxLitePay(orderMaster.getDeptId(), payParam, expend, null, null);
String paymentId = response.getString("id");
// 更新财务主单的paymentId
if (PayStatus.WAIT_PAY.getCode().equals(financialMaster.getPayStatus())) {
FinancialMaster fm2update = new FinancialMaster();
fm2update.setId(financialMaster.getId());
fm2update.setPaymentId(paymentId);
financialMasterService.updateFinancialMaster(fm2update);
}
// 更新财务变更记录的paymentId
for (FinancialChangeRecord fcr : financialChangeRecords) {
if (PayStatus.WAIT_PAY.getCode().equals(fcr.getPayStatus())) {
FinancialChangeRecord fcr2update = new FinancialChangeRecord();
fcr2update.setId(fcr.getId());
fcr2update.setPaymentId(paymentId);
financialChangeRecordService.update(fcr2update);
}
}
// 保存支付ID与订单ID到关系表
for (PaymentRelation relation : relations) {
relation.setPaymentId(paymentId);

2
ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java
View File

@ -39,6 +39,8 @@ public class OrderListResponse {
private Long workerId;
private Long masterWorkerId;
private String workerName;
private String workerPhone;