From ff2b096a39e8726c0f7cba70baa2e9deca94396e Mon Sep 17 00:00:00 2001 From: Jack <46790855@qq.com> Date: Thu, 3 Jul 2025 18:27:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=B3=BB=E7=BB=9F=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E9=80=80=E6=AC=BE=20=E7=9B=B8=E5=85=B3=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../suisung/mall/common/api/StateCode.java | 2 +- .../mall/common/feignService/PayService.java | 9 + .../pay/controller/admin/PayController.java | 6 + .../mall/pay/service/PayUserPayService.java | 8 + .../impl/PayConsumeTradeServiceImpl.java | 4 +- .../service/impl/PayUserPayServiceImpl.java | 41 ++++ .../controller/mobile/LakalaController.java | 7 +- .../service/impl/LakalaApiServiceImpl.java | 11 +- .../order/service/ShopOrderReturnService.java | 9 + .../impl/ShopOrderReturnServiceImpl.java | 189 ++++++++++++++---- .../service/impl/SFExpressApiServiceImpl.java | 32 +-- .../impl/ShopStoreConfigServiceImpl.java | 14 +- pom.xml | 24 +-- 13 files changed, 274 insertions(+), 82 deletions(-) diff --git a/mall-common/src/main/java/com/suisung/mall/common/api/StateCode.java b/mall-common/src/main/java/com/suisung/mall/common/api/StateCode.java index eb68092b..1508858a 100644 --- a/mall-common/src/main/java/com/suisung/mall/common/api/StateCode.java +++ b/mall-common/src/main/java/com/suisung/mall/common/api/StateCode.java @@ -280,7 +280,7 @@ public class StateCode { public static final int RETURN_PROCESS_CHECK = 3105; //退单审核1ReturnReturn public static final int RETURN_PROCESS_RECEIVED = 3110; //收货确认0ReturnReturn public static final int RETURN_PROCESS_REFUND = 3115; //退款确认0ReturnReturn - public static final int RETURN_PROCESS_RECEIPT_CONFIRMATION = 3120; //客户】收款确认0ReturnReturn + public static final int RETURN_PROCESS_RECEIPT_CONFIRMATION = 3120; //【客户】收款确认0ReturnReturn public static final int RETURN_PROCESS_FINISH = 3125; //完成1ReturnReturn3130-商家拒绝退货 public static final int RETURN_PROCESS_REFUSED = 3130; //-商家拒绝退货 public static final int RETURN_PROCESS_CANCEL = 3135; //-买家取消 diff --git a/mall-common/src/main/java/com/suisung/mall/common/feignService/PayService.java b/mall-common/src/main/java/com/suisung/mall/common/feignService/PayService.java index 86b4b3c4..c6d08237 100644 --- a/mall-common/src/main/java/com/suisung/mall/common/feignService/PayService.java +++ b/mall-common/src/main/java/com/suisung/mall/common/feignService/PayService.java @@ -134,6 +134,15 @@ public interface PayService { @PostMapping(value = "/admin/pay/payController/aliPayRefund") ShopOrderReturn aliPayRefund(@RequestBody ShopOrderReturn return_row); + /** + * 拉卡拉退款接口 + * + * @param orderReturn + * @return + */ + @PostMapping(value = "/lklPayRefund") + ShopOrderReturn lklPayRefund(@RequestBody ShopOrderReturn orderReturn); + // 次卡处理发卡 @PostMapping(value = "/card/pay/pay-card-info/editPayCard") boolean editPayCard(@RequestParam(name = "order_id") String order_id, diff --git a/mall-pay/src/main/java/com/suisung/mall/pay/controller/admin/PayController.java b/mall-pay/src/main/java/com/suisung/mall/pay/controller/admin/PayController.java index 9ccea544..28d66807 100644 --- a/mall-pay/src/main/java/com/suisung/mall/pay/controller/admin/PayController.java +++ b/mall-pay/src/main/java/com/suisung/mall/pay/controller/admin/PayController.java @@ -385,6 +385,12 @@ public class PayController { return shopOrderReturn; } + @ApiOperation(value = "拉卡拉退款", notes = "拉卡拉退款") + @RequestMapping(value = "/lklPayRefund", method = RequestMethod.POST) + public ShopOrderReturn lklPayRefund(@RequestBody ShopOrderReturn orderReturn) { + return payUserPayService.wxPayRefund(orderReturn); + } + @ApiOperation(value = "获取用户资源信息", notes = "获取用户资源信息") @RequestMapping(value = "/resource", method = RequestMethod.GET) public CommonResult resourceIndex() { diff --git a/mall-pay/src/main/java/com/suisung/mall/pay/service/PayUserPayService.java b/mall-pay/src/main/java/com/suisung/mall/pay/service/PayUserPayService.java index 15fcbb84..41ab986a 100644 --- a/mall-pay/src/main/java/com/suisung/mall/pay/service/PayUserPayService.java +++ b/mall-pay/src/main/java/com/suisung/mall/pay/service/PayUserPayService.java @@ -49,6 +49,14 @@ public interface PayUserPayService extends IBaseService { */ ShopOrderReturn wxPayRefund(ShopOrderReturn orderReturn); + /** + * 拉卡拉 退款接口 + * + * @param orderReturn + * @return + */ + ShopOrderReturn lklPayRefund(ShopOrderReturn orderReturn); + void wxRefundNotify(HttpServletRequest request); ShopOrderReturn aliPayRefund(ShopOrderReturn orderReturn); diff --git a/mall-pay/src/main/java/com/suisung/mall/pay/service/impl/PayConsumeTradeServiceImpl.java b/mall-pay/src/main/java/com/suisung/mall/pay/service/impl/PayConsumeTradeServiceImpl.java index 1625f487..3418217b 100644 --- a/mall-pay/src/main/java/com/suisung/mall/pay/service/impl/PayConsumeTradeServiceImpl.java +++ b/mall-pay/src/main/java/com/suisung/mall/pay/service/impl/PayConsumeTradeServiceImpl.java @@ -181,7 +181,7 @@ public class PayConsumeTradeServiceImpl extends BaseServiceImpl 0) { // log.info("买家余额差额大于 0，调用退款接口"); - // TODO 支付宝微信金额原路返回（调用 拉卡拉的退款接口） + // TODO 重要：支付宝微信金额原路返回（调用 拉卡拉的退款接口） Pair refundResult = lakalaPayService.innerLklRefund( storeId, returnRow.getReturn_id(), // 退货单ID diff --git a/mall-pay/src/main/java/com/suisung/mall/pay/service/impl/PayUserPayServiceImpl.java b/mall-pay/src/main/java/com/suisung/mall/pay/service/impl/PayUserPayServiceImpl.java index dbd2d1e9..56c33215 100644 --- a/mall-pay/src/main/java/com/suisung/mall/pay/service/impl/PayUserPayServiceImpl.java +++ b/mall-pay/src/main/java/com/suisung/mall/pay/service/impl/PayUserPayServiceImpl.java @@ -1687,6 +1687,47 @@ public class PayUserPayServiceImpl extends BaseServiceImpl params = RefundModel.builder().appid(wxPayApiConfig.getAppId()).mch_id(wxPayApiConfig.getMchId()).nonce_str(WxPayKit.generateStr()).transaction_id(deposit_trade_no).out_refund_no(WxPayKit.generateStr()).total_fee(refundAmount).refund_fee(refundAmount).build().createSign(wxPayApiConfig.getPartnerKey(), SignType.MD5); + logger.info(String.format(I18nUtil._("微信退款请求参数参数: params【%s】"), params.toString())); + InputStream certInStream = PayKit.getFileToStream(wxPayApiConfig.getCertPath()); + //IJPAY低版本jdk环境使用退款方法jdk1.8.0_111以下 + //String xmlResult = WxPayApi.orderRefund(false, params, certInStream, wxPayApiConfig.getMchId()); + //下面的方法解决IJPAY高版本jdk导致退款协议不支持问题jdk1.8.0_111以上 + String xmlResult = HttpKit.getDelegate().post(WxPayApi.getReqUrl(WxApiType.REFUND, null, false), WxPayKit.toXml(params), certInStream, wxPayApiConfig.getMchId(), ""); + logger.info(String.format(I18nUtil._("微信退款返回参数: xmlResult【%s】"), xmlResult)); + Map resultMap = WxPayKit.xmlToMap(xmlResult); + String returnCode = resultMap.get("return_code"); + String resultCode = resultMap.get("result_code"); + + if (!WxPayKit.codeIsOk(returnCode) || !WxPayKit.codeIsOk(resultCode)) { + LogUtil.error("微信退款异常！" + resultMap); + return null; + } + + ShopOrderReturn shopOrderReturn = new ShopOrderReturn(); + shopOrderReturn.setReturn_channel_flag(1); + shopOrderReturn.setDeposit_trade_no(deposit_trade_no); + shopOrderReturn.setOrder_id(orderReturn.getOrder_id()); + shopOrderReturn.setReturn_channel_trans_id(resultMap.get("refund_id")); + shopOrderReturn.setReturn_channel_time(new Date()); + return shopOrderReturn; + } + /** * 微信退款成功回调 * diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/lakala/controller/mobile/LakalaController.java b/mall-shop/src/main/java/com/suisung/mall/shop/lakala/controller/mobile/LakalaController.java index 06ce06de..4df3b82c 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/lakala/controller/mobile/LakalaController.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/lakala/controller/mobile/LakalaController.java @@ -10,10 +10,10 @@ package com.suisung.mall.shop.lakala.controller.mobile; import cn.hutool.json.JSONObject; import com.suisung.mall.common.api.CommonResult; -import com.suisung.mall.common.service.GeTuiPushService; import com.suisung.mall.common.service.impl.BaseControllerImpl; import com.suisung.mall.shop.lakala.service.LakalaApiService; import com.suisung.mall.shop.library.service.LibraryProductService; +import com.suisung.mall.shop.order.service.ShopOrderReturnService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.http.HttpStatus; @@ -35,7 +35,7 @@ public class LakalaController extends BaseControllerImpl { private LakalaApiService lakalaPayService; @Resource - private GeTuiPushService geTuiPushService; + private ShopOrderReturnService shopOrderReturnService; @Resource private LibraryProductService libraryProductService; @@ -43,7 +43,8 @@ public class LakalaController extends BaseControllerImpl { @ApiOperation(value = "测试案例", notes = "测试案例") @RequestMapping(value = "/testcase", method = RequestMethod.POST) public Object testcase(@RequestBody JSONObject paramsJSON) { - return lakalaPayService.applyLedgerMerEc(paramsJSON.getStr("mchMobile")); + return shopOrderReturnService.sfExpressExpiredForceRefund(paramsJSON.getStr("orderId"), paramsJSON.getInt("returnFlag")); +// return lakalaPayService.applyLedgerMerEc(paramsJSON.getStr("mchMobile")); // return lakalaPayService.LedgerMerEcDownload(975790666910121984L); // return geTuiPushService.pushMessageToSingleByCid("f9da7081a7951cff6d7f1d4e2d2f270b", "", "从 shop 发消息", "none", ""); diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/impl/LakalaApiServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/impl/LakalaApiServiceImpl.java index 1f89d918..2804981a 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/impl/LakalaApiServiceImpl.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/impl/LakalaApiServiceImpl.java @@ -1632,7 +1632,7 @@ public class LakalaApiServiceImpl implements LakalaApiService { String errorMsg = String.format("店铺[%s]未绑定平台方接收账户，跳过分账", shopOrderLkl.getStore_id()); log.error(errorMsg); errorMessages.append(errorMsg).append("; "); - lklOrderSeparateService.updateRemark(lklOrderSeparateExist.getId(), errorMsg); +// lklOrderSeparateService.updateRemark(lklOrderSeparateExist.getId(), errorMsg); continue; } @@ -1641,7 +1641,6 @@ public class LakalaApiServiceImpl implements LakalaApiService { if (!canSplit) { String errorMsg = String.format("店铺[%s]分账比例为0，仅扣除运费", shopOrderLkl.getStore_id()); log.error(errorMsg); - lklOrderSeparateService.updateRemark(lklOrderSeparateExist.getId(), errorMsg); } // 构建分账请求对象 @@ -1752,8 +1751,11 @@ public class LakalaApiServiceImpl implements LakalaApiService { lklOrderSeparate.setTotal_separate_value(totalSeparateValue); try { - lklOrderSeparateService.addOrUpdateByReceiverNo(lklOrderSeparate); - successCount++; + if (lklOrderSeparateService.addOrUpdateByReceiverNo(lklOrderSeparate)) { + successCount++; + } else { + lklOrderSeparateService.updateRemark(lklOrderSeparate.getId(), errorMessages.toString()); + } } catch (Exception e) { log.error("保存分账记录失败: {}", e.getMessage(), e); errorMessages.append("保存分账记录失败; "); @@ -1763,6 +1765,7 @@ public class LakalaApiServiceImpl implements LakalaApiService { // 返回最终处理结果 if (successCount == 0) { return Pair.of(false, "分账全部失败: " + errorMessages); + } else if (successCount < totalCount) { return Pair.of(true, "部分分账成功，处理中: " + errorMessages); } else { diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/ShopOrderReturnService.java b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/ShopOrderReturnService.java index 145daa33..29548b15 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/ShopOrderReturnService.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/ShopOrderReturnService.java @@ -82,6 +82,15 @@ public interface ShopOrderReturnService extends IBaseService { CommonResult doForceRefund(String return_id, Integer return_flag); + /** + * 支付订单，顺丰同城配送超时，自动取消订单并退款，加库存 + * + * @param orderId 订单Id + * @param returnFlag 退货类型(ENUM): 0-不用退货;1-需要退货 + * @return + */ + Boolean sfExpressExpiredForceRefund(String orderId, Integer returnFlag); + CommonResult editRefund(String return_id, BigDecimal return_refund_amount); /** diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderReturnServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderReturnServiceImpl.java index 574f4949..6c742c34 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderReturnServiceImpl.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderReturnServiceImpl.java @@ -56,6 +56,7 @@ import com.suisung.mall.shop.store.service.ShopStoreBaseService; import com.suisung.mall.shop.store.service.ShopStoreConfigService; import com.suisung.mall.shop.store.service.ShopStoreShippingAddressService; import io.seata.spring.annotation.GlobalTransactional; +import lombok.extern.slf4j.Slf4j; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -79,6 +80,7 @@ import static com.suisung.mall.common.utils.ContextUtil.getCurrentUser; * @author Xinze * @since 2021-05-06 */ +@Slf4j @Service public class ShopOrderReturnServiceImpl extends BaseServiceImpl implements ShopOrderReturnService { @@ -861,7 +863,7 @@ public class ShopOrderReturnServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("order_id", orderId); + ShopOrderReturn shopOrderReturn = findOne(queryWrapper); + if (shopOrderReturn == null) { + throw new ApiException(I18nUtil._("订单信息异常！")); + } + + returnFlag = CheckUtil.isEmpty(returnFlag) ? 0 : returnFlag; + + // RETURN_PROCESS_SUBMIT = 3100; //【客户】提交退单1ReturnReturn + // RETURN_PROCESS_CHECK = 3105; //退单审核1ReturnReturn + // RETURN_PROCESS_RECEIVED = 3110; //收货确认0ReturnReturn + // RETURN_PROCESS_REFUND = 3115; //退款确认0ReturnReturn + // RETURN_PROCESS_RECEIPT_CONFIRMATION = 3120; //[【客户】收款确认0 ReturnReturn + // RETURN_PROCESS_FINISH = 3125; //完成1退货退款 + // RETURN_PROCESS_REFUSED = 3130; //-商家拒绝退货 + // RETURN_PROCESS_CANCEL = 3135; //-买家取消退款 + + List return_ids = Collections.singletonList(shopOrderReturn.getReturn_id()); + + //订单已支付，但拣货超时，顺丰同城配送异常超时被取消， 强制退款 + ShopOrderReturn orderReturn = new ShopOrderReturn(); + orderReturn.setReturn_state_id(StateCode.RETURN_PROCESS_RECEIVED); + orderReturn.setReturn_flag(returnFlag); + if (!editShopOrderReturnAndItemNextState(return_ids, StateCode.RETURN_PROCESS_CHECK, orderReturn)) { + throw new ApiException(I18nUtil._("修改订单信息失败！")); + } + + shopOrderReturn.setReturn_state_id(StateCode.RETURN_PROCESS_RECEIVED); + shopOrderReturn.setReturn_flag(returnFlag); + // end 待审核状态 + + if (!edit(shopOrderReturn)) { + throw new ApiException(I18nUtil._("修改订单信息失败！")); + } + + // 订单审核 + return processReviewList(return_ids, Collections.singletonList(shopOrderReturn), StateCode.RETURN_PROCESS_RECEIVED, StateCode.RETURN_PROCESS_FINISH); + } + /** * 修改退款退货记录 * @@ -979,7 +1037,8 @@ public class ShopOrderReturnServiceImpl extends BaseServiceImpl return_ids, List return_rows, Integer state_id, Integer return_next_state_id) { + public boolean processReviewList(List return_ids, List return_rows, Integer return_curr_state_id, Integer return_next_state_id) { if (CollUtil.isEmpty(return_ids)) { throw new ApiException(I18nUtil._("请选择需要审核的退单！")); } @@ -1256,7 +1330,7 @@ public class ShopOrderReturnServiceImpl extends BaseServiceImpl return_ids, Integer return_state_id, ShopOrderReturn shopOrderReturn) { + public boolean editShopOrderReturnAndItemNextState(List return_ids, Integer return_curr_state_id, ShopOrderReturn shopOrderReturn) { QueryWrapper returnQueryWrapper = new QueryWrapper<>(); - returnQueryWrapper.in("return_id", return_ids).eq("return_state_id", return_state_id); + returnQueryWrapper.in("return_id", return_ids).eq("return_state_id", return_curr_state_id); if (!edit(shopOrderReturn, returnQueryWrapper)) { throw new ApiException(I18nUtil._("修改退单状态失败！")); } @@ -1735,41 +1811,65 @@ public class ShopOrderReturnServiceImpl extends BaseServiceImpl getOnlineRefundReturnId() { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("return_channel_flag", 0) - .in("return_channel_code", "alipay", "wx_native"); + queryWrapper.eq("return_channel_flag", 0) //渠道是否退款(ENUM): 0-待退; 1-已退; 2-异常 + .in("return_channel_code", "alipay", "wx_native", "lakala"); return Convert.toList(String.class, findKey(queryWrapper)); } /** - * (支付宝、微信)在线原路退款 - *

- * TODO 拉卡拉退款 + * 在线原路退款（支持支付宝、微信、拉卡拉） * - * @param return_id - * @return + * @param return_id 退单ID + * @return 退款操作是否成功 + *

+ * 功能说明：根据退单ID获取退单信息，依据支付渠道执行对应的退款操作，并更新退款状态。 */ @Override public boolean doOnlineRefund(String return_id) { - ShopOrderReturn shopOrderReturn = get(return_id); - String return_channel_code = shopOrderReturn.getReturn_channel_code(); - if (StrUtil.equals(return_channel_code, "alipay")) { - - shopOrderReturn = payService.aliPayRefund(shopOrderReturn); - if (shopOrderReturn == null) { - return false; - } - return updateRefundOrderReturn(shopOrderReturn); - - } else if (StrUtil.equals(return_channel_code, "wx_native")) { - - shopOrderReturn = payService.wxPayRefund(get(return_id)); - if (shopOrderReturn == null) { - return false; - } - return updateRefundOrderReturn(shopOrderReturn); - + // 输入验证 + if (StrUtil.isBlank(return_id)) { + log.error("Invalid return_id: blank"); + return false; + } + + ShopOrderReturn shopOrderReturn = get(return_id); + if (shopOrderReturn == null) { + log.error("Order return not found: {}", return_id); + return false; + } + + String return_channel_code = shopOrderReturn.getReturn_channel_code(); + if (StrUtil.isBlank(return_channel_code)) { + log.error("Empty return_channel_code for return_id: {}", return_id); + return false; + } + + try { + // 统一处理不同支付渠道 + switch (return_channel_code.toLowerCase()) { + case "alipay": + shopOrderReturn = payService.aliPayRefund(shopOrderReturn); + break; + case "wx_native": + shopOrderReturn = payService.wxPayRefund(shopOrderReturn); + break; + case "lakala": + shopOrderReturn = payService.lklPayRefund(shopOrderReturn); + break; + default: + log.warn("Unsupported payment channel: {}", return_channel_code); + return false; + } + + if (shopOrderReturn == null) { + return false; + } + + return updateRefundOrderReturn(shopOrderReturn); + } catch (Exception e) { + log.error("Error occurred during refund processing for return_id: {}", return_id, e); + return false; } - return false; } /** @@ -1786,16 +1886,17 @@ public class ShopOrderReturnServiceImpl extends BaseServiceImpl orderList = new ArrayList<>(); - orderList.add(shopStoreSfOrderExist.getShop_order_id()); +// // 更改商城订单状态为：已取消，注意事务问题 +// List orderList = new ArrayList<>(); +// orderList.add(shopStoreSfOrderExist.getShop_order_id()); // 取消订单, 流程：订单状态；积分、众宝、库存、礼包、优惠券 有就统统退还 - Boolean success = shopOrderBaseService.cancel(orderList, null, false); // 不检查订单付款状态 + Boolean success = shopOrderReturnService.sfExpressExpiredForceRefund(shopStoreSfOrderExist.getShop_order_id(), 0); // 不检查订单付款状态 if (!success) { throw new ApiException(I18nUtil._("取消商家订单失败！")); } @@ -549,9 +553,10 @@ public class SFExpressApiServiceImpl implements SFExpressApiService { // 更改顺丰同城订单状态 ShopStoreSfOrder shopStoreSfOrder = toShopStoreSfOrder(jsonData); - String orderId = shopStoreSfOrder.getShop_order_id(); + String shopOrderId = shopStoreSfOrder.getShop_order_id(); + String sfOrderId = shopStoreSfOrder.getSf_order_id(); // 判断订单的状态，是否已经取消了？已取消，不再执行 - ShopStoreSfOrder shopStoreSfOrderExist = shopStoreSfOrderService.getBySfOrderId(orderId); + ShopStoreSfOrder shopStoreSfOrderExist = shopStoreSfOrderService.getBySfOrderId(sfOrderId); if (shopStoreSfOrderExist != null && shopStoreSfOrderExist.getOrder_status() != null && (shopStoreSfOrderExist.getOrder_status().equals(StateCode.SF_ORDER_STATUS_CANCELED) || (shopStoreSfOrderExist.getOrder_status().equals(StateCode.SF_ORDER_STATUS_CANCELING)))) { @@ -564,15 +569,18 @@ public class SFExpressApiServiceImpl implements SFExpressApiService { } // 更改商城订单状态为：已取消，注意事务问题 - List orderList = new ArrayList<>(); - orderList.add(shopStoreSfOrder.getShop_order_id()); - success = shopOrderBaseService.cancel(orderList, null, false); +// List orderList = new ArrayList<>(); +// orderList.add(shopStoreSfOrder.getShop_order_id()); + + // 重要：订单取消 +// success = shopOrderBaseService.cancel(orderList, null, false); + success = shopOrderReturnService.sfExpressExpiredForceRefund(shopOrderId, 0); if (!success) { return new ThirdApiRes().fail(-1, "取消订单业务处理失败！"); } // 个推推送消息 - pushMessageService.noticeMerchantEmployeeOrderAction(null, orderId, "您有一笔取消订单", "您有一笔取消订单[" + orderId + "]，请及时处理。", null); + pushMessageService.noticeMerchantEmployeeOrderAction(null, shopOrderId, "您有一笔取消订单", "您有一笔取消订单[" + shopOrderId + "]，请及时处理。", null); return new ThirdApiRes().success("success"); diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreConfigServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreConfigServiceImpl.java index 72774bdf..3d1b6941 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreConfigServiceImpl.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreConfigServiceImpl.java @@ -201,22 +201,28 @@ public class ShopStoreConfigServiceImpl extends BaseServiceImpl 114.132.210.208:8718 - 42.194.196.179 - 3306 - mall_dev - webdev - jbFr9YewcA9Mihx6fnw51Kzq - com.mysql.cj.jdbc.Driver - - - - - - + + + + + + + 42.194.196.179 + 3306 + mall_prod + root + J0XivNvAcR14}pA6Cysm.E27 + com.mysql.cj.jdbc.Driver 114.132.210.208 15