alipay 扫码退款

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/manage/GoblinStoreOrderServiceImpl.java

@@ -7,6 +7,7 @@ import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.base.constant.MQConst;
 import com.liquidnet.service.candy.vo.CandyCouponVo;
+import com.liquidnet.service.dragon.constant.DragonConstant;
 import com.liquidnet.service.goblin.constant.GoblinStatusConst;
 import com.liquidnet.service.goblin.dto.vo.*;
 import com.liquidnet.service.goblin.entity.GoblinBackOrder;
@@ -535,6 +536,9 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
                 )
         );
         if (success) {
+            if (orderVo.getPaymentType().equals(DragonConstant.REFUND_TYPE_MICROPAY_ALIPAY)) {
+                alipayCallBack(orderVo, refundCode);
+            }
             return ResponseDto.success();
         }
         return ResponseDto.failure("退款失败:" + message);
@@ -712,7 +716,20 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
         MultiValueMap<String, String> headers = CollectionUtil.linkedMultiValueMapStringString();
         headers.add("Accept", "application/json;charset=UTF-8");
         String returnString = HttpUtil.post(refundApply, params, headers);
-        log.debug("REFUND DATA = " + returnString);
+        log.debug("REFUND BACK DATA = " + returnString);
+        return returnString;
+    }
+
+    private String alipayCallBack(GoblinStoreOrderVo orderVo, String refundCode) {
+        MultiValueMap<String, String> params = CollectionUtil.linkedMultiValueMapStringString();
+        params.add("callBackUrl", orderVo.getPayCode());
+        params.add("orderCode", orderVo.getMasterOrderCode());
+        params.add("orderRefundCode", refundCode);
+        params.add("paymentId", orderVo.getPaymentId());
+        MultiValueMap<String, String> headers = CollectionUtil.linkedMultiValueMapStringString();
+        headers.add("Accept", "application/json;charset=UTF-8");
+        String returnString = HttpUtil.post(refundApply, params, headers);
+        log.debug("REFUND CALLBACK DATA = " + returnString);
         return returnString;
     }
 }

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

@@ -608,16 +608,16 @@ 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);
-            }
+//            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();