Sfoglia il codice sorgente

1.掌柜币控制
2.对接ai

wks 2 anni fa
parent
commit
ef7a3f76d1
32 ha cambiato i file con 1235 aggiunte e 507 eliminazioni
  1. 9 1
      src/main/java/com/ydtech/modules/admin/constants/SwitchConfig.java
  2. 127 119
      src/main/java/com/ydtech/modules/admin/controller/SysUserAccountController.java
  3. 0 3
      src/main/java/com/ydtech/modules/admin/model/dto/ExportExpenditureTypeDetalsSZDto.java
  4. 24 0
      src/main/java/com/ydtech/modules/admin/model/dto/FeeLookSwitchesDTO.java
  5. 23 5
      src/main/java/com/ydtech/modules/admin/model/dto/MyCollectInAdvanceAllDto.java
  6. 0 4
      src/main/java/com/ydtech/modules/admin/model/dto/MyCollectInAdvanceDto.java
  7. 25 0
      src/main/java/com/ydtech/modules/admin/model/vo/MyIncomeAndExpensesNewPageVo.java
  8. 29 2
      src/main/java/com/ydtech/modules/admin/service/SysSwitchConfigService.java
  9. 3 2
      src/main/java/com/ydtech/modules/admin/service/SysUserAccountService.java
  10. 34 0
      src/main/java/com/ydtech/modules/admin/service/impl/SysSwitchConfigServiceImpl.java
  11. 362 349
      src/main/java/com/ydtech/modules/admin/service/impl/SysUserAccountServiceImpl.java
  12. 34 0
      src/main/java/com/ydtech/modules/customer/components/CustomerComponents.java
  13. 28 0
      src/main/java/com/ydtech/modules/customer/controller/CustomerController.java
  14. 18 0
      src/main/java/com/ydtech/modules/customer/dao/CusChatMessagesMapper.java
  15. 116 0
      src/main/java/com/ydtech/modules/customer/entity/po/CusChatMessages.java
  16. 15 0
      src/main/java/com/ydtech/modules/customer/service/CusChatMessagesService.java
  17. 14 0
      src/main/java/com/ydtech/modules/customer/service/CustomerService.java
  18. 22 0
      src/main/java/com/ydtech/modules/customer/service/impl/CusChatMessagesServiceImpl.java
  19. 19 0
      src/main/java/com/ydtech/modules/customer/service/impl/CustomerServiceImpl.java
  20. 58 0
      src/main/java/com/ydtech/modules/fee/service/FeeDisplayService.java
  21. 104 0
      src/main/java/com/ydtech/modules/fee/service/impl/FeeDisplayServiceImpl.java
  22. 21 0
      src/main/java/com/ydtech/modules/ins/model/vo/QuoteRespVo.java
  23. 6 5
      src/main/java/com/ydtech/modules/order/aop/aspect/QuoteVerificationAspect.java
  24. 24 0
      src/main/java/com/ydtech/modules/order/entity/crawler/request/CrawlerCustomerRequest.java
  25. 24 2
      src/main/java/com/ydtech/modules/order/entity/vo/FeeOrderNewVo.java
  26. 29 8
      src/main/java/com/ydtech/modules/order/entity/vo/InsOrdersEditingVo.java
  27. 8 2
      src/main/java/com/ydtech/modules/order/entity/vo/OrderVo.java
  28. 15 3
      src/main/java/com/ydtech/modules/order/service/impl/InsOrdersServiceImpl.java
  29. 7 0
      src/main/resources/application-pre.yml
  30. 7 1
      src/main/resources/application-prod.yml
  31. 7 1
      src/main/resources/application-test.yml
  32. 23 0
      src/main/resources/mapper/modules/customer/CusChatMessagesMapper.xml

+ 9 - 1
src/main/java/com/ydtech/modules/admin/constants/SwitchConfig.java

@@ -13,7 +13,15 @@ import lombok.Getter;
 public enum SwitchConfig {
 
     SC_01("proxyCustomerAgent", "代客录单(代理人启动)"),
-    SC_02("proxyCustomerChannel", "代客录单(渠道启动)");
+    SC_02("proxyCustomerChannel", "代客录单(渠道启动)"),
+
+    // 费用查看是否 / 10
+    FEE_01("feeViewAgent", "掌柜币显示(代理人启动)"),
+    FEE_02("feeViewChannel", "掌柜币显示(渠道启动)"),
+
+    // 是否显示费用
+    FDA_01("feeDisplayAgent", "费用显示(代理人启动)"),
+    FDA_02("feeDisplayChannel", "费用显示(渠道启动)");
 
     private final String code;
 

+ 127 - 119
src/main/java/com/ydtech/modules/admin/controller/SysUserAccountController.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.admin.model.dto.*;
 import com.ydtech.modules.admin.model.po.SysUserAccount;
+import com.ydtech.modules.admin.model.vo.MyIncomeAndExpensesNewPageVo;
 import com.ydtech.modules.admin.model.vo.SubOrder;
 import com.ydtech.modules.admin.model.vo.SysUserAccountVo;
 import com.ydtech.modules.admin.service.SysUserAccountService;
@@ -38,15 +39,15 @@ public class SysUserAccountController extends BaseController {
 
     @PostMapping("/queryPage")
     @ApiOperation(value = "用户账户表分页")
-    public HttpResult<BasePageResult<SysUserAccount>> queryPageOrder(@RequestBody @Valid SysUserAccountVo sysUserAccountVo ) {
+    public HttpResult<BasePageResult<SysUserAccount>> queryPageOrder(@RequestBody @Valid SysUserAccountVo sysUserAccountVo) {
         BasePageResult<SysUserAccount> result = sysUserAccountService.queryByVo(sysUserAccountVo);
         return HttpResult.ok("success", result);
     }
 
     @PostMapping("/queryPageList")
     @ApiOperation(value = "用户账户表分页2")
-    public HttpResult<IPage<SysUserAccount>> queryPageList(@RequestBody SysUserAccountVo sysUserAccountVo ) {
-            IPage<SysUserAccount> result = sysUserAccountService.queryByVo1(sysUserAccountVo);
+    public HttpResult<IPage<SysUserAccount>> queryPageList(@RequestBody SysUserAccountVo sysUserAccountVo) {
+        IPage<SysUserAccount> result = sysUserAccountService.queryByVo1(sysUserAccountVo);
         return HttpResult.ok("success", result);
     }
 
@@ -56,11 +57,12 @@ public class SysUserAccountController extends BaseController {
     public HttpResult<Object> submit(@RequestBody SysUserAccountVo sysUserAccountVo) {
         return sysUserAccountService.inert(sysUserAccountVo);
     }
+
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/6/19 8:52
-     *  @Description:  提现
+     * @version
+     * @author: hxl
+     * @Date: 2024/6/19 8:52
+     * @Description: 提现
      */
     @PostMapping("/withdraw")
     @ApiOperation("提现")
@@ -76,230 +78,236 @@ public class SysUserAccountController extends BaseController {
 
     @GetMapping(value = "/getSysAllAmount")
     @ApiOperation("用户余额new")
-    public HttpResult<SysUserAccountVo>  getSysAllAmount (){
-        String   userId = BaseController.getUser().getId();
+    public HttpResult<SysUserAccountVo> getSysAllAmount() {
+        String userId = BaseController.getUser().getId();
         SysUserAccountVo result = sysUserAccountService.getSysAllAmount(userId);
-        return  HttpResult.ok("success", result);
+        return HttpResult.ok("success", result);
     }
+
     @PostMapping("getInsOrders")
     @ApiOperation("获取预收实收列表数据")
-    public HttpResult<SysUserAccountVo>  getInsOrders(@RequestBody SysUserAccountVo sysUserAccountVo){
+    public HttpResult<SysUserAccountVo> getInsOrders(@RequestBody SysUserAccountVo sysUserAccountVo) {
 
-        if(StringUtils.isBlank(sysUserAccountVo.getAmountType())){
+        if (StringUtils.isBlank(sysUserAccountVo.getAmountType())) {
             return HttpResult.error("金额类型(手续费金额1跟单金额2推广金额3)amountType不能为空");
         }
         //预收实收类型
-        if(StringUtils.isBlank(sysUserAccountVo.getSearchType())){
+        if (StringUtils.isBlank(sysUserAccountVo.getSearchType())) {
             return HttpResult.error("预收实收类型(预收1实收2)searchType不能为空");
         }
         //查询时间
-        if(StringUtils.isBlank(sysUserAccountVo.getTimeFiltering())){
+        if (StringUtils.isBlank(sysUserAccountVo.getTimeFiltering())) {
             return HttpResult.error("查询时间timeFiltering不能为空");
         }
-        try{
-            SysUserAccountVo result =sysUserAccountService.getInsOrders(sysUserAccountVo);
-            return  HttpResult.ok("success", result);
-        }catch (Exception e){
-            return HttpResult.error("查询失败"+e.getMessage());
+        try {
+            SysUserAccountVo result = sysUserAccountService.getInsOrders(sysUserAccountVo);
+            return HttpResult.ok("success", result);
+        } catch (Exception e) {
+            return HttpResult.error("查询失败" + e.getMessage());
         }
     }
+
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/6/3 15:03
-     *  @Description: 通过子订单编号查询订单的详情页面
+     * @version
+     * @author: hxl
+     * @Date: 2024/6/3 15:03
+     * @Description: 通过子订单编号查询订单的详情页面
      */
     @GetMapping("getSubOrderDetails")
     @ApiOperation("获取推广费订单详情")
-    public HttpResult<SubOrder>  getSubOrderDetails(String subOrderId){
-        if(StringUtils.isBlank(subOrderId)){
+    public HttpResult<SubOrder> getSubOrderDetails(String subOrderId) {
+        if (StringUtils.isBlank(subOrderId)) {
             return HttpResult.error("订单号subOrderId不能为空");
         }
-        try{
-            SubOrder subOrder =sysUserAccountService.getSubOrderDetails(subOrderId,BaseController.getUser().getId());
-            return  HttpResult.ok("success", subOrder);
-        }catch (Exception e){
-            return HttpResult.error("操作失败"+e.getMessage());
+        try {
+            SubOrder subOrder = sysUserAccountService.getSubOrderDetails(subOrderId, BaseController.getUser().getId());
+            return HttpResult.ok("success", subOrder);
+        } catch (Exception e) {
+            return HttpResult.error("操作失败" + e.getMessage());
         }
     }
 
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/6/19 9:00
-     *  @Description: 查询我的账户金额
+     * @version
+     * @author: hxl
+     * @Date: 2024/6/19 9:00
+     * @Description: 查询我的账户金额
      */
     @GetMapping("getUserSumAmountByUserId")
     @ApiOperation("查询我的账户总金额")
-    public HttpResult<BigDecimal>  getUserSumAmountByUserId(String userId){
-        try{
-            BigDecimal sumAmount  =sysUserAccountService.getUserSumAmountByUserId(userId);
-            return  HttpResult.ok("success", sumAmount);
-        }catch (Exception e){
-            return HttpResult.error("操作失败"+e.getMessage());
+    public HttpResult<BigDecimal> getUserSumAmountByUserId(String userId) {
+        try {
+            BigDecimal sumAmount = sysUserAccountService.getUserSumAmountByUserId(userId);
+            return HttpResult.ok("success", sumAmount);
+        } catch (Exception e) {
+            return HttpResult.error("操作失败" + e.getMessage());
         }
     }
+
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/6/19 9:14
-     *  @Description: 查询我的预收明细
+     * @version
+     * @author: hxl
+     * @Date: 2024/6/19 9:14
+     * @Description: 查询我的预收明细
      */
     @PostMapping("findMyCollectInAdvanceByUserId")
     @ApiOperation("查询我的预收明细")
-    public HttpResult<MyCollectInAdvanceAllDto>  findMyCollectInAdvanceByUserId(@RequestBody MyCollectInAdvanceQueryDto myCollectInAdvanceQueryDto){
-       return  HttpResult.ok(sysUserAccountService.findMyCollectInAdvanceByUserId(myCollectInAdvanceQueryDto));
+    public HttpResult<MyCollectInAdvanceAllDto> findMyCollectInAdvanceByUserId(@RequestBody MyCollectInAdvanceQueryDto myCollectInAdvanceQueryDto) {
+        return HttpResult.ok(sysUserAccountService.findMyCollectInAdvanceByUserId(myCollectInAdvanceQueryDto));
     }
 
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/6/19 9:14
-     *  @Description: 查询我的预收的数据
+     * @version
+     * @author: hxl
+     * @Date: 2024/6/19 9:14
+     * @Description: 查询我的预收的数据
      */
     @PostMapping("findMyIncomeAndExpensesByUserId")
     @ApiOperation("查询我的收支明细")
-    public HttpResult<MyCollectInAdvanceAllDto>  findIncomeAndExpensesByUserId(@RequestBody MyIncomeAndExpensesQueryDto myIncomeAndExpensesQueryDto){
-      return  HttpResult.ok(sysUserAccountService.findIncomeAndExpensesByUserId(myIncomeAndExpensesQueryDto));
+    public HttpResult<MyCollectInAdvanceAllDto> findIncomeAndExpensesByUserId(@RequestBody MyIncomeAndExpensesQueryDto myIncomeAndExpensesQueryDto) {
+        return HttpResult.ok(sysUserAccountService.findIncomeAndExpensesByUserId(myIncomeAndExpensesQueryDto));
     }
 
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/6/19 9:14
-     *  @Description: 提现中、已提现的详情
+     * @version
+     * @author: hxl
+     * @Date: 2024/6/19 9:14
+     * @Description: 提现中、已提现的详情
      */
     @GetMapping("findDetailById")
     @ApiOperation("提现的详情")
-    public HttpResult<WithdrawalDetalsDto>  findDetailById(String  id){
-        return  HttpResult.ok(sysUserAccountService.findDetailById(id));
+    public HttpResult<WithdrawalDetalsDto> findDetailById(String id) {
+        return HttpResult.ok(sysUserAccountService.findDetailById(id));
     }
+
     /**
-    @PostMapping("findOrderDetailById")
-    @ApiOperation("订单详情")
-    public HttpResult<OrderDetalsDto>  findOrderDetailById(String subOrderId){
-        return  HttpResult.ok(sysUserAccountService.findOrderDetailById(subOrderId));
-    }
-    **/
+     * @PostMapping("findOrderDetailById")
+     * @ApiOperation("订单详情") public HttpResult<OrderDetalsDto>  findOrderDetailById(String subOrderId){
+     * return  HttpResult.ok(sysUserAccountService.findOrderDetailById(subOrderId));
+     * }
+     **/
 
     @GetMapping("findRefundDetailById")
     @ApiOperation("退款详情")
-    public HttpResult<RefundDetalsDto>  findRefundDetailById(String  id){
-        return  HttpResult.ok(sysUserAccountService.findRefundDetailById(id));
+    public HttpResult<RefundDetalsDto> findRefundDetailById(String id) {
+        return HttpResult.ok(sysUserAccountService.findRefundDetailById(id));
     }
 
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/6/30 19:14
-     *  @Description: 查询我的车险明细
+     * @version
+     * @author: hxl
+     * @Date: 2024/6/30 19:14
+     * @Description: 查询我的车险明细
      */
     @PostMapping("findMyInsuranceByUserId")
     @ApiOperation("查询我的车险明细")
-    public HttpResult<BasePageResult<ExportExpenditureTypeDetalsDto>>  findMyInsuranceByUserId(@RequestBody MyInsuranceQueryDto myInsuranceQueryDto){
-        return  HttpResult.ok(sysUserAccountService.findMyInsuranceByUserId(myInsuranceQueryDto));
+    public HttpResult<MyIncomeAndExpensesNewPageVo<ExportExpenditureTypeDetalsDto>> findMyInsuranceByUserId(@RequestBody MyInsuranceQueryDto myInsuranceQueryDto) {
+        return HttpResult.ok(sysUserAccountService.findMyInsuranceByUserId(myInsuranceQueryDto));
     }
 
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/6/30 19:14
-     *  @Description: 查询我的推广费明细
+     * @version
+     * @author: hxl
+     * @Date: 2024/6/30 19:14
+     * @Description: 查询我的推广费明细
      */
     @PostMapping("findMyInsuranceTGByUserId")
     @ApiOperation("查询我的推广费明细")
-    public HttpResult<BasePageResult<ExportExpenditureTypeDetalsTGDto>>  findMyInsuranceTGByUserId(@RequestBody MyInsuranceTgQueryDto myInsuranceTgQueryDto){
-        return  HttpResult.ok(sysUserAccountService.findMyInsuranceTGByUserId(myInsuranceTgQueryDto));
+    public HttpResult<BasePageResult<ExportExpenditureTypeDetalsTGDto>> findMyInsuranceTGByUserId(@RequestBody MyInsuranceTgQueryDto myInsuranceTgQueryDto) {
+        return HttpResult.ok(sysUserAccountService.findMyInsuranceTGByUserId(myInsuranceTgQueryDto));
     }
 
 
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/6/30 19:14
-     *  @Description:  查询导出车险明细
+     * @version
+     * @author: hxl
+     * @Date: 2024/6/30 19:14
+     * @Description: 查询导出车险明细
      */
     @PostMapping("exportMyInsuranceByUserId")
     @ApiOperation("查询导出车险明细")
-    public HttpResult<List<ExportExpenditureTypeDetalsDto>>  exportMyInsuranceByUserId(@RequestBody MyInsuranceQueryDto myInsuranceQueryDto){
+    public HttpResult<List<ExportExpenditureTypeDetalsDto>> exportMyInsuranceByUserId(@RequestBody MyInsuranceQueryDto myInsuranceQueryDto) {
         List<ExportExpenditureTypeDetalsDto> exportIncomeTypeDetalsList = sysUserAccountService.exportMyInsuranceByUserId(myInsuranceQueryDto);
         ExcelUtils<ExportExpenditureTypeDetalsDto> excelUtils = new ExcelUtils<>(ExportExpenditureTypeDetalsDto.class);
         String fileName = "车险明细" + System.currentTimeMillis() + ".xlsx";
-        String saveFilePath = uploadPath+"//" + EXCEL_PATH + fileName;
+        String saveFilePath = uploadPath + "//" + EXCEL_PATH + fileName;
         String resultPath = UPLOAD_PATH + fileName;
         String sheetName = "车险明细表";
-        try{
-            excelUtils.writeExcelNew(saveFilePath,sheetName, exportIncomeTypeDetalsList);
+        try {
+            excelUtils.writeExcelNew(saveFilePath, sheetName, exportIncomeTypeDetalsList);
             return HttpResult.ok(resultPath);
-        }catch(Exception e){
-            return HttpResult.error("导出车险明细表失败:"+e.getMessage());
+        } catch (Exception e) {
+            return HttpResult.error("导出车险明细表失败:" + e.getMessage());
         }
     }
 
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/6/30 19:14
-     *  @Description:  查询导出推广费明细
+     * @version
+     * @author: hxl
+     * @Date: 2024/6/30 19:14
+     * @Description: 查询导出推广费明细
      */
     @PostMapping("expeortMyInsuranceTGByUserId")
     @ApiOperation("查询导出推广费明细")
-    public HttpResult<List<ExportExpenditureTypeDetalsTGDto>>  expeortMyInsuranceTGByUserId(@RequestBody MyInsuranceTgQueryDto myInsuranceTgQueryDto){
+    public HttpResult<List<ExportExpenditureTypeDetalsTGDto>> expeortMyInsuranceTGByUserId(@RequestBody MyInsuranceTgQueryDto myInsuranceTgQueryDto) {
         List<ExportExpenditureTypeDetalsTGDto> exportIncomeTypeDetalsList = sysUserAccountService.exportMyInsuranceTGByUserId(myInsuranceTgQueryDto);
         ExcelUtils<ExportExpenditureTypeDetalsTGDto> excelUtils = new ExcelUtils<>(ExportExpenditureTypeDetalsTGDto.class);
         String fileName = "推广费明细" + System.currentTimeMillis() + ".xlsx";
-        String saveFilePath = uploadPath+"//" + EXCEL_PATH + fileName;
+        String saveFilePath = uploadPath + "//" + EXCEL_PATH + fileName;
         String resultPath = UPLOAD_PATH + fileName;
         String sheetName = "推广费明细表";
-        try{
-            excelUtils.writeExcelNew(saveFilePath,sheetName, exportIncomeTypeDetalsList);
+        try {
+            excelUtils.writeExcelNew(saveFilePath, sheetName, exportIncomeTypeDetalsList);
             return HttpResult.ok(resultPath);
-        }catch(Exception e){
-            return HttpResult.error("导出推广费明细表失败:"+e.getMessage());
+        } catch (Exception e) {
+            return HttpResult.error("导出推广费明细表失败:" + e.getMessage());
         }
     }
+
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/6/30 19:14
-     *  @Description:  收支明细
+     * @version
+     * @author: hxl
+     * @Date: 2024/6/30 19:14
+     * @Description: 收支明细
      */
     @PostMapping("findMyIncomeAndExpensesNewByUserId")
     @ApiOperation("查询收支明细新")
-    public HttpResult<BasePageResult<ExportExpenditureTypeDetalsSZDto>>  findMyIncomeAndExpensesNewByUserId(@RequestBody MyCollectInAdvanceQueryNewDto myCollectInAdvanceQueryNewDto){
-        return  HttpResult.ok(sysUserAccountService.findMyIncomeAndExpensesNewByUserId(myCollectInAdvanceQueryNewDto));
+    public HttpResult<MyIncomeAndExpensesNewPageVo<ExportExpenditureTypeDetalsSZDto>> findMyIncomeAndExpensesNewByUserId(@RequestBody MyCollectInAdvanceQueryNewDto myCollectInAdvanceQueryNewDto) {
+        return HttpResult.ok(sysUserAccountService.findMyIncomeAndExpensesNewByUserId(myCollectInAdvanceQueryNewDto));
     }
+
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/7/1 8:57
-     *  @Description: 导出收支明细新
+     * @version
+     * @author: hxl
+     * @Date: 2024/7/1 8:57
+     * @Description: 导出收支明细新
      */
     @PostMapping("exportMyIncomeAndExpensesNewByUserId")
     @ApiOperation("导出收支明细新")
-    public HttpResult<MyCollectInAdvanceAllDto>  exportMyIncomeAndExpensesNewByUserId(@RequestBody MyCollectInAdvanceQueryNewDto myCollectInAdvanceQueryNewDto){
+    public HttpResult<MyCollectInAdvanceAllDto> exportMyIncomeAndExpensesNewByUserId(@RequestBody MyCollectInAdvanceQueryNewDto myCollectInAdvanceQueryNewDto) {
         List<ExportExpenditureTypeDetalsSZDto> exportIncomeTypeDetalsList = sysUserAccountService.exportMyIncomeAndExpensesNewByUserId(myCollectInAdvanceQueryNewDto);
         ExcelUtils<ExportExpenditureTypeDetalsSZDto> excelUtils = new ExcelUtils<>(ExportExpenditureTypeDetalsSZDto.class);
         String fileName = "收支明细" + System.currentTimeMillis() + ".xlsx";
-        String saveFilePath = uploadPath+"//" + EXCEL_PATH + fileName;
+        String saveFilePath = uploadPath + "//" + EXCEL_PATH + fileName;
         String resultPath = UPLOAD_PATH + fileName;
         String sheetName = "收支明细表";
-        try{
-            excelUtils.writeExcelNew(saveFilePath,sheetName, exportIncomeTypeDetalsList);
+        try {
+            excelUtils.writeExcelNew(saveFilePath, sheetName, exportIncomeTypeDetalsList);
             return HttpResult.ok(resultPath);
-        }catch(Exception e){
-            return HttpResult.error("导出收支明细表失败:"+e.getMessage());
+        } catch (Exception e) {
+            return HttpResult.error("导出收支明细表失败:" + e.getMessage());
         }
     }
+
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/6/30 18:43
-     *  @Description: 我的账户页面的数据
+     * @version
+     * @author: hxl
+     * @Date: 2024/6/30 18:43
+     * @Description: 我的账户页面的数据
      */
     @PostMapping("findMyAmount")
     @ApiOperation("我的账户页面的数据")
-    public HttpResult<MySumAmountDto>  findMyAmount(@RequestBody MySumAmountQueryDto mySumAmountQueryDto){
+    public HttpResult<MySumAmountDto> findMyAmount(@RequestBody MySumAmountQueryDto mySumAmountQueryDto) {
         MySumAmountDto amountDto = sysUserAccountService.findMyAmount(mySumAmountQueryDto);
         return HttpResult.ok(amountDto);
     }

+ 0 - 3
src/main/java/com/ydtech/modules/admin/model/dto/ExportExpenditureTypeDetalsSZDto.java

@@ -56,7 +56,6 @@ public class ExportExpenditureTypeDetalsSZDto {
     @ApiModelProperty(value = "交易类型")
     private String  transactionType;
 
-
     /***
      * 金额
      */
@@ -64,8 +63,6 @@ public class ExportExpenditureTypeDetalsSZDto {
     @ApiModelProperty(value = "交易金额")
     private BigDecimal amount;
 
-
-
     @ExcelProperty(value="提现状态",index=6)
     @ApiModelProperty(value = "提现状态  1 提现申请  2.处理中 3.提现失败  4.提现成功")
     private String auditingStatus;

+ 24 - 0
src/main/java/com/ydtech/modules/admin/model/dto/FeeLookSwitchesDTO.java

@@ -0,0 +1,24 @@
+package com.ydtech.modules.admin.model.dto;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class FeeLookSwitchesDTO implements Serializable {
+
+    private static final long serialVersionUID = -8717266422994737007L;
+
+    @ApiModelProperty("费用查看 /10")
+    private Boolean feeView;
+
+    @ApiModelProperty("费用显示 ")
+    private Boolean feeDisplay;
+
+}

+ 23 - 5
src/main/java/com/ydtech/modules/admin/model/dto/MyCollectInAdvanceAllDto.java

@@ -1,6 +1,7 @@
 package com.ydtech.modules.admin.model.dto;
 
 import com.ydtech.modules.order.entity.BasePageResult;
+import com.ydtech.utils.BigDecimalUtils;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -22,6 +23,7 @@ public class MyCollectInAdvanceAllDto {
      */
     @ApiModelProperty(value = "收入金额")
     private BigDecimal sumAmountSR;
+
     /***
      * 支出金额
      */
@@ -34,20 +36,36 @@ public class MyCollectInAdvanceAllDto {
     @ApiModelProperty(value = "预收金额")
     private BigDecimal sumAmountYS;
 
+    @ApiModelProperty("掌柜币显示 /10")
+    private Boolean feeView;
+
     @ApiModelProperty(value = "分页数据")
     BasePageResult<MyCollectInAdvanceDto> data =new BasePageResult<>();
 
     public MyCollectInAdvanceAllDto() {
     }
 
-    public MyCollectInAdvanceAllDto(BigDecimal sumAmountSR,BigDecimal sumAmountZC, BasePageResult<MyCollectInAdvanceDto> data) {
-        this.sumAmountSR = sumAmountSR;
-        this.sumAmountZC = sumAmountZC;
+    public MyCollectInAdvanceAllDto(BigDecimal sumAmountSR,BigDecimal sumAmountZC, BasePageResult<MyCollectInAdvanceDto> data, boolean b) {
+        if (b) {
+            this.sumAmountSR = BigDecimalUtils.nullToZero(sumAmountSR).divide(new BigDecimal(10));
+            this.sumAmountZC = BigDecimalUtils.nullToZero(sumAmountZC).divide(new BigDecimal(10));
+        }else {
+            this.sumAmountSR = sumAmountSR;
+            this.sumAmountZC = sumAmountZC;
+        }
         this.data = data;
+        this.feeView = b;
     }
 
-    public MyCollectInAdvanceAllDto(BigDecimal sumAmountYS, BasePageResult<MyCollectInAdvanceDto> data) {
-        this.sumAmountYS = sumAmountYS;
+    public MyCollectInAdvanceAllDto(BigDecimal sumAmountYS, BasePageResult<MyCollectInAdvanceDto> data, boolean b) {
+        if (b) {
+            this.sumAmountYS = BigDecimalUtils.nullToZero(sumAmountYS).divide(new BigDecimal(10));
+        }else {
+            this.sumAmountYS = sumAmountYS;
+        }
+
         this.data = data;
+        this.feeView = b;
     }
+
 }

+ 0 - 4
src/main/java/com/ydtech/modules/admin/model/dto/MyCollectInAdvanceDto.java

@@ -28,7 +28,6 @@ public class MyCollectInAdvanceDto {
     @ApiModelProperty(value = "承保时间")
     private String  signingTime;
 
-
     /***
      * 车牌
      */
@@ -41,7 +40,6 @@ public class MyCollectInAdvanceDto {
     @ApiModelProperty(value = "金额")
     private BigDecimal amount;
 
-
     /***
      * 交易号
      */
@@ -54,8 +52,6 @@ public class MyCollectInAdvanceDto {
     @ApiModelProperty(value = "支出时间")
     private String   createTime;
 
-
-
     @ApiModelProperty(value = "业务板块")
     private String businessSegmentsType;
 

+ 25 - 0
src/main/java/com/ydtech/modules/admin/model/vo/MyIncomeAndExpensesNewPageVo.java

@@ -0,0 +1,25 @@
+package com.ydtech.modules.admin.model.vo;
+
+import com.ydtech.modules.order.entity.BasePageResult;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class MyIncomeAndExpensesNewPageVo<T> extends BasePageResult<T> {
+
+    @ApiModelProperty("掌柜币显示 /10")
+    private Boolean feeView;
+
+    public MyIncomeAndExpensesNewPageVo(long pageNum, long pageSize, long totalSize, long totalPages, List<T> content, boolean feeView) {
+        super(pageNum, pageSize, totalSize, totalPages, content);
+        this.feeView = feeView;
+    }
+}

+ 29 - 2
src/main/java/com/ydtech/modules/admin/service/SysSwitchConfigService.java

@@ -1,12 +1,12 @@
 package com.ydtech.modules.admin.service;
 
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.ydtech.extension.BaseIService;
+import com.ydtech.modules.admin.model.dto.FeeLookSwitchesDTO;
 import com.ydtech.modules.admin.model.po.SysSwitchConfig;
 import com.ydtech.modules.admin.model.vo.SysSwitchConfigQueryVo;
 import com.ydtech.modules.admin.model.vo.SysSwitchConfigVo;
 import com.ydtech.modules.order.entity.BasePageResult;
-import com.ydtech.modules.protocol.utils.AssertionUtils;
+import com.ydtech.modules.order.entity.vo.OrderVo;
 
 import java.math.BigDecimal;
 
@@ -48,4 +48,31 @@ public interface SysSwitchConfigService extends BaseIService<SysSwitchConfig> {
      * @return
      */
     BasePageResult<SysSwitchConfig> queryPage(SysSwitchConfigQueryVo sysSwitchConfigQueryVo);
+
+    /**
+     * 是否开启
+     *
+     * @param keyWord 键值
+     * @return true 开启  false 关闭
+     */
+    default boolean isEnabled(String keyWord) {
+        SysSwitchConfig one = lambdaQuery().eq(SysSwitchConfig::getKeyword, keyWord).one();
+        if (one == null) return false;
+        return 1 == one.getEnabled();
+    }
+
+    /**
+     * 费用查看开关
+     *
+     * @return 是否开启
+     */
+    FeeLookSwitchesDTO feeLookSwitches();
+
+    /**
+     * 机构 掌柜币查看
+     *
+     * @return
+     */
+    boolean feeDisplaySwitches();
+
 }

+ 3 - 2
src/main/java/com/ydtech/modules/admin/service/SysUserAccountService.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.admin.model.dto.*;
 import com.ydtech.modules.admin.model.po.SysUserAccount;
+import com.ydtech.modules.admin.model.vo.MyIncomeAndExpensesNewPageVo;
 import com.ydtech.modules.admin.model.vo.SubOrder;
 import com.ydtech.modules.admin.model.vo.SysUserAccountVo;
 import com.ydtech.modules.order.entity.BasePageResult;
@@ -89,7 +90,7 @@ public interface SysUserAccountService extends IService<SysUserAccount> {
      *  @Date: 2024/6/30 15:27
      *  @Description: 预收车险明细
      */
-    BasePageResult<ExportExpenditureTypeDetalsDto> findMyInsuranceByUserId(MyInsuranceQueryDto myInsuranceQueryDto);
+    MyIncomeAndExpensesNewPageVo<ExportExpenditureTypeDetalsDto> findMyInsuranceByUserId(MyInsuranceQueryDto myInsuranceQueryDto);
     /**
      *  @version
      *  @author: hxl
@@ -117,7 +118,7 @@ public interface SysUserAccountService extends IService<SysUserAccount> {
      *  @Date: 2024/6/30 18:24
      *  @Description:  收支明细查询
      */
-    BasePageResult<ExportExpenditureTypeDetalsSZDto> findMyIncomeAndExpensesNewByUserId(MyCollectInAdvanceQueryNewDto myCollectInAdvanceQueryNewDto);
+    MyIncomeAndExpensesNewPageVo<ExportExpenditureTypeDetalsSZDto> findMyIncomeAndExpensesNewByUserId(MyCollectInAdvanceQueryNewDto myCollectInAdvanceQueryNewDto);
     /**
      *  @version
      *  @author: hxl

+ 34 - 0
src/main/java/com/ydtech/modules/admin/service/impl/SysSwitchConfigServiceImpl.java

@@ -7,6 +7,7 @@ import com.ydtech.modules.admin.constants.ManagementSource;
 import com.ydtech.modules.admin.constants.SwitchConfig;
 import com.ydtech.modules.admin.dao.SysSwitchConfigMapper;
 import com.ydtech.modules.admin.model.SysDept;
+import com.ydtech.modules.admin.model.dto.FeeLookSwitchesDTO;
 import com.ydtech.modules.admin.model.po.SysSwitchConfig;
 import com.ydtech.modules.admin.model.vo.SysSwitchConfigQueryVo;
 import com.ydtech.modules.admin.model.vo.SysSwitchConfigVo;
@@ -17,6 +18,7 @@ import com.ydtech.modules.fee.constants.CostAllocation;
 import com.ydtech.modules.fee.dto.po.InsFeeOrderConfig;
 import com.ydtech.modules.fee.service.InsFeeOrderConfigService;
 import com.ydtech.modules.order.entity.BasePageResult;
+import com.ydtech.modules.order.entity.vo.OrderVo;
 import com.ydtech.modules.protocol.utils.AssertionUtils;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.ObjectUtils;
@@ -110,6 +112,38 @@ public class SysSwitchConfigServiceImpl extends ServiceImpl<SysSwitchConfigMappe
                 sysSwitchConfigPage.getTotal(), sysSwitchConfigPage.getPages(), sysSwitchConfigPage.getRecords());
     }
 
+    @Override
+    public FeeLookSwitchesDTO feeLookSwitches() {
+        String deptId = BaseController.getDeptId();
+        FeeLookSwitchesDTO feeLookSwitchesDTO = new FeeLookSwitchesDTO();
+        SysDept dept = sysDeptService.getById(deptId);
+        // 渠道
+        if (ManagementSource.MS_01.getCode().equals(dept.getManagementSource())) {
+            feeLookSwitchesDTO.setFeeView(isEnabled(SwitchConfig.FEE_02.getCode()));
+            feeLookSwitchesDTO.setFeeDisplay(isEnabled(SwitchConfig.FDA_02.getCode()));
+            // 代理人
+        } else if (ManagementSource.MS_02.getCode().equals(dept.getManagementSource())) {
+            feeLookSwitchesDTO.setFeeView(isEnabled(SwitchConfig.FEE_01.getCode()));
+            feeLookSwitchesDTO.setFeeDisplay(isEnabled(SwitchConfig.FDA_01.getCode()));
+        }else {
+            feeLookSwitchesDTO.setFeeView(true);
+            feeLookSwitchesDTO.setFeeDisplay(true);
+        }
+        return feeLookSwitchesDTO;
+    }
+
+    @Override
+    public boolean feeDisplaySwitches() {
+        String deptId = BaseController.getDeptId();
+        SysDept dept = sysDeptService.getById(deptId);
+        if (ManagementSource.MS_01.getCode().equals(dept.getManagementSource())) {
+            return isEnabled(SwitchConfig.FEE_02.getCode());
+            // 代理人
+        } else if (ManagementSource.MS_02.getCode().equals(dept.getManagementSource())) {
+            return isEnabled(SwitchConfig.FEE_01.getCode());
+        }
+        return false;
+    }
 }
 
 

File diff suppressed because it is too large
+ 362 - 349
src/main/java/com/ydtech/modules/admin/service/impl/SysUserAccountServiceImpl.java


+ 34 - 0
src/main/java/com/ydtech/modules/customer/components/CustomerComponents.java

@@ -0,0 +1,34 @@
+package com.ydtech.modules.customer.components;
+
+
+import com.ydtech.modules.order.components.InsCrawlerOrderComponents;
+import com.ydtech.modules.order.entity.crawler.request.CrawlerCustomerRequest;
+import com.ydtech.modules.order.entity.crawler.response.CrawlerBaseResponse;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpHeaders;
+import org.springframework.stereotype.Component;
+
+@Component
+@RequiredArgsConstructor
+public class CustomerComponents {
+
+    @Value("${customer.api.url}")
+    private String baseUrl;
+
+    private final InsCrawlerOrderComponents insCrawlerOrderComponents;
+
+    /**
+     * 发送消息
+     *
+     * @param message 消息
+     * @return 返回消息
+     */
+    public String sendMessage(String message) {
+        CrawlerCustomerRequest crawlerCustomerRequest = new CrawlerCustomerRequest(message);
+        CrawlerBaseResponse post = insCrawlerOrderComponents.post(baseUrl, "AI", "AI", crawlerCustomerRequest, CrawlerBaseResponse.class, new HttpHeaders());
+        return post.getMessage();
+    }
+
+
+}

+ 28 - 0
src/main/java/com/ydtech/modules/customer/controller/CustomerController.java

@@ -0,0 +1,28 @@
+package com.ydtech.modules.customer.controller;
+
+
+import com.ydtech.aop.request.RequestSingleParam;
+import com.ydtech.core.page.HttpResult;
+import com.ydtech.modules.customer.service.CustomerService;
+import io.swagger.annotations.Api;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Api(tags = "客服功能", value = "客服功能")
+@RequestMapping("/customer")
+@RestController
+@RequiredArgsConstructor
+public class CustomerController {
+
+    private final CustomerService customerService;
+
+    @PostMapping("/ai/sendMessage")
+    public HttpResult<String> sendMessage(@RequestSingleParam(value = "message") String message) {
+        String resultMessage = customerService.sendMessage(message);
+        return HttpResult.ok(resultMessage);
+    }
+
+
+}

+ 18 - 0
src/main/java/com/ydtech/modules/customer/dao/CusChatMessagesMapper.java

@@ -0,0 +1,18 @@
+package com.ydtech.modules.customer.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ydtech.modules.customer.entity.po.CusChatMessages;
+
+/**
+* @author Administrator
+* @description 针对表【cus_chat_messages(客服消息)】的数据库操作Mapper
+* @createDate 2024-09-11 17:59:16
+* @Entity generator.domain.CusChatMessages
+*/
+public interface CusChatMessagesMapper extends BaseMapper<CusChatMessages> {
+
+}
+
+
+
+

+ 116 - 0
src/main/java/com/ydtech/modules/customer/entity/po/CusChatMessages.java

@@ -0,0 +1,116 @@
+package com.ydtech.modules.customer.entity.po;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 客服消息
+ * @TableName cus_chat_messages
+ */
+@TableName(value ="cus_chat_messages")
+@Data
+public class CusChatMessages implements Serializable {
+    /**
+     * 组件
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 发送用户的id
+     */
+    @TableField(value = "from_user_id")
+    private String fromUserId;
+
+    /**
+     * 接受用户的工号
+     */
+    @TableField(value = "to_user_id")
+    private String toUserId;
+
+    /**
+     * 消息类型
+     */
+    @TableField(value = "message_type")
+    private Integer messageType;
+
+    /**
+     * 消息体
+     */
+    @TableField(value = "message")
+    private String message;
+
+    /**
+     * 消息分组
+     */
+    @TableField(value = "group_type")
+    private Integer groupType;
+
+    /**
+     * 发送消息的时间
+     */
+    @TableField(value = "created_at")
+    private Date createdAt;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public boolean equals(Object that) {
+        if (this == that) {
+            return true;
+        }
+        if (that == null) {
+            return false;
+        }
+        if (getClass() != that.getClass()) {
+            return false;
+        }
+        CusChatMessages other = (CusChatMessages) that;
+        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
+            && (this.getFromUserId() == null ? other.getFromUserId() == null : this.getFromUserId().equals(other.getFromUserId()))
+            && (this.getToUserId() == null ? other.getToUserId() == null : this.getToUserId().equals(other.getToUserId()))
+            && (this.getMessageType() == null ? other.getMessageType() == null : this.getMessageType().equals(other.getMessageType()))
+            && (this.getMessage() == null ? other.getMessage() == null : this.getMessage().equals(other.getMessage()))
+            && (this.getGroupType() == null ? other.getGroupType() == null : this.getGroupType().equals(other.getGroupType()))
+            && (this.getCreatedAt() == null ? other.getCreatedAt() == null : this.getCreatedAt().equals(other.getCreatedAt()));
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
+        result = prime * result + ((getFromUserId() == null) ? 0 : getFromUserId().hashCode());
+        result = prime * result + ((getToUserId() == null) ? 0 : getToUserId().hashCode());
+        result = prime * result + ((getMessageType() == null) ? 0 : getMessageType().hashCode());
+        result = prime * result + ((getMessage() == null) ? 0 : getMessage().hashCode());
+        result = prime * result + ((getGroupType() == null) ? 0 : getGroupType().hashCode());
+        result = prime * result + ((getCreatedAt() == null) ? 0 : getCreatedAt().hashCode());
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", fromUserId=").append(fromUserId);
+        sb.append(", toUserId=").append(toUserId);
+        sb.append(", messageType=").append(messageType);
+        sb.append(", message=").append(message);
+        sb.append(", groupType=").append(groupType);
+        sb.append(", createdAt=").append(createdAt);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

+ 15 - 0
src/main/java/com/ydtech/modules/customer/service/CusChatMessagesService.java

@@ -0,0 +1,15 @@
+package com.ydtech.modules.customer.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ydtech.modules.customer.entity.po.CusChatMessages;
+
+/**
+* @author Administrator
+* @description 针对表【cus_chat_messages(客服消息)】的数据库操作Service
+* @createDate 2024-09-11 17:59:16
+*/
+public interface CusChatMessagesService extends IService<CusChatMessages> {
+
+
+
+}

+ 14 - 0
src/main/java/com/ydtech/modules/customer/service/CustomerService.java

@@ -0,0 +1,14 @@
+package com.ydtech.modules.customer.service;
+
+public interface CustomerService {
+
+    /**
+     * 发送消息
+     *
+     * @param message 消息
+     * @return
+     */
+    String sendMessage(String message);
+
+
+}

+ 22 - 0
src/main/java/com/ydtech/modules/customer/service/impl/CusChatMessagesServiceImpl.java

@@ -0,0 +1,22 @@
+package com.ydtech.modules.customer.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ydtech.modules.customer.dao.CusChatMessagesMapper;
+import com.ydtech.modules.customer.entity.po.CusChatMessages;
+import com.ydtech.modules.customer.service.CusChatMessagesService;
+import org.springframework.stereotype.Service;
+
+/**
+* @author Administrator
+* @description 针对表【cus_chat_messages(客服消息)】的数据库操作Service实现
+* @createDate 2024-09-11 17:59:16
+*/
+@Service
+public class CusChatMessagesServiceImpl extends ServiceImpl<CusChatMessagesMapper, CusChatMessages>
+    implements CusChatMessagesService {
+
+}
+
+
+
+

+ 19 - 0
src/main/java/com/ydtech/modules/customer/service/impl/CustomerServiceImpl.java

@@ -0,0 +1,19 @@
+package com.ydtech.modules.customer.service.impl;
+
+import com.ydtech.modules.customer.components.CustomerComponents;
+import com.ydtech.modules.customer.service.CustomerService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+public class CustomerServiceImpl implements CustomerService {
+
+    private final CustomerComponents customerComponents;
+
+    @Override
+    public String sendMessage(String message) {
+        String s = customerComponents.sendMessage(message);
+        return s;
+    }
+}

+ 58 - 0
src/main/java/com/ydtech/modules/fee/service/FeeDisplayService.java

@@ -0,0 +1,58 @@
+package com.ydtech.modules.fee.service;
+
+
+import com.ydtech.modules.admin.model.dto.ExportExpenditureTypeDetalsDto;
+import com.ydtech.modules.admin.model.dto.ExportExpenditureTypeDetalsSZDto;
+import com.ydtech.modules.admin.model.dto.MyCollectInAdvanceDto;
+import com.ydtech.modules.ins.model.vo.QuoteRespVo;
+import com.ydtech.modules.order.entity.vo.InsOrdersEditingVo;
+import com.ydtech.modules.order.entity.vo.OrderVo;
+
+import java.util.List;
+
+public interface FeeDisplayService {
+
+    /**
+     * 设置是否可以查看费用 和 费用比例 / 10
+     *
+     * @param orderVo
+     */
+    void setUpFeePresentationFormat(OrderVo orderVo);
+
+
+    /**
+     * 设置费用显示
+     *
+     * @param insAreaCompanyEditingDtos 订单列表
+     */
+    void setUpRevise(List<InsOrdersEditingVo.InsAreaCompanyEditingDto> insAreaCompanyEditingDtos);
+
+    /**
+     * 设置报价
+     *
+     * @param quoteRespVo 报价
+     */
+    void setQuote(QuoteRespVo quoteRespVo);
+
+
+    /**
+     * 设置收支明细
+     *
+     * @param recordsNew 收支数据
+     */
+    boolean setWithdrawals(List<MyCollectInAdvanceDto> recordsNew);
+
+    /**
+     * 设置收支明细
+     *
+     * @param recordsNew 收支数据
+     */
+    boolean setWithdrawalsPc(List<ExportExpenditureTypeDetalsSZDto> recordsNew);
+
+
+    /**
+     * 查询数据
+     * @param recordsNew 收支数据
+     */
+    boolean setCarInsurance(List<ExportExpenditureTypeDetalsDto> recordsNew);
+}

+ 104 - 0
src/main/java/com/ydtech/modules/fee/service/impl/FeeDisplayServiceImpl.java

@@ -0,0 +1,104 @@
+package com.ydtech.modules.fee.service.impl;
+
+
+import com.ydtech.modules.admin.model.dto.ExportExpenditureTypeDetalsDto;
+import com.ydtech.modules.admin.model.dto.ExportExpenditureTypeDetalsSZDto;
+import com.ydtech.modules.admin.model.dto.FeeLookSwitchesDTO;
+import com.ydtech.modules.admin.model.dto.MyCollectInAdvanceDto;
+import com.ydtech.modules.admin.service.SysSwitchConfigService;
+import com.ydtech.modules.fee.service.FeeDisplayService;
+import com.ydtech.modules.ins.model.vo.QuoteRespVo;
+import com.ydtech.modules.order.entity.vo.FeeOrderNewVo;
+import com.ydtech.modules.order.entity.vo.InsOrdersEditingVo;
+import com.ydtech.modules.order.entity.vo.OrderVo;
+import com.ydtech.utils.BigDecimalUtils;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Service
+@RequiredArgsConstructor
+public class FeeDisplayServiceImpl implements FeeDisplayService {
+
+    private final SysSwitchConfigService sysSwitchConfigService;
+
+    @Override
+    public void setUpFeePresentationFormat(OrderVo orderVo) {
+        FeeLookSwitchesDTO feeLookSwitchesDTO = sysSwitchConfigService.feeLookSwitches();
+        FeeOrderNewVo feeOrderNewVo = orderVo.getFeeOrderNewVo();
+        if (feeLookSwitchesDTO.getFeeDisplay()) {
+            List<FeeOrderNewVo.ExportFee> exportFee = feeOrderNewVo.getExportFee();
+            exportFee.forEach(FeeOrderNewVo.ExportFee::feeVacant);
+        } else if (feeLookSwitchesDTO.getFeeView()) {
+            List<FeeOrderNewVo.ExportFee> exportFee = feeOrderNewVo.getExportFee();
+            exportFee.forEach(FeeOrderNewVo.ExportFee::feeDivideBy10);
+        }
+        orderVo.setFeeDisplay(feeLookSwitchesDTO.getFeeDisplay());
+        orderVo.setFeeView(feeLookSwitchesDTO.getFeeView());
+
+    }
+
+    @Override
+    public void setUpRevise(List<InsOrdersEditingVo.InsAreaCompanyEditingDto> insAreaCompanyEditingDtos) {
+        FeeLookSwitchesDTO feeLookSwitchesDTO = sysSwitchConfigService.feeLookSwitches();
+        if (feeLookSwitchesDTO.getFeeDisplay()) {
+            insAreaCompanyEditingDtos.forEach(InsOrdersEditingVo.InsAreaCompanyEditingDto::feeVacant);
+        } else if (feeLookSwitchesDTO.getFeeView()) {
+            insAreaCompanyEditingDtos.forEach(InsOrdersEditingVo.InsAreaCompanyEditingDto::feeDivideBy10);
+        }
+        insAreaCompanyEditingDtos.forEach(x -> {
+            x.setFeeDisplay(feeLookSwitchesDTO.getFeeDisplay());
+            x.setFeeView(feeLookSwitchesDTO.getFeeView());
+        });
+    }
+
+    @Override
+    public void setQuote(QuoteRespVo quoteRespVo) {
+        FeeLookSwitchesDTO feeLookSwitchesDTO = sysSwitchConfigService.feeLookSwitches();
+        if (feeLookSwitchesDTO.getFeeDisplay()) {
+            quoteRespVo.feeVacant();
+        } else if (feeLookSwitchesDTO.getFeeView()) {
+            quoteRespVo.feeDivideBy10();
+        }
+
+        quoteRespVo.setFeeDisplay(feeLookSwitchesDTO.getFeeDisplay());
+        quoteRespVo.setFeeView(feeLookSwitchesDTO.getFeeView());
+
+    }
+
+    @Override
+    public boolean setWithdrawals(List<MyCollectInAdvanceDto> recordsNew) {
+        boolean b = sysSwitchConfigService.feeDisplaySwitches();
+        if (b) {
+            recordsNew.forEach(x -> {
+                x.setAmount(BigDecimalUtils.nullToZero(x.getAmount()).divide(new BigDecimal(10)));
+            });
+        }
+        return b;
+    }
+
+
+    @Override
+    public boolean setWithdrawalsPc(List<ExportExpenditureTypeDetalsSZDto> recordsNew) {
+        boolean b = sysSwitchConfigService.feeDisplaySwitches();
+        if (b) {
+            recordsNew.forEach(x -> {
+                x.setAmount(BigDecimalUtils.nullToZero(x.getAmount()).divide(new BigDecimal(10)));
+            });
+        }
+        return b;
+    }
+
+    @Override
+    public boolean setCarInsurance(List<ExportExpenditureTypeDetalsDto> recordsNew) {
+        boolean b = sysSwitchConfigService.feeDisplaySwitches();
+        if (b) {
+            recordsNew.forEach(x -> {
+                x.setAmount(BigDecimalUtils.nullToZero(x.getAmount()).divide(new BigDecimal(10)));
+            });
+        }
+        return b;
+    }
+}

+ 21 - 0
src/main/java/com/ydtech/modules/ins/model/vo/QuoteRespVo.java

@@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.ydtech.modules.order.entity.TaxArrears;
 import com.ydtech.modules.order.entity.crawler.response.CrawlerQuoteResponse;
 import com.ydtech.modules.order.entity.vo.CoreModelsVo;
+import com.ydtech.utils.BigDecimalUtils;
 import com.ydtech.utils.StringUtils;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -178,6 +179,12 @@ public class QuoteRespVo {
     @ApiModelProperty("自主定价系数")
     private String pricingCoefficient;
 
+    @ApiModelProperty("费用查看")
+    private Boolean feeView;
+
+    @ApiModelProperty("费用显示")
+    private Boolean feeDisplay;
+
     public void setJqClaims(String jqClaims) {
         this.jqClaims = StringUtils.isEmpty(jqClaims) ? null : jqClaims;
     }
@@ -210,8 +217,22 @@ public class QuoteRespVo {
             this.opinion = predictInfoDTO.getOpinion();
         }
 
+    }
+
+    public void feeVacant(){
+        this.jqExportFee = null;
+        this.syExportFee = null;
+        this.noExportFee = null;
+        this.sumExportFee = null;
+    }
 
+    public void feeDivideBy10(){
+        this.jqExportFee = BigDecimalUtils.nullToZero(this.jqExportFee).divide(new BigDecimal(10));
+        this.syExportFee = BigDecimalUtils.nullToZero(this.syExportFee).divide(new BigDecimal(10));
+        this.noExportFee = BigDecimalUtils.nullToZero(this.noExportFee).divide(new BigDecimal(10));
+        this.sumExportFee = BigDecimalUtils.nullToZero(this.sumExportFee).divide(new BigDecimal(10));
     }
 
 
+
 }

+ 6 - 5
src/main/java/com/ydtech/modules/order/aop/aspect/QuoteVerificationAspect.java

@@ -3,7 +3,6 @@ package com.ydtech.modules.order.aop.aspect;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ydtech.constants.enums.InsuranceRisk;
-import com.ydtech.constants.enums.dict.InsOrderStatusEnum;
 import com.ydtech.constants.enums.dict.agreement.ProductsType;
 import com.ydtech.constants.sys.SystemConstant;
 import com.ydtech.core.page.HttpResult;
@@ -15,6 +14,7 @@ import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.esm.model.EsmInsCompany;
 import com.ydtech.modules.esm.service.EsmInsCompanyService;
 import com.ydtech.modules.fee.service.CostsCalcService;
+import com.ydtech.modules.fee.service.FeeDisplayService;
 import com.ydtech.modules.fee.service.FeeRuleSchemeNewService;
 import com.ydtech.modules.ins.model.vo.KindInfoVo;
 import com.ydtech.modules.ins.model.vo.QuoteRespVo;
@@ -35,7 +35,6 @@ import com.ydtech.modules.protocol.constants.TaxSourceStatusConstants;
 import com.ydtech.modules.protocol.dao.PtlTaxSourceNewMapper;
 import com.ydtech.modules.protocol.entity.dto.TaxSourceExcludeDto;
 import com.ydtech.modules.protocol.entity.po.PtlAgreement;
-import com.ydtech.modules.protocol.entity.po.PtlAgreementDept;
 import com.ydtech.modules.protocol.entity.po.PtlTaxSourceNew;
 import com.ydtech.modules.protocol.service.ITaxSourceExcludeService;
 import com.ydtech.modules.protocol.service.PtlAgreementDeptService;
@@ -89,21 +88,20 @@ public class QuoteVerificationAspect {
 
     private final InsFeeOrderNewService insFeeOrderNewService;
 
-
     private final SysUserService sysUserService;
 
     private final PtlTaxSourceNewService ptlTaxSourceNewService;
 
-
     private final ITaxSourceExcludeService taxSourceExcludeService;
 
-
     private final PtlTaxSourceNewMapper ptlTaxSourceNewMapper;
 
     private final PtlAgreementService ptlAgreementService;
 
     private final InsAreaCompanyErrorService insAreaCompanyErrorService;
 
+    private final FeeDisplayService feeDisplayService;
+
     @AfterReturning(pointcut = "@annotation(com.ydtech.modules.order.aop.QuoteVerification)", returning = "result")
     public void doAfter(HttpResult<QuoteRespVo> result) {
         //计算费用因子
@@ -132,7 +130,10 @@ public class QuoteVerificationAspect {
                         result.getData().setSumExportFee(subOrderExportFeeVo.getJqExportCosts()
                                 .add(subOrderExportFeeVo.getSyExportCosts())
                                 .add(subOrderExportFeeVo.getNoExportCosts()));
+                    }else {
+                        feeDisplayService.setQuote(result.getData());
                     }
+
                 }else{
                     //输出费用匹配失败日志
                     result.getData().setFeeNoDescription(logs.toString());

+ 24 - 0
src/main/java/com/ydtech/modules/order/entity/crawler/request/CrawlerCustomerRequest.java

@@ -0,0 +1,24 @@
+package com.ydtech.modules.order.entity.crawler.request;
+
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class CrawlerCustomerRequest implements Serializable {
+
+    private static final long serialVersionUID = -3877747852543263512L;
+
+    /**
+     * 消息
+     */
+    @JsonProperty(value = "question")
+    private String question;
+
+}

+ 24 - 2
src/main/java/com/ydtech/modules/order/entity/vo/FeeOrderNewVo.java

@@ -1,6 +1,7 @@
 package com.ydtech.modules.order.entity.vo;
 
 
+import com.ydtech.utils.BigDecimalUtils;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -88,6 +89,27 @@ public class FeeOrderNewVo implements Serializable {
         @ApiModelProperty("外部金额")
         private BigDecimal externalPremiums;
 
+        public void feeVacant() {
+            this.totalProportion = null;
+            this.totalAmount = null;
+            this.superviseCosts = null;
+            this.superviseCostsPremiums = null;
+            this.otherCostsProportion = null;
+            this.otherCostsPremiums = null;
+            this.externalProportion = null;
+            this.externalPremiums = null;
+        }
+
+        public void feeDivideBy10() {
+            this.totalProportion = BigDecimalUtils.nullToZero(this.totalProportion).divide(new BigDecimal(10));
+            this.totalAmount = BigDecimalUtils.nullToZero(this.totalAmount).divide(new BigDecimal(10));
+            this.superviseCosts = BigDecimalUtils.nullToZero(this.superviseCosts).divide(new BigDecimal(10));
+            this.superviseCostsPremiums = BigDecimalUtils.nullToZero(this.superviseCostsPremiums).divide(new BigDecimal(10));
+            this.otherCostsProportion = BigDecimalUtils.nullToZero(this.otherCostsProportion).divide(new BigDecimal(10));
+            this.otherCostsPremiums = BigDecimalUtils.nullToZero(this.otherCostsPremiums).divide(new BigDecimal(10));
+            this.externalProportion = BigDecimalUtils.nullToZero(this.externalProportion).divide(new BigDecimal(10));
+            this.externalPremiums = BigDecimalUtils.nullToZero(this.externalPremiums).divide(new BigDecimal(10));
+        }
 
     }
 
@@ -129,7 +151,7 @@ public class FeeOrderNewVo implements Serializable {
 
     @ApiModel(description = "分销费用")
     @Data
-    public static class RetailFee{
+    public static class RetailFee {
         @ApiModelProperty("险种")
         private String insuranceType;
 
@@ -157,7 +179,7 @@ public class FeeOrderNewVo implements Serializable {
         @ApiModelProperty("总分销金额")
         private BigDecimal totalRetailPremiums;
 
-        public RetailFee(){
+        public RetailFee() {
             jqRetailProportion = new BigDecimal(0);
             jqRetailPremiums = new BigDecimal(0);
             syRetailProportion = new BigDecimal(0);

+ 29 - 8
src/main/java/com/ydtech/modules/order/entity/vo/InsOrdersEditingVo.java

@@ -10,10 +10,14 @@ import com.ydtech.modules.ins.model.vo.QuoteRiskRespVo;
 import com.ydtech.modules.order.entity.InsOrders;
 import com.ydtech.modules.order.entity.TaxArrears;
 import com.ydtech.modules.order.entity.dto.InsAreaCompanyQueryDto;
+import com.ydtech.utils.BigDecimalUtils;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import org.apache.commons.lang3.ObjectUtils;
 
+import javax.persistence.NamedQueries;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
@@ -79,13 +83,17 @@ public class InsOrdersEditingVo extends InsOrders implements Serializable {
     private LocalDateTime signDate;
 
     @Data
+    @AllArgsConstructor
+    @NoArgsConstructor
     public static class InsAreaCompanyEditingDto implements Serializable {
 
-        public InsAreaCompanyEditingDto(){
+        private static final long serialVersionUID = 5819731807013343817L;
 
-        }
+        @ApiModelProperty("费用查看")
+        private Boolean feeView;
 
-        private static final long serialVersionUID = 5819731807013343817L;
+        @ApiModelProperty("费用显示")
+        private Boolean feeDisplay;
 
         @ApiModelProperty("编辑状态")
         private boolean editStatus = true;
@@ -213,6 +221,19 @@ public class InsOrdersEditingVo extends InsOrders implements Serializable {
         @ApiModelProperty("总共出口费用")
         private BigDecimal sumExportFee;
 
+        public void feeVacant() {
+            this.jqExportFee = null;
+            this.syExportFee = null;
+            this.noExportFee = null;
+            this.sumExportFee = null;
+        }
+
+        public void feeDivideBy10() {
+            this.jqExportFee = BigDecimalUtils.nullToZero(this.jqExportFee).divide(new BigDecimal(10));
+            this.syExportFee = BigDecimalUtils.nullToZero(this.syExportFee).divide(new BigDecimal(10));
+            this.noExportFee = BigDecimalUtils.nullToZero(this.noExportFee).divide(new BigDecimal(10));
+            this.sumExportFee = BigDecimalUtils.nullToZero(this.sumExportFee).divide(new BigDecimal(10));
+        }
 
         public InsAreaCompanyEditingDto(InsAreaCompanyQueryDto insAreaCompany) {
             this.orderno = insAreaCompany.getOrderno();
@@ -221,11 +242,11 @@ public class InsOrdersEditingVo extends InsOrders implements Serializable {
             this.inscompany = insAreaCompany.getInscompany();
             this.kindList = ObjectUtils.isEmpty(insAreaCompany.getKindinfo()) ? new ArrayList<>() :
                     insAreaCompany.getKindinfo().toJavaList(QuoteKindRespVo.class);
-            this.jqPremium = ObjectUtils.isEmpty(insAreaCompany.getJqpremium()) ? 0.0 :insAreaCompany.getJqpremium().doubleValue();
-            this.syPremium = ObjectUtils.isEmpty(insAreaCompany.getSypremium()) ? 0.0 :insAreaCompany.getSypremium().doubleValue();
-            this.jyPremium = ObjectUtils.isEmpty(insAreaCompany.getJypremium()) ? 0.0 :insAreaCompany.getJypremium().doubleValue();
-            this.taxAmount = ObjectUtils.isEmpty(insAreaCompany.getTaxamount()) ? 0.0 :insAreaCompany.getTaxamount().doubleValue();
-            this.sumPermium = ObjectUtils.isEmpty(insAreaCompany.getSumpremium()) ? 0.0 :insAreaCompany.getSumpremium().doubleValue();
+            this.jqPremium = ObjectUtils.isEmpty(insAreaCompany.getJqpremium()) ? 0.0 : insAreaCompany.getJqpremium().doubleValue();
+            this.syPremium = ObjectUtils.isEmpty(insAreaCompany.getSypremium()) ? 0.0 : insAreaCompany.getSypremium().doubleValue();
+            this.jyPremium = ObjectUtils.isEmpty(insAreaCompany.getJypremium()) ? 0.0 : insAreaCompany.getJypremium().doubleValue();
+            this.taxAmount = ObjectUtils.isEmpty(insAreaCompany.getTaxamount()) ? 0.0 : insAreaCompany.getTaxamount().doubleValue();
+            this.sumPermium = ObjectUtils.isEmpty(insAreaCompany.getSumpremium()) ? 0.0 : insAreaCompany.getSumpremium().doubleValue();
             this.startDateJq = insAreaCompany.getJqStartDate();
             this.endDateJq = insAreaCompany.getJqEndDate();
             this.startDateSy = insAreaCompany.getSyStartDate();

+ 8 - 2
src/main/java/com/ydtech/modules/order/entity/vo/OrderVo.java

@@ -383,7 +383,7 @@ public class OrderVo implements Serializable {
     /**
      * 分销明细
      */
-    private List<DistributionLevelVo>  distributionLevelVoList;
+    private List<DistributionLevelVo> distributionLevelVoList;
 
     /**
      * 紫金能源车(鼎然-车辆风险评分  add by hxl 2024-04-09
@@ -492,7 +492,7 @@ public class OrderVo implements Serializable {
     /**
      * 交强险种信息
      */
-    @TableField(exist = false,typeHandler = FastjsonTypeHandler.class)
+    @TableField(exist = false, typeHandler = FastjsonTypeHandler.class)
     private JSONArray jqInsuranceType;
 
     @ApiModelProperty(value = "api类型")
@@ -507,4 +507,10 @@ public class OrderVo implements Serializable {
     @ApiModelProperty(value = "核保原因")
     private String underwritingReason;
 
+    @ApiModelProperty("费用查看")
+    private Boolean feeView;
+
+    @ApiModelProperty("费用显示")
+    private Boolean feeDisplay;
+
 }

+ 15 - 3
src/main/java/com/ydtech/modules/order/service/impl/InsOrdersServiceImpl.java

@@ -33,6 +33,8 @@ import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.esm.model.EsmUserReferrer;
 import com.ydtech.modules.esm.service.EsmUserReferrerService;
 import com.ydtech.modules.fee.service.CostsCalcService;
+import com.ydtech.modules.fee.service.FeeDisplayService;
+import com.ydtech.modules.fee.service.impl.FeeDisplayServiceImpl;
 import com.ydtech.modules.fee.service.impl.FeeRuleSchemeServiceImpl;
 import com.ydtech.modules.fnc.entity.InsFeeAudit;
 import com.ydtech.modules.fnc.service.InsFeeAuditService;
@@ -131,6 +133,8 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
 
     private final InsOrdersUnderwritingReasonService insOrdersUnderwritingReasonService;
 
+    private final FeeDisplayService feeDisplayService;
+
     @Autowired
     private SysUserInfoService sysUserInfoService;
 
@@ -178,7 +182,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
                                 PtlAgreementService ptlAgreementService,
                                 @Lazy FeeRuleSchemeServiceImpl feeRuleSchemeService,
                                 @Lazy InsFeeAuditService insFeeAuditService, InsOrdersTrackService insOrdersTrackService,
-                                InsOrdersUnderwritingReasonService insOrdersUnderwritingReasonService) {
+                                InsOrdersUnderwritingReasonService insOrdersUnderwritingReasonService, FeeDisplayService feeDisplayService) {
 
         this.orderComponents = orderComponents;
         this.sysUserService = sysUserService;
@@ -192,6 +196,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         this.insFeeAuditService = insFeeAuditService;
         this.insOrdersTrackService = insOrdersTrackService;
         this.insOrdersUnderwritingReasonService = insOrdersUnderwritingReasonService;
+        this.feeDisplayService = feeDisplayService;
     }
 
 
@@ -741,6 +746,8 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
 
         String insOrdersUnderwritingReason = insOrdersUnderwritingReasonService.getInsOrdersUnderwritingReason(orderAndAreaCompany.getCompanyId(), orderAndAreaCompany.getOrderstatus());
         orderAndAreaCompany.setUnderwritingReason(insOrdersUnderwritingReason);
+        // 置空数据 数据除以10
+        feeDisplayService.setUpFeePresentationFormat(orderAndAreaCompany);
         return HttpResult.ok("success", orderAndAreaCompany);
     }
 
@@ -874,10 +881,10 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             });
 
         });
-        if (insAreaCompanyEditingDtos != null && insAreaCompanyEditingDtos.size() > 0) {
+        if (!insAreaCompanyEditingDtos.isEmpty()) {
             //根据出单员判断  编辑查看
             //add  by  hxl   添加出单员不能查看优惠的限制    2024-07-16
-            String userId = new BaseController().getUserId();
+            String userId = BaseController.getUserId();
             SysUserRole sysUserRole = sysUserRoleService.selectByUserId(userId);
             if (sysUserRole != null && sysUserRole.getRoleId() == 19) {
                 insAreaCompanyEditingDtos.forEach(item -> {
@@ -887,8 +894,13 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
                             item.setSumExportFee(null);
                         }
                 );
+            }else {
+                feeDisplayService.setUpRevise(insAreaCompanyEditingDtos);
             }
+
         }
+
+
         insOrdersEditingVo.setInsAreaCompanyEditingDtos(insAreaCompanyEditingDtos);
         return insOrdersEditingVo;
     }

+ 7 - 0
src/main/resources/application-pre.yml

@@ -374,6 +374,7 @@ xxl:
       #logpath: /data/logs/mls/job
       # 执行器日志文件保存天数 [选填] : 过期日志自动清理, 限制值大于等于3时生效; 否则, 如-1, 关闭自动清理功能;
       logretentiondays: 7
+
 #接口反爬虫配置
 anti:
   reptile:
@@ -393,3 +394,9 @@ anti:
   redis:
     redisson:
       file: classpath:redisson-pre.yml
+
+
+### AI
+customer:
+  api:
+    url: http://47.92.254.66:8088/ai

+ 7 - 1
src/main/resources/application-prod.yml

@@ -394,4 +394,10 @@ anti:
       file: classpath:redisson-prod.yml
 
 python:
-  check: zs
+  check: zs
+
+
+### AI
+customer:
+  api:
+    url: http://47.92.254.66:8088/ai

+ 7 - 1
src/main/resources/application-test.yml

@@ -475,4 +475,10 @@ anti:
       file: classpath:redisson-test.yml
 
 python:
-  check: ceshi
+  check: ceshi
+
+
+### AI
+customer:
+  api:
+    url: http://47.92.254.66:8088/ai

+ 23 - 0
src/main/resources/mapper/modules/customer/CusChatMessagesMapper.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ydtech.modules.customer.dao.CusChatMessagesMapper">
+
+    <resultMap id="BaseResultMap" type="com.ydtech.modules.customer.entity.po.CusChatMessages">
+            <id property="id" column="id" jdbcType="BIGINT"/>
+            <result property="fromUserId" column="from_user_id" jdbcType="VARCHAR"/>
+            <result property="toUserId" column="to_user_id" jdbcType="VARCHAR"/>
+            <result property="messageType" column="message_type" jdbcType="TINYINT"/>
+            <result property="message" column="message" jdbcType="VARCHAR"/>
+            <result property="groupType" column="group_type" jdbcType="TINYINT"/>
+            <result property="createdAt" column="created_at" jdbcType="TIMESTAMP"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,from_user_id,to_user_id,
+        message_type,message,group_type,
+        created_at
+    </sql>
+
+</mapper>

Some files were not shown because too many files changed in this diff