修改 order的下单

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/utils/GoblinOrderUtils.java

@@ -9,6 +9,9 @@ import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.base.constant.MQConst;
 import com.liquidnet.service.candy.param.BackCouponParam;
 import com.liquidnet.service.candy.vo.CandyUseResultVo;
+import com.liquidnet.service.dragon.dto.DragonRefundAppDto;
+import com.liquidnet.service.dragon.service.IDragonOrderRefundsService;
+import com.liquidnet.service.dragon.service.IDragonOrdersService;
 import com.liquidnet.service.goblin.constant.GoblinStatusConst;
 import com.liquidnet.service.goblin.dto.GoblinQueueBizIntegralDto;
 import com.liquidnet.service.goblin.dto.GoblinQueueBizMongoDto;
@@ -36,8 +39,8 @@ public class GoblinOrderUtils {
     private String candyUrl;
     @Value("${liquidnet.service.order.url-pay.goblinRefundUrl}")
     private String synUrl;
-    @Value("${liquidnet.service.dragon.urls.refundApply}")
-    private String refundApply;
+    @Autowired
+    private IDragonOrderRefundsService dragonOrderRefundsService;
 
     @Autowired
     QueueUtils queueUtils;
@@ -228,6 +231,7 @@ public class GoblinOrderUtils {
 
     /**
      * mongo操作入队列
+     *
      * @param collect Mongo集合名
      * @param column  Mongo集合中的字段属性名称
      * @param bizId   Mongo集合中的字段属性值
@@ -481,23 +485,21 @@ public class GoblinOrderUtils {
     }
 
     private String initRefund(GoblinStoreOrderVo orderVo, BigDecimal price, String refundCode) {
-        MultiValueMap<String, String> params = CollectionUtil.linkedMultiValueMapStringString();
-        params.add("code", orderVo.getPayCode());
-        params.add("notifyUrl", synUrl);
-        params.add("orderCode", orderVo.getMasterOrderCode());
-        params.add("orderRefundCode", refundCode);
-        params.add("paymentId", orderVo.getPaymentId());
-        params.add("paymentType", orderVo.getPaymentType());
-        params.add("price", String.valueOf(price));
         BigDecimal totalPrice = BigDecimal.ZERO;
         totalPrice = totalPrice.add(price);
-        params.add("priceTotal", String.valueOf(totalPrice));
-        params.add("reason", "超时支付");
-        MultiValueMap<String, String> headers = CollectionUtil.linkedMultiValueMapStringString();
-        headers.add("Accept", "application/json;charset=UTF-8");
-        String returnString = HttpUtil.post(refundApply, params, headers);
+        ResponseDto<DragonRefundAppDto> returnData = dragonOrderRefundsService.dragonRefund(
+                orderVo.getMasterOrderCode(),
+                orderVo.getPayCode(),
+                refundCode,
+                "超时支付",
+                synUrl,
+                price,
+                orderVo.getPaymentType(),
+                orderVo.getPaymentId(),
+                totalPrice);
+        String returnString = JSON.toJSONString(returnData);
         log.debug("REFUND DATA = " + returnString);
-        return returnString;
+        return JsonUtils.toJson(returnString);
     }
 
     //订单异常处理