Merge remote-tracking branch 'origin/dev_goblin' into dev_goblin

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

@@ -360,7 +360,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
         storeOrder.setIsMember(isMember ? 1 : 0);
         storeOrder.setOrderType(0);
         storeOrder.setWriteOffCode(writeOffCode);
-        if (marketType!=null && marketType.equals(GoblinStatusConst.MarketPreStatus.MARKET_PRE_ZHENGZAI.getValue())) {
+        if (marketType != null && marketType.equals(GoblinStatusConst.MarketPreStatus.MARKET_PRE_ZHENGZAI.getValue())) {
             storeOrder.setPayCountdownMinute(1);
         } else {
             storeOrder.setPayCountdownMinute(5);
@@ -587,7 +587,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
             httpData.add("price", storeOrderVo.getPriceActual().toString());
             httpData.add("name", redisUtils.getStoreInfoVo(storeOrderVo.getStoreId()).getStoreName());
             httpData.add("detail", "查找最初订单");
-            httpData.add("orderCode", storeOrderVo.getOrderCode());
+            httpData.add("orderCode", storeOrderVo.getMasterOrderCode());
 //            httpData.add("orderId", storeOrderVo.getOrderId());
             httpData.add("clientIp", storeOrderVo.getIpAddress());
             httpData.add("notifyUrl", synUrl);