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

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());
+    }
+
 }

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

@@ -26,6 +26,7 @@ import com.cool.store.service.*;
 import com.cool.store.vo.cuser.IdentityCardInfoVO;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -63,6 +64,9 @@ public class TestController {
     @Resource
     private FollowTaskService followTaskService;
 
+    @Autowired
+    private WechatMiniAppService wechatMiniAppService;
+
     @PostMapping("/post")
     public ResponseResult<Boolean> get(@RequestBody List<TestRequest> testRequestList){
         log.info(JSONObject.toJSONString(testRequestList));
@@ -285,4 +289,9 @@ public class TestController {
     public ResponseResult initOpenArea() {
         return ResponseResult.success(openAreaService.addOpenArea());
     }
+
+    @GetMapping("/getMiniAppUrl")
+    public ResponseResult getMiniAppUrl(){
+        return ResponseResult.success(wechatMiniAppService.getMiniAppUrl());
+    }
 }