Ver Fonte

no message

FengChaoYu há 5 meses atrás
pai
commit
23140a188c

+ 11 - 0
mall-miniapp-service/src/main/java/com/gree/mall/miniapp/controller/worker/WorkerTeamController.java

@@ -7,6 +7,7 @@ import com.gree.mall.miniapp.enums.ExamineStatusEnum;
 import com.gree.mall.miniapp.exception.RemoteServiceException;
 import com.gree.mall.miniapp.helper.ResponseHelper;
 import com.gree.mall.miniapp.logic.worker.WorkerTeamLogic;
+import com.gree.mall.miniapp.plus.entity.WorkerTeam;
 import com.gree.mall.miniapp.plus.entity.WorkerTeamApply;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -38,6 +39,16 @@ public class WorkerTeamController {
         return ResponseHelper.success(page);
     }
 
+    @PostMapping("/manage/page")
+    @ApiOperation(value = "后台列表")
+    public ResponseHelper<Page<WorkerTeam>> managePage(
+            @ApiParam(value = "页号", required = true) @RequestParam Integer pageNum,
+            @ApiParam(value = "页大小", required = true) @RequestParam Integer pageSize
+    ) throws RemoteServiceException {
+        IPage<WorkerTeam> page = workerTeamLogic.managePage(pageNum, pageSize);
+        return ResponseHelper.success(page);
+    }
+
     @PostMapping("/add")
     @ApiOperation("新增")
     public ResponseHelper add(@RequestBody WorkerTeamApply workerTeam) throws RemoteServiceException {

+ 15 - 0
mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/worker/WorkerTeamLogic.java

@@ -54,6 +54,19 @@ public class WorkerTeamLogic {
         return page;
     }
 
+    public IPage<WorkerTeam> managePage(Integer pageNum, Integer pageSize) {
+        CurrentCompanyWechat current = commonLogic.getCurrentCompanyWechat();
+        final Page<WorkerTeam> page = workerTeamService.lambdaQuery()
+                .eq(WorkerTeam::getCompanyWechatId, current.getUser().getCompanyWechatId())
+                .and(v -> v.eq(WorkerTeam::getMasterWorkerId, current.getUser().getWorkerNumber())
+                        .or()
+                        .eq(WorkerTeam::getAssistantWorkerId, current.getUser().getWorkerNumber())
+                )
+                .page(new Page<>(pageNum, pageSize));
+        return page;
+    }
+
+
     public void add(WorkerTeamApply workerTeam) {
         CurrentCompanyWechat current = commonLogic.getCurrentCompanyWechat();
         workerTeam.setCompanyWechatId(current.getUser().getCompanyWechatId())
@@ -120,4 +133,6 @@ public class WorkerTeamLogic {
         }
         return beanList;
     }
+
+
 }

+ 2 - 2
mall-server-api/src/main/resources/bootstrap-prd.properties

@@ -64,8 +64,8 @@ spring.redis.timeout=100000ms
 ali.access.key.id=LTAI5tGCLsqbXGgtgArvCX7t
 ali.access.key.secert=EK0mN35vqozFcRhI3KCZXOnP1VCLNp
 ali.oss.bucket.name=zfire-jsm
-ali.oss.endpoint.ww=oss-cn-guangzhou.aliyuncs.com/
-ali.oss.endpoint=oss-cn-guangzhou-internal.aliyuncs.com/
+ali.oss.endpoint.ww=oss-cn-shenzhen.aliyuncs.com/
+ali.oss.endpoint=oss-cn-shenzhen-internal.aliyuncs.com/
 ali.oss.type.pic=uploadfile/
 ali.sms.msg.code=SMS_212320165
 ali.cdn.url=