diff --git a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java index f6ce3d133..d604d138b 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -331,11 +331,19 @@ public class OrderService { memberTransactionRecordService.insertSelective(record); } + /** + * 微信退款 + * @param dto + */ public void weChatRefund(WeChatRefundDTO dto) { log.info("微信退款接口 param:{}", JSONObject.toJSONString(dto)); orderBasicInfoService.weChatRefund(dto); } + /** + * 汇付退款 + * @param dto + */ public void adapayRefund(WeChatRefundDTO dto) { log.info("汇付退款 param:{}", JSON.toJSONString(dto)); // 退款有两种情况 1-订单结算退款 2-用户余额退款 @@ -507,6 +515,12 @@ public class OrderService { return vo; } + /** + * 微信支付退款回调 + * @param request + * @param body + * @throws Exception + */ public void wechatPayRefundCallback(HttpServletRequest request, WechatPayNotifyParameter body) throws Exception { // 获取微信退款成功返回的信息 Map map = wechatPayService.wechatPayRefundCallbackInfo(request, body); @@ -610,6 +624,11 @@ public class OrderService { return vo; } + /** + * 小程序订单详情V2 + * @param orderCode + * @return + */ public UniAppOrderDetailVO getUniAppOrderDetailV2(String orderCode) { UniAppOrderDetailVO resultVO = new UniAppOrderDetailVO(); @@ -633,6 +652,10 @@ public class OrderService { return CollectionUtils.isNotEmpty(chargingRealTimeData) ? Constants.ONE : Constants.ZERO; } + /** + * 关闭支付未启动的订单 + * @param dto + */ public void closeStartFailedOrder(QueryOrderDTO dto) { orderBasicInfoService.closeStartFailedOrder(dto.getStartTime(), dto.getEndTime()); } @@ -730,6 +753,12 @@ public class OrderService { return result; } + /** + * 查询未开发票订单 + * 时间限制15天内 + * @param dto + * @return + */ public List queryUninvoicedOrderList(QueryOrderDTO dto) { int i = 15; @@ -838,8 +867,12 @@ public class OrderService { orderInvoiceRecordService.insertOrderInvoiceRecord(orderInvoiceRecord); } + /** + * 查询开票记录 + * @param dto + * @return + */ public PageResponse queryInvoiceRecord(QueryInvoiceRecordDTO dto) { - QueryInvoiceRecordDTO build = QueryInvoiceRecordDTO.builder() .memberId(dto.getMemberId()) .build(); @@ -982,6 +1015,10 @@ public class OrderService { } + /** + * 对公账户创建失败 + * @param data + */ private void corpMemberFailed(String data) { // 删除表中的记录 JSONObject jsonObject = JSON.parseObject(data); @@ -998,6 +1035,10 @@ public class OrderService { adapayMemberAccountService.updateAdapayMemberAccount(adapayMemberAccount); } + /** + * 对公账户创建成功 + * @param data + */ private void corpMemberSucceeded(String data) { JSONObject jsonObject = JSON.parseObject(data); String memberId = jsonObject.getString("member_id"); @@ -1029,10 +1070,7 @@ public class OrderService { log.info("汇付支付退款回调验签失败:{}", data); return; } - adapayRefundRecordService.saveAdapayRefundRecord(data); - } - }