Merge remote-tracking branch 'origin/cc_partner_init' into cc_partner_init

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

@@ -2,6 +2,7 @@ package com.cool.store.controller.webb;
 
 import com.cool.store.context.CurrentUserHolder;
 import com.cool.store.context.LoginUserInfo;
+import com.cool.store.request.AddTagsRequest;
 import com.cool.store.request.LineListRequest;
 import com.cool.store.response.ResponseResult;
 import com.cool.store.service.LineService;
@@ -58,6 +59,12 @@ public class LineInfoController {
         return ResponseResult.success(lineService.getLineList(lineListRequest,user,Boolean.TRUE));
     }
 
+    @PostMapping(path = "/addTags")
+    @ApiOperation("添加标签接口")
+    public ResponseResult<Boolean> addTags(@RequestBody AddTagsRequest addTagsRequest){
+        return ResponseResult.success(lineService.addTags(CurrentUserHolder.getUser(),addTagsRequest));
+    }
+
 
 
 

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

@@ -0,0 +1,31 @@
+package com.cool.store.controller.webb;
+
+import com.cool.store.response.ResponseResult;
+import com.cool.store.service.OSSService;
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * @Author suzhuhong
+ * @Date 2024/3/28 14:25
+ * @Version 1.0
+ */
+@Api(tags ="PC OSS配置")
+@RestController
+@RequestMapping({"/pc/oss"})
+@Slf4j
+public class OssClientController {
+
+    @Resource
+    OSSService ossService;
+
+    @GetMapping("/getUploadFileConfig")
+    public ResponseResult getUploadFileConfig(){
+        return ResponseResult.success(ossService.getUploadFileConfig());
+    }
+}

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

@@ -0,0 +1,41 @@
+package com.cool.store.controller.webb;
+
+import com.cool.store.context.CurrentUserHolder;
+import com.cool.store.context.LoginUserInfo;
+import com.cool.store.request.RegionAreaConfigAddRequest;
+import com.cool.store.response.ResponseResult;
+import com.cool.store.service.RegionAreaConfigService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * @author wxp
+ * @version 1.0
+ */
+@Api(tags = "区域配置")
+@RestController
+@RequestMapping("pc/regionAreaConfig")
+public class RegionAreaConfigController {
+
+    @Autowired
+    private RegionAreaConfigService regionAreaConfigService;
+
+    @ApiOperation(value = "区域配置省市")
+    @PostMapping("/addRegionAreaConfig")
+    public ResponseResult<Boolean> saveOrUpdateRegionAreaConfig(@Valid @RequestBody RegionAreaConfigAddRequest request) {
+        LoginUserInfo user = CurrentUserHolder.getUser();
+        return ResponseResult.success(regionAreaConfigService.saveOrUpdateRegionAreaConfig(request, user));
+    }
+
+    @ApiOperation("根据战区id获取配置的省市列表")
+    @GetMapping("/listAreaIdByRegionId")
+    public ResponseResult<List<Long>> listAreaIdByRegionId(@RequestParam("regionId")Long regionId) {
+        return ResponseResult.success(regionAreaConfigService.listAreaIdByRegionId(regionId));
+    }
+
+}

coolstore-partner-web/src/main/java/com/cool/store/controller/webc/BankController.java

@@ -0,0 +1,46 @@
+package com.cool.store.controller.webc;
+
+import com.cool.store.entity.BankdocDO;
+import com.cool.store.entity.BanktypeDO;
+import com.cool.store.request.BranchBankPageRequest;
+import com.cool.store.response.ResponseResult;
+import com.cool.store.service.BankService;
+import com.github.pagehelper.PageInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @author Fun Li 2023/8/10 14:20
+ * @version 1.0
+ */
+@RestController
+@RequestMapping("/mini/bank")
+@Api(tags = "银行信息")
+@Slf4j
+public class BankController {
+
+    @Autowired
+    private BankService bankService;
+
+    @ApiOperation("银行类型")
+    @GetMapping("/listBank")
+    public ResponseResult<List<BanktypeDO>> listBank() {
+        List<BanktypeDO> result = bankService.listBank();
+        return ResponseResult.success(result);
+    }
+
+    @ApiOperation("支行列表查询")
+    @GetMapping("/listBranchBank")
+    public ResponseResult<PageInfo<BankdocDO>> listBranchBank(@RequestBody BranchBankPageRequest request) {
+        return ResponseResult.success(bankService.listBranchBank(request));
+    }
+
+}

coolstore-partner-web/src/main/java/com/cool/store/controller/webc/LinePayController.java

@@ -0,0 +1,48 @@
+package com.cool.store.controller.webc;
+
+import com.cool.store.context.PartnerUserHolder;
+import com.cool.store.request.LinePaySubmitRequest;
+import com.cool.store.response.ResponseResult;
+import com.cool.store.service.LinePayService;
+import com.cool.store.vo.LinePayVO;
+import com.cool.store.vo.PartnerUserInfoVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * @Author wxp
+ * @Date 2024/3/25 13:43
+ * @Version 1.0
+ */
+@RestController
+@RequestMapping("/mini/linePay")
+@Api(tags = "缴纳意向金")
+@Slf4j
+public class LinePayController {
+
+    @Resource
+    private LinePayService linePayService;
+
+    @ApiOperation("查询意向金详情")
+    @GetMapping("/getLinePayInfo")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "lineId", value = "线索id", required = true)
+    })
+    public ResponseResult<LinePayVO> getLinePayInfo(@RequestParam("lineId")Long lineId) {
+        return ResponseResult.success(linePayService.getLinePayInfo(lineId));
+    }
+
+    @ApiOperation("缴纳意向金")
+    @PostMapping("/submitPayInfo")
+    public ResponseResult<Long> submitPayInfo(@RequestBody LinePaySubmitRequest request){
+        PartnerUserInfoVO partnerUser = PartnerUserHolder.getUser();
+        return ResponseResult.success(linePayService.submitPayInfo(request, partnerUser));
+    }
+
+}

coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniOssClientController.java

@@ -0,0 +1,31 @@
+package com.cool.store.controller.webc;
+
+import com.cool.store.response.ResponseResult;
+import com.cool.store.service.OSSService;
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * @Author suzhuhong
+ * @Date 2024/3/28 14:25
+ * @Version 1.0
+ */
+@RestController
+@Api(tags ="小程序OSS配置")
+@RequestMapping({"/mini/oss"})
+@Slf4j
+public class MiniOssClientController {
+
+    @Resource
+    OSSService ossService;
+
+    @GetMapping("/getUploadFileConfig")
+    public ResponseResult getUploadFileConfig(){
+        return ResponseResult.success(ossService.getUploadFileConfig());
+    }
+}

coolstore-partner-web/src/main/java/com/cool/store/controller/webc/TestController.java

@@ -6,7 +6,9 @@ import com.cool.store.dto.OpenCityDTO;
 import com.cool.store.entity.*;
 import com.cool.store.mapper.HyOpenAreaInfoMapper;
 import com.cool.store.response.ResponseResult;
+import com.cool.store.service.RegionService;
 import com.cool.store.utils.poi.ExcelUtil;
+import com.cool.store.vo.RegionPathNameVO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -41,6 +43,9 @@ public class TestController {
     @Resource
     private UserRegionMappingDAO userRegionMappingDAO;
 
+    @Resource
+    private RegionService regionService;
+
 
     @PostMapping("/importCity")
     public ResponseResult<Integer> importCity(MultipartFile file){
@@ -155,4 +160,10 @@ public class TestController {
         List<UserRegionMappingDO> userRegionMappingDOList = userRegionMappingDAO.listUserRegionMappingByUserId(userIds);
         return ResponseResult.success(userRegionMappingDOList);
     }
+
+    @GetMapping("/getAllRegionName")
+    public ResponseResult getAllRegionName(@RequestParam("regionId")Long regionId){
+        RegionPathNameVO regionPathNameVO = regionService.getAllRegionName(regionId);
+        return ResponseResult.success(regionPathNameVO);
+    }
 }