修改退款回调

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinBackOrderVo.java

@@ -94,7 +94,7 @@ public class GoblinBackOrderVo implements Serializable, Cloneable {
     public GoblinBackOrderVo copy(GoblinBackOrder source) {
         this.setBackOrderId(source.getBackOrderId());
         this.setBackCode(source.getBackCode());
-        this.setOrderId(source.getBackOrderId());
+        this.setOrderId(source.getOrderId());
         this.setOrderCode(source.getOrderCode());
         this.setStoreId(source.getStoreId());
         this.setUserId(source.getUserId());

liquidnet-bus-config/liquidnet-config/liquidnet-service-order-dev.yml

@@ -16,7 +16,7 @@ liquidnet:
     database-name: dev_ln_scene
   mongodb:
     sslEnabled: false
-    database: dev_ln_scene
+    database: test_ln_scene
   url-pay:
     pay: ${liquidnet.service.order.url-pay.pay}
     check: ${liquidnet.service.order.url-pay.check}

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

@@ -901,7 +901,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
             String orderId = backOrderVo.getOrderId();
             List<GoblinBackOrderSkuVo> backOrderSkuVos = backOrderVo.getBackOrderSkuVos();
             GoblinStoreOrderVo orderVo = redisUtils.getGoblinOrder(orderId);
-            orderVo.setPriceRefund(orderVo.getPriceRefund().add(refundCallbackParam.getRefundPrice()));
+            orderVo.setPriceRefund(orderVo.getPriceRefund()==null?BigDecimal.ZERO:orderVo.getPriceRefund().add(refundCallbackParam.getRefundPrice()));
             if (orderVo.getPriceRefund().compareTo(orderVo.getPriceActual()) >= 0) {
                 //整单退款 退券
                 orderVo.setStatus(GoblinStatusConst.Status.ORDER_STATUS_6.getValue());