永诚优化v1

src/main/java/com/ydtech/modules/esm/controller/EsmInsCompanyController.java

@@ -3,6 +3,7 @@ package com.ydtech.modules.esm.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ydtech.constants.RedisConstant;
@@ -18,6 +19,8 @@ import com.ydtech.utils.JsonUtils;
 import com.ydtech.utils.RedisUtils;
 import com.ydtech.utils.StringUtils;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -137,30 +140,81 @@ public class EsmInsCompanyController extends BaseController {
 
     }
 
+//    /**
+//     * 删除公司信息
+//     *
+//     * @param idList
+//     * @return
+//     */
+//    @PostMapping(value = "/deleteInsCompany")
+//    public HttpResult delete(@RequestParam List<String> idList) {
+//        Integer result = 0;
+//        String msg = "删除成功";
+//
+//        if (idList != null && idList.size() > 0) {
+////            result = esmInsCompanyService.delete(idList);
+//            esmInsCompanyService.removeByIds(idList);
+//
+////            esmInsCompanyService.allowQuote(null,idList);
+//            return HttpResult.ok(msg);
+//
+//        } else {
+//            msg = "编码不能为空";
+//            return HttpResult.ok(msg, result);
+//        }
+//    }
+
+
+
     /**
-     * 删除公司信息
+     *  批量逻辑删除
      *
-     * @param idList
-     * @return
+     * @author: lig
+     * @date: 2023年04月14日 0014
      */
-    @PostMapping(value = "/deleteInsCompany")
-    public HttpResult delete(@RequestParam List<String> idList) {
-        Integer result = 0;
-        String msg = "删除成功";
+    @ApiOperation(value = "批量删除操作")
+    @DeleteMapping(value ="/idBatch")
+    public HttpResult deleteBatch(@RequestParam List<String> idList) {
+        LambdaUpdateWrapper<EsmInsCompany> lqw = new LambdaUpdateWrapper<>();
+        lqw.in(EsmInsCompany::getId,idList);
+        lqw.set(EsmInsCompany::getDelFlag,-1);
+        esmInsCompanyService.update(lqw);
+
+        return HttpResult.ok("操作成功");
+
+    }
+
+
+    @ApiOperation(value = "删除操作")
+    @DeleteMapping(value ="/{id}")
+    public HttpResult delete(@PathVariable("id") String id) {
 
-        if (idList != null && idList.size() > 0) {
-//            result = esmInsCompanyService.delete(idList);
-            esmInsCompanyService.removeByIds(idList);
+        EsmInsCompany eic = esmInsCompanyService.getById(id);
+        if(null == eic) return HttpResult.error("对象不存在");
 
-//            esmInsCompanyService.allowQuote(null,idList);
-            return HttpResult.ok(msg);
+        eic.setDelFlag(-1);
+        esmInsCompanyService.updateById(eic);
+
+        return HttpResult.ok("操作成功");
 
-        } else {
-            msg = "编码不能为空";
-            return HttpResult.ok(msg, result);
-        }
     }
 
+    @ApiOperation(value = "恢复删除操作")
+    @GetMapping(value ="/{id}")
+    public HttpResult rollBackDelete(@PathVariable("id") String id) {
+
+        EsmInsCompany eic = esmInsCompanyService.getById(id);
+        if(null == eic) return HttpResult.error("对象不存在");
+
+        eic.setDelFlag(0);
+        esmInsCompanyService.updateById(eic);
+
+        return HttpResult.ok("操作成功");
+
+    }
+
+
+
     @ApiOperation(value = "获取允许报价的保险公司列表")
     @GetMapping(value = "/gainAllowQuoteList")
     public HttpResult gainAllowQuoteList() {

src/main/java/com/ydtech/modules/esm/service/impl/EsmInsCompanyServiceImpl.java

@@ -37,6 +37,7 @@ public class EsmInsCompanyServiceImpl extends ServiceImpl<EsmInsCompanyMapper, E
     @Override
     public List<EsmInsCompany> findTree(EsmInsCompanyReq req) {
         LambdaQueryWrapper<EsmInsCompany> lqw = new LambdaQueryWrapper();
+        lqw.eq(EsmInsCompany::getDelFlag,0);
         if (null != req) {
             lqw.like(StringUtils.isNotEmpty(req.getName()), EsmInsCompany::getName, req.getName());
 //            lqw.like(StringUtils.isNotEmpty(req.getParentId()), EsmInsCompany::getParentId, req.getParentId());

src/main/java/com/ydtech/modules/ins/model/yc/ruote/Base.java

@@ -282,6 +282,7 @@ public class Base {
 
 
     public static Base buildBase(YaQuoteInfoVo yaQuoteInfoVo) {
+//    public static Base buildBase(YaQuoteInfoVo yaQuoteInfoVo,Agent agent) {
         Base base = new Base();
 
         base.setCDptCde("14A4");

src/main/resources/application-dev.properties

@@ -238,15 +238,15 @@ yc.api.agent.qlftNo=\u6C38\u946B\u4FDD\u9669\u9500\u552E\u670D\u52A1\u6709\u9650
 # \u4EE3\u7406\u4EBA\u8D44\u683C\u8BC1\u53F7(qlftNo)
 yc.api.agent.operatorCode=2752454675645
 # \u5F55\u5165\u4EBA(operatorCode)
-yc.api.agent.salesmanNo=100030057
+yc.api.agent.salesmanNo=100050029
 # \u4E1A\u52A1\u5458\u4EE3\u7801(salesmanNo)
-yc.api.agent.cChaType=100030057
+yc.api.agent.cChaType=100050029
 # \u65B0\u4E1A\u52A1\u6765\u6E90(CChaType)
 yc.api.agent.custNature=191010
 # \u5BA2\u6237\u6027\u8D28(custNature)
 yc.api.agent.cOprcde=192099
 # \u64CD\u4F5C\u4EBA\u5458\u4EE3\u7801(cOprcde)
-yc.api.agent.cBsnsTyp=100030057
+yc.api.agent.cBsnsTyp=100050029
 
 # \u652F\u4ED8\u56DE\u8C03\u5730\u5740
 yc.api.pay.callBack=http://127.0.0.1:8080/api/yongCheng/callBack?str=

src/main/resources/application-test.properties

@@ -239,15 +239,15 @@ yc.api.agent.qlftNo=\u6C38\u946B\u4FDD\u9669\u9500\u552E\u670D\u52A1\u6709\u9650
 # \u4EE3\u7406\u4EBA\u8D44\u683C\u8BC1\u53F7(qlftNo)
 yc.api.agent.operatorCode=2752454675645
 # \u5F55\u5165\u4EBA(operatorCode)
-yc.api.agent.salesmanNo=100030057
+yc.api.agent.salesmanNo=100050029
 # \u4E1A\u52A1\u5458\u4EE3\u7801(salesmanNo)
-yc.api.agent.cChaType=100030057
+yc.api.agent.cChaType=100050029
 # \u65B0\u4E1A\u52A1\u6765\u6E90(CChaType)
 yc.api.agent.custNature=191010
 # \u5BA2\u6237\u6027\u8D28(custNature)
 yc.api.agent.cOprcde=192099
 # \u64CD\u4F5C\u4EBA\u5458\u4EE3\u7801(cOprcde)
-yc.api.agent.cBsnsTyp=100030057
+yc.api.agent.cBsnsTyp=100050029
 
 # \u652F\u4ED8\u56DE\u8C03\u5730\u5740
 yc.api.pay.callBack=http://47.92.254.66:8080/api/yongCheng/callBack