Merge branch 'master-modify-cutAmount' into dev

# Conflicts:
#	xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/OrderPageVO.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderVehicleCrosstownBiz.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderCancelBiz.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/biz/FastServiceBiz.java

@@ -2,11 +2,47 @@ package com.xxfc.platform.universal.biz;
 
 
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.xxfc.platform.universal.fastservice.api.FastServiceApi;
+import com.xxfc.platform.universal.fastservice.dto.RequestBodyDto;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 @Service
 @Slf4j
 public class FastServiceBiz {
 
+    @Autowired
+    FastServiceApi fastServiceApi;
+
+    /**
+     * 获取用户授权token
+     * @param code
+     * @return
+     */
+    public ObjectRestResponse getAccessToken(String code) {
+        String result = fastServiceApi.getAccessToken(code);
+        return ObjectRestResponse.succ(result);
+    }
+
+    /**
+     * 获取应用token
+     * @return
+     */
+    public ObjectRestResponse getAccessToken() {
+        String result = fastServiceApi.getAccessToken();
+        return ObjectRestResponse.succ(result);
+    }
+
+    /**
+     * 获取用户 openId
+     * @param accessToken
+     * @return
+     */
+    public ObjectRestResponse getOpenId(String accessToken) {
+        String result = fastServiceApi.getOpenId(accessToken);
+        return ObjectRestResponse.succ(result);
+    }
+
+
 }

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/controller/FastServiceController.java

+package com.xxfc.platform.universal.controller;
+
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.xxfc.platform.universal.biz.FastServiceBiz;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/fastService")
+public class FastServiceController {
+
+    @Autowired
+    FastServiceBiz fastServiceBiz;
+
+    /**
+     * 获取用户授权token
+     * @param code
+     * @return
+     */
+    @GetMapping(value = "/token")
+    public ObjectRestResponse getAccessToken(String code) {
+        return fastServiceBiz.getAccessToken(code);
+    }
+
+    /**
+     * 获取应用token
+     * @return
+     */
+    @GetMapping(value = "/token")
+    public ObjectRestResponse getAccessToken() {
+        return fastServiceBiz.getAccessToken();
+    }
+
+    /**
+     * 获取用户 openId
+     * @param accessToken
+     * @return
+     */
+    @GetMapping(value = "/openId")
+    public ObjectRestResponse getOpenId(String accessToken) {
+        return fastServiceBiz.getOpenId(accessToken);
+    }
+
+}