From db5b5dfb8cf5ebf01cbbeafb91b9e32026cc478b Mon Sep 17 00:00:00 2001
From: "autumn.g@foxmail.com" <autumn.g@foxmail.com>
Date: Thu, 27 Jul 2023 15:10:11 +0800
Subject: [PATCH] update

---
 .../com/jsowell/service/MemberService.java    |  3 +-
 .../impl/OrderBasicInfoServiceImpl.java       | 42 -------------------
 2 files changed, 1 insertion(+), 44 deletions(-)

diff --git a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java
index c80d27ded..7716f04df 100644
--- a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java
+++ b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java
@@ -588,9 +588,8 @@ public class MemberService {
 		createAdaPaymentParam.setPay_amt(AdapayUtil.formatAmount(dto.getAmount()));
 		createAdaPaymentParam.setApp_id(ADAPAY_APP_ID); // 移动到配置文件中
 		createAdaPaymentParam.setPay_channel("wx_lite"); // todo 如果以后有支付宝等别的渠道，这里需要做修改，判断是什么渠道的请求
-		createAdaPaymentParam.setGoods_title("余额");
+		createAdaPaymentParam.setGoods_title("充值余额");
 		createAdaPaymentParam.setGoods_desc("会员充值余额");
-		// createAdaPaymentParam.setDescription("充电费用3");
 		createAdaPaymentParam.setExpend(JSONObject.toJSONString( ImmutableMap.of("open_id", dto.getOpenId())));
 		//异步通知地址，url为http/https路径，服务器POST回调，URL 上请勿附带参数
 		createAdaPaymentParam.setNotify_url(ADAPAY_CALLBACK_URL);
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
index 46dce4753..c0860dea6 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
@@ -2328,48 +2328,6 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
 
     }
 
-    /**
-     * 微信支付订单逻辑 获取支付参数
-     *
-     * @param dto
-     * @return
-     * @throws Exception
-     */
-    private Map<String, Object> wechatPayOrder(PayOrderDTO dto) throws Exception {
-        // 相同参数重复请求，返回同一个支付对象
-        String redisKey = CacheConstants.WECHAT_PAY_ORDER_PARAM + dto.getOrderCode();
-        Map<String, Object> cacheObject = redisCache.getCacheObject(redisKey);
-        if (cacheObject != null) {
-            return cacheObject;
-        }
-
-        OrderBasicInfo orderInfo = dto.getOrderBasicInfo();
-        if (orderInfo == null) {
-            orderInfo = this.getOrderInfoByOrderCode(dto.getOrderCode());
-        }
-        String openId = wxAppletRemoteService.getOpenIdByCode(dto.getCode());
-        if (StringUtils.isBlank(openId)) {
-            throw new BusinessException(ReturnCodeEnum.CODE_GET_OPEN_ID_BY_CODE_ERROR);
-        }
-        WeixinPayDTO weixinPayDTO = new WeixinPayDTO();
-        weixinPayDTO.setOpenId(openId);
-        weixinPayDTO.setAmount(dto.getPayAmount().toString());
-        // 支付订单 附加参数
-        PaymentScenarioDTO paymentScenarioDTO = PaymentScenarioDTO.builder()
-                .type(ScenarioEnum.ORDER.getValue())
-                .orderCode(dto.getOrderCode())
-                .memberId(orderInfo.getMemberId())
-                .build();
-        weixinPayDTO.setAttach(JSONObject.toJSONString(paymentScenarioDTO));
-        weixinPayDTO.setDescription("充电费用");
-        Map<String, Object> payV3 = wechatPayService.weixinPayV3(weixinPayDTO);
-        if (payV3 != null) {
-            // 表示已经获取到支付参数了，后续再有支付请求就拒绝
-            redisCache.setCacheObject(redisKey, payV3, 15, TimeUnit.MINUTES);
-        }
-        return payV3;
-    }
-
     /**
      * 使用汇付支付
      *