fix

SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/controller/OrderController.java

@@ -6,7 +6,6 @@ import com.github.microservice.auth.client.content.ResultContent;
 import com.github.microservice.auth.security.annotations.ResourceAuth;
 import com.github.microservice.auth.security.helper.AuthHelper;
 import com.github.microservice.auth.security.type.AuthType;
-import com.zhongshu.payment.client.model.Pages;
 import com.zhongshu.payment.client.model.order.*;
 import com.zhongshu.payment.client.model.order.v2.CreateOrder2Model;
 import com.zhongshu.payment.client.model.order.v2.OrderResult2Model;
@@ -19,8 +18,6 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
 import org.springframework.http.MediaType;
 import org.springframework.util.Assert;
 import org.springframework.web.bind.annotation.*;
@@ -147,6 +144,7 @@ public class OrderController {
 
         return orderServiceImp.goodsDetail(id);
     }
+
     @ApiOperation("订单商品详细")
     @RequestMapping(value = "user/orderDetail/{orderNo}", method = RequestMethod.GET)
     @ResourceAuth(value = AuthConstant.User, type = AuthType.User)
@@ -168,6 +166,14 @@ public class OrderController {
         return orderServiceImp.shopSearch(seachOrderModel);
     }
 
+    @ApiOperation("商家_订单详情")
+    @RequestMapping(value = "shop/orderDetail/{orderNo}", method = RequestMethod.GET)
+    @ResourceAuth(value = "admin", type = AuthType.Enterprise)
+    @ResourceAuth(value = "admin", type = AuthType.Project)
+    public ResultContent shopOrderDetail(@PathVariable("orderNo") String orderNo) {
+        return orderServiceImp.shopOrderDetail(orderNo);
+    }
+
 
     // 平台接口
 
@@ -179,6 +185,15 @@ public class OrderController {
         return orderServiceImp.adminSearch(seachOrderModel);
     }
 
+    @ApiOperation("平台_订单详情")
+    @RequestMapping(value = "platform/orderDetail/{orderNo}", method = RequestMethod.GET)
+    @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform)
+    @ResourceAuth(value = "admin", type = AuthType.Enterprise)
+    @ResourceAuth(value = "admin", type = AuthType.Project)
+    public ResultContent adminOrderDetail(@PathVariable("orderNo") String orderNo) {
+
+        return orderServiceImp.adminOrderDetail(orderNo);
+    }
 
 
 }

SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/controller/PaymentController.java

@@ -102,7 +102,7 @@ public class PaymentController {
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform)
     @ResourceAuth(value = "admin", type = AuthType.Enterprise)
     @ResourceAuth(value = "admin", type = AuthType.Project)
-    @RequestMapping(value = "transfer/list", method = RequestMethod.GET)
+    @RequestMapping(value = "transfer/list", method = RequestMethod.POST)
     public ResultContent<TransferModel> transferList(@RequestBody @Valid AdminSeachOrderModel adminSeachOrderModel) {
         Pageable page = page(adminSeachOrderModel);
         return paymentServer.transferList(adminSeachOrderModel, page);

SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/service/OrderServiceImp.java

@@ -30,7 +30,6 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -120,7 +119,6 @@ public class OrderServiceImp implements OrderService {
     public ResultContent verification(String token) {
 
 
-
         Object id = redisHelper.getValue(redisKey + token);
         if (ObjectUtil.isEmpty(id)) {
             return ResultContent.build(ResultState.Fail, ErrorCode.CQ_TIME_OUTE.getMess());
@@ -138,8 +136,8 @@ public class OrderServiceImp implements OrderService {
         EmployeeDetailVo employeeContent = employee.getContent();
         com.zswl.cloud.shop.client.ret.ResultContent<ShopDetailVo> detail = shopService.detail(enterPriseId);
         ShopDetailVo shopDetailVo = detail.getContent();
-        entries.set("shopName",shopDetailVo.getShopName());
-        entries.set("employeeName",employeeContent.getEmployeeName());
+        entries.set("shopName", shopDetailVo.getShopName());
+        entries.set("employeeName", employeeContent.getEmployeeName());
 
         verificationModel.setVerification(entries);
         verificationModel.setId((String) id);
@@ -182,6 +180,7 @@ public class OrderServiceImp implements OrderService {
 
         return orderService2.goodsDetail(userId, id);
     }
+
     public ResultContent orderDetails(String orderNo) {
         String userId = authHelper.getCurrentUser().getUserId();
 
@@ -193,9 +192,17 @@ public class OrderServiceImp implements OrderService {
         return orderService2.adminSearch(adminSeachOrderModel);
     }
 
-    public ResultContent<Page<OrderResult2Model>> adminSearch(AdminSeachOrderModel adminSeachOrderModel) {
+    public ResultContent<Page<OrderResult2Model>> shopOrderDetail(String orderNo) {
+        return orderService2.shopOrderDetail(authHelper.getEnterPriseId(), orderNo);
+    }
+
+    public ResultContent adminSearch(AdminSeachOrderModel adminSeachOrderModel) {
         return orderService2.adminSearch(adminSeachOrderModel);
     }
 
+    public ResultContent adminOrderDetail(String orderNo) {
+        return orderService2.adminOrderDetail(orderNo);
+    }
+
 
 }