提现及菜单的调整

commons/src/main/java/com/jzg/commons/entity/dto/InsFeeOrdersParam.java

@@ -1,5 +1,6 @@
 package com.jzg.commons.entity.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -19,9 +20,11 @@ public class InsFeeOrdersParam {
     private String distributorId;
 
     @Schema(description = "时间筛选开始")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createTimeStart;
 
     @Schema(description = "时间筛选结束")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createTimeEnd;
 
 }

commons/src/main/java/com/jzg/commons/entity/po/SysRolePerms.java

@@ -23,4 +23,10 @@ public class SysRolePerms {
     @Schema(description = "权限标识")
     @TableField(value = "perms")
     private String perms;
+
+    @TableField(exist = false)
+    private String type;
+
+    @TableField(value = "half_checked")
+    private String halfChecked;
 }

commons/src/main/java/com/jzg/commons/entity/vo/SysRoleVo.java

@@ -1,5 +1,6 @@
 package com.jzg.commons.entity.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.jzg.commons.aop.LogDescriptionField;
 import com.jzg.commons.core.base.PageRequest;
 import com.jzg.commons.entity.po.SysRole;
@@ -56,6 +57,10 @@ public class SysRoleVo extends PageRequest {
         private String id;
 
         private String auth;
+
+        private String type;
+
+        private String halfChecked;
     }
 
     public SysRole getSysRole(){
@@ -85,6 +90,8 @@ public class SysRoleVo extends PageRequest {
             PermsVo vo = new PermsVo();
             vo.id = item.getPermsId();
             vo.auth = item.getPerms();
+            vo.type = item.getType();
+            vo.halfChecked = item.getHalfChecked();
             this.perms.add(vo);
         });
     }

platform/src/main/java/com/jzg/service/impl/UserRoleServiceImpl.java

@@ -151,6 +151,7 @@ public class UserRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> imp
             perms.setRoleId(sysRole.getId());
             perms.setPermsId(item.getId());
             perms.setPerms(item.getAuth());
+            perms.setHalfChecked(item.getHalfChecked());
             sysRolePermsList.add(perms);
         });
         baseMapper.updateById(sysRole);

platform/src/main/resources/mapper/SysRolePermsMapper.xml

@@ -16,7 +16,9 @@
         SELECT
             srp.id AS role_id,
             sm.id AS perms_id,
-            sm.perms
+            sm.perms,
+            sm.type,
+            srp.half_checked
         FROM
             sys_menu sm
                 LEFT JOIN sys_role_perms srp ON srp.perms_id = sm.id

pom.xml

@@ -13,7 +13,6 @@
     <module>tenant</module>
     <module>rocketmq</module>
     <module>consoleStatistics</module>
-      <module>tenant/insurance/quotation-renbao</module>
     <module>partner</module>
   </modules>
   <packaging>pom</packaging>

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/controller/InsFeeOrderController.java

@@ -1,5 +1,6 @@
 package com.jzg.quotation.summary.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.jzg.commons.entity.dto.InsFeeOrdersParam;
 import com.jzg.commons.entity.po.InsFeeOrders;
 import com.jzg.quotation.summary.service.InsFeeOrdersService;
@@ -8,6 +9,8 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.List;
 
 /**
@@ -34,8 +37,9 @@ public class InsFeeOrderController {
 
     @PostMapping("/getInsFeeOrderByUserId")
     @Operation(summary = "订单费用列表通过用户id查询")
-    public List<InsFeeOrders> getInsFeeOrderByUserId(@RequestBody InsFeeOrdersParam param){
-        return insFeeOrdersService.getInsFeeOrderListByUserId(param);
+    public List<InsFeeOrders> getInsFeeOrderByUserId(@RequestBody JSONObject param){
+        InsFeeOrdersParam insFeeOrdersParam = param.toJavaObject(InsFeeOrdersParam.class);
+        return insFeeOrdersService.getInsFeeOrderListByUserId(insFeeOrdersParam);
     }
 
     @GetMapping("/getInsFeeOrderListByTopReferrerIdAndUserId")

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysUserJzgAppServiceImpl.java

@@ -91,8 +91,10 @@ public class SysUserJzgAppServiceImpl extends ServiceImpl<SysUserJzgAppMapper, S
                 .eq(SysUserJzgInfo::getIsDelete, 0)
                 .eq(SysUserJzgInfo::getIsEnable, 0);
         List<SysUserJzgInfo> infos = sysUserJzgInfoService.list(queryWrapper);
-        List<String> typeAttrs = infos.stream().map(SysUserJzgInfo::getTypeAttr).collect(Collectors.toList());
-        infoVo.setTypeNames(typeAttrs);
+        if(infos.size() > 0 && infos.get(0) != null) {
+            List<String> typeAttrs = infos.stream().map(SysUserJzgInfo::getTypeAttr).collect(Collectors.toList());
+            infoVo.setTypeNames(typeAttrs);
+        }
         SysUserJzgInfo sysUserJzgInfo = sysUserJzgInfoService.getOne(new LambdaQueryWrapper<SysUserJzgInfo>()
                 .eq(SysUserJzgInfo::getUserId, infoVo.getUserId()).eq(SysUserJzgInfo::getSystemCode, baseController.getAppSystemCode()));
         infoVo.setInfoId(sysUserJzgInfo.getId());

tenant/organization/src/main/resources/mapper/SysUserJzgInfoBankCardMapper.xml

@@ -42,8 +42,8 @@
         ss.sys_name as systemName
         from
         sys_user_jzg_info_bank_card sujibc
-        left join sys_user su on su.id = sujibc.user_info_id
-        left join sys_user_jzg_info suji on suji.user_id = su.id
+        LEFT JOIN sys_user_jzg_info suji ON suji.id = sujibc.user_info_id
+        LEFT JOIN sys_user su ON su.id = suji.user_id
         left join sys_system ss on ss.sys_code = sujibc.system_code
         where
         1=1