Merge remote-tracking branch 'origin/dev/feat/partner1.4_20231009' into dev/feat/partner1.4_20231009

# Conflicts:
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java

coolstore-partner-webb/src/main/java/com/cool/store/config/swagger/Swagger2Config.java

@@ -52,7 +52,7 @@ public class Swagger2Config {
                 .groupName(groupName)
                 .select()
                 .apis(this.scanBasePackage(packages))
-                .paths(PathSelectors.regex(".*/getPartnerIntentInfo|.*/queryPartnerClerkInfoList|.*/queryPartnerBaseInfo"))
+                //.paths(PathSelectors.regex(".*/getPartnerIntentInfo|.*/queryPartnerClerkInfoList|.*/queryPartnerBaseInfo"))
                 .build()
                 .globalOperationParameters(pars);
     }

coolstore-partner-webb/src/main/java/com/cool/store/controller/BeautyCameraSettingController.java

@@ -0,0 +1,41 @@
+package com.cool.store.controller;
+
+import com.cool.store.context.CurrentUserHolder;
+import com.cool.store.request.beauty.AddBeautyCameraSettingRequest;
+import com.cool.store.response.ResponseResult;
+import com.cool.store.service.BeautyCameraSettingService;
+import com.cool.store.vo.beauty.BeautyCameraSettingVO;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * @author zhangchenbiao
+ * @FileName: BeautyCameraSettingController
+ * @Description: 美颜配置
+ * @date 2023-09-11 14:21
+ */
+@RestController
+@Api(tags = "美颜配置")
+public class BeautyCameraSettingController {
+    
+    @Resource
+    private BeautyCameraSettingService beautyCameraSettingService;
+
+
+    @PostMapping("/saveBeautyCameraSetting")
+    public ResponseResult<Long> saveBeautyCameraSetting(@RequestBody AddBeautyCameraSettingRequest request){
+        Long result = beautyCameraSettingService.saveBeautyCameraSetting(CurrentUserHolder.getUserId(), request);
+        return ResponseResult.success(result);
+    }
+
+    @PostMapping("/queryBeautyCameraSetting")
+    public ResponseResult<BeautyCameraSettingVO> queryBeautyCameraSetting(){
+        return ResponseResult.success(beautyCameraSettingService.queryBeautyCameraSetting(CurrentUserHolder.getUserId()));
+    }
+    
+}

coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java

@@ -11,6 +11,7 @@ import com.cool.store.response.ResponseResult;
 import com.cool.store.service.*;
 import com.cool.store.vo.*;
 import com.cool.store.vo.interview.InterviewVO;
+import com.cool.store.vo.partner.PartnerSimpleBaseInfoVO;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -314,4 +315,16 @@ public class DeskController {
                                                                 @RequestParam(value = "needDevelopmentDirector",required = false)Boolean needDevelopmentDirector) throws ApiException {
         return ResponseResult.success(hyPartnerLineInfoService.getInterviewInfo(lineId,needDevelopmentDirector));
     }
+
+    @PostMapping(path = "/editBaseInfo")
+    @ApiOperation("修改接口")
+    public ResponseResult<Integer> editBaseInfo(@RequestBody EditBaseInfoRequest request){
+        return ResponseResult.success(hyPartnerLineInfoService.editBaseInfo(request));
+    }
+
+    @GetMapping(path = "/queryBaseInfo")
+    @ApiOperation("获取数据接口")
+    public ResponseResult<PartnerSimpleBaseInfoVO> queryBaseInfo(@RequestParam(value = "partnerLineId")Long partnerLineId){
+        return ResponseResult.success(hyPartnerLineInfoService.queryBaseInfo(partnerLineId));
+    }
 }

coolstore-partner-webb/src/main/java/com/cool/store/controller/FlowController.java

@@ -9,10 +9,7 @@ import com.cool.store.service.FlowService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.io.IOException;
 
@@ -28,6 +25,8 @@ public class FlowController {
 
     @Autowired
     private FlowService flowService;
+
+
     @PostMapping("/qualifyVerify/create")
     @ApiOperation("发起加盟商资质审核")
     public ResponseResult createQualifyVerify(@RequestBody CreateQualifyVerifyReq request) throws ApiException, IOException {
@@ -42,4 +41,10 @@ public class FlowController {
         return ResponseResult.success();
     }
 
+    @GetMapping("/dictList")
+    @ApiOperation("获取资质审核数据来源")
+    public ResponseResult getDictList(){
+        return ResponseResult.success(flowService.getDictList());
+    }
+
 }