合并问题

sso-server/src/main/java/com/uas/sso/foreign/bihe/controller/BiHeController.java

@@ -3,7 +3,7 @@ package com.uas.sso.foreign.bihe.controller;
 import com.uas.sso.foreign.bihe.entity.BiHeInfo;
 import com.uas.sso.foreign.bihe.entity.BiHeUserInfo;
 import com.uas.sso.foreign.bihe.service.BiHeService;
-import com.uas.sso.bihe.entity.BiHeOrder;
+import com.uas.sso.foreign.bihe.entity.BiHeOrder;
 import com.uas.sso.controller.BaseController;
 import com.uas.sso.entity.Token;
 import com.uas.sso.entity.User;

sso-server/src/main/java/com/uas/sso/bihe/entity/BiHeOrder.java → sso-server/src/main/java/com/uas/sso/foreign/bihe/entity/BiHeOrder.java

@@ -1,4 +1,4 @@
-package com.uas.sso.bihe.entity;
+package com.uas.sso.foreign.bihe.entity;
 
 import java.io.Serializable;
 import java.util.List;

sso-server/src/main/java/com/uas/sso/foreign/bihe/service/BiHeService.java

@@ -2,6 +2,7 @@ package com.uas.sso.foreign.bihe.service;
 
 import com.uas.sso.foreign.ForeignService;
 import com.uas.sso.foreign.bihe.entity.BiHeInfo;
+import com.uas.sso.foreign.bihe.entity.BiHeOrder;
 import com.uas.sso.foreign.bihe.entity.BiHeUserInfo;
 import org.springframework.stereotype.Service;
 
@@ -12,4 +13,19 @@ import org.springframework.stereotype.Service;
 @Service
 public interface BiHeService extends ForeignService<BiHeInfo, BiHeUserInfo> {
 
+    /**
+     * 根据refreshToken获取accessToken
+     * @param refreshToken
+     * @return
+     */
+    String getAccessTokenByRefreshToken(String refreshToken);
+
+    /**
+     * 保存订单到碧合
+     * @param order 订单内容
+     * @return
+     */
+    void saveOrder(BiHeOrder order);
+
+    void updateOrder(BiHeOrder order);
 }

sso-server/src/main/java/com/uas/sso/foreign/bihe/service/impl/BiHeServiceImpl.java

@@ -6,7 +6,7 @@ import com.uas.sso.foreign.bihe.entity.BiHeInfo;
 import com.uas.sso.foreign.bihe.entity.BiHeResult;
 import com.uas.sso.foreign.bihe.entity.BiHeUserInfo;
 import com.uas.sso.foreign.bihe.service.BiHeService;
-import com.uas.sso.bihe.entity.BiHeOrder;
+import com.uas.sso.foreign.bihe.entity.BiHeOrder;
 import com.uas.sso.core.BHParam;
 import com.uas.sso.exception.VisibleError;
 import com.uas.sso.util.HttpUtil;