order 快递费修改

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performances/details.html

@@ -4,12 +4,13 @@
     <th:block th:include="include :: header('选项卡 & 面板')"/>
 </head>
 <style>
-    .img-details{
+    .img-details {
         width: 300px;
         height: 400px;
     }
-    .img-Approval{
-        max-width:300px;
+
+    .img-Approval {
+        max-width: 300px;
         height: 400px;
     }
 </style>
@@ -68,7 +69,8 @@
                                   th:object="${kylinPerformanceMisVo}">
                                 <div>
                                     <h4>演出封面：</h4>
-                                        <img class="img-details" name="img" th:src="*{imgPoster}" th:onclick="click_big([[*{imgPoster}]])">
+                                    <img class="img-details" name="img" th:src="*{imgPoster}"
+                                         th:onclick="click_big([[*{imgPoster}]])">
                                 </div>
                                 </br>
                                 <div class="panel panel-info">
@@ -122,7 +124,8 @@
                                 </div>
                                 <div>
                                     <h4>演出批文：</h4>
-                                        <img class="img-Approval" name="img" th:src="*{approvalUrl}"  th:onclick="click_big([[*{approvalUrl}]])">
+                                    <img class="img-Approval" name="img" th:src="*{approvalUrl}"
+                                         th:onclick="click_big([[*{approvalUrl}]])">
                                 </div>
                                 </br>
                                 <h4>演出详情：</h4>
@@ -143,7 +146,7 @@
                                         </div>
                                     </div>
                                 </div>
-                                <div th:each="dict : ${kylinPerformanceMisVo.ticketTimes}" >
+                                <div th:each="dict : ${kylinPerformanceMisVo.ticketTimes}">
                                     <div th:each="dict2 : ${dict.ticket}" class="panel panel-info">
                                         <div class="panel-heading">
                                             <span>票种名称：</span>
@@ -210,16 +213,14 @@
                                             <span>快递票停售时间：</span>
                                             <span th:text="${dict2.timeEndExpress}"></span>
                                         </div>
-                                        <div th:each="dict3 : ${dict2.ExpressModuleList}" class="panel panel-info">
-                                            <div class="panel-footer">
-                                                <span>快递编号：</span>
-                                                <span th:text="${dict3.productCode}"></span>
-                                            </div>
+                                        <div th:each="dict3 : ${dict2.ExpressModuleList}" class="">
                                             <div class="panel-footer">
+<!--                                                <span>快递编号：</span>-->
+<!--                                                <span th:text="${dict3.productCode}"></span>-->
+<!--                                                <br/>-->
                                                 <span>快递名称：</span>
                                                 <span th:text="${dict3.title}"></span>
-                                            </div>
-                                            <div class="panel-footer">
+                                                <br/>
                                                 <span>预估价格：</span>
                                                 <span th:text="${dict3.estimatePriceMin}"></span>
                                                 <span> - </span>
@@ -420,9 +421,9 @@
     });
 
     // 点击图片放大
-    function click_big(url){
+    function click_big(url) {
         var img_url = url
-        if(url.indexOf("x-oss-process") != "-1"){
+        if (url.indexOf("x-oss-process") != "-1") {
             img_url = url.split("?")[0]
         }
         var json = {

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

@@ -11,6 +11,7 @@ import com.liquidnet.service.kylin.dto.param.SyncOrderParam;
 import com.liquidnet.service.kylin.dto.vo.returns.*;
 import com.liquidnet.service.kylin.service.IKylinOrderTicketsOrderService;
 import com.liquidnet.service.order.utils.ObjectUtil;
+import com.liquidnet.service.order.utils.OrderUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
@@ -74,6 +75,9 @@ public class KylinOrderTicketsController {
         return orderTicketsOrderService.syncOrder(syncOrderParam);
     }
 
+    @Autowired
+    OrderUtils orderUtils;
+
     @GetMapping("checkPayment")
     @ApiOperation("订单状态")
     @ApiResponse(code = 200, message = "接口返回对象参数")

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

@@ -305,10 +305,11 @@ public class OrderUtils {
         try {
             MultiValueMap<String, String> header = CollectionUtil.linkedMultiValueMapStringString();
             header.add("Accept", "application/json;charset=UTF-8");
+            header.add("Authorization", "Bearer " + CurrentUtil.getToken());
             String resultData = HttpUtil.get(kylinUrl + "/getShunFengPrice/getPrice?adcode=" + adCode + "&productCode=" + productCode, null, header);
             ResponseDto<String> innerReturnVo = JsonUtils.fromJson(resultData, new TypeReference<ResponseDto<String>>() {
             });
-            return BigDecimal.valueOf(Integer.parseInt(innerReturnVo.getData()));
+            return BigDecimal.valueOf(Integer.parseInt(innerReturnVo.getData().replace("元", "")));
         } catch (Exception e) {
             log.error("获取快递费失败:{}", e);
             return BigDecimal.valueOf(23);