Merge branch 'dev_goblin' into pre

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/store/homeSet/searchStore.html

@@ -149,6 +149,8 @@
                     hotArr.push(hotStr[i])
                     $(".tags").append(str);
                 }
+                let time = data.changeTime / 60;
+                $("#time").val(time)
             })
         })
         function addItems () {

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

@@ -659,15 +659,15 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
                 httpData.add("openId", param.getOpenId());
             }
             if (param.getPayType().equals("alipay") && param.getDeviceFrom().equals("wap")) {
-                httpData.add("showUrl", param.getShowUrl() + storeOrderVo.getOrderId());
-                httpData.add("returnUrl", param.getReturnUrl() + storeOrderVo.getOrderId());
+                httpData.add("showUrl", param.getShowUrl() + storeOrderVo.getMasterOrderCode());
+                httpData.add("returnUrl", param.getReturnUrl() + storeOrderVo.getMasterOrderCode());
             }
             if (param.getPayType().equals("douyinpay")) {
-                httpData.add("showUrl", param.getShowUrl() + storeOrderVo.getOrderId());
-                httpData.add("returnUrl", param.getReturnUrl() + storeOrderVo.getOrderId());
+                httpData.add("showUrl", param.getShowUrl() + storeOrderVo.getMasterOrderCode());
+                httpData.add("returnUrl", param.getReturnUrl() + storeOrderVo.getMasterOrderCode());
             }
             if (param.getPayType().equals("unionpay")) {
-                httpData.add("returnUrl", param.getReturnUrl() + storeOrderVo.getOrderId());
+                httpData.add("returnUrl", param.getReturnUrl() + storeOrderVo.getMasterOrderCode());
             }
             String returnData = HttpUtil.post(payUrl, httpData);
             log.debug("调用 DRAGON 结果 = " + returnData);
@@ -680,8 +680,8 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
             payInnerResultVo.setOrderId(storeOrderVo.getMasterOrderCode());
             payInnerResultVo.setPayType(param.getPayType());
             payInnerResultVo.setPrice(price);
-            payInnerResultVo.setShowUrl(param.getShowUrl() + storeOrderVo.getOrderId());
-            payInnerResultVo.setReturnUrl(param.getReturnUrl() + storeOrderVo.getOrderId());
+            payInnerResultVo.setShowUrl(param.getShowUrl() + storeOrderVo.getMasterOrderCode());
+            payInnerResultVo.setReturnUrl(param.getReturnUrl() + storeOrderVo.getMasterOrderCode());
             //redis
             storeOrderVo.setPayType(param.getPayType());
             storeOrderVo.setDeviceFrom(param.getDeviceFrom());