~admin:会员管理:会员订单:退款逻辑调整;

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/adam/service/impl/AdamMemberOrderAdminServiceImpl.java

@@ -129,29 +129,15 @@ public class AdamMemberOrderAdminServiceImpl extends ServiceImpl<AdamMemberOrder
     @Override
     @Transactional
     public AjaxResult refundProcessing(AdamMemberOrderRefundParam param, AdamMemberOrder memberOrder) {
-        LinkedMultiValueMap<String, String> linkedMultiValueMap = new LinkedMultiValueMap<>();
-
-        String refundNo = IDGenerator.nextTimeId2().concat("VR");
-
-        linkedMultiValueMap.add("code", memberOrder.getPayNo());
-        linkedMultiValueMap.add("notifyUrl", notifyUrl);
-        linkedMultiValueMap.add("orderCode", memberOrder.getOrderNo());
-        linkedMultiValueMap.add("orderRefundCode", refundNo);
-        linkedMultiValueMap.add("paymentId", memberOrder.getPaymentId());
-        linkedMultiValueMap.add("paymentType", (memberOrder.getDeviceFrom() + memberOrder.getPayType()).toUpperCase());
-        linkedMultiValueMap.add("price", String.valueOf(param.getRefundAmt()));
-        linkedMultiValueMap.add("priceTotal", String.valueOf(memberOrder.getPricePaid()));
-        linkedMultiValueMap.add("reason", param.getReason());
-
-        log.info("会员退款:支付中心请求参数:{}", linkedMultiValueMap);
-        String postResult = HttpUtil.post(applyUrl, linkedMultiValueMap);
-        log.info("会员退款:支付中心返回数据:{}", postResult);
-
-        JsonNode postResultJNode = JsonUtils.fromJson(postResult, JsonNode.class);
-        if (!postResultJNode.get("success").asBoolean()) {
-            return AjaxResult.warn("会员退款请求支付中心失败");
-        }
-        // 退款请求成功，修改订单状态，同步REDIS
+        String refundNo, price, reason;
+        AdamMemberRefund existsRefund = adamMemberRefundMapper.selectOne(Wrappers.lambdaQuery(AdamMemberRefund.class)
+                .eq(AdamMemberRefund::getOrderNo, memberOrder.getOrderNo()).eq(AdamMemberRefund::getRefundState, 9));
+        if (null == existsRefund) {
+            refundNo = IDGenerator.nextTimeId2().concat("VR");
+            price = String.valueOf(param.getRefundAmt());
+            reason = param.getReason();
+
+            {// 修改订单状态，同步REDIS
                 LocalDateTime now = LocalDateTime.now();
 
                 AdamMemberRefund memberRefund = new AdamMemberRefund();
@@ -212,7 +198,33 @@ public class AdamMemberOrderAdminServiceImpl extends ServiceImpl<AdamMemberOrder
                     uidBlackList.add(memberOrder.getUid());
                     redisDataSourceUtil.getRedisAdamUtil().set(AdamRedisConst.BLK_LIST_MEMBER_UID, uidBlackList);
                 }
+            }
+        } else {
+            log.warn("会员管理:会员订单:退款:该订单正在退款中[AdamMemberOrderRefundParam={}]", JsonUtils.toJson(param));
+            refundNo = existsRefund.getRefundNo();
+            price = String.valueOf(existsRefund.getRefundPrice());
+            reason = existsRefund.getRefundReason();
+        }
 
+        LinkedMultiValueMap<String, String> linkedMultiValueMap = new LinkedMultiValueMap<>();
+        linkedMultiValueMap.add("code", memberOrder.getPayNo());
+        linkedMultiValueMap.add("notifyUrl", notifyUrl);
+        linkedMultiValueMap.add("orderCode", memberOrder.getOrderNo());
+        linkedMultiValueMap.add("orderRefundCode", refundNo);
+        linkedMultiValueMap.add("paymentId", memberOrder.getPaymentId());
+        linkedMultiValueMap.add("paymentType", (memberOrder.getDeviceFrom() + memberOrder.getPayType()).toUpperCase());
+        linkedMultiValueMap.add("price", price);
+        linkedMultiValueMap.add("priceTotal", String.valueOf(memberOrder.getPricePaid()));
+        linkedMultiValueMap.add("reason", reason);
+
+        log.info("会员管理:会员订单:退款:支付中心请求参数:{}", linkedMultiValueMap);
+        String postResult = HttpUtil.post(applyUrl, linkedMultiValueMap);
+        log.info("会员管理:会员订单:退款:支付中心返回数据:{}", postResult);
+
+        JsonNode postResultJNode = JsonUtils.fromJson(postResult, JsonNode.class);
+        if (!postResultJNode.get("success").asBoolean()) {
+            return AjaxResult.warn("会员退款请求支付中心失败");
+        }
         return AjaxResult.success();
     }