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-06-04 18:01:21 +08:00
parent ca4530ce84
commit dfc1aaca91
2 changed files with 39 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,6 @@
package com.ghy.web.controller.order; package com.ghy.web.controller.order;
import com.alibaba.fastjson.JSONObject;
import com.ghy.common.annotation.Log; import com.ghy.common.annotation.Log;
import com.ghy.common.constant.UserConstants; import com.ghy.common.constant.UserConstants;
import com.ghy.common.core.controller.BaseController; import com.ghy.common.core.controller.BaseController;
@ -20,6 +21,7 @@ import com.ghy.order.service.*;
import com.ghy.payment.domain.FinancialChangeRecord; import com.ghy.payment.domain.FinancialChangeRecord;
import com.ghy.payment.domain.FinancialDetail; import com.ghy.payment.domain.FinancialDetail;
import com.ghy.payment.domain.FinancialMaster; import com.ghy.payment.domain.FinancialMaster;
import com.ghy.payment.service.AdapayService;
import com.ghy.payment.service.FinancialChangeRecordService; import com.ghy.payment.service.FinancialChangeRecordService;
import com.ghy.payment.service.FinancialDetailService; import com.ghy.payment.service.FinancialDetailService;
import com.ghy.payment.service.FinancialMasterService; import com.ghy.payment.service.FinancialMasterService;
@ -55,6 +57,8 @@ import java.math.RoundingMode;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static jdk.nashorn.internal.runtime.regexp.joni.Config.log;
/** /**
* 详细订单API * 详细订单API
* *
@ -119,6 +123,9 @@ public class OrderDetailController extends BaseController {
@Resource @Resource
private IOrderAttachmentRecordService orderAttachmentRecordService; private IOrderAttachmentRecordService orderAttachmentRecordService;
@Resource
private AdapayService adapayService;
@RequiresPermissions("order:detail:view") @RequiresPermissions("order:detail:view")
@GetMapping() @GetMapping()
public String orderDetail() { public String orderDetail() {
@ -817,7 +824,7 @@ public class OrderDetailController extends BaseController {
orderListResponse.setProvinceName(array[0]); orderListResponse.setProvinceName(array[0]);
orderListResponse.setCityName(array[1]); orderListResponse.setCityName(array[1]);
orderListResponse.setCountryName(array[2]); orderListResponse.setCountryName(array[2]);
orderListResponse.setStreetName(array.length>3?array[3]:null); orderListResponse.setStreetName(array[3]);
orderListResponse.setProvinceId(customerAddress.getProvinceId()); orderListResponse.setProvinceId(customerAddress.getProvinceId());
orderListResponse.setCityId(customerAddress.getCityId()); orderListResponse.setCityId(customerAddress.getCityId());
orderListResponse.setCountryId(customerAddress.getCountryId()); orderListResponse.setCountryId(customerAddress.getCountryId());
@ -1299,11 +1306,24 @@ public class OrderDetailController extends BaseController {
for (FinancialChangeRecord fcr : fcrList) { for (FinancialChangeRecord fcr : fcrList) {
if (PayStatus.PAID.getCode().equals(fcr.getPayStatus()) || PayStatus.PAYED_ADD.getCode().equals(fcr.getPayStatus())) { if (PayStatus.PAID.getCode().equals(fcr.getPayStatus()) || PayStatus.PAYED_ADD.getCode().equals(fcr.getPayStatus())) {
executor.execute(() -> financialChangeRecordService.refund(om.getDeptId(), fcr.getId())); executor.execute(() -> financialChangeRecordService.refund(om.getDeptId(), fcr.getId()));
payMoney = payMoney.subtract(fcr.getChangeMoney()); OrderAttachmentRecord orderAttachmentRecord = new OrderAttachmentRecord();
orderAttachmentRecord.setFinancialChangeRecordId(fcr.getId());
List<OrderAttachmentRecord> orderAttachmentRecords = orderAttachmentRecordService.selectOrderAttachmentRecordList(orderAttachmentRecord);
for (OrderAttachmentRecord orderAttachmentRecord1 : orderAttachmentRecords) {
executor.execute(() -> {
try {
JSONObject response = adapayService.payReverse(om.getDeptId(), orderAttachmentRecord1.getPaymentId(),
String.valueOf(orderAttachmentRecord1.getAttachMoney()), RefundType.RCG);
logger.info("配件退款成功: paymentId={}, amount={}，response{}", orderAttachmentRecord1.getPaymentId(), orderAttachmentRecord1.getAttachMoney(),response);
} catch (BaseAdaPayException e) {
logger.error("配件退款失败: paymentId={}, amount={}, error={}",
orderAttachmentRecord1.getPaymentId(), orderAttachmentRecord1.getAttachMoney(), e.getMessage(), e);
}
});
}
} }
} }
financialMaster.setPayMoney(payMoney);
financialMasterService.updateFinancialMaster(financialMaster);
// 退回旧商品 // 退回旧商品
// List<OrderGoods> goodsList = orderGoodsService.selectByOrderDetailId(orderDetail.getId()); // List<OrderGoods> goodsList = orderGoodsService.selectByOrderDetailId(orderDetail.getId());
// goodsList.forEach(orderGoods -> { // goodsList.forEach(orderGoods -> {

30
ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java
View File

@ -407,26 +407,26 @@ public class OrderServiceImpl implements OrderService {
param.setOrderId(order.getId()); param.setOrderId(order.getId());
List<OrderCallRecord> list = orderCallRecordService.selectOrderCallRecordList(param); List<OrderCallRecord> list = orderCallRecordService.selectOrderCallRecordList(param);
if (order.getOrderStatus()==OrderStatus.RECEIVE.code()){ if (order.getOrderStatus()==OrderStatus.RECEIVE.code()){
try { try {
// 推送公众号通知数据。 // 推送公众号通知数据。
// 消息组装。 // 消息组装。
Map<String, Object> paramsNew = new HashMap<>(); Map<String, Object> paramsNew = new HashMap<>();
// 订单编号 // 订单编号
paramsNew.put("thing9", "您帐号有1条新订单超时未接"); paramsNew.put("thing9", "您帐号有1条新订单超时未接");
// 名称 // 名称
paramsNew.put("thing10", "请进入【我的订单--新订单】操作处理"); paramsNew.put("thing10", "请进入【我的订单--新订单】操作处理");
OrderMaster orderMaster = orderMasterService.selectById(order.getOrderMasterId()); OrderMaster orderMaster = orderMasterService.selectById(order.getOrderMasterId());
CustomerAddress address = customerAddressService.selectByCustomerAddressId(orderMaster.getAddressId()); CustomerAddress address = customerAddressService.selectByCustomerAddressId(orderMaster.getAddressId());
paramsNew.put("thing2", address.getName()); paramsNew.put("thing2", address.getName());
// 预约时间 // 预约时间
paramsNew.put("time8", com.ghy.common.utils.DateUtils.parseDateToStr("yyyy年MM月dd日 HH:mm", new Date())); paramsNew.put("time8", com.ghy.common.utils.DateUtils.parseDateToStr("yyyy年MM月dd日 HH:mm", new Date()));
// 查师傅信息 // 查师傅信息
Worker worker = workerService.selectById(order.getWorkerId()); Worker worker = workerService.selectById(order.getWorkerId());
WechatMsgUtils.sendWeChatMsg(WechatMsgUtils.getToken(), worker.getWxOpenId(), WxMsgEnum.TIMEOUT_ORDER, paramsNew); WechatMsgUtils.sendWeChatMsg(WechatMsgUtils.getToken(), worker.getWxOpenId(), WxMsgEnum.TIMEOUT_ORDER, paramsNew);
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
}
} }
}
// 超时预约通知 // 超时预约通知
else if (CollectionUtil.isEmpty(list)) { else if (CollectionUtil.isEmpty(list)) {
// 通知师傅新订单 // 通知师傅新订单
@ -886,7 +886,7 @@ public class OrderServiceImpl implements OrderService {
List<OrderDetail> tmpDetailListOfMasters = orderDetailService.selectOrderDetailList(detailAfterListOfMasterQry); List<OrderDetail> tmpDetailListOfMasters = orderDetailService.selectOrderDetailList(detailAfterListOfMasterQry);
List<OrderListResponse> detailListOfMasters = new ArrayList<>(); List<OrderListResponse> detailListOfMasters = new ArrayList<>();
tmpDetailListOfMasters.forEach(model -> { tmpDetailListOfMasters.forEach(model -> {
OrderListResponse response = new OrderListResponse(); OrderListResponse response = new OrderListResponse();
BeanUtils.copyProperties(model, response); BeanUtils.copyProperties(model, response);
detailListOfMasters.add(response); detailListOfMasters.add(response);
}); });