取消 dragon的改动

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/dragon/channel/wepay/resp/AliPayRefundReturnCallBackDto.java

 package com.liquidnet.service.dragon.channel.wepay.resp;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.liquidnet.service.goblin.dto.vo.GoblinOrderSkuVo;
 import lombok.Data;
 
 @Data
-public class AliPayRefundReturnCallBackDto implements Cloneable{
+public class AliPayRefundReturnCallBackDto {
     @JsonProperty("gmt_create")
     private String gmtCreate;
     @JsonProperty("charset")
@@ -55,13 +54,4 @@ public class AliPayRefundReturnCallBackDto implements Cloneable{
     @JsonProperty("seller_id")
     private String sellerId;
 
-    private static final AliPayRefundReturnCallBackDto obj = new AliPayRefundReturnCallBackDto();
-
-    public static AliPayRefundReturnCallBackDto getNew() {
-        try {
-            return (AliPayRefundReturnCallBackDto) obj.clone();
-        } catch (CloneNotSupportedException e) {
-            return new AliPayRefundReturnCallBackDto();
-        }
-    }
 }

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/dragon/service/impl/DragonOrderRefundsServiceImpl.java

@@ -93,19 +93,19 @@ public class DragonOrderRefundsServiceImpl implements IDragonOrderRefundsService
             if (insertResult) {
                 switch (paymentType) {
                     case DragonConstant.REFUND_TYPE_APP_ALIPAY:
-                        dto = aliPayRefund(code, orderRefundCode, code, reason, price, paymentId, paymentType, nowTime, orderCode);
+                        dto = aliPayRefund(code, orderRefundCode, code, reason, price, paymentId, paymentType, nowTime);
                         break;
                     case DragonConstant.REFUND_TYPE_WAP_ALIPAY:
-                        dto = aliPayRefund(code, orderRefundCode, code, reason, price, paymentId, paymentType, nowTime, orderCode);
+                        dto = aliPayRefund(code, orderRefundCode, code, reason, price, paymentId, paymentType, nowTime);
                         break;
                     case DragonConstant.REFUND_TYPE_WEB_ALIPAY:
-                        dto = aliPayRefund(code, orderRefundCode, code, reason, price, paymentId, paymentType, nowTime, orderCode);
+                        dto = aliPayRefund(code, orderRefundCode, code, reason, price, paymentId, paymentType, nowTime);
                         break;
                     case DragonConstant.REFUND_TYPE_APP_WEPAY:
                         dto = weyPayRefund(code, orderRefundCode, code, reason, price, priceTotal, paymentId, paymentType, localWePayCallBackUrl, nowTime);
                         break;
                     case DragonConstant.REFUND_TYPE_MICROPAY_ALIPAY:
-                        dto = aliPayRefund(code, orderRefundCode, code, reason, price, paymentId, paymentType, nowTime, orderCode);
+                        dto = aliPayRefund(code, orderRefundCode, code, reason, price, paymentId, paymentType, nowTime);
                         break;
                     case DragonConstant.REFUND_TYPE_WAP_WEPAY:
                         dto = weyPayRefund(code, orderRefundCode, code, reason, price, priceTotal, paymentId, paymentType, localWePayCallBackUrl, nowTime);
@@ -416,14 +416,14 @@ public class DragonOrderRefundsServiceImpl implements IDragonOrderRefundsService
                 parameters.put("appid", PayWepayUtils.getInstance().getAPPLET_APP_ID());
             } else if (paymentType.equalsIgnoreCase(DragonConstant.PayTypeEnum.PAYMENT_TYPE_WAP_WEPAY.getCode())) {
                 parameters.put("appid", PayWepayUtils.getInstance().getWAP_APP_ID());
-            } else if (paymentType.equalsIgnoreCase(DragonConstant.PayTypeEnum.PAYMENT_TYPE_MICROPAY_WEPAY.getCode())) {
+            }else if(paymentType.equalsIgnoreCase(DragonConstant.PayTypeEnum.PAYMENT_TYPE_MICROPAY_WEPAY.getCode())){
                 parameters.put("appid", PayWepayUtils.getInstance().getAPP_ID());
             }
             parameters.put("nonce_str", nonceStr);
             parameters.put("out_refund_no", refundCode);
             parameters.put("out_trade_no", code);
-            parameters.put("refund_fee", (price.multiply(new BigDecimal(100)).intValue()) + "");
-            parameters.put("total_fee", (priceTotal.multiply(new BigDecimal(100)).intValue()) + "");
+            parameters.put("refund_fee", (price.multiply(new BigDecimal(100)).intValue())+"");
+            parameters.put("total_fee", (priceTotal.multiply(new BigDecimal(100)).intValue())+"");
             parameters.put("notify_url", notifyUrl);
             parameters.put("refund_desc", reason);
             parameters.put("refund_account", "REFUND_SOURCE_RECHARGE_FUNDS");
@@ -528,7 +528,7 @@ public class DragonOrderRefundsServiceImpl implements IDragonOrderRefundsService
     }
 
     //支付宝退款接口
-    public DragonRefundChannelDto aliPayRefund(String orderRefundId, String refundCode, String code, String reason, BigDecimal price, String paymentId, String paymentType, LocalDateTime nowTime, String orderCode) {
+    public DragonRefundChannelDto aliPayRefund(String orderRefundId, String refundCode, String code, String reason, BigDecimal price, String paymentId, String paymentType, LocalDateTime nowTime) {
         String refundStatus;
         DragonRefundChannelDto channelDto = new DragonRefundChannelDto();
         RefundContentDto contentDto = new RefundContentDto();
@@ -608,16 +608,6 @@ public class DragonOrderRefundsServiceImpl implements IDragonOrderRefundsService
             contentDto.setRequest(JSON.toJSONString(response.getParams()));
             contentDto.setResponse(response.getBody());
             channelDto.setContent(contentDto);
-//            if (DragonConstant.REFUND_TYPE_MICROPAY_ALIPAY.equals(paymentType) && response.getFundChange().equals("Y")) {
-//                AliPayRefundReturnCallBackDto map = AliPayRefundReturnCallBackDto.getNew();
-//                map.setOutBizNo(refundCode);
-//                map.setTradeNo(paymentId);
-//                map.setOutTradeNo(orderCode);
-//                map.setGmtRefund(DateUtil.format(response.getGmtRefundPay(), DateUtil.Formatter.yyyyMMddHHmmss));
-//                String jsonStr = JSON.toJSONString(map);
-//                jsonStr = jsonStr.replace("gmtRefund", "gmt_refund").replace("outBizNo", "out_biz_no").replace("outTradeNo", "out_trade_no").replace("tradeNo", "trade_no");
-//                aliPayRefundCallBack(jsonStr);
-//            }
             return channelDto;
         } catch (Exception e) {
             e.printStackTrace();
@@ -939,7 +929,6 @@ public class DragonOrderRefundsServiceImpl implements IDragonOrderRefundsService
                     "\"trade_no\":\"" + callBackDto.getTradeNo() + "\"," +
                     "\"out_request_no\":\"" + callBackDto.getOutBizNo() + "\"}"); //设置业务参数
             AlipayTradeFastpayRefundQueryResponse response = PayAlipayUtils.getInstance().getHttpClient().execute(request);
-            log.info("request.Biz = "+request.getBizContent());
             log.info("AlipayTradeFastpayRefundQueryRequest -> data = " + JSON.toJSONString(response));
 
             if (response.isSuccess()) {