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

lidongdong

2022-11-10 38596b03540250dd7de85c49f53ece5dd6bfe5b7

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

 flower_city/src/main/java/com/dg/core/api/ElseAccessoryAppletsController.java

@@ -48,7 +48,7 @@
        {
            return getDataTable("您没有权限查看该数据");
        }
        List<ElseAccessoryEntity> list = iElseAccessoryService.selectConfigList(Name,ids);
        List<ElseAccessoryEntity> list = iElseAccessoryService.selectConfigList(Name,ids,sysUser.getUserId());
        int num=iElseAccessoryService.countNum(Name,ids);
        return getDataTable(list,num);
    }

 flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java

@@ -86,7 +86,8 @@
    @GetMapping("/orderdata")
    @Authorization
    public ResultData selectConfigData(@RequestParam(value = "Id",required = false) String Id,
                                       @RequestParam(value = "orderNum",required = false)  String orderNum)
                                       @RequestParam(value = "orderNum",required = false)  String orderNum,
                                       @CurrentUser SysUser sysUser)
    {
        if(StringUtils.isEmpty(Id) && StringUtils.isEmpty(orderNum))
        {
@@ -94,7 +95,7 @@
        }

        GuideRepairOrder order=iGuideRepairOrderService.selectConfigData(Id,orderNum);
        order.setGuideEvolveEntities(iGuideEvolveService.selectConfigList(Id));
        order.setGuideEvolveEntities(iGuideEvolveService.selectConfigList(Id,sysUser));

        return ResultData.success(order);
    }
@@ -336,7 +337,7 @@
        {
            userId=sysUser.getUserId()+"";
        }
        List<GuideRepairOrder> list = iGuideRepairOrderService.selectConfigList(null,ids,status,userId);
        List<GuideRepairOrder> list = iGuideRepairOrderService.selectConfigList(null,ids,status,userId,null,null,null);
        int num=iGuideRepairOrderService.countConfigList(null,ids,status,userId);
        return getDataTable(list,num);
    }

 flower_city/src/main/java/com/dg/core/api/ReplyTemplateAppletsController.java

@@ -50,7 +50,7 @@
        {
            return getDataTable("您没有权限查看该数据");
        }
        List<ReplyTemplateEntity> list = iReplyTemplateService.selectConfigList(pageParam,pageSize,Name,ids);
        List<ReplyTemplateEntity> list = iReplyTemplateService.selectConfigList(pageParam,pageSize,Name,ids,null);
        int num=iReplyTemplateService.countNum(Name,ids);
        return getDataTable(list,num);
    }

 flower_city/src/main/java/com/dg/core/controller/ElseAccessoryController.java

@@ -47,7 +47,12 @@
    {
        Page<ElseAccessoryEntity> pageParam = new Page<>(pageNum,pageSize);
        List<String> ids= PermissionUtil.getPermission(sysUser,iOrganizationChartService);
        List<ElseAccessoryEntity> list = iElseAccessoryService.selectConfigList(pageParam,pageSize,name,ids);
        List<ElseAccessoryEntity> list;
        if (sysUser.getUserType().equals("2")){
         list = iElseAccessoryService.selectConfigList(pageParam,pageSize,name,ids,sysUser.getUserId());}
        else {
            list = iElseAccessoryService.selectConfigList(pageParam,pageSize,name,ids,null);
        }
        int num=iElseAccessoryService.countNum(name,ids);
        return getDataTable(list,num);
    }
@@ -64,7 +69,7 @@
                                             @CurrentUser SysUser sysUser)
    {
        List<String> ids= PermissionUtil.getPermission(sysUser,iOrganizationChartService);
        List<ElseAccessoryEntity> list = iElseAccessoryService.selectConfigList(Name,ids);
        List<ElseAccessoryEntity> list = iElseAccessoryService.selectConfigList(Name,ids,sysUser.getUserId());
        int num=iElseAccessoryService.countNum(Name,ids);
        return getDataTable(list,num);
    }
@@ -78,7 +83,7 @@
    @ApiOperation("新增附件")
    @PostMapping(path = "/add")
    @Authorization
    public ResultData insertConfig(@RequestBody ElseAccessoryEntity entity)
    public ResultData insertConfig(@RequestBody ElseAccessoryEntity entity,@CurrentUser SysUser sysUser)
    {
        if(entity==null)
        {
@@ -99,7 +104,7 @@
        {
            return ResultData.error("部门不能为空");
        }

        entity.setCreateUserId(sysUser.getUserId());
        return toAjax(iElseAccessoryService.insertConfig(entity));
    }


 flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java

@@ -87,7 +87,8 @@
    @GetMapping("/orderdata")
    @Authorization
    public ResultData selectConfigData(@RequestParam(value = "Id",required = false) String Id,
                                       @RequestParam(value = "orderNum",required = false)  String orderNum)
                                       @RequestParam(value = "orderNum",required = false)  String orderNum,
                                       @CurrentUser SysUser sysUser)
    {
        if(StringUtils.isEmpty(Id) && StringUtils.isEmpty(orderNum))
        {
@@ -95,7 +96,7 @@
        }

        GuideRepairOrder order=iGuideRepairOrderService.selectConfigData(Id,orderNum);
        order.setGuideEvolveEntities(iGuideEvolveService.selectConfigList(Id));
        order.setGuideEvolveEntities(iGuideEvolveService.selectConfigList(Id,sysUser));

        return ResultData.success(order);
    }
@@ -373,6 +374,9 @@
                                          @RequestParam(value = "pageSize",required = false) Integer pageSize,
                                          @RequestParam(value = "matterName",required = false) String matterName,
                                          @RequestParam(value = "status",required = false) String status,
                                          @RequestParam(value = "createTimeStartTime",required = false) String createTimeStartTime,
                                          @RequestParam(value = "createTimeTimeEndTime",required = false) String createTimeTimeEndTime,
                                          @RequestParam(value = "classifyId",required = false)String  classifyId,
                                          @CurrentUser SysUser sysUser)
    {
        Assert.notNull(pageNum, "pageNum 不能为空");
@@ -402,7 +406,7 @@
        }

        List<GuideRepairOrder> list = iGuideRepairOrderService.selectConfigList(pageParam,pageSize,
                matterName,ids,status,userId);
                matterName,ids,status,userId,createTimeStartTime,createTimeTimeEndTime,classifyId);
        int num=iGuideRepairOrderService.countConfigList(matterName,ids,status,userId);
        return getDataTable(list,num);
    }

 flower_city/src/main/java/com/dg/core/controller/ReplyTemplateController.java

@@ -45,7 +45,12 @@
    {
        Page<ReplyTemplateEntity> pageParam = new Page<>(pageNum,pageSize);
        List<String> ids=PermissionUtil.getPermission(sysUser,iOrganizationChartService);
        List<ReplyTemplateEntity> list = iReplyTemplateService.selectConfigList(pageParam,pageSize,Name,ids);
        List<ReplyTemplateEntity> list;
        if (sysUser.getUserType().equals("2")){
              list = iReplyTemplateService.selectConfigList(pageParam,pageSize,Name,ids,sysUser.getUserId());}
        else {
            list = iReplyTemplateService.selectConfigList(pageParam,pageSize,Name,ids,null);
        }
        int num=iReplyTemplateService.countNum(Name,ids);
        return getDataTable(list,num);
    }

 flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java

@@ -303,11 +303,15 @@
    {
        boolean a = false;
        String fileName = file.getOriginalFilename();
        boolean b = iTransactionEventService.batchImport(fileName, file);
        if (b){
            return  ResultData.success("导入成功");
         Integer b = iTransactionEventService.batchImport(fileName, file);
        if (b == 3) {//
            return ResultData.success("全部导入成功");//全部导入成功
        } else if (b == 2) {
            return ResultData.success("部分导入成功");//部分导入成功
        } else if (b == 0) {
            return ResultData.error("部分失败");//导入失败
        }
        return   ResultData.error("导入失败");
        return ResultData.error("部分失败");//导入失败
    }



 flower_city/src/main/java/com/dg/core/controller/UserController.java

@@ -390,6 +390,20 @@
    }


    /**
     * 获取登录人员信息
     *
     * @return 结果
     */
    @ApiOperation("获取登录人员信息")
    @PostMapping("/getLoginInformation")
    @Authorization
    public ResultData getLoginInformation(@CurrentUser SysUser sysUse)
    {
      return  ResultData.success(sysUse);
    }






 flower_city/src/main/java/com/dg/core/db/gen/entity/ElseAccessoryEntity.java

@@ -66,4 +66,19 @@
    @ApiModelProperty(name = "url", value = "文件地址")
    private String url;

    /**
     * 创建人id
     */
    @ApiModelProperty(name = "id", value = "创建人id")
    private String createUserId;

    /**
     * 是否能删除修改
     */
    @TableField(exist = false)
    @ApiModelProperty(name = "isDelete", value = "是否能删除修改")
    private Integer isDelete;



}

 flower_city/src/main/java/com/dg/core/db/gen/entity/ReplyTemplateEntity.java

@@ -147,4 +147,12 @@
    @ApiModelProperty("推荐办事指南列表")
    private List<TransactionEvent> transactionEventList;


    /**
     * 是否能够删除修改
     */
    @TableField(exist = false)
    @ApiModelProperty("是否能够删除修改")
    private Integer isDelete;

}

 flower_city/src/main/java/com/dg/core/db/gen/entity/SysUser.java

@@ -60,7 +60,7 @@
    /**
     * 用户类型（1系统后台用户     2导办人员用户）
     */
    @ApiModelProperty("用户类型（1系统后台用户     2导办人员用户）")
    @ApiModelProperty("用户类型（1系统后台用户     2导办人员用户  3.部门领导  4.普通用户（小程序用户））")
    private String userType;



 flower_city/src/main/java/com/dg/core/db/gen/mapper/ElseAccessoryMapper.java

@@ -19,7 +19,8 @@
     */
    public List<ElseAccessoryEntity> selectConfigList(IPage<ElseAccessoryEntity> page, Integer state,
                                                      @Param("Name") String Name,
                                                      @Param("ids") List<String> ids);
                                                      @Param("ids") List<String> ids,
                                                      @Param("userId") String userId);

    /**
     * 获取附件列表全部
@@ -27,7 +28,8 @@
     * @return
     */
    public List<ElseAccessoryEntity> selectConfigList(@Param("Name") String Name,
                                                      @Param("ids") List<String> ids);
                                                      @Param("ids") List<String> ids,
                                                      @Param("userId") String userId);


    /**

 flower_city/src/main/java/com/dg/core/db/gen/mapper/GuideEvolveMapper.java

@@ -16,6 +16,12 @@
    public List<GuideEvolveEntity> selectConfigList(String guideId);

    /**
     * 查询记录列表(隐藏工单姓名)
     * @return
     */
    public List<GuideEvolveEntity>  selectHideList(String guideId);

    /**
     * 新增记录
     * @param entity
     * @return

 flower_city/src/main/java/com/dg/core/db/gen/mapper/GuideRepairOrderMapper.java

@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.data.repository.query.Param;

import java.time.LocalDateTime;
import java.util.List;

/**
@@ -54,7 +55,10 @@
                                            @Param("matterName") String matterName,
                                            @Param("ids") List<String> ids,
                                            @Param("status") String status,
                                            @Param("guideUserId") String guideUserId);
                                            @Param("guideUserId") String guideUserId,
                                            @Param("createTimeStartTime") String createTimeStartTime,
                                            @Param("createTimeTimeEndTime") String createTimeTimeEndTime,
                                            @Param("classifyId") String classifyId);


    /**
@@ -65,7 +69,11 @@
    List<GuideRepairOrder> selectConfigList(@Param("matterName") String matterName,
                                            @Param("ids") List<String> ids,
                                            @Param("status") String status,
                                            @Param("guideUserId") String guideUserId);
                                            @Param("guideUserId") String guideUserId,
                                            @Param("createTimeStartTime") String createTimeStartTime,
                                            @Param("createTimeTimeEndTime") String createTimeTimeEndTime,
                                            @Param("classifyId") String classifyId
                                            );

    /**
     * 获取工单列表(求和)

 flower_city/src/main/java/com/dg/core/db/gen/mapper/ReplyTemplateMapper.java

@@ -16,7 +16,8 @@
     */
    public List<ReplyTemplateEntity> selectConfigList(IPage<ReplyTemplateEntity> page, Integer state,
                                                      @Param("Name") String Name,
                                                      @Param("ids") List<String> ids);
                                                      @Param("ids") List<String> ids,
                                                      @Param("userId")  String  userId);


    /**

 flower_city/src/main/java/com/dg/core/service/IElseAccessoryService.java

@@ -16,14 +16,14 @@
     * @return
     */
    public List<ElseAccessoryEntity> selectConfigList(IPage<ElseAccessoryEntity> page, Integer state,
                                                      String Name,List<String> ids);
                                                      String Name,List<String> ids,String userId);

    /**
     * 获取附件列表全部
     * @param Name
     * @return
     */
    public List<ElseAccessoryEntity> selectConfigList(String Name,List<String> ids);
    public List<ElseAccessoryEntity> selectConfigList(String Name,List<String> ids,String userId);


    /**

 flower_city/src/main/java/com/dg/core/service/IGuideEvolveService.java

@@ -2,6 +2,7 @@


import com.dg.core.db.gen.entity.GuideEvolveEntity;
import com.dg.core.db.gen.entity.SysUser;
import org.springframework.data.repository.query.Param;

import java.util.List;
@@ -12,7 +13,7 @@
     * 查询记录列表
     * @return
     */
    public List<GuideEvolveEntity> selectConfigList(String guideId);
    public List<GuideEvolveEntity> selectConfigList(String guideId, SysUser sysUser);

    /**
     * 新增记录

 flower_city/src/main/java/com/dg/core/service/IGuideRepairOrderService.java

@@ -5,6 +5,7 @@
import com.dg.core.db.gen.entity.*;
import org.springframework.data.repository.query.Param;

import java.time.LocalDateTime;
import java.util.List;

public interface IGuideRepairOrderService {
@@ -41,7 +42,8 @@
     * @return
     */
    List<GuideRepairOrder> selectConfigList(IPage<GuideRepairOrder> page, Integer state,
                                            String matterName,List<String> ids,String status,String guideUserId);
                                            String matterName, List<String> ids, String status, String guideUserId,
                                            String createTimeStartTime, String createTimeTimeEndTime, String classifyId);

    /**
     * 获取工单列表(不分页用于小程序)
@@ -49,7 +51,7 @@
     * @return
     */
    List<GuideRepairOrder> selectConfigList(String matterName, List<String> ids,String status,
                                            String guideUserId);
                                            String guideUserId, String createTimeStartTime,String createTimeTimeEndTime,String classifyId);


    /**

 flower_city/src/main/java/com/dg/core/service/IReplyTemplateService.java

@@ -12,7 +12,7 @@
     * @return
     */
    public List<ReplyTemplateEntity> selectConfigList(IPage<ReplyTemplateEntity> page, Integer state,
                                                      String Name,List<String> ids);
                                                      String Name,List<String> ids,String userId);

    /**
     * 获取详情

 flower_city/src/main/java/com/dg/core/service/ITransactionEventService.java

@@ -151,6 +151,6 @@
     * @return
     */
    List<TransactionEvent> selectClassifyList(List<String> ids);
    boolean batchImport(String fileName, MultipartFile file) ;
    Integer batchImport(String fileName, MultipartFile file) ;

}

 flower_city/src/main/java/com/dg/core/service/impl/ElseAccessoryImpl.java

@@ -16,13 +16,13 @@

    @Override
    public List<ElseAccessoryEntity> selectConfigList(IPage<ElseAccessoryEntity> page, Integer state,
                                                      String Name,List<String> ids) {
        return baseMapper.selectConfigList(page,state,Name, ids);
                                                      String Name,List<String> ids,String userId) {
        return baseMapper.selectConfigList(page,state,Name, ids,userId);
    }

    @Override
    public List<ElseAccessoryEntity> selectConfigList(String Name,List<String> ids) {
        return baseMapper.selectConfigList(Name,ids);
    public List<ElseAccessoryEntity> selectConfigList(String Name,List<String> ids,String userId) {
        return baseMapper.selectConfigList(Name,ids,userId);
    }

    @Override

 flower_city/src/main/java/com/dg/core/service/impl/GuideEvolveImpl.java

@@ -24,8 +24,13 @@
    private TransactionEventMapper transactionEventMapper;

    @Override
    public List<GuideEvolveEntity> selectConfigList(String guideId) {
        List<GuideEvolveEntity> guideEvolveEntities = baseMapper.selectConfigList(guideId);
    public List<GuideEvolveEntity> selectConfigList(String guideId,SysUser sysUser) {
        List<GuideEvolveEntity> guideEvolveEntities;
        if (sysUser.getUserType().equals("4")){
            guideEvolveEntities=baseMapper.selectHideList(guideId);
        }else {
            guideEvolveEntities = baseMapper.selectConfigList(guideId);
        }
        for (GuideEvolveEntity guideEvolveEntity: guideEvolveEntities) {
            String[] split;
            if (guideEvolveEntity.getAccessoryId()!=null){

 flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java

@@ -229,14 +229,15 @@
    @Override
    public List<GuideRepairOrder> selectConfigList(IPage<GuideRepairOrder> page, Integer state,
                                                   String matterName, List<String> ids, String status,
                                                   String guideUserId) {
        return baseMapper.selectConfigList(page, state, matterName, ids, status, guideUserId);
                                                   String guideUserId, String createTimeStartTime,
                                                   String createTimeTimeEndTime,String classifyId) {
        return baseMapper.selectConfigList(page, state, matterName, ids, status, guideUserId,createTimeStartTime,createTimeTimeEndTime,classifyId);
    }

    @Override
    public List<GuideRepairOrder> selectConfigList(String matterName, List<String> ids, String status,
                                                   String guideUserId) {
        return baseMapper.selectConfigList(matterName, ids, status, guideUserId);
                                                   String guideUserId, String createTimeStartTime,String createTimeTimeEndTime,String classifyId) {
        return baseMapper.selectConfigList(matterName, ids, status, guideUserId,createTimeStartTime,createTimeTimeEndTime,classifyId);
    }

    @Override

 flower_city/src/main/java/com/dg/core/service/impl/ReplyTemplateImpl.java

@@ -26,8 +26,8 @@

    @Override
    public List<ReplyTemplateEntity> selectConfigList(IPage<ReplyTemplateEntity> page,
                                                      Integer state,String Name,List<String> ids) {
        return baseMapper.selectConfigList(page,state,Name,ids);
                                                      Integer state,String Name,List<String> ids,String userId) {
        return baseMapper.selectConfigList(page,state,Name,ids,userId);
    }

    @Override

 flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java

@@ -92,7 +92,7 @@
                newUser.setUserId(huaChengSysUser.getUserId()+"");
                newUser.setLoginName(huaChengSysUser.getPhone());
                newUser.setUserName(huaChengSysUser.getNickName());
                newUser.setUserType("3");
                newUser.setUserType("4");
                newUser.setPhonenumber(huaChengSysUser.getPhone());
                newUser.setSex(huaChengSysUser.getSex());
                newUser.setAvatar(huaChengSysUser.getImageUrl());
@@ -304,4 +304,9 @@








}

 flower_city/src/main/java/com/dg/core/service/impl/TransactionEventImpl.java

@@ -12,9 +12,7 @@
import com.dg.core.service.ITransactionEventService;

import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.ss.usermodel.*;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -253,15 +251,14 @@
    public List<TransactionEvent> selectList(String keyWord) {
        if (keyWord!=null&&keyWord!=""){
            return baseMapper.selectList(new QueryWrapper<TransactionEvent>().lambda().like(TransactionEvent::getMatterName,keyWord));
        }
        else {
        } else {
        return baseMapper.selectList(new QueryWrapper<TransactionEvent>().lambda());
        }
    }


    @Override
    public boolean batchImport(String fileName, MultipartFile file)  {
    public Integer batchImport(String fileName, MultipartFile file) {
        boolean notNull = false;
        if (!fileName.matches("^.+\\.(?i)(xls)$") && !fileName.matches("^.+\\.(?i)(xlsx)$")) {
            throw   new RuntimeException("选择文件格式不正确，请下载模板上传");
@@ -291,38 +288,42 @@
                throw new RuntimeException(e);
            }
        }
        Integer failNum = 0;//失败数量
        // 获取excel的sheet页数
        int numberOfSheets = wb.getNumberOfSheets();
        for (int j = 0; j < numberOfSheets; j++) {
        //获取excel字段名称进行比较
        Sheet sheetAt = wb.getSheetAt(0);
            Sheet sheetAt = wb.getSheetAt(j);
            if(sheetAt.getRow(2)!=null){
        Row row1 = sheetAt.getRow(2);
        TransactionEvent transactionEvent = baseMapper.selectOne(new QueryWrapper<TransactionEvent>().lambda().eq(TransactionEvent::getMatterName, row1.getCell(1).getStringCellValue()));
            TransactionEvent transactionEvent = baseMapper.selectOne(new QueryWrapper<TransactionEvent>().lambda().eq(TransactionEvent::getMatterName, new DataFormatter().formatCellValue(row1.getCell(1))));
        boolean isAdd=false;
        if(transactionEvent==null){
            transactionEvent=new TransactionEvent();
            isAdd=true;
        }
        transactionEvent.setMatterName(row1.getCell(1).getStringCellValue());
            transactionEvent.setMatterName(new DataFormatter().formatCellValue(row1.getCell(1)));
        Row row2 = sheetAt.getRow(3);
        transactionEvent.setSetGist("<p>"+row2.getCell(1).getStringCellValue()+"</p>");
            transactionEvent.setSetGist("<p>" + new DataFormatter().formatCellValue(row2.getCell(1)) + "</p>");
        Row row3 = sheetAt.getRow(4);
        Row row4 = sheetAt.getRow(5);
        transactionEvent.setBasicInformation("<p> 事项名称："+row1.getCell(1).getStringCellValue()+"<br />"
            +row3.getCell(0).getStringCellValue()+":"+row3.getCell(1).getStringCellValue()+"<br />"
            +row3.getCell(3).getStringCellValue()+":"+row3.getCell(4).getStringCellValue()+"<br />"
                +row4.getCell(0).getStringCellValue()+":"+row4.getCell(1).getStringCellValue()+"</p>");
            transactionEvent.setBasicInformation("<p> 事项名称：" + new DataFormatter().formatCellValue(row1.getCell(1)) + "<br />"
                    + new DataFormatter().formatCellValue(row3.getCell(0)) + ":" + new DataFormatter().formatCellValue(row3.getCell(1))+ "<br />"
                    + new DataFormatter().formatCellValue(row3.getCell(3)) + ":" + new DataFormatter().formatCellValue(row3.getCell(4)) + "<br />"
                    + new DataFormatter().formatCellValue(row4.getCell(0)) + ":" + new DataFormatter().formatCellValue(row4.getCell(1)) + "</p>");
        int i=7;
        String applicationMaterial="<p>";
        while (true){
            Row row = sheetAt.getRow(i);
            if (row.getCell(0).getStringCellValue().equals("办理途径、条件和注意事项")){
                if (new DataFormatter().formatCellValue(row.getCell(0)).equals("办理途径、条件和注意事项")) {
                i=i+2;
                break;
            }
            applicationMaterial=applicationMaterial+"办理区域："+row.getCell(0).getStringCellValue()+"<br />"
                    +"咨询电话："+row.getCell(1).getStringCellValue()+"<br />"
                    +"办公地址："+row.getCell(2).getStringCellValue()+"<br />"
                    +"办公时间："+row.getCell(3).getStringCellValue()+"<br />";
                applicationMaterial = applicationMaterial + "办理区域：" + new DataFormatter().formatCellValue(row.getCell(0)) + "<br />"
                        + "部门名称：" + new DataFormatter().formatCellValue(row.getCell(1)) + "<br />"
                        + "咨询电话：" + new DataFormatter().formatCellValue(row.getCell(2)) + "<br />"
                        + "办公地址：" + new DataFormatter().formatCellValue(row.getCell(3)) + "<br />"
                        + "办公时间：" + new DataFormatter().formatCellValue(row.getCell(4)) + "<br />";
            applicationMaterial=applicationMaterial+"<br />";
            i++;
        }
@@ -331,13 +332,15 @@
        String acceptConditions="<p>";
        while (true){
            Row row = sheetAt.getRow(i);
            if (row.getCell(0).getStringCellValue().equals("（二）网上申报")){
                if (new DataFormatter().formatCellValue(row.getCell(0)).equals("（二）网上申报")) {
                i=i+1;
                break;
            }
            acceptConditions=acceptConditions+row.getCell(0).getStringCellValue()+"&nbsp; "
                    +row.getCell(1).getStringCellValue()+"&nbsp; "
                    +row.getCell(2).getStringCellValue()+"&nbsp; ";
                acceptConditions = acceptConditions + new DataFormatter().formatCellValue(row.getCell(0)) + "&nbsp; "
                        +new DataFormatter().formatCellValue( row.getCell(1)) + "&nbsp; "
                        + new DataFormatter().formatCellValue(row.getCell(2)) + "&nbsp; "
                         +new DataFormatter().formatCellValue( row.getCell(3)) + "&nbsp; "
                        + new DataFormatter().formatCellValue(row.getCell(4)) + "&nbsp; ";
            acceptConditions=acceptConditions+"<br />";
            i++;
        }
@@ -346,13 +349,15 @@
        String rates="<p>";
        while (true){
            Row row = sheetAt.getRow(i);
            if (row.getCell(0).getStringCellValue().equals("（三）手机移动申报")){
                if (new DataFormatter().formatCellValue(row.getCell(0)).equals("（三）手机移动申报")) {
                i=i+1;
                break;
            }
            rates=rates+row.getCell(0).getStringCellValue()+"&nbsp; "
                    +row.getCell(1).getStringCellValue()+"&nbsp; "
                    +row.getCell(2).getStringCellValue()+"&nbsp; ";
                rates = rates + new DataFormatter().formatCellValue(row.getCell(0)) + "&nbsp; "
                        + new DataFormatter().formatCellValue(row.getCell(1)) + "&nbsp; "
                        + new DataFormatter().formatCellValue(row.getCell(2)) + "&nbsp; "
                        +new DataFormatter().formatCellValue( row.getCell(3)) + "&nbsp; "
                        + new DataFormatter().formatCellValue(row.getCell(4)) + "&nbsp; ";
            rates=rates+"<br />";
            i++;
        }
@@ -361,13 +366,15 @@
        String transactionArea="<p>";
        while (true){
            Row row = sheetAt.getRow(i);
            if (row.getCell(0).getStringCellValue().equals("（四）经营许可（备案）事项程序运行图谱（附电子版）")){
                if (new DataFormatter().formatCellValue(row.getCell(0)).equals("（四）经营许可（备案）事项程序运行图谱（附电子版）")) {
                i=i+1;
                break;
            }
            transactionArea=transactionArea+row.getCell(0).getStringCellValue()+"&nbsp; "
                    +row.getCell(1).getStringCellValue()+"&nbsp; "
                    +row.getCell(2).getStringCellValue()+"&nbsp; ";
                transactionArea = transactionArea + new DataFormatter().formatCellValue(row.getCell(0)) + "&nbsp; "
                        + new DataFormatter().formatCellValue(row.getCell(1)) + "&nbsp; "
                        + new DataFormatter().formatCellValue(row.getCell(2)) + "&nbsp; "
                        +new DataFormatter().formatCellValue( row.getCell(3)) + "&nbsp; "
                        + new DataFormatter().formatCellValue(row.getCell(4)) + "&nbsp; ";
            transactionArea=transactionArea+"<br />";
            i++;
        }
@@ -376,13 +383,15 @@
        String handlingProcedures="<p>";
        while (true){
            Row row = sheetAt.getRow(i);
            if (row.getCell(0).getStringCellValue().equals("（五）经营许可（备案）事项实施内容一览表（附电子版）")){
                if (new DataFormatter().formatCellValue(row.getCell(0)).equals("（五）经营许可（备案）事项实施内容一览表（附电子版）")) {
                i=i+1;
                break;
            }
            handlingProcedures=handlingProcedures+row.getCell(0).getStringCellValue()+"&nbsp; "
                    +row.getCell(1).getStringCellValue()+"&nbsp; "
                    +row.getCell(2).getStringCellValue()+"&nbsp; ";
                handlingProcedures = handlingProcedures + new DataFormatter().formatCellValue(row.getCell(0)) + "&nbsp; "
                        + new DataFormatter().formatCellValue(row.getCell(1)) + "&nbsp; "
                        + new DataFormatter().formatCellValue(row.getCell(2)) + "&nbsp; "
                        +new DataFormatter().formatCellValue( row.getCell(3)) + "&nbsp; "
                        + new DataFormatter().formatCellValue(row.getCell(4)) + "&nbsp; ";
            handlingProcedures=handlingProcedures+"<br />";
            i++;
        }
@@ -394,13 +403,21 @@
        }else {
            ans =baseMapper.updateById(transactionEvent);
        }
       if (ans>0){
           return  true;
            if (ans <= 0) {
                failNum++;
       }
       return  false;
    }


        }
        if (failNum == 0) {//
            return 3;//全部导入成功
        } else if (failNum < numberOfSheets) {
            return 2;//部分导入成功
        } else if (failNum.equals(numberOfSheets)) {
            return 0;//导入失败
        }
        return 0;
    }


}

 flower_city/src/main/resources/mapper/ElseAccessoryMapper.xml

@@ -26,7 +26,23 @@
    </sql>

    <select id="selectConfigList"  resultMap="ElseAccessoryEntityResult">
        <include refid="selectElseAccessoryEntityVo"/>
        SELECT
        id,
        department_id,
        (select organization_name from automessage_organization_chart where automessage_organization_chart.id=automessage_else_accessory.department_id) as departmentName,
        create_time,
        update_time,
        url,
        name,
        create_user_id,
        <if test="userId!=null and userId!=''">
        (case create_user_id when  #{userId} then 1 else 0 end)isDelete
        </if>
        <if test="userId==null or userId==''">
            1 isDelete
        </if>
        FROM
        automessage_else_accessory
        <where>
            <if test="Name != null and Name != ''">
                AND automessage_else_accessory.name like concat('%', #{Name}, '%')
@@ -57,6 +73,7 @@
        <if test="departmentId != null and departmentId != '' ">department_id,</if>
        <if test="name != null and name != '' ">name,</if>
        <if test="url != null and url != '' ">url,</if>
        <if test="createUserId != null and createUserId != '' ">create_user_id,</if>
        update_time,
        create_time
        )values(
@@ -64,6 +81,7 @@
        <if test="departmentId != null and departmentId != '' ">#{departmentId},</if>
        <if test="name != null and name != ''  ">#{name},</if>
        <if test="url != null and url != '' ">#{url},</if>
        <if test="createUserId != null and createUserId != '' ">#{createUserId},</if>
        sysdate(),
        sysdate()
        )

 flower_city/src/main/resources/mapper/GuideEvolveMapper.xml

@@ -60,6 +60,42 @@
        order by create_time desc
    </select>

    <select id="selectHideList" resultMap="GuideEvolveResult">
        SELECT
            id,
            departmental_id,
            IFNULL(
                    (select  concat(substring(user_name,1,1),'老师') from automessage_sys_user where a.to_user_id=user_id and user_type in (1,2,3)),
                    (select user_name from automessage_sys_user where a.to_user_id=user_id))toUserName,
            IFNULL(
                    (select  concat(substring(user_name,1,1),'老师') from automessage_sys_user where a.from_user_id=user_id and user_type in (1,2,3)),
                    (select user_name from automessage_sys_user where a.from_user_id=user_id))fromUserName,
            to_user_id,
            from_user_id,
            state,
            remark,
            guide_id,
            transaction_id,
            accessory_id,
            accessory_name,
            accessory_url,
            from_departmental_id,
            video_url,
            picture_url,
            create_time,
            update_time,
            guide_order_num,
            is_timeout
        FROM
            automessage_guide_evolve a
        <where>
            <if test="guideId != null and guideId != ''">
                AND guide_id=#{guideId}
            </if>
        </where>
        order by create_time desc
    </select>


    <insert id="insertConfig" parameterType="com.dg.core.db.gen.entity.GuideEvolveEntity">
        insert into automessage_guide_evolve (

 flower_city/src/main/resources/mapper/GuideRepairOrderMapper.xml

@@ -105,6 +105,16 @@
            <if test="status != null and status != ''">
                AND a.state=#{status}
            </if>
            <if test="createTimeStartTime != null and createTimeStartTime != ''">
                and create_time > #{createTimeStartTime}
            </if>
            <if test="createTimeTimeEndTime != null and createTimeTimeEndTime != ''">
               and  #{createTimeTimeEndTime} > create_time
            </if>
            <if test="classifyId != null and classifyId != ''">
                and  classify_id in (select id FROM automessage_classify_administration where  parent_id = #{classifyId})
            </if>

        </where>
        order by  update_time desc ,  create_time desc
    </select>

 flower_city/src/main/resources/mapper/ReplyTemplateMapper.xml

@@ -47,7 +47,33 @@
    </sql>

    <select id="selectConfigList"  resultMap="ReplyTemplateResult">
        <include refid="selectReplyTemplateVo"/>
        SELECT
        id,
        name,
        create_time,
        update_time,
        handle_state,
        response,
        accessory_url,
        accessory_name,
        video_url,
        video_name,
        picture_url,
        picture_name,
        department_id,
        create_user_id,
        <if test="userId!=null and userId!=''">
            (case create_user_id when  #{userId} then 1 else 0 end)isDelete,
        </if>
        <if test="userId==null or userId==''">
            1 isDelete,
        </if>
        accessory_id,
        (select organization_name from automessage_organization_chart where automessage_organization_chart.id=automessage_reply_template.department_id) as departmentName,
        (select user_name from automessage_sys_user where automessage_sys_user.user_id=automessage_reply_template.create_user_id) as createUser,
        guidance
        FROM
        automessage_reply_template
        <where>
            <if test="Name != null and Name != ''">
                AND automessage_reply_template.name like concat('%', #{Name}, '%')

 flower_city/src/main/resources/mapper/TransactionEventMapper.xml

@@ -153,10 +153,12 @@
        <include refid="selectTransactionEventList"/>
        <where>
            <if test="keyword != null and keyword != ''">
                AND (matter_name like concat('%', #{keyword}, '%')) or
                AND (
                    (matter_name like concat('%', #{keyword}, '%')) or
                    (department_id in (SELECT id FROM automessage_organization_chart WHERE organization_name like concat('%', #{keyword}, '%')))
                    or (classify_id in (SELECT id FROM automessage_classify_administration WHERE classify_name like concat('%', #{keyword}, '%')))
                    or (associate_names like concat('%', #{keyword}, '%'))
                    )

            </if>
            <if test="classifyGrade != null and classifyGrade != ''">
                AND (select classify_grade from automessage_classify_administration where automessage_classify_administration.id=classify_id) = #{classifyGrade}

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComPropertyApi.java

@@ -68,4 +68,10 @@
        return userService.myFeedBack(this.getLoginUserInfo().getUserId(),type);
    }

    @ApiOperation("通知公告列表")
    @GetMapping("notice")
    public R noticeList(@RequestParam("page")Integer page,@RequestParam("size")Integer size,@RequestParam("propertyId")Long propertyId){
        return communityService.noticeList(page,size,propertyId);
    }

}

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java

@@ -317,7 +317,11 @@
    @ApiOperation(value = "查询当前用户党员信息")
    @GetMapping("/getPartyMember")
    public R getPartyMember(@RequestParam("type")Integer type){
        return partyBuildingService.getPartyMember(this.getLoginUserInfo().getPhone(),type);
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        if (StrUtil.isEmpty(loginUserInfo.getPhone())){
            return R.fail("请先实名认证");
        }
        return partyBuildingService.getPartyMember(loginUserInfo.getPhone(),type);
    }
    @ApiOperation(value = "查询报道单位详情")
    @GetMapping("/comPbCheckUnit/detailByPhone")

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java

@@ -16,6 +16,7 @@
import com.panzhihua.common.model.dtos.community.social.PageProjectDTO;
import com.panzhihua.common.model.vos.community.rentHouse.WxPayOrderVO;
import com.panzhihua.common.utlis.DateUtils;
import io.swagger.annotations.ApiParam;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.data.redis.core.StringRedisTemplate;
@@ -530,4 +531,17 @@
    public R selectAutomessageSysUserById(@RequestParam("id")Long id){
        return communityService.selectAutomessageSysUserById(id);
    }

    @ApiOperation("新增投诉建议或问题留言")
    @PostMapping("addFeedBack")
    public R addFeedBack(@RequestBody SysUserFeedbackDTO sysUserFeedbackDTO){
        return userService.addFeedback(sysUserFeedbackDTO);
    }

    @ApiOperation("查看自己的投诉建议或问题留言记录")
    @GetMapping("myFeedBack")
    public R myFeedBack(@ApiParam("类型:1问题留言2投诉建议") @RequestParam(value = "type",required = false)Integer type){
        return userService.myFeedBack(this.getLoginUserInfo().getUserId(),type);
    }

}

 springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ComPropertyApi.java

New file
@@ -0,0 +1,70 @@
package com.panzhihua.applets_backstage.api;

import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.dtos.user.SysUserFeedbackDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComPropertyVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.user.UserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

/**
 * @author zts
 */
@Slf4j
@Api(tags = {"物业公司"})
@RestController
@RequestMapping("/comProperty")
public class ComPropertyApi extends BaseController {
    @Resource
    private CommunityService communityService;
    @Resource
    private UserService userService;

    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @ApiOperation(value = "物业公司列表",response = ComPropertyVO.class)
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        commonPage.setParamId(this.getCommunityId());
        return this.communityService.comPropertySelectAll(commonPage);
    }

    @ApiOperation(value = "物业公司详情", response = ComPropertyVO.class)
    @ApiImplicitParam(name = "id", value = "物业公司id", required = true)
    @GetMapping("detail")
    public R detailProperty(@RequestParam("id") Long id) {
        return this.communityService.detailProperty(id);
    }

    @ApiOperation("新增投诉建议或问题留言")
    @PostMapping("addFeedBack")
    public R addFeedBack(@RequestBody SysUserFeedbackDTO sysUserFeedbackDTO){
        return userService.addFeedback(sysUserFeedbackDTO);
    }

    @ApiOperation("查看自己的投诉建议或问题留言记录")
    @GetMapping("myFeedBack")
    public R myFeedBack(@ApiParam("类型:1问题留言2投诉建议") @RequestParam(value = "type",required = false)Integer type){
        return userService.myFeedBack(this.getLoginUserInfo().getUserId(),type);
    }

    @ApiOperation(value = "通知公告列表",response = ComPropertyVO.class)
    @GetMapping("notice")
    public R noticeList(@RequestParam("page")Integer page,@RequestParam("size")Integer size,@RequestParam("propertyId")Long propertyId){
        return communityService.noticeList(page,size,propertyId);
    }

}

 springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/CommunityConvenientApi.java

@@ -397,6 +397,12 @@
                                           Long pointId) {
        return communityService.deletePoint(pointId, this.getUserId());
    }
    @ApiOperation(value = "自提点详情")
    @GetMapping("/point/detail")
    public R detailPoint(@RequestParam("pointId") @ApiParam(value = "自提点id", required = true) Long pointId) {
        return communityService.detailPoint(pointId);
    }


    @ApiOperation(value = "新增商品分类")
    @PostMapping("/goodsCategory/add")

 springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/IndexApi.java

@@ -235,10 +235,10 @@
    }


    @GetMapping("/communityList")
    @GetMapping("/getAllCommunityList")
    @ApiOperation(value = "获取当前账号下的社区/村落列表",response = StreetVO.class)
    public R communityList(){
        return userService.communityList(this.getLoginUserInfo().getAccount(),this.getUserId());
        return userService.getAllCommunityList();
    }

}

 springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/UserApi.java

@@ -2,6 +2,7 @@

import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.interfaces.OperLog;
import com.panzhihua.common.model.dtos.user.SysUserFeedbackDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.user.ChangePasswordVO;
@@ -10,6 +11,7 @@
import com.panzhihua.common.utlis.StringUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -84,5 +86,17 @@
        return R.ok();
    }

    @ApiOperation("新增投诉建议或问题留言")
    @PostMapping("addFeedBack")
    public R addFeedBack(@RequestBody SysUserFeedbackDTO sysUserFeedbackDTO){
        return userService.addFeedback(sysUserFeedbackDTO);
    }

    @ApiOperation("查看自己的投诉建议或问题留言记录")
    @GetMapping("myFeedBack")
    public R myFeedBack(@ApiParam("类型:1问题留言2投诉建议") @RequestParam(value = "type",required = false)Integer type){
        return userService.myFeedBack(this.getLoginUserInfo().getUserId(),type);
    }


}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActProceedingsDTO.java

@@ -69,5 +69,7 @@
     */
    private Date updateBy;

    private String workTime;

    private static final long serialVersionUID = 1L;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/ConvenientElevatingPointDTO.java

@@ -42,10 +42,6 @@
    @NotBlank(groups = {AddGroup.class}, message = "微信账号不能为空")
    private String wechatAccount;

    @ApiModelProperty("所属地区")
    @NotBlank(groups = {AddGroup.class}, message = "所属地区不能为空")
    private String region;

    @ApiModelProperty("详细地址")
    @NotBlank(groups = {AddGroup.class}, message = "详细地址不能为空")
    private String address;
@@ -66,7 +62,7 @@

    @ApiModelProperty(value = "所属社区id")
    @NotNull(groups = {AddGroup.class}, message = "所属社区id不能为空")
    private Long communityId;
    private String communityId;

    @ApiModelProperty(value = "创建人", hidden = true)
    private Long createdBy;

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/sanshuo/ComSanshuoExpertDTO.java

@@ -134,6 +134,9 @@
    private String unit;
    private String unitId;

    @ApiModelProperty("appId，区分西区或花城")
    private String appId;



}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/user/PageFeedBackDTO.java

@@ -37,4 +37,6 @@
    private String phone;

    private String areaCode;

    private Integer type;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/user/SysUserFeedbackDTO.java

@@ -50,4 +50,19 @@

    @ApiModelProperty("1投诉建议2问题留言")
    private Integer type;

    @ApiModelProperty("页数")
    private Integer page;

    @ApiModelProperty("每页大小")
    private Integer size;

    @ApiModelProperty("用户昵称")
    private String nickName;

    @ApiModelProperty("用户姓名")
    private String name;

    @ApiModelProperty("电话")
    private String phone;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java

@@ -253,4 +253,7 @@

    @ApiModelProperty("权限等级1-5：超管-行业分中心-街道-社区-专家")
    private Integer level;

    @ApiModelProperty("物业公司id")
    private Long propertyId;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActAnnouncementVO.java

@@ -1,5 +1,6 @@
package com.panzhihua.common.model.vos.community;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
@@ -28,6 +29,7 @@
     * 创建时间
     */
    @ApiModelProperty(value = "创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date createTime;

    /**
@@ -57,4 +59,7 @@

    @ApiModelProperty("分类名称")
    private String columnName;

    @ApiModelProperty("propertyId")
    private Long propertyId;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActProceedingsVO.java

@@ -69,5 +69,8 @@
     */
    private Date updateBy;

    @ApiModelProperty("工作时间")
    private String workTime;

    private static final long serialVersionUID = 1L;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientElevatingPointVO.java

@@ -30,17 +30,12 @@
     * 社区id
     */
    @ApiModelProperty("社区id")
    private Long communityId;
    private String communityId;
    /**
     * 社区名称
     */
    @ApiModelProperty("社区名称")
    private String communityName;
    /**
     * 所属地区
     */
    @ApiModelProperty("所属地区")
    private String region;
    /**
     * 提货点地址
     */

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComSanRequestVO.java

@@ -43,4 +43,5 @@
    /**调解上传图片地址列表，逗号进行分割*/
    @ApiModelProperty(name = "images", value = "调解上传图片地址列表，逗号进行分割")
    private List<ComEventRequestImageVO> images;
    private String appId;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopFlowerGoodsAttrVO.java

@@ -21,10 +21,27 @@
    private Long goodsAttrId;

    @ApiModelProperty("商品规格")
    private String goodsAttr;
    private String goodsAttrName;

    @ApiModelProperty("规格价格")
    @Min(groups = {AddGroup.class}, value = 0, message = "价格最小值为0")
    @ApiModelProperty("原价")
    @Min(groups = {AddGroup.class}, value = 0, message = "原价最小值为0")
    @Digits(groups = {AddGroup.class}, integer = 8, fraction = 2)
    private BigDecimal attrPrice;
    private BigDecimal price;

    @ApiModelProperty("包邮价")
//    @Min(groups = {AddGroup.class}, value = 0, message = "包邮价最小值为0")
//    @Digits(groups = {AddGroup.class}, integer = 8, fraction = 2)
    private BigDecimal freeShippingPrice;

    @ApiModelProperty("拼单价")
//    @Min(groups = {AddGroup.class}, value = 0, message = "拼单价最小值为0")
//    @Digits(groups = {AddGroup.class}, integer = 8, fraction = 2)
    private BigDecimal collatePrice;

    @ApiModelProperty("商品规格图")
    private String attrPic;

    @ApiModelProperty("库存")
    private Integer stock;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopFlowerGoodsVO.java

@@ -33,7 +33,7 @@
    @ApiModelProperty("商品单位")
    private String unit;

    @ApiModelProperty("商品状态(1.上架  2.已下架  3.回收站)")
    @ApiModelProperty("商品状态(1.出售中  2.已下架  3.回收站)")
    private Integer status;

    @ApiModelProperty("商品主图")
@@ -48,7 +48,7 @@
    /**
     * 配送方式（1.商家配送 2.快递物流）
     */
    @ApiModelProperty(value = "配送方式（1.自提  2.快递）", hidden = true)
    @ApiModelProperty(value = "配送方式（1.商家配送  2.快递物流）", hidden = true)
    private Integer deliveryType;

    @ApiModelProperty("商品规格")

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerGoodsVO.java

@@ -1,6 +1,7 @@
package com.panzhihua.common.model.vos.shop;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -106,13 +107,13 @@
     * 商品规格列表
     */
    @ApiModelProperty("商品规格列表")
    private List<ComShopGoodsAttrVO> goodsAttrList;
    private List<ComShopFlowerGoodsAttrVO> goodsAttrList;

    /**
     * 店铺信息
     */
    @ApiModelProperty("商品店铺信息")
    private PageShopStoreVO shopStoreVO;
    private ConvenientMerchantVO convenientMerchantVO;

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty("创建时间")

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -10513,6 +10513,13 @@
    @DeleteMapping("/point/delete")
    R deletePoint(@RequestParam("pointId") Long pointId, @RequestParam("operator") Long operator);

    /**
     * 便民服务详情 自提点
     * @param pointId
     * @return
     */
    @GetMapping("/point/detail")
    R detailPoint(@RequestParam("pointId") Long pointId);

    /**
     * 新增商品分类
@@ -10556,4 +10563,13 @@

    @GetMapping("/dataCount")
    R dataCount();

    @DeleteMapping("/proceedings/remove")
    R removeProceedings(@RequestParam("id") Long id);

    /**
     * 获取物业公司通知公告列表
     * */
    @GetMapping("comProperty/noticeList")
    R noticeList(@RequestParam("page")Integer page,@RequestParam("size")Integer size,@RequestParam("propertyId")Long propertyId);
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java

@@ -1305,7 +1305,6 @@
     R addComPbCheckUser(@RequestBody ComPbCheckUserDTO comPbCheckUserDTO);



    /**
     * 是否为专家登陆小程序
     * */
@@ -1326,4 +1325,12 @@

    @GetMapping("/myFeedBack")
    R myFeedBack(@RequestParam("userId") Long userId,@RequestParam(value = "type",required = false)Integer type);

    /**
     * 获取所有社区等
     * @return
     */
    @GetMapping("/getAllCommunityList")
    R getAllCommunityList();

}

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActFeedBackApi.java

New file
@@ -0,0 +1,48 @@
package com.panzhihua.community_backstage.api;

import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.user.PageFeedBackDTO;
import com.panzhihua.common.model.dtos.user.SysUserFeedbackDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.user.SysUserFeedbackVO;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.validated.PageGroup;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

@RestController
@RequestMapping("/feedBack")
@Api(tags = "问题留言和投诉建议")
public class ComActFeedBackApi extends BaseController {
    @Resource
    private UserService userService;

    @ApiOperation(value = "分页查询用户意见反馈", response = SysUserFeedbackVO.class)
    @PostMapping("pagefeedback")
    public R pageFeedback(@RequestBody @Validated(PageGroup.class) PageFeedBackDTO pageFeedBackDTO) {
        pageFeedBackDTO.setAreaCode(this.getAreaCode());
        return userService.pageFeedback(pageFeedBackDTO);
    }

    @ApiOperation(value = "反馈意见详情", response = SysUserFeedbackVO.class)
    @GetMapping("feedback")
    public R detailFeedback(@RequestParam("id") Long id) {
        return userService.detailFeedback(id);
    }

    @ApiOperation(value = "删除意见反馈")
    @DeleteMapping("feedback")
    public R deleteFeedback(@RequestParam("id") Long id) {
        return userService.deleteFeedback(id);
    }

    @ApiOperation("回复意见反馈或修改意见反馈回复")
    @PostMapping("feedback")
    public R replyFeedBack(@RequestBody SysUserFeedbackVO sysUserFeedbackVO){
        return userService.updateFeedBack(sysUserFeedbackVO);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActPorceedingsApi.java

@@ -6,22 +6,20 @@
import com.panzhihua.common.service.community.CommunityService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

@RestController
@RequestMapping("/proceedings")
@Api(tags = "议事委员会")
@Api(tags = {"议事委员会"})
public class ComActPorceedingsApi {

    @Resource
    private CommunityService communityService;

    @ApiOperation(value = "分页查询议事委员会列表",response = ComActProceedingsVO.class)
    @GetMapping
    public R list(@RequestParam(value = "page",required = false) Integer page,
                  @RequestParam(value = "size",required = false) Integer size,
                  @RequestParam(value = "keyWord",required = false) String keyWord){
@@ -29,10 +27,15 @@
    }

    @ApiOperation("新增或修改议事委员会")
    @PostMapping
    public R addOrUpdate(@RequestBody ComActProceedingsDTO comActProceedingsDTO){
        return communityService.addOrUpdateProceedings(comActProceedingsDTO);
    }


    @DeleteMapping("/{id}")
    @ApiOperation("删除议事委员会")
    public R remove(@PathVariable Long id){
        return communityService.removeProceedings(id);
    }

}

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComPropertyApi.java

@@ -1,9 +1,11 @@
package com.panzhihua.community_backstage.api;

import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.ComActProceedingsDTO;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActCommiteeVO;
import com.panzhihua.common.model.vos.community.ComActProceedingsVO;
import com.panzhihua.common.model.vos.community.ComPropertyVO;
import com.panzhihua.common.service.community.CommunityService;
import io.swagger.annotations.Api;
@@ -37,6 +39,7 @@
        commonPage.setParamId(this.getCommunityId());
        return this.communityService.comPropertySelectAll(commonPage);
    }

    /**
     * 新增数据
     *

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/LoginApi.java

@@ -2,10 +2,14 @@

import javax.annotation.Resource;

import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.interfaces.OperLog;
import com.panzhihua.common.model.vos.LoginReturnsVO;
import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.community_backstage.util.MyAESUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;

@@ -28,11 +32,14 @@
@RestController
@RequestMapping("/")
@Api(tags = {"社区平台登录模块"})
@Slf4j
public class LoginApi extends BaseController {
    @Resource
    private TokenService tokenService;
    @Resource
    private UserService userService;
    @Resource
    private CommunityService communityService;

    @OperLog(operModul="用户登录",operType = 1)
    @ApiOperation(value = "社区平台登录", response = LoginReturnVO.class)
@@ -141,4 +148,34 @@
        return r;
    }

    @ApiOperation(value = "商家后台登录", response = LoginReturnVO.class)
    @PostMapping("loginShopBackStage")
    public R loginShopBackStage(@RequestBody LoginBody loginBody){
        String account = loginBody.getAccount();
        String password = loginBody.getPassword();
        boolean empty = ObjectUtils.isEmpty(account);
        boolean empty1 = ObjectUtils.isEmpty(password);
        if (empty || empty1) {
            return R.fail("账户密码不能为空");
        }
        log.info("登录用户信息【{}】", loginBody);
        try {
            R<ConvenientMerchantVO> merchant = communityService.getUserMerchantInfoByAccount(account);
            if (R.isOk(merchant)) {
                ConvenientMerchantVO merchantVO =
                        JSONObject.parseObject(JSONObject.toJSONString(merchant.getData()), ConvenientMerchantVO.class);
                Boolean accountValid = merchantVO.getAccountStatus() == 1;
                if (accountValid) {
                    R result = tokenService.loginMerchantBackStage(account, loginBody.getPassword(),this.getAppId());
                    return result;
                } else {
                    return R.fail("账号被禁用");
                }
            }
            return R.fail(merchant.getMsg());
        } catch (Exception e) {
            return R.fail("登陆失败了");
        }
    }

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActProceedingsApi.java

@@ -42,5 +42,9 @@
        return comActProceedingsService.addOrUpdate(comActProceedingsDTO);
    }

    @DeleteMapping("/remove")
    public R removeProceedings(@RequestParam("id") Long id){
        return R.ok(comActProceedingsService.removeById(id));
    }
     
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComPropertyApi.java

@@ -83,4 +83,9 @@
    public R detailProperty(@RequestParam("id") Long id) {
        return comPropertyService.detailProperty(id);
    }

    @GetMapping("/noticeList")
    public R noticeList(@RequestParam("page")Integer page,@RequestParam("size")Integer size,@RequestParam("propertyId")Long propertyId){
        return comPropertyService.noticeList(page,size,propertyId);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java

@@ -66,6 +66,7 @@
        comEvent.setRequestUserId(loginUser.getUserId());
        comEvent.setRequestUserName(loginUser.getName());
        comEvent.setRequestUserTel(loginUser.getPhone());
        comEvent.setAppId(loginUser.getAppId());
        return comEventService.insertComEvent(comEvent);
    }


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoExpertApi.java

@@ -51,6 +51,7 @@
    @PostMapping
    public R add(@RequestBody ComSanshuoExpertDTO comSanshuoExpertDTO){
        comSanshuoExpertDTO.setCreateBy(this.getLoginUserInfo().getName());
        comSanshuoExpertDTO.setAppId(getLoginUserInfo().getAppId());
        return comSanShuoExpertService.addOrUpdateExpert(comSanshuoExpertDTO);
    }


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java

@@ -2710,12 +2710,4 @@
        return automessageSysUserService.selectAutomessageSysUserById(id);
    }


    /**
     * 获取问题清单，需求清单，报道服务活动数量
     * */
    @GetMapping("/dataCount")
    public R dataCount(){
        return null;
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java

@@ -745,6 +745,16 @@
    }

    /**
     * 便民服务详情 自提点
     * @param pointId
     * @return
     */
    @GetMapping("/point/detail")
    public R detailPoint(@RequestParam("pointId") Long pointId) {
        return convenientElevatingPointService.detailPoint(pointId);
    }

    /**
     * 新增商品分类
     * @param convenientGoodsCategoryDTO
     * @return

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java

@@ -441,4 +441,6 @@
    public R selectCount(@RequestParam("type")Integer type,@RequestParam(value = "phone",required = false)String phone,@RequestParam("communityId")Long communityId){
        return this.comActNeighborCircleService.selectCount(type,phone,communityId);
    }


}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopFlowerApi.java

New file
@@ -0,0 +1,564 @@
package com.panzhihua.service_community.api;

import java.util.List;

import javax.annotation.Resource;

import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
import com.panzhihua.service_community.service.*;
import org.springframework.beans.BeanUtils;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
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.RequestParam;
import org.springframework.web.bind.annotation.RestController;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.panzhihua.common.model.dtos.PageDTO;
import com.panzhihua.common.model.dtos.shop.ComShopAddressDTO;
import com.panzhihua.common.model.dtos.shop.ComShopCartDTO;
import com.panzhihua.common.model.dtos.shop.ComShopEditNubCartDTO;
import com.panzhihua.common.model.dtos.shop.ComShopFundsExportDTO;
import com.panzhihua.common.model.dtos.shop.ComShopGoodsDTO;
import com.panzhihua.common.model.dtos.shop.ComShopOrderCreateDTO;
import com.panzhihua.common.model.dtos.shop.ComShopOrderDeliverDTO;
import com.panzhihua.common.model.dtos.shop.ComShopOrderExportDTO;
import com.panzhihua.common.model.dtos.shop.ComShopOrderPreviewDTO;
import com.panzhihua.common.model.dtos.shop.ComShopOrderQueryDTO;
import com.panzhihua.common.model.dtos.shop.ComShopOrderShipDTO;
import com.panzhihua.common.model.dtos.shop.ComShopSysConfDTO;
import com.panzhihua.common.model.dtos.shop.OrderPayDTO;
import com.panzhihua.common.model.dtos.shop.PageComOrderListDTO;
import com.panzhihua.common.model.dtos.shop.PageComShopAddressDTO;
import com.panzhihua.common.model.dtos.shop.PageComShopFundsSearchDTO;
import com.panzhihua.common.model.dtos.shop.PageComShopGoodsDTO;
import com.panzhihua.common.model.dtos.shop.PageComShopOrderSearchDTO;
import com.panzhihua.common.model.dtos.shop.PageComShopStoreDTO;
import com.panzhihua.common.model.dtos.shop.PageComShopSysConfDTO;
import com.panzhihua.common.model.dtos.shop.WxPayNotifyOrderDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.shop.AddShopGoodsVO;
import com.panzhihua.common.model.vos.shop.ComShopSysConfVO;
import com.panzhihua.common.model.vos.shop.ShopOperLogVO;
import com.panzhihua.common.model.vos.shop.ShopStoreVO;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.service_community.model.dos.ComShopSysConfDO;

import lombok.extern.slf4j.Slf4j;

@Slf4j
@RestController
@RequestMapping("/shopFlower")
public class ShopFlowerApi {

    @Resource
    private ComShopFlowerGoodsService comShopFlowerGoodsService;
//    @Resource
//    private ComShopOperLogService comShopOperLogService;
//    @Resource
//    private ComShopOrderService comShopOrderService;
//    @Resource
//    private ComShopCartService comShopCartService;
//    @Resource
//    private ComShopUserAddressService comShopUserAddressService;

    @Resource
    private ConvenientMerchantService convenientMerchantService;
    @Resource
    private UserService userService;

    /*
    *//**
     * 分页查询 商家订单
     *
     * @param pageComShopOrderSearchDTO
     *            分页数据
     * @return 分页订单
     *//*
    @PostMapping("/order/page")
    public R pageShopOrder(@RequestBody PageComShopOrderSearchDTO pageComShopOrderSearchDTO) {
        return comShopOrderService.pageShopOrder(pageComShopOrderSearchDTO);
    }

    *//**
     * 根据店铺id查询店铺详情
     *
     * @param comShopStoreDTO
     *            请求参数
     * @return 店铺详情
     *//*
    @PostMapping("shopStoreDetail")
    public R shopStoreDetail(@RequestBody PageComShopStoreDTO comShopStoreDTO) {
        return comShopStoreService.shopStoreDetail(comShopStoreDTO);
    }

    *//**
     * 分页查询商品列表
     *
     * @param comShopGoodsDTO
     *            请求参数
     * @return 商品列表
     *//*
    @PostMapping("/pageShopGoods")
    public R pageShopGoods(@RequestBody ComShopGoodsDTO comShopGoodsDTO) {

        return comShopFlowerGoodsService.pageShopGoods(comShopGoodsDTO);
    }

    *//**
     * 根据商品id查询商品详情
     *
     * @param goodsId
     *            商品id
     * @return 商品信息
     *//*
    @PostMapping("shopGoodsDetail")
    public R shopGoodsDetail(@RequestParam("goodsId") Long goodsId) {
        return comShopFlowerGoodsService.shopGoodsDetail(goodsId);
    }

    *//**
     * 根据用户id查询购物车列表
     *
     * @param userId
     *            用户id
     * @return 购物车列表信息
     *//*
    @PostMapping("shopCartList")
    public R shopCartList(@RequestParam("userId") Long userId) {
        return comShopCartService.shopCartList(userId);
    }

    *//**
     * 查询用户购物车数量
     *
     * @param userId
     *            用户id
     * @return 用户购物车商品数量
     *//*
    @PostMapping("shopCartUserTotal")
    public R shopCartUserTotal(@RequestParam("userId") Long userId) {
        return comShopCartService.shopCartUserTotal(userId);
    }

    *//**
     * 购物车添加
     *
     * @param comShopCartDTO
     *            请求参数
     * @return 添加结果
     *//*
    @PostMapping("shopAddCart")
    public R shopAddCart(@RequestBody ComShopCartDTO comShopCartDTO) {
        return comShopCartService.shopAddCart(comShopCartDTO);
    }

    *//**
     * 购物车内商品数量添加
     *
     * @param shopEditNubCartDTO
     *            请求参数
     * @return 修改结果
     *//*
    @PostMapping("shopEditNubCart")
    public R shopEditNubCart(@RequestBody ComShopEditNubCartDTO shopEditNubCartDTO) {
        return comShopCartService.shopEditNubCart(shopEditNubCartDTO);
    }

    *//**
     * 删除购物车记录
     *
     * @param Ids
     *            购物车id集合
     * @return 删除结果
     *//*
    @PostMapping("shopDelCart")
    public R shopDelCart(@RequestBody List<Long> Ids) {
        return comShopCartService.shopDelCart(Ids);
    }

    *//**
     * 查询用户收货地址列表
     *
     * @param comShopAddressDTO
     *            请求参数
     * @return 用户收获地址列表
     *//*
    @PostMapping("shopUserAddressList")
    public R shopUserAddressList(@RequestBody PageComShopAddressDTO comShopAddressDTO) {
        return comShopUserAddressService.shopUserAddressList(comShopAddressDTO);
    }

    *//**
     * 用户添加书货地址
     *
     * @param comShopAddressDTO
     *            请求参数
     * @return 添加结果
     *//*
    @PostMapping("shopAddUserAddress")
    public R shopAddUserAddress(@RequestBody ComShopAddressDTO comShopAddressDTO) {
        return comShopUserAddressService.shopAddUserAddress(comShopAddressDTO);
    }

    *//**
     * 用户修改收货地址
     *
     * @param comShopAddressDTO
     *            请求参数
     * @return 修改结果
     *//*
    @PostMapping("shopEditUserAddress")
    public R shopEditUserAddress(@RequestBody ComShopAddressDTO comShopAddressDTO) {
        return comShopUserAddressService.shopEditUserAddress(comShopAddressDTO);
    }

    *//**
     * 用户删除收货地址
     *
     * @param addressId
     *            收货地址id
     * @return 删除结果
     *//*
    @PostMapping("shopDelUserAddress")
    public R shopDelUserAddress(@RequestParam("addressId") Long addressId) {
        return comShopUserAddressService.shopDelUserAddress(addressId);
    }

    *//**
     * 订单预览
     *
     * @param orderPreviewDTO
     *            请求参数
     * @return 订单预览数据
     *//*
    @PostMapping("orderPreview")
    public R orderPreview(@RequestBody ComShopOrderPreviewDTO orderPreviewDTO) {
        return comShopOrderService.orderPreview(orderPreviewDTO);
    }

    *//**
     * 创建订单
     *
     * @param orderCreateDTO
     *            创建订单请求参数
     * @return 创建结果
     *//*
    @PostMapping("orderCreate")
    public R orderCreate(@RequestBody ComShopOrderCreateDTO orderCreateDTO) {
        return comShopOrderService.orderCreate(orderCreateDTO);
    }

    *//**
     * 分页查询用户订单列表
     *
     * @param comOrderListDTO
     *            请求参数
     * @return 查询结果
     *//*
    @PostMapping("pageOrderList")
    public R pageOrderList(@RequestBody PageComOrderListDTO comOrderListDTO) {
        return comShopOrderService.pageOrderList(comOrderListDTO);
    }

    *//**
     * 根据订单id查询订单详情
     *
     * @param orderId
     *            订单id
     * @return 订单详情
     *//*
    @PostMapping("orderDetail")
    public R orderDetail(@RequestParam("orderId") Long orderId) {
        return comShopOrderService.orderDetail(orderId);
    }

    *//**
     * 根据订单id取消订单
     *
     * @param comShopOrderQueryDTO
     *            请求参数
     * @return 取消结果
     *//*
    @PostMapping("orderCancel")
    public R orderCancel(@RequestBody ComShopOrderQueryDTO comShopOrderQueryDTO) {
        return comShopOrderService.orderCancel(comShopOrderQueryDTO);
    }

    *//**
     * 根据订单id删除订单
     *
     * @param orderId
     *            订单id
     * @return 删除结果
     *//*
    @PostMapping("orderDelete")
    public R orderDelete(@RequestParam("orderId") Long orderId) {
        return comShopOrderService.orderDelete(orderId);
    }

    *//**
     * 根据订单id确认收货
     *
     * @param comShopOrderQueryDTO
     *            请求参数
     * @return 确认结果
     *//*
    @PostMapping("orderConfirm")
    public R orderConfirm(@RequestBody ComShopOrderQueryDTO comShopOrderQueryDTO) {
        return comShopOrderService.orderConfirm(comShopOrderQueryDTO.getOrderId(), comShopOrderQueryDTO.getPhone());
    }

    *//**
     * 统计用户订单数量
     *
     * @param userId
     *            用户id
     * @return 统计结果
     *//*
    @PostMapping("orderStatistics")
    public R orderStatistics(@RequestParam("userId") Long userId) {
        return comShopOrderService.orderStatistics(userId);
    }

    *//**
     * 商品列表-分页查询
     *
     * @param pageComShopGoodsDTO
     *            查询参数
     * @return PageShopStoreVO
     *//*
    @PostMapping("pageGoods")
    public R pageShopStore(@RequestBody PageComShopGoodsDTO pageComShopGoodsDTO) {
        return comShopFlowerGoodsService.pageGoodsList(pageComShopGoodsDTO);
    }

    *//**
     * 新增商品
     *
     * @param addShopGoodsVO
     * @return
     *//*
    @PostMapping("saveShopGoods")
    public R saveStore(@RequestBody AddShopGoodsVO addShopGoodsVO) {
        return comShopFlowerGoodsService.saveShopGoods(addShopGoodsVO);
    }

    *//**
     * 编辑商品
     *
     * @param addShopGoodsVO
     * @param id
     *            商铺Id
     * @return
     *//*
    @Transactional(rollbackFor = Exception.class)
    @PostMapping("editShopGoods/{id}")
    public R editShopGoods(@PathVariable("id") Long id, @RequestBody AddShopGoodsVO addShopGoodsVO) {
        return comShopFlowerGoodsService.editShopGoods(id, addShopGoodsVO);
    }

    *//**
     * 删除商品
     *
     * @param id
     * @return
     *//*
    @PostMapping("deleteShopGoods")
    public R deleteShopGoods(@RequestBody Long[] id) {
        return comShopFlowerGoodsService.deleteShopGoods(id);
    }

    *//**
     * 修改商品状态
     *
     * @param id
     * @return
     *//*
    @GetMapping("changeShopGoodsStatus")
    public R changeStatus(@RequestParam("id") Long id, @RequestParam("status") Integer status) {
        return comShopFlowerGoodsService.changeStatus(id, status);
    }

    *//**
     * 商家资金的订单详情
     *
     * @param id
     * @return
     *//*
    @GetMapping("capitalDetailByStore")
    public R capitalDetailByStore(@RequestParam("id") Long id) {
        return comShopOrderService.capitalDetailByStore(id);
    }

    *//**
     * 订单发货
     *
     * @param orderShipDTO
     *            发货信息
     * @return 发货结果
     *//*
    @PostMapping("/shipOrder")
    R shipOrder(@RequestBody ComShopOrderShipDTO orderShipDTO) {
        return comShopOrderService.shipOrder(orderShipDTO);
    }

    *//**
     * 订单配送
     *
     * @param deliverDTO
     *            订单ID
     * @return 配送结果
     *//*
    @PostMapping("/deliverOrder")
    R deliverOrder(@RequestBody ComShopOrderDeliverDTO deliverDTO) {
        return comShopOrderService.deliverOrder(deliverDTO);
    }

    *//**
     * 订单配送
     *
     * @param deliverDTO
     *            订单ID
     * @return 配送完成
     *//*
    @PostMapping("/finishDeliverOrder")
    R finishDeliverOrder(@RequestBody ComShopOrderDeliverDTO deliverDTO) {
        return comShopOrderService.finishDeliverOrder(deliverDTO);
    }

    *//**
     * 订单导出信息
     *
     * @param comShopOrderExportDTO
     *            订单导出信息
     * @return 订单导出信息
     *//*
    @PostMapping("/shopOrderExportData")
    R shopOrderExportData(@RequestBody ComShopOrderExportDTO comShopOrderExportDTO) {
        return comShopOrderService.shopOrderExportData(comShopOrderExportDTO);
    }

    *//**
     * 资金管理导出信息
     *
     * @param comShopFundsExportDTO
     *            资金管理导出信息
     * @return 资金管理导出信息
     *//*
    @PostMapping("/shopOrderFundsExportData")
    R shopOrderFundsExportData(@RequestBody ComShopFundsExportDTO comShopFundsExportDTO) {
        return comShopOrderService.shopOrderFundsExportData(comShopFundsExportDTO);
    }

    *//**
     * 用户资金统计信息
     *
     * @param userId
     *            用户ID
     * @return 统计信息
     *//*
    @GetMapping("/getFundsStat")
    R getFundsStat(@RequestParam("userId") Long userId) {
        return comShopOrderService.getFundsStat(userId);
    }

    *//**
     * 店铺资金统计信息
     *
     * @param pageComShopFundsSearchDTO
     *            店铺资金
     * @return 店铺资金统计信息
     *//*
    @PostMapping("/pageShopFunds")
    R pageShopFunds(@RequestBody PageComShopFundsSearchDTO pageComShopFundsSearchDTO) {
        return comShopOrderService.pageShopFunds(pageComShopFundsSearchDTO);
    }

    *//**
     * 微信支付订单回调
     *
     * @param wxPayNotifyOrderDTO
     *            订单支付回调参数
     *//*
    @PostMapping("/wxOrderPayNotify")
    public void wxOrderPayNotify(@RequestBody WxPayNotifyOrderDTO wxPayNotifyOrderDTO) {
        comShopOrderService.wxOrderPayNotify(wxPayNotifyOrderDTO);
    }

    *//**
     * 点击去支付订单
     *
     * @param orderPayDTO
     *            请求参数
     * @return 支付对象
     *//*
    @PostMapping("/wxPay")
    public R wxPay(@RequestBody OrderPayDTO orderPayDTO) {
        return comShopOrderService.wxPay(orderPayDTO);
    }

    *//**
     * 商城系统配置
     *
     * @param comShopSysConfDTO
     * @return
     *//*
    @PostMapping("/conf/edit")
    R editShopSysConf(@RequestBody ComShopSysConfDTO comShopSysConfDTO) {
        ComShopSysConfDO comShopSysConfDO = comShopSysConfService.getBaseMapper().selectById(comShopSysConfDTO.getId());
        switch (comShopSysConfDTO.getHidden()) {
            case 0:
                comShopSysConfDO.setVal("0");
                comShopSysConfDO.setEnabled("1");
                break;
            case 1:
                comShopSysConfDO.setVal("1");
                comShopSysConfDO.setEnabled("1");
                break;
            default:
                break;
        }
        int updated = comShopSysConfService.getBaseMapper().updateById(comShopSysConfDO);
        if (updated == 1) {
            return R.ok();
        }
        return R.fail();
    }

    *//**
     * 商城系统配置查询
     *
     * @param pageComShopSysConfDTO
     * @return
     *//*
    @PostMapping("/conf/get")
    R pageShopSysConf(@RequestBody PageComShopSysConfDTO pageComShopSysConfDTO) {
        List<ComShopSysConfDO> confList =
                comShopSysConfService.getBaseMapper().selectList(new LambdaQueryWrapper<ComShopSysConfDO>()
                        .eq(ComShopSysConfDO::getName, "SHOP_HIDDEN").orderByDesc(ComShopSysConfDO::getCreate_at));
        ComShopSysConfVO comShopSysConfVO = new ComShopSysConfVO();
        if (confList != null && confList.size() > 0) {
            ComShopSysConfDO firstConf = confList.get(0);
            BeanUtils.copyProperties(firstConf, comShopSysConfVO);
            return R.ok(comShopSysConfVO);
        }
        return R.ok();
    }

    *//**
     * check商家/店铺是否有效
     * @param userId
     * @return
     *//*
    @GetMapping("/checkStoreIsValid")
    public R checkStoreIsValid(@RequestParam("userId") Long userId) {
        Boolean isShopValid = comShopStoreService.checkStoreIsValid(userId);
        Boolean isConvenientValid = convenientMerchantService.checkStoreIsValid(userId);
        Boolean isMcsValid = userService.checkUserIsValid(userId, 11);
        return R.ok(isShopValid || isConvenientValid || isMcsValid);
    }*/
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/config/MyMetaObjectHandler.java

@@ -27,6 +27,8 @@
        this.strictInsertFill(metaObject, "updateAt", () -> new Date(), Date.class); // 起始版本 3.3.3(推荐)
        // 或者
        // this.fillStrategy(metaObject, "createTime", LocalDateTime.now()); // 也可以使用(3.3.0 该方法有bug)
        this.strictInsertFill(metaObject, "createdAt", () -> new Date(), Date.class); // 起始版本 3.3.3(推荐)
        this.strictInsertFill(metaObject, "updatedAt", () -> new Date(), Date.class); // 起始版本 3.3.3(推荐)
    }

    @Override
@@ -35,6 +37,7 @@
        // this.strictUpdateFill(metaObject, "updateTime", LocalDateTime.class, LocalDateTime.now()); // 起始版本 3.3.0(推荐)
        // 或者
        this.strictUpdateFill(metaObject, "updateAt", () -> new Date(), Date.class); // 起始版本 3.3.3(推荐)
        this.strictUpdateFill(metaObject, "updatedAt", () -> new Date(), Date.class); // 起始版本 3.3.3(推荐)
        // 或者
        // this.fillStrategy(metaObject, "updateTime", LocalDateTime.now()); // 也可以使用(3.3.0 该方法有bug)
    }

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDAO.java

@@ -3,6 +3,7 @@
import java.util.List;

import com.panzhihua.common.model.vos.community.ComActPasswordVo;
import com.panzhihua.common.model.vos.community.DataCount;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActProceedingsDao.java

@@ -30,4 +30,5 @@
     * */
    List<ComActProceedings> pageProceedings(Page page, @Param("keyWord") String keyWord);


}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComPropertyDao.java

@@ -4,11 +4,13 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.community.ComActAnnouncementVO;
import com.panzhihua.common.model.vos.community.ComPropertyVO;
import com.panzhihua.common.model.vos.community.StatisticsCommVO;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenAlarmStatisticsInfo;
import com.panzhihua.common.model.vos.property.ComPropertyAlarmVO;
import com.panzhihua.common.model.vos.property.ComPropertyEquipmentVO;
import com.panzhihua.service_community.entity.ComActAnnouncement;
import org.apache.ibatis.annotations.Mapper;
import com.panzhihua.service_community.entity.ComProperty;
import org.apache.ibatis.annotations.Param;
@@ -104,4 +106,6 @@
     * @return
     */
    List<ComPropertyEquipmentVO> getAlarmPointMapData(@Param("communityId") Long communityId);

    IPage<ComActAnnouncementVO> noticeList(Page page, @Param("propertyId") Long propertyId);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComSanshuoExpertDao.java

@@ -29,7 +29,7 @@
     * @param id 社区或街道或业务中心id
     * @return 处理结果
     * */
    IPage<ComSanshuoExpertVO> expertPage(Page page, @Param("keyWord")String keyWord, @Param("range") Integer range, @Param("id")Long id,@Param("level")Integer level);
    IPage<ComSanshuoExpertVO> expertPage(Page page, @Param("keyWord")String keyWord, @Param("range") Integer range, @Param("id")Long id,@Param("level")Integer level,@Param("appId")String appId);

    /**
     * 专家风采列表
@@ -70,7 +70,7 @@

    Integer selectExpertVoList();

    IPage<ComSanshuoExpertVO> expertList(Page page, @Param("level") Integer level, @Param("id") Long  id);
    IPage<ComSanshuoExpertVO> expertList(Page page, @Param("level") Integer level, @Param("id") Long  id,@Param("appId")String appId);
}



 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerEvaluateDAO.java

New file
@@ -0,0 +1,15 @@
package com.panzhihua.service_community.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.service_community.model.dos.ComShopFlowerEvaluateDO;
import org.apache.ibatis.annotations.Mapper;

/**
 * @ClassName:  ComShopFlowerEvaluateMapper
 * @Author: yh
 * @Date: 2022/11/9 16:46
 * @Description: TODO
 */
@Mapper
public interface ComShopFlowerEvaluateDAO extends BaseMapper<ComShopFlowerEvaluateDO> {
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerGoodsAttrDAO.java

@@ -2,12 +2,9 @@

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.common.model.vos.shop.ComShopFlowerGoodsAttrVO;
import com.panzhihua.common.model.vos.shop.ComShopGoodsAttrVO;
import com.panzhihua.service_community.model.dos.ComShopFlowerGoodsAttrDO;
import com.panzhihua.service_community.model.dos.ComShopGoodsAttrDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;

import java.util.List;


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerGoodsDAO.java

@@ -3,10 +3,11 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.shop.*;
import com.panzhihua.common.model.dtos.shop.ComShopFlowerGoodsDTO;
import com.panzhihua.common.model.dtos.shop.PageComShopFlowerGoodsDTO;
import com.panzhihua.common.model.dtos.shop.PageComShopFlowerStoreDTO;
import com.panzhihua.common.model.vos.shop.ComShopFlowerGoodsVO;
import com.panzhihua.common.model.vos.shop.ComShopGoodsVO;
import com.panzhihua.common.model.vos.shop.PageShopGoodsVO;
import com.panzhihua.common.model.vos.shop.PageShopFlowerGoodsVO;
import com.panzhihua.service_community.model.dos.ComShopFlowerGoodsDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -19,7 +20,7 @@
@Mapper
public interface ComShopFlowerGoodsDAO extends BaseMapper<ComShopFlowerGoodsDO> {

    IPage<ComShopFlowerGoodsVO> pageShopGoods(@Param("page") Page page, @Param("pageComShopFlowerGoodsDTO") PageComShopFlowerGoodsDTO pageComShopFlowerGoodsDTO);
    IPage<PageShopFlowerGoodsVO> pageShopGoods(@Param("page") Page page, @Param("pageComShopFlowerGoodsDTO") PageComShopFlowerGoodsDTO pageComShopFlowerGoodsDTO);

    /**
     * 根据店铺id查询商品列表

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerOrderDAO.java

New file
@@ -0,0 +1,15 @@
package com.panzhihua.service_community.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.service_community.model.dos.ComShopFlowerOrderDO;
import org.apache.ibatis.annotations.Mapper;

/**
 * @ClassName:  ComShopFlowerOrderMapper
 * @Author: yh
 * @Date: 2022/11/9 16:46
 * @Description: TODO
 */
@Mapper
public interface ComShopFlowerOrderDAO extends BaseMapper<ComShopFlowerOrderDO> {
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerOrderGoodsDAO.java

New file
@@ -0,0 +1,15 @@
package com.panzhihua.service_community.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.service_community.model.dos.ComShopFlowerOrderGoodsDO;
import org.apache.ibatis.annotations.Mapper;

/**
 * @ClassName:  ComShopFlowerOrderGoodsMapper
 * @Author: yh
 * @Date: 2022/11/9 16:46
 * @Description: TODO
 */
@Mapper
public interface ComShopFlowerOrderGoodsDAO extends BaseMapper<ComShopFlowerOrderGoodsDO> {
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerOrderOperateDAO.java

New file
@@ -0,0 +1,15 @@
package com.panzhihua.service_community.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.service_community.model.dos.ComShopFlowerOrderOperateDO;
import org.apache.ibatis.annotations.Mapper;

/**
 * @ClassName:  ComShopFlowerOrderOperateMapper
 * @Author: yh
 * @Date: 2022/11/9 16:46
 * @Description: TODO
 */
@Mapper
public interface ComShopFlowerOrderOperateDAO extends BaseMapper<ComShopFlowerOrderOperateDO> {
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerOrderPayDAO.java

New file
@@ -0,0 +1,15 @@
package com.panzhihua.service_community.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.service_community.model.dos.ComShopFlowerOrderPayDO;
import org.apache.ibatis.annotations.Mapper;

/**
 * @ClassName:  ComShopFlowerOrderPayMapper
 * @Author: yh
 * @Date: 2022/11/9 16:46
 * @Description: TODO
 */
@Mapper
public interface ComShopFlowerOrderPayDAO extends BaseMapper<ComShopFlowerOrderPayDO> {
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerRefundOrderDAO.java

New file
@@ -0,0 +1,15 @@
package com.panzhihua.service_community.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.service_community.model.dos.ComShopFlowerRefundOrderDO;
import org.apache.ibatis.annotations.Mapper;

/**
 * @ClassName:  ComShopFlowerRefundOrderMapper
 * @Author: yh
 * @Date: 2022/11/9 16:46
 * @Description: TODO
 */
@Mapper
public interface ComShopFlowerRefundOrderDAO extends BaseMapper<ComShopFlowerRefundOrderDO> {
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerUserAddressDAO.java

New file
@@ -0,0 +1,15 @@
package com.panzhihua.service_community.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.service_community.model.dos.ComShopFlowerUserAddressDO;
import org.apache.ibatis.annotations.Mapper;

/**
 * @ClassName: ComShopFlowerUserAddressMapper
 * @Author: yh
 * @Date: 2022/11/9 16:46
 * @Description: TODO
 */
@Mapper
public interface ComShopFlowerUserAddressDAO extends BaseMapper<ComShopFlowerUserAddressDO> {
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActAnnouncement.java

@@ -66,5 +66,9 @@
     */
    @ApiModelProperty(value = "社区id")
    private Long communityId;
    /**
     * 物业公司id
     * */
    private Long propertyId;

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActProceedings.java

@@ -2,6 +2,8 @@

import java.io.Serializable;
import java.util.Date;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
@@ -38,12 +40,12 @@
    /**
     * 是否删除0否1是
     */
    private Boolean delFlag;
    private Integer delFlag;

    /**
     * 状态0可用1禁用
     */
    private Boolean status;
    private Integer status;

    /**
     * 创建时间
@@ -64,6 +66,11 @@
     * 修改人
     */
    private Date updateBy;
   /**
    * 工作时间
    * */
    private String workTime;


    private static final long serialVersionUID = 1L;
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComEvent.java

@@ -214,5 +214,6 @@
    //更换专家
    @TableField(exist = false)
    private Integer changeExpert;
    private String appId;

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComSanshuoExpert.java

@@ -129,8 +129,7 @@
    @TableField(exist = false)
    private BigDecimal rate;
    private Integer added;


    private String appId;
    @TableField(exist = false)
    private static final long serialVersionUID = 1L;


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerEvaluateDO.java

New file
@@ -0,0 +1,74 @@
package com.panzhihua.service_community.model.dos;

import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;

/**
 * @ClassName:  ComShopFlowerEvaluate
 * @Author: yh
 * @Date: 2022/11/9 16:46
 * @Description: 评价表
 */

@TableName(value = "com_shop_flower_evaluate")
@Data
public class ComShopFlowerEvaluateDO  implements Serializable {
    private static final long serialVersionUID = 1L;
    /**
     * ,主键
     */
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;

    /**
     * 订单号
     */
    @TableField(value = "order_no")
    private String orderNo;

    /**
     * 商品id
     */
    @TableField(value = "goods_id")
    private String goodsId;

    /**
     * 评价人id
     */
    @TableField(value = "user_id")
    private Long userId;

    /**
     * 评价时间
     */
    @TableField(value = "evaluate_time")
    private Date evaluateTime;

    /**
     * 评价类型(1.非常满意 2.满意 3.一般 4.不满意 5.糟糕透了)
     */
    @TableField(value = "evaluate_type")
    private Integer evaluateType;

    /**
     * 评价内容
     */
    @TableField(value = "evaluate_content")
    private String evaluateContent;

    /**
     * 评价图片
     */
    @TableField(value = "evaluate_pic")
    private String evaluatePic;

    /**
     * 创建时间
     */
    @TableField(value = "create_at",fill = FieldFill.INSERT)
    private Date createAt;

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerOrderDO.java

New file
@@ -0,0 +1,177 @@
package com.panzhihua.service_community.model.dos;

import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;

import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;

/**
 * @ClassName:  ComShopFlowerOrder
 * @Author: yh
 * @Date: 2022/11/9 16:46
 * @Description: 花城订单表
 */

@TableName(value = "com_shop_flower_order")
@Data
public class ComShopFlowerOrderDO  implements Serializable {
    private static final long serialVersionUID = 1L;
    /**
     * 订单id
     */
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;

    /**
     * 店铺id
     */
    @TableField(value = "store_id")
    private Long storeId;

    /**
     * 用户id
     */
    @TableField(value = "user_id")
    private Long userId;

    /**
     * 订单号
     */
    @TableField(value = "order_no")
    private String orderNo;

    /**
     * 支付单号
     */
    @TableField(value = "pay_no")
    private String payNo;

    /**
     * 微信交易单号
     */
    @TableField(value = "wx_tarde_no")
    private String wxTardeNo;

    /**
     * 订单状态(1.等待配送 2.配送中 3.待收货 4.待评价 5.已完成 6.已取消 7.已退款)
     */
    @TableField(value = "status")
    private Integer status;

    /**
     * 支付状态(1.未支付 2.已支付)
     */
    @TableField(value = "pay_status")
    private Integer payStatus;

    /**
     * 订单收货人id
     */
    @TableField(value = "receiver_id")
    private Long receiverId;

    /**
     * 删除状态(1.未删除 2.已删除)
     */
    @TableField(value = "delete_status")
    private Integer deleteStatus;

    /**
     * 订单总金额
     */
    @TableField(value = "total_amount")
    private BigDecimal totalAmount;

    /**
     * 优惠总金额
     */
    @TableField(value = "discount_amount")
    private BigDecimal discountAmount;

    /**
     * 支付总金额
     */
    @TableField(value = "pay_amount")
    private BigDecimal payAmount;

    /**
     * 支付方式（1.微信支付）
     */
    @TableField(value = "pay_type")
    private Integer payType;

    /**
     * 支付时间
     */
    @TableField(value = "pay_time")
    private Date payTime;

    /**
     * 配送方式（1.自提  2.快递）
     */
    @TableField(value = "delivery_type")
    private Integer deliveryType;

    /**
     * 订单发货状态（1.未发货  2.已发货）
     */
    @TableField(value = "delivery_status")
    private Integer deliveryStatus;

    /**
     * 订单备注
     */
    @TableField(value = "remark")
    private String remark;

    /**
     * 物流公司
     */
    @TableField(value = "logistics_company")
    private String logisticsCompany;

    /**
     * 物流单号
     */
    @TableField(value = "logistics_no")
    private String logisticsNo;

    /**
     * 下单时间
     */
    @TableField(value = "create_at",fill = FieldFill.INSERT)
    private Date createAt;

    /**
     * 修改时间
     */
    @TableField(value = "update_at",fill = FieldFill.UPDATE)
    private Date updateAt;

    /**
     * 配送时间
     */
    @TableField(value = "delivery_time")
    private Date deliveryTime;

    /**
     * 送达时间
     */
    @TableField(value = "service_time")
    private Date serviceTime;

    /**
     * 收货时间
     */
    @TableField(value = "receiving_time")
    private Date receivingTime;

    /**
     * 退款时间
     */
    @TableField(value = "refund_time")
    private Date refundTime;

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerOrderGoodsDO.java

New file
@@ -0,0 +1,406 @@
package com.panzhihua.service_community.model.dos;

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.math.BigDecimal;
import java.util.Date;

/**
 * @ClassName:  ComShopFlowerOrderGoods
 * @Author: yh
 * @Date: 2022/11/9 16:46
 * @Description: 花城订单商品表
 */
@TableName(value = "com_shop_flower_order_goods")
@Data
public class ComShopFlowerOrderGoodsDO  implements Serializable {
    private static final long serialVersionUID = 1L;
    /**
     * 订单商品id
     */
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;

    /**
     * 店铺id
     */
    @TableField(value = "store_id")
    private Long storeId;

    /**
     * 订单id
     */
    @TableField(value = "order_id")
    private Long orderId;

    /**
     * 用户id
     */
    @TableField(value = "user_id")
    private Long userId;

    /**
     * 订单号
     */
    @TableField(value = "order_no")
    private String orderNo;

    /**
     * 商品id
     */
    @TableField(value = "goods_id")
    private Long goodsId;

    /**
     * 商品规格id
     */
    @TableField(value = "goods_attr_id")
    private Long goodsAttrId;

    /**
     * 规格名称
     */
    @TableField(value = "goods_attr_name")
    private String goodsAttrName;

    /**
     * 购买数量
     */
    @TableField(value = "amount")
    private Integer amount;

    /**
     * 商品规格价格
     */
    @TableField(value = "goods_attr_price")
    private BigDecimal goodsAttrPrice;

    /**
     * 商品规格图
     */
    @TableField(value = "goods_attr_pic")
    private String goodsAttrPic;

    /**
     * 原价（划线价）
     */
    @TableField(value = "price")
    private BigDecimal price;

    /**
     * 包邮价
     */
    @TableField(value = "free_shipping_price")
    private BigDecimal freeShippingPrice;

    /**
     * 拼单价
     */
    @TableField(value = "collate_price")
    private BigDecimal collatePrice;

    /**
     * 商品名称
     */
    @TableField(value = "goods_name")
    private String goodsName;

    /**
     * 创建时间
     */
    @TableField(value = "create_at")
    private Date createAt;

    /**
     * 获取订单商品id
     *
     * @return id - 订单商品id
     */
    public Long getId() {
        return id;
    }

    /**
     * 设置订单商品id
     *
     * @param id 订单商品id
     */
    public void setId(Long id) {
        this.id = id;
    }

    /**
     * 获取店铺id
     *
     * @return store_id - 店铺id
     */
    public Long getStoreId() {
        return storeId;
    }

    /**
     * 设置店铺id
     *
     * @param storeId 店铺id
     */
    public void setStoreId(Long storeId) {
        this.storeId = storeId;
    }

    /**
     * 获取订单id
     *
     * @return order_id - 订单id
     */
    public Long getOrderId() {
        return orderId;
    }

    /**
     * 设置订单id
     *
     * @param orderId 订单id
     */
    public void setOrderId(Long orderId) {
        this.orderId = orderId;
    }

    /**
     * 获取用户id
     *
     * @return user_id - 用户id
     */
    public Long getUserId() {
        return userId;
    }

    /**
     * 设置用户id
     *
     * @param userId 用户id
     */
    public void setUserId(Long userId) {
        this.userId = userId;
    }

    /**
     * 获取订单号
     *
     * @return order_no - 订单号
     */
    public String getOrderNo() {
        return orderNo;
    }

    /**
     * 设置订单号
     *
     * @param orderNo 订单号
     */
    public void setOrderNo(String orderNo) {
        this.orderNo = orderNo;
    }

    /**
     * 获取商品id
     *
     * @return goods_id - 商品id
     */
    public Long getGoodsId() {
        return goodsId;
    }

    /**
     * 设置商品id
     *
     * @param goodsId 商品id
     */
    public void setGoodsId(Long goodsId) {
        this.goodsId = goodsId;
    }

    /**
     * 获取商品规格id
     *
     * @return goods_attr_id - 商品规格id
     */
    public Long getGoodsAttrId() {
        return goodsAttrId;
    }

    /**
     * 设置商品规格id
     *
     * @param goodsAttrId 商品规格id
     */
    public void setGoodsAttrId(Long goodsAttrId) {
        this.goodsAttrId = goodsAttrId;
    }

    /**
     * 获取规格名称
     *
     * @return goods_attr_name - 规格名称
     */
    public String getGoodsAttrName() {
        return goodsAttrName;
    }

    /**
     * 设置规格名称
     *
     * @param goodsAttrName 规格名称
     */
    public void setGoodsAttrName(String goodsAttrName) {
        this.goodsAttrName = goodsAttrName;
    }

    /**
     * 获取购买数量
     *
     * @return amount - 购买数量
     */
    public Integer getAmount() {
        return amount;
    }

    /**
     * 设置购买数量
     *
     * @param amount 购买数量
     */
    public void setAmount(Integer amount) {
        this.amount = amount;
    }

    /**
     * 获取商品规格价格
     *
     * @return goods_attr_price - 商品规格价格
     */
    public BigDecimal getGoodsAttrPrice() {
        return goodsAttrPrice;
    }

    /**
     * 设置商品规格价格
     *
     * @param goodsAttrPrice 商品规格价格
     */
    public void setGoodsAttrPrice(BigDecimal goodsAttrPrice) {
        this.goodsAttrPrice = goodsAttrPrice;
    }

    /**
     * 获取商品规格图
     *
     * @return goods_attr_pic - 商品规格图
     */
    public String getGoodsAttrPic() {
        return goodsAttrPic;
    }

    /**
     * 设置商品规格图
     *
     * @param goodsAttrPic 商品规格图
     */
    public void setGoodsAttrPic(String goodsAttrPic) {
        this.goodsAttrPic = goodsAttrPic;
    }

    /**
     * 获取原价（划线价）
     *
     * @return price - 原价（划线价）
     */
    public BigDecimal getPrice() {
        return price;
    }

    /**
     * 设置原价（划线价）
     *
     * @param price 原价（划线价）
     */
    public void setPrice(BigDecimal price) {
        this.price = price;
    }

    /**
     * 获取包邮价
     *
     * @return free_shipping_price - 包邮价
     */
    public BigDecimal getFreeShippingPrice() {
        return freeShippingPrice;
    }

    /**
     * 设置包邮价
     *
     * @param freeShippingPrice 包邮价
     */
    public void setFreeShippingPrice(BigDecimal freeShippingPrice) {
        this.freeShippingPrice = freeShippingPrice;
    }

    /**
     * 获取拼单价
     *
     * @return collate_price - 拼单价
     */
    public BigDecimal getCollatePrice() {
        return collatePrice;
    }

    /**
     * 设置拼单价
     *
     * @param collatePrice 拼单价
     */
    public void setCollatePrice(BigDecimal collatePrice) {
        this.collatePrice = collatePrice;
    }

    /**
     * 获取商品名称
     *
     * @return goods_name - 商品名称
     */
    public String getGoodsName() {
        return goodsName;
    }

    /**
     * 设置商品名称
     *
     * @param goodsName 商品名称
     */
    public void setGoodsName(String goodsName) {
        this.goodsName = goodsName;
    }

    /**
     * 获取创建时间
     *
     * @return create_at - 创建时间
     */
    public Date getCreateAt() {
        return createAt;
    }

    /**
     * 设置创建时间
     *
     * @param createAt 创建时间
     */
    public void setCreateAt(Date createAt) {
        this.createAt = createAt;
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerOrderOperateDO.java

New file
@@ -0,0 +1,62 @@
package com.panzhihua.service_community.model.dos;

import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;

/**
 * @ClassName:  ComShopFlowerOrderOperate
 * @Author: yh
 * @Date: 2022/11/9 16:46
 * @Description: 花城订单操作记录表
 */
@TableName(value = "com_shop_flower_order_operate")
@Data
public class ComShopFlowerOrderOperateDO  implements Serializable {
    private static final long serialVersionUID = 1L;
    /**
     * ,主键
     */
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;

    /**
     * 订单号
     */
    @TableField(value = "order_no")
    private String orderNo;

    /**
     * 操作人
     */
    @TableField(value = "operation_by")
    private String operationBy;

    /**
     * 操作时间
     */
    @TableField(value = "operation_time")
    private Date operationTime;

    /**
     * 操作类型(1.创建订单 2.取消订单 3.订单支付 4.订单发货 5.订单完成)
     */
    @TableField(value = "operation_type")
    private Integer operationType;

    /**
     * 操作内容
     */
    @TableField(value = "operation_content")
    private String operationContent;

    /**
     * 创建时间
     */
    @TableField(value = "create_at",fill = FieldFill.INSERT)
    private Date createAt;


}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerOrderPayDO.java

New file
@@ -0,0 +1,80 @@
package com.panzhihua.service_community.model.dos;

import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;

import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;

/**
 * @ClassName:  ComShopFlowerOrderPay
 * @Author: yh
 * @Date: 2022/11/9 16:46
 * @Description: 花城订单支付记录表
 */
@TableName(value = "com_shop_flower_order_pay")
@Data
public class ComShopFlowerOrderPayDO  implements Serializable {
    private static final long serialVersionUID = 1L;
    /**
     * 主键id
     */
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;

    /**
     * 订单号
     */
    @TableField(value = "order_no")
    private String orderNo;

    /**
     * 支付单号
     */
    @TableField(value = "pay_no")
    private String payNo;

    /**
     * 微信交易号
     */
    @TableField(value = "wx_trade_no")
    private String wxTradeNo;

    /**
     * 支付状态（1.未支付  2.已支付）
     */
    @TableField(value = "pay_status")
    private Integer payStatus;

    /**
     * 订单金额
     */
    @TableField(value = "order_amount")
    private BigDecimal orderAmount;

    /**
     * 支付金额
     */
    @TableField(value = "pay_amount")
    private BigDecimal payAmount;

    /**
     * 支付时间
     */
    @TableField(value = "pay_time")
    private Date payTime;

    /**
     * 创建时间
     */
    @TableField(value = "create_at",fill = FieldFill.INSERT)
    private Date createAt;

    /**
     * 修改时间
     */
    @TableField(value = "update_at",fill = FieldFill.UPDATE)
    private Date updateAt;

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerRefundOrderDO.java

New file
@@ -0,0 +1,128 @@
package com.panzhihua.service_community.model.dos;

import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;

import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;

/**
 * @ClassName:  ComShopFlowerRefundOrder
 * @Author: yh
 * @Date: 2022/11/9 16:46
 * @Description: 花城退款订单表
 */
@TableName(value = "com_shop_flower_refund_order")
@Data
public class ComShopFlowerRefundOrderDO  implements Serializable {
    private static final long serialVersionUID = 1L;
    /**
     * 订单id
     */
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;

    /**
     * 店铺id
     */
    @TableField(value = "store_id")
    private Long storeId;

    /**
     * 用户id
     */
    @TableField(value = "user_id")
    private Long userId;

    /**
     * 原始订单号
     */
    @TableField(value = "order_no")
    private String orderNo;

    /**
     * 原始订单id
     */
    @TableField(value = "order_id")
    private String orderId;

    /**
     * 退款订单号
     */
    @TableField(value = "refund_order_no")
    private String refundOrderNo;

    /**
     * 订单状态(1.处理中 2.退款成功 3.退款失败 4.已取消 5.退款中)
     */
    @TableField(value = "status")
    private Integer status;

    /**
     * 删除状态(1.未删除 2.已删除)
     */
    @TableField(value = "delete_status")
    private Integer deleteStatus;

    /**
     * 支付总金额
     */
    @TableField(value = "pay_amount")
    private BigDecimal payAmount;

    /**
     * 申请退款金额
     */
    @TableField(value = "refund_amount")
    private BigDecimal refundAmount;

    /**
     * 退款原因
     */
    @TableField(value = "refund_reason")
    private String refundReason;

    /**
     * 退款照片
     */
    @TableField(value = "refund_pic")
    private String refundPic;

    /**
     * 申请时间
     */
    @TableField(value = "create_at",fill = FieldFill.INSERT)
    private Date createAt;

    /**
     * 修改时间
     */
    @TableField(value = "update_at")
    private Date updateAt;

    /**
     * 处理时间
     */
    @TableField(value = "handle_time")
    private Date handleTime;

    /**
     * 退款时间
     */
    @TableField(value = "refund_time")
    private Date refundTime;

    /**
     * 处理结果
     */
    @TableField(value = "handle_result")
    private String handleResult;

    /**
     * 商家备注
     */
    @TableField(value = "remark")
    private String remark;

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerUserAddressDO.java

New file
@@ -0,0 +1,109 @@
package com.panzhihua.service_community.model.dos;

import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;

/**
 * @ClassName:  ComShopFlowerUserAddress
 * @Author: yh
 * @Date: 2022/11/9 16:46
 * @Description: 花城用户收货地址表
 */
@TableName(value = "com_shop_flower_user_address")
@Data
public class ComShopFlowerUserAddressDO  implements Serializable {
    private static final long serialVersionUID = 1L;
    /**
     * ,主键
     */
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;

    /**
     * 用户id
     */
    @TableField(value = "user_id")
    private Long userId;

    /**
     * 收货人名称
     */
    @TableField(value = "name")
    private String name;

    /**
     * 收货人手机号
     */
    @TableField(value = "phone")
    private String phone;

    /**
     * 收货人省份编码
     */
    @TableField(value = "province_code")
    private String provinceCode;

    /**
     * 收货人省份名称
     */
    @TableField(value = "province_name")
    private String provinceName;

    /**
     * 收货人城市编码
     */
    @TableField(value = "city_code")
    private String cityCode;

    /**
     * 收货人城市名称
     */
    @TableField(value = "city_name")
    private String cityName;

    /**
     * 收货人区县编码
     */
    @TableField(value = "district_code")
    private String districtCode;

    /**
     * 收货人区县名称
     */
    @TableField(value = "district_name")
    private String districtName;

    /**
     * 收货人详细地址
     */
    @TableField(value = "detail_address")
    private String detailAddress;

    /**
     * 是否是默认地址(1.是  2.否)
     */
    @TableField(value = "is_default")
    private Integer isDefault;

    /**
     * 创建时间
     */
    @TableField(value = "create_at",fill = FieldFill.INSERT)
    private Date createAt;

    /**
     * 修改时间
     */
    @TableField(value = "update_at",fill = FieldFill.UPDATE)
    private Date updateAt;

    /**
     * 是否已删除（1.是  2.否）
     */
    @TableField(value = "delete_status")
    private Integer deleteStatus;

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ConvenientElevatingPointDO.java

@@ -1,8 +1,6 @@
package com.panzhihua.service_community.model.dos;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;

import java.io.Serializable;
@@ -31,15 +29,11 @@
    /**
     * 社区id
     */
    private Long communityId;
    private String communityId;
    /**
     * 社区名称
     */
    private String communityName;
    /**
     * 所属地区
     */
    private String region;
    /**
     * 提货点地址
     */
@@ -87,7 +81,9 @@
    /**
     * 创建时间
     */
    @TableField(fill = FieldFill.INSERT)
    private Date createdAt;

    /**
     * 创建人
     */
@@ -95,6 +91,7 @@
    /**
     * 更新时间
     */
    @TableField(fill = FieldFill.UPDATE)
    private Date updatedAt;
    /**
     * 更新人

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ConvenientGoodsCategoryDO.java

@@ -1,8 +1,6 @@
package com.panzhihua.service_community.model.dos;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;

import java.io.Serializable;
@@ -49,7 +47,9 @@
    /**
     * 创建时间
     */
    @TableField(fill = FieldFill.INSERT)
    private Date createdAt;

    /**
     * 创建人
     */
@@ -57,6 +57,7 @@
    /**
     * 更新时间
     */
    @TableField(fill = FieldFill.UPDATE)
    private Date updatedAt;
    /**
     * 更新人

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ConvenientMerchantDO.java

@@ -1,14 +1,10 @@
package com.panzhihua.service_community.model.dos;

import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @title: ConvenientMerchantDO
@@ -107,7 +103,9 @@
    /**
     * 创建时间
     */
    @TableField(fill = FieldFill.INSERT)
    private Date createdAt;

    /**
     * 创建人
     */
@@ -115,6 +113,7 @@
    /**
     * 更新时间
     */
    @TableField(fill = FieldFill.UPDATE)
    private Date updatedAt;
    /**
     * 更新人

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComPropertyService.java

@@ -55,4 +55,10 @@
     * @return
     */
    R detailProperty(Long id);

    /**
     * 物业公司通知公告列表
     * @param propertyId 物业公司Id
     * */
    R noticeList(Integer page, Integer size, Long propertyId);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopFlowerGoodsAttrService.java

New file
@@ -0,0 +1,13 @@
package com.panzhihua.service_community.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.service_community.model.dos.ComShopFlowerGoodsAttrDO;

/**
 * @ClassName: ComShopFlowerGoodsAttrService
 * @Author: yh
 * @Date: 2022/11/8 17:19
 * @Description: 商品规格
 */
public interface ComShopFlowerGoodsAttrService extends IService<ComShopFlowerGoodsAttrDO> {
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopFlowerGoodsService.java

New file
@@ -0,0 +1,82 @@
package com.panzhihua.service_community.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.shop.ComShopFlowerGoodsDTO;
import com.panzhihua.common.model.dtos.shop.ComShopGoodsDTO;
import com.panzhihua.common.model.dtos.shop.PageComShopFlowerGoodsDTO;
import com.panzhihua.common.model.dtos.shop.PageComShopGoodsDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.shop.AddShopFlowerGoodsVO;
import com.panzhihua.common.model.vos.shop.AddShopGoodsVO;
import com.panzhihua.service_community.model.dos.ComShopFlowerGoodsDO;

/**
 * @ClassName: ComShopFlowerGoodsService
 * @Author: yh
 * @Date: 2022/11/8 17:16
 * @Description: 商品
 */
public interface ComShopFlowerGoodsService extends IService<ComShopFlowerGoodsDO> {

    /**
     * 添加商品
     *
     * @param addShopFlowerGoodsVO
     * @return
     */
    R saveShopFlowerGoods(AddShopFlowerGoodsVO addShopFlowerGoodsVO);


    /**
     * 商品列表-分页查询
     *
     * @param pageComShopFlowerGoodsDTO
     *            查询参数
     * @return PageShopStoreVO
     */
    R pageFlowerGoodsList(PageComShopFlowerGoodsDTO pageComShopFlowerGoodsDTO);

    /**
     * 分页查询商品列表
     *
     * @param comShopFlowerGoodsDTO
     *            请求参数
     * @return 商品列表
     */
    R pageShopFlowerGoodsByApp(ComShopFlowerGoodsDTO comShopFlowerGoodsDTO);

    /**
     * 根据商品id查询商品信息
     *
     * @param goodsId
     *            商品id
     * @return 商品信息
     */
    R shopFlowerGoodsDetail(Long goodsId);

    /**
     * 编辑商品
     *
     * @param id
     *            商铺ID
     * @param addShopFlowerGoodsVO
     * @return
     */
    R editFlowerShopGoods(Long id, AddShopFlowerGoodsVO addShopFlowerGoodsVO);

    /**
     * 删除商品
     *
     * @param id
     * @return
     */
    R deleteShopFlowerGoods(Long[] id);

    /**
     * 修改商品状态
     *
     * @param id
     * @return
     */
    R changeStatus(Long id, Integer status);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ConvenientElevatingPointService.java

@@ -42,4 +42,11 @@
     * @return
     */
    R deletePoint(Long pointId, Long operator);

    /**
     * 详情
     * @param pointId
     * @return
     */
    R detailPoint(Long pointId);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDynServiceImpl.java

@@ -5,6 +5,7 @@

import javax.annotation.Resource;

import com.panzhihua.common.model.vos.community.DataCount;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
@@ -199,4 +200,5 @@
        return R.ok(iPage);
    }


}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActProceedingsServiceImpl.java

@@ -46,7 +46,10 @@
            ComActProceedings comActProceedings=new ComActProceedings();
            comActProceedings.setId(Snowflake.getId());
            comActProceedings.setCreateTime(new Date());
            int i = comActProceedingsDao.insertSelective(comActProceedings);
            comActProceedings.setDelFlag(0);
            comActProceedings.setStatus(0);
            BeanUtils.copyProperties(comActProceedingsDTO, comActProceedings);
            int i = comActProceedingsDao.insert(comActProceedings);
            if (i>0){
                return R.ok();
            }

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java

@@ -97,6 +97,7 @@
        Boolean isExpertCheck=false;
        Long expertId=null;
        Boolean isStretAccount = isStreetAccount(loginUserInfoVO);
        comEvent.setAppId(loginUserInfoVO.getAppId());
        if (nonNull(comEvent.getUserType())){
            if (comEvent.getUserType().equals(1)){
                //个人账号权限
@@ -1004,6 +1005,7 @@
            }
        }
        log.info("当前userType===="+comEvent.getUserType());
        comEvent.setAppId(loginUserInfoVO.getAppId());
        List<ComEventCalculateVO> calculateList = baseMapper.calculate(comEvent);
        ComEventCalculateVO comEventCalculateVO =new ComEventCalculateVO();
        comEventCalculateVO.setStatus("0");

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComPropertyServiceImpl.java

@@ -60,6 +60,9 @@
            if (isNotBlank(comPropertyVO.getAccount())) {
                AdministratorsUserVO administratorsUserVO=new AdministratorsUserVO();
                administratorsUserVO.setType(3);
                if (comPropertyVO.getCommunityId().equals(10172)){
                    administratorsUserVO.setType(20);
                }
                administratorsUserVO.setAccount(comPropertyVO.getAccount());
                administratorsUserVO.setPassword(comPropertyVO.getPassword());
                administratorsUserVO.setRoleId(comPropertyVO.getRoleId());
@@ -142,4 +145,9 @@
        comPropertyVO.setPassword(null);
        return R.ok(comPropertyVO);
    }

    @Override
    public R noticeList(Integer page, Integer size, Long propertyId) {
        return R.ok(comPropertyDao.noticeList(new Page(page,size),propertyId));
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoExpertServiceImpl.java

@@ -196,7 +196,7 @@
            range=1;
        }
        log.info("");
        IPage<ComSanshuoExpertVO> comSanshuoExpertVOIPage = comSanshuoExpertDao.expertPage(new Page(page, size), keyWord, range, id, level);
        IPage<ComSanshuoExpertVO> comSanshuoExpertVOIPage = comSanshuoExpertDao.expertPage(new Page(page, size), keyWord, range, id, level,loginUserInfo.getAppId());
        for (ComSanshuoExpertVO record : comSanshuoExpertVOIPage.getRecords()) {
            //获取调解次数和成功率
            record.setCount(comEventMapper.selectCount(new QueryWrapper<ComEvent>().lambda().eq(ComEvent::getSpecialistId, record.getId())));
@@ -431,16 +431,16 @@
        if (nonNull(level)){
            if (level.equals(1)){
                //三说会堂权限，查看所有
                return R.ok(comSanshuoExpertDao.expertList(new Page(page,size),level,null));
                return R.ok(comSanshuoExpertDao.expertList(new Page(page,size),level,null ,loginUserInfoVO.getAppId()));
            }else if (level.equals(2)){
                //行业分中心
                ComSanshuoIndustryCenter center = comSanshuoIndustryCenterDao.selectOne(new QueryWrapper<ComSanshuoIndustryCenter>().lambda().eq(ComSanshuoIndustryCenter::getAccount, loginUserInfoVO.getAccount()));
                return R.ok(comSanshuoExpertDao.expertList(new Page(page,size),level,center.getId()));
                return R.ok(comSanshuoExpertDao.expertList(new Page(page,size),level,center.getId(),loginUserInfoVO.getAppId()));
            }else if (level.equals(3)){
                //街道
                return R.ok(comSanshuoExpertDao.expertList(new Page(page,size),level,loginUserInfoVO.getStreetId()));
                return R.ok(comSanshuoExpertDao.expertList(new Page(page,size),level,loginUserInfoVO.getStreetId(),loginUserInfoVO.getAppId()));
            }else if(level.equals(4)){
                return R.ok(comSanshuoExpertDao.expertList(new Page(page,size),level,loginUserInfoVO.getCommunityId()));
                return R.ok(comSanshuoExpertDao.expertList(new Page(page,size),level,loginUserInfoVO.getCommunityId(),loginUserInfoVO.getAppId()));
            }
        }
        return null;

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerGoodsAttrServiceImpl.java

New file
@@ -0,0 +1,23 @@
package com.panzhihua.service_community.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.service_community.dao.ComShopFlowerGoodsAttrDAO;
import com.panzhihua.service_community.dao.ComShopGoodsAttrDAO;
import com.panzhihua.service_community.model.dos.ComShopFlowerGoodsAttrDO;
import com.panzhihua.service_community.model.dos.ComShopGoodsAttrDO;
import com.panzhihua.service_community.service.ComShopFlowerGoodsAttrService;
import com.panzhihua.service_community.service.ComShopGoodsAttrService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

/**
 * @auther yh
 * @create 2022-11-08 17:25:45
 * @describe 商品规格表服务实现类
 */
@Slf4j
@Service
public class ComShopFlowerGoodsAttrServiceImpl extends ServiceImpl<ComShopFlowerGoodsAttrDAO, ComShopFlowerGoodsAttrDO>
    implements ComShopFlowerGoodsAttrService {

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerGoodsServiceImpl.java

New file
@@ -0,0 +1,273 @@
package com.panzhihua.service_community.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.collect.Lists;
import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.model.dtos.shop.ComShopFlowerGoodsDTO;
import com.panzhihua.common.model.dtos.shop.PageComShopFlowerGoodsDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
import com.panzhihua.common.model.vos.shop.*;
import com.panzhihua.common.utlis.DifferentLongListUtil;
import com.panzhihua.service_community.dao.ComShopFlowerGoodsAttrDAO;
import com.panzhihua.service_community.dao.ComShopFlowerGoodsDAO;
import com.panzhihua.service_community.dao.ConvenientMerchantDAO;
import com.panzhihua.service_community.model.dos.*;
import com.panzhihua.service_community.service.ComShopFlowerGoodsAttrService;
import com.panzhihua.service_community.service.ComShopFlowerGoodsService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;

/**
 * @ClassName: ComShopFlowerGoodsServiceImpl
 * @Author: yh
 * @Date: 2022/11/8 17:17
 * @Description: 商品
 */
@Service
@Slf4j
public class ComShopFlowerGoodsServiceImpl extends ServiceImpl<ComShopFlowerGoodsDAO, ComShopFlowerGoodsDO> implements ComShopFlowerGoodsService {

    @Resource
    private ComShopFlowerGoodsAttrService comShopFlowerGoodsAttrService;
    @Resource
    private ComShopFlowerGoodsAttrDAO shopFlowerGoodsAttrDAO;
    @Resource
    private ConvenientMerchantDAO convenientMerchantDAO;

    @Override
    public R saveShopFlowerGoods(AddShopFlowerGoodsVO addShopFlowerGoodsVO) {
        if (addShopFlowerGoodsVO == null) {
            return R.ok("500", "数据为空！");
        }
        String[] images = addShopFlowerGoodsVO.getGoodsPic().split(",");
        ComShopFlowerGoodsDO shopGoodsDO = new ComShopFlowerGoodsDO();
        BeanUtils.copyProperties(addShopFlowerGoodsVO, shopGoodsDO);
        shopGoodsDO.setOriginalPrice(addShopFlowerGoodsVO.getPrice());
        if (images.length > 1) {
            shopGoodsDO.setGoodsPic(images[0]);
        }
        shopGoodsDO.setImages(addShopFlowerGoodsVO.getGoodsPic());
        shopGoodsDO.setSale(0);
        shopGoodsDO.setDetails(addShopFlowerGoodsVO.getDetails());
        int goodsId = this.baseMapper.insert(shopGoodsDO);
        if (goodsId > 0) {
            ArrayList<ComShopFlowerGoodsAttrDO> goodsAttrDOS = Lists.newArrayList();
            ComShopFlowerGoodsDO goodDO = this.baseMapper.selectById(shopGoodsDO.getId());
            addShopFlowerGoodsVO.getGoodsAttrVOList().forEach(goodsAttr -> {
                // 维护商品规格表
                if (goodDO == null) {
                    throw new ServiceException("商品id不存在！");
                }
                ComShopFlowerGoodsAttrDO shopGoodsAttrDO = new ComShopFlowerGoodsAttrDO();
                shopGoodsAttrDO.setGoodsId(shopGoodsDO.getId());
                shopGoodsAttrDO.setStoreId(goodDO.getStoreId());
                shopGoodsAttrDO.setGoodsName(goodDO.getName());
                shopGoodsAttrDO.setGoodsAttrName(goodsAttr.getGoodsAttrName());
                shopGoodsAttrDO.setIsDefault(1);
                shopGoodsAttrDO.setPrice(goodsAttr.getPrice());
                shopGoodsAttrDO.setCollatePrice(goodsAttr.getCollatePrice());
                shopGoodsAttrDO.setFreeShippingPrice(goodsAttr.getFreeShippingPrice());
                shopGoodsAttrDO.setAttrPic(goodsAttr.getAttrPic());
                shopGoodsAttrDO.setStock(goodsAttr.getStock());
                shopGoodsAttrDO.setSale(0);
                goodsAttrDOS.add(shopGoodsAttrDO);
            });
            if (goodsAttrDOS.size() > 0) {
                comShopFlowerGoodsAttrService.saveBatch(goodsAttrDOS);
            }
        }
        return R.ok();
    }

    /**
     * 分页查询
     *
     * @param pageComShopFlowerGoodsDTO 查询参数
     * @return
     */
    @Override
    public R pageFlowerGoodsList(PageComShopFlowerGoodsDTO pageComShopFlowerGoodsDTO) {
        long pageNum = pageComShopFlowerGoodsDTO.getPageNum() != null ? pageComShopFlowerGoodsDTO.getPageNum() : 1;
        long pageSize = pageComShopFlowerGoodsDTO.getPageSize() != null ? pageComShopFlowerGoodsDTO.getPageSize() : 10;
        Page page = new Page<>(pageNum, pageSize);
        IPage<PageShopFlowerGoodsVO> comShopStoreVOIPage = this.baseMapper.pageShopGoods(page, pageComShopFlowerGoodsDTO);
        if (!comShopStoreVOIPage.getRecords().isEmpty()) {
            comShopStoreVOIPage.getRecords().forEach(shopGoods -> {
                List<ComShopFlowerGoodsAttrDO> goodsAttrDOs =
                        shopFlowerGoodsAttrDAO.selectList(new QueryWrapper<ComShopFlowerGoodsAttrDO>().lambda()
                                .eq(ComShopFlowerGoodsAttrDO::getGoodsId, shopGoods.getId()));
                ArrayList<AddShopFlowerGoodsAttrVO> goodsAttrVOList = Lists.newArrayList();
                for (ComShopFlowerGoodsAttrDO oneGoodsAttrDO : goodsAttrDOs) {
                    AddShopFlowerGoodsAttrVO goodsAttrVO = new AddShopFlowerGoodsAttrVO();
                    BeanUtils.copyProperties(oneGoodsAttrDO, goodsAttrVO);
                    goodsAttrVOList.add(goodsAttrVO);
                }
                shopGoods.setGoodsAttrs(goodsAttrVOList);
            });
        }
        return R.ok(comShopStoreVOIPage);
    }


    /**
     * 分页查询商品列表
     *
     * @param comShopFlowerGoodsDTO 请求参数
     * @return
     */
    @Override
    public R pageShopFlowerGoodsByApp(ComShopFlowerGoodsDTO comShopFlowerGoodsDTO) {
        Page page = new Page<>(comShopFlowerGoodsDTO.getPageNum(), comShopFlowerGoodsDTO.getPageSize());
        IPage<ComShopFlowerGoodsVO> goodsVOIPage = this.baseMapper.pageShopGoodByApps(page, comShopFlowerGoodsDTO);
        if (!goodsVOIPage.getRecords().isEmpty()) {
            goodsVOIPage.getRecords().forEach(goodsVo -> {
                List<ComShopFlowerGoodsAttrVO> goodsAttrList = shopFlowerGoodsAttrDAO.getGoodsAttr(goodsVo.getId());
                if (!goodsAttrList.isEmpty()) {
                    ComShopFlowerGoodsAttrVO comShopFlowerGoodsAttrVO = goodsAttrList.get(0);

                    goodsVo.setGoodsAttrList(goodsAttrList);
                    goodsVo.setGoodsPic(comShopFlowerGoodsAttrVO.getAttrPic());
                    goodsVo.setOriginalPrice(comShopFlowerGoodsAttrVO.getPrice());
                    goodsVo.setPrice(comShopFlowerGoodsAttrVO.getCollatePrice());
                }
            });
        }
        return R.ok(goodsVOIPage);
    }

    @Override
    public R shopFlowerGoodsDetail(Long goodsId) {
        // 根据id查询商品信息
        ComShopFlowerGoodsDO goodsDO = this.baseMapper.selectById(goodsId);
        if (goodsDO == null || goodsDO.getDeleteStatus().equals(ComShopFlowerGoodsDO.deleteStatus.yes)) {
            return R.fail(403, "商品不存在");
        }
        if (!goodsDO.getStatus().equals(ComShopFlowerGoodsDO.status.sell)) {
            return R.fail(405, "商品已下架");
        }

        // 根据商品id查询商品规格信息
        List<ComShopFlowerGoodsAttrVO> goodsAttrList = new ArrayList<>();
        List<ComShopFlowerGoodsAttrDO> goodsAttrDOS =
                shopFlowerGoodsAttrDAO.selectList(new QueryWrapper<ComShopFlowerGoodsAttrDO>().eq("goods_id", goodsId));
        goodsAttrDOS.forEach(attrDO -> {
            ComShopFlowerGoodsAttrVO goodsAttrVO = new ComShopFlowerGoodsAttrVO();
            BeanUtils.copyProperties(attrDO, goodsAttrVO);
            goodsAttrList.add(goodsAttrVO);
        });

        // 查询商品店铺信息
        ConvenientMerchantDO convenientMerchantDO = convenientMerchantDAO.selectById(goodsDO.getStoreId());
        ConvenientMerchantVO convenientMerchantVO = new ConvenientMerchantVO();
        BeanUtils.copyProperties(convenientMerchantDO, convenientMerchantVO);

        // 设置值
        ComShopFlowerGoodsVO shopGoods = new ComShopFlowerGoodsVO();
        BeanUtils.copyProperties(goodsDO, shopGoods);
        shopGoods.setGoodsAttrList(goodsAttrList);
        shopGoods.setConvenientMerchantVO(convenientMerchantVO);
        return R.ok(shopGoods);
    }

    @Override
    public R editFlowerShopGoods(Long id, AddShopFlowerGoodsVO addShopFlowerGoodsVO) {
        if (addShopFlowerGoodsVO == null) {
            return R.ok("500", "数据为空！");
        }
        LambdaQueryWrapper<ComShopFlowerGoodsDO> query =
                new LambdaQueryWrapper<ComShopFlowerGoodsDO>().eq(ComShopFlowerGoodsDO::getId, id);
        ComShopFlowerGoodsDO shopGoodsDO = new ComShopFlowerGoodsDO();
        BeanUtils.copyProperties(addShopFlowerGoodsVO, shopGoodsDO);
        shopGoodsDO.setOriginalPrice(addShopFlowerGoodsVO.getPrice());
        int update = this.baseMapper.update(shopGoodsDO, query);
        if (update < 1) {
            throw new ServiceException("修改失败");
        }
        // 修改规格表
        List<ComShopFlowerGoodsAttrDO> comShopFlowerGoodsAttrDOS = shopFlowerGoodsAttrDAO
                .selectList(new LambdaQueryWrapper<ComShopFlowerGoodsAttrDO>().eq(ComShopFlowerGoodsAttrDO::getGoodsId, id));
        if (addShopFlowerGoodsVO.getGoodsAttrVOList().size() == 0) {
            shopFlowerGoodsAttrDAO
                    .delete(new LambdaQueryWrapper<ComShopFlowerGoodsAttrDO>().eq(ComShopFlowerGoodsAttrDO::getGoodsId, id));
            ComShopFlowerGoodsAttrDO comShopFlowerGoodsAttrDO = new ComShopFlowerGoodsAttrDO();
            comShopFlowerGoodsAttrDO.setGoodsId(id);
            comShopFlowerGoodsAttrDO.setStoreId(addShopFlowerGoodsVO.getStoreId());
            comShopFlowerGoodsAttrDO.setGoodsName(addShopFlowerGoodsVO.getName());
            comShopFlowerGoodsAttrDO.setGoodsAttrName("默认");
            comShopFlowerGoodsAttrDO.setAttrPic(addShopFlowerGoodsVO.getGoodsPic());
            comShopFlowerGoodsAttrDO.setIsDefault(1);
            comShopFlowerGoodsAttrDO.setPrice(addShopFlowerGoodsVO.getPrice());
            shopFlowerGoodsAttrDAO.insert(comShopFlowerGoodsAttrDO);
        } else {
            List<Long> attrIds =
                    comShopFlowerGoodsAttrDOS.stream().map(ComShopFlowerGoodsAttrDO::getId).collect(Collectors.toList());
            List<Long> voAttrIds = addShopFlowerGoodsVO.getGoodsAttrVOList().stream().map(AddShopFlowerGoodsAttrVO::getGoodsAttrId)
                    .collect(Collectors.toList());
            // 需要删除的规格ID——针对编辑时删除了规格的情况
            List<Long> deleteIds = DifferentLongListUtil.getDiffrent(attrIds, voAttrIds);
            if (deleteIds.size() != 0) {
                shopFlowerGoodsAttrDAO.deleteBatchIds(deleteIds);
            }
            addShopFlowerGoodsVO.getGoodsAttrVOList().forEach(goodsAttr -> {
                ComShopFlowerGoodsAttrDO comShopGoodsAttrDO = shopFlowerGoodsAttrDAO.selectById(goodsAttr.getGoodsAttrId());
                if (comShopGoodsAttrDO != null) {
                    comShopGoodsAttrDO.setPrice(goodsAttr.getPrice());
                    comShopGoodsAttrDO.setCollatePrice(goodsAttr.getCollatePrice());
                    comShopGoodsAttrDO.setFreeShippingPrice(goodsAttr.getFreeShippingPrice());
                    comShopGoodsAttrDO.setGoodsAttrName(goodsAttr.getGoodsAttrName());
                    comShopGoodsAttrDO.setAttrPic(goodsAttr.getAttrPic());
                    comShopGoodsAttrDO.setStock(goodsAttr.getStock());
                    shopFlowerGoodsAttrDAO.updateById(comShopGoodsAttrDO);
                } else {
                    comShopGoodsAttrDO = new ComShopFlowerGoodsAttrDO();
                    comShopGoodsAttrDO.setGoodsId(shopGoodsDO.getId());
                    comShopGoodsAttrDO.setStoreId(shopGoodsDO.getStoreId());
                    comShopGoodsAttrDO.setGoodsName(shopGoodsDO.getName());
                    comShopGoodsAttrDO.setGoodsAttrName(goodsAttr.getGoodsAttrName());
                    comShopGoodsAttrDO.setIsDefault(1);
                    comShopGoodsAttrDO.setPrice(goodsAttr.getPrice());
                    comShopGoodsAttrDO.setCollatePrice(goodsAttr.getCollatePrice());
                    comShopGoodsAttrDO.setFreeShippingPrice(goodsAttr.getFreeShippingPrice());
                    comShopGoodsAttrDO.setAttrPic(goodsAttr.getAttrPic());
                    comShopGoodsAttrDO.setStock(goodsAttr.getStock());
                    comShopGoodsAttrDO.setSale(0);
                    shopFlowerGoodsAttrDAO.insert(comShopGoodsAttrDO);
                }
            });
        }
        return R.ok();
    }

    @Override
    public R deleteShopFlowerGoods(Long[] id) {
        LambdaQueryWrapper<ComShopFlowerGoodsDO> query = new LambdaQueryWrapper<ComShopFlowerGoodsDO>().in(ComShopFlowerGoodsDO::getId, id);
        List<ComShopFlowerGoodsDO> comShopGoodsDOS = this.baseMapper.selectList(query);
        for (ComShopFlowerGoodsDO one : comShopGoodsDOS) {
            one.setDeleteStatus(ComShopFlowerGoodsDO.deleteStatus.yes);
            this.baseMapper.updateById(one);
        }
        return R.ok();
    }

    @Override
    public R changeStatus(Long id, Integer status) {
        ComShopFlowerGoodsDO shopGoodsDO = this.baseMapper.selectById(id);
        if (shopGoodsDO == null) {
            return R.fail("id有误!");
        }
        shopGoodsDO.setStatus(status);
        this.baseMapper.updateById(shopGoodsDO);
        return R.ok();
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientElevatingPointServiceImpl.java

@@ -65,8 +65,13 @@
    public R addPoint(ConvenientElevatingPointDTO convenientElevatingPointDTO) {
        ConvenientElevatingPointDO convenientElevatingPointDO = new ConvenientElevatingPointDO();
        BeanUtils.copyProperties(convenientElevatingPointDTO,convenientElevatingPointDO);
        ComActDO comActDO = comActDAO.selectById(convenientElevatingPointDTO.getCommunityId());
        String communityId = convenientElevatingPointDTO.getCommunityId();
        if (nonNull(communityId)) {
            ComActDO comActDO = comActDAO.selectById(Long.parseLong(communityId.substring(communityId.lastIndexOf(",")+1)));
            if(comActDO!=null){
        convenientElevatingPointDO.setCommunityName(comActDO.getName());
            }
        }
        this.baseMapper.insert(convenientElevatingPointDO);
        return R.ok();
    }
@@ -84,13 +89,11 @@
        if (isNull(convenientElevatingPointDO)) {
            return R.fail("自提点不存在");
        }
        Long communityId = convenientElevatingPointDTO.getCommunityId();
        String communityId = convenientElevatingPointDTO.getCommunityId();
        if (nonNull(communityId)) {
            ComActDO comActDO = comActDAO.selectById(communityId);
            ComActDO comActDO = comActDAO.selectById(Long.parseLong(communityId.substring(communityId.lastIndexOf(",")+1)));
            if(comActDO!=null){
                convenientElevatingPointDO.setCommunityName(comActDO.getName());
            } else {
                convenientElevatingPointDO.setCommunityName("西区社区");
            }
        }
        BeanUtils.copyProperties(convenientElevatingPointDTO, convenientElevatingPointDO);
@@ -111,4 +114,10 @@
        }
        return R.fail("删除失败");
    }

    @Override
    public R detailPoint(Long pointId) {
        ConvenientElevatingPointDO convenientElevatingPointDO = this.baseMapper.selectById(pointId);
        return R.ok(convenientElevatingPointDO);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActProceedingsDao.xml

@@ -31,12 +31,10 @@
  <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.panzhihua.service_community.entity.ComActProceedings" useGeneratedKeys="true">
    insert into com_act_proceedings (id,`name`, unit_name, unit_id,
      introduce, del_flag, `status`, 
      create_time, create_by, update_time, 
      update_by)
    values (#{name,jdbcType=VARCHAR}, #{unitName,jdbcType=VARCHAR}, #{unitId,jdbcType=BIGINT}, 
      create_time)
    values (#{id},#{name,jdbcType=VARCHAR}, #{unitName,jdbcType=VARCHAR}, #{unitId,jdbcType=BIGINT},
      #{introduce,jdbcType=VARCHAR}, #{delFlag,jdbcType=BIT}, #{status,jdbcType=BIT}, 
      #{createTime,jdbcType=TIMESTAMP}, #{createBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, 
      #{updateBy,jdbcType=TIMESTAMP})
      #{createTime,jdbcType=TIMESTAMP})
  </insert>
  <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.panzhihua.service_community.entity.ComActProceedings" useGeneratedKeys="true">
    insert into com_act_proceedings

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComConvenientElevatingPointMapper.xml

@@ -5,9 +5,8 @@
        <!--@Table com_convenient_elevating_point-->
        <id column="id" jdbcType="BIGINT" property="id"/>
        <result column="name" jdbcType="VARCHAR" property="name"/>
        <result column="community_id" jdbcType="BIGINT" property="communityId"/>
        <result column="community_id" jdbcType="VARCHAR" property="communityId"/>
        <result column="community_name" jdbcType="VARCHAR" property="communityName"/>
        <result column="region" jdbcType="VARCHAR" property="region"/>
        <result column="address" jdbcType="VARCHAR" property="address"/>
        <result column="contacts" jdbcType="VARCHAR" property="contacts"/>
        <result column="phone" jdbcType="VARCHAR" property="phone"/>
@@ -25,7 +24,7 @@
        <result column="updated_by" jdbcType="BIGINT" property="updatedBy"/>
    </resultMap>
    <sql id="Base_Column_List">
        id, `name`, community_id, community_name, region, address, contacts, phone, wechat_account,
        id, `name`, community_id, community_name, address, contacts, phone, wechat_account,
        lat, lon, `business_status`, cumulative_goods_num, prepare_goods_num, already_goods_num, is_del,
        created_at, created_by, updated_at, updated_by
    </sql>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComEventMapper.xml

@@ -57,6 +57,7 @@
        FROM com_sanshuo_event_info
        <where>
            event_process_status !=9
            AND app_id=#{comEvent.appId}
            <if test="comEvent.keyword != null and comEvent.keyword!=''" >
                AND    ( order_sn = #{comEvent.keyword} or request_user_tel =#{comEvent.keyword} or current_org_name=#{comEvent.keyword})
            </if>
@@ -104,6 +105,7 @@
        FROM com_sanshuo_event_info
        <where>
            event_process_status !=9
            AND app_id=#{comEvent.appId}
            <if test="eventIds != null">
                AND id in 
                <foreach collection="eventIds" item="id" separator="," open="(" close=")">
@@ -162,6 +164,7 @@
        from com_sanshuo_event_info
        <where>
            event_process_status not in (9)
            AND app_id=#{comEvent.appId}
        <if test="comEvent.userType == 1">
            AND request_user_id=#{comEvent.requestUserId}
        </if>
@@ -193,7 +196,7 @@
        from com_sanshuo_event_info
        <where>
            event_process_status not in (9)

            AND app_id=#{comEvent.appId}
            <if test="comEvent.userType == 1">
                AND request_user_id=#{comEvent.requestUserId}
            </if>
@@ -224,6 +227,7 @@
        (SELECT count(id) FROM com_sanshuo_event_info
        where event_process_status  in (2,3,5,6)
        AND user_event_status not in(3,4)
        AND app_id='wx0cef797390444b75'
        <if test="dto.type == 2">
            AND current_process_type=1
            <if test="dto.id != null">
@@ -249,6 +253,7 @@
        (SELECT count(id) FROM com_sanshuo_event_info
        where event_process_status = 5
        AND user_event_status not in(3,4)
        AND app_id='wx0cef797390444b75'
        <if test="dto.type == 2">
            AND current_process_type=1
            <if test="dto.id != null">
@@ -273,6 +278,7 @@
        (SELECT count(id) FROM com_sanshuo_event_info
        where event_process_status = 6
        AND user_event_status not in(3)
        AND app_id='wx0cef797390444b75'
        <if test="dto.type == 2">
            AND current_process_type=1
            <if test="dto.id != null">
@@ -300,6 +306,7 @@
        where t.event_process_status in (6,7)
        AND t.user_event_status not in(3,4)
        AND t1.event_status=7
        AND app_id='wx0cef797390444b75'
        <if test="dto.type == 2">
            AND t.current_process_type=1
            <if test="dto.id != null">
@@ -324,6 +331,7 @@
        (select count(id) FROM com_sanshuo_event_info
        where event_result=2
        AND user_event_status not in(3,4)
        AND app_id='wx0cef797390444b75'
        <if test="dto.type == 2">
            AND current_process_type=1
            <if test="dto.id != null">
@@ -348,6 +356,7 @@
        (select count(id) FROM com_sanshuo_event_info
        where event_result=1
        AND user_event_status not in(3,4)
        AND app_id='wx0cef797390444b75'
        <if test="dto.type == 2">
            AND current_process_type=1
            <if test="dto.id != null">
@@ -372,6 +381,7 @@
        (select count(id) from com_sanshuo_event_info WHERE
        create_at BETWEEN DATE_FORMAT(#{beginDate}, '%Y-%m-%d 00:00:00') AND DATE_FORMAT(#{endDate}, '%Y-%m-%d 23:59:59')
        AND event_process_status not in (8)
        AND app_id='wx0cef797390444b75'
        <if test="dto.type == 2">
            AND current_process_type=1
            <if test="dto.id != null">
@@ -397,6 +407,7 @@
        create_at BETWEEN DATE_FORMAT(#{beginDate}, '%Y-%m-%d 00:00:00') AND DATE_FORMAT(#{endDate}, '%Y-%m-%d 23:59:59')
        AND event_process_status not in (8)
        AND event_process_status = 6
        AND app_id='wx0cef797390444b75'
        <if test="dto.type == 2">
            AND current_process_type=1
            <if test="dto.id != null">
@@ -424,6 +435,7 @@
        SELECT COUNT(id) FROM com_sanshuo_event_info
        WHERE create_at BETWEEN DATE_FORMAT(#{beginDate}, '%Y-%m-%d 00:00:00') AND DATE_FORMAT(#{endDate}, '%Y-%m-%d 23:59:59')
        AND event_process_status not in (9)
        AND app_id='wx0cef797390444b75'
        <if test="dto.type == 2">
            AND current_process_type=1
            <if test="dto.id != null">
@@ -450,6 +462,7 @@
        SELECT COUNT(id) FROM com_sanshuo_event_info
        WHERE create_at BETWEEN DATE_FORMAT(#{beginDate}, '%Y-%m-%d 00:00:00') AND DATE_FORMAT(#{endDate}, '%Y-%m-%d 23:59:59')
        AND event_process_status=6
        AND app_id='wx0cef797390444b75'
        <if test="dto.type == 2">
            AND current_process_type=1
            <if test="dto.id != null">
@@ -475,17 +488,19 @@
    <select id="eventRate" resultType="com.panzhihua.common.model.vos.sanshuo.EventRateVO">
        select count(id) as count,current_process_type from com_sanshuo_event_info
        where event_process_status not in(7,8,9)
        AND app_id='wx0cef797390444b75'
        group by current_process_type
        having current_process_type &lt;>5
    </select>
    <select id="expertRate" resultType="com.panzhihua.common.model.vos.sanshuo.EventRateVO">
        select count(id) as count,level as type  from com_sanshuo_expert
        select count(id) as count,level as type  from com_sanshuo_expert where app_id='wx0cef797390444b75'
        group by level
    </select>
    <select id="mediateTypeRate" resultType="com.panzhihua.common.model.vos.sanshuo.EventRateVO">
        select count(t.id) as count,t1.name from com_sanshuo_event_info t
        left join com_mediate_type t1 on t.event_category=t1.id
        where t.event_process_status not in(7,8,9)
        AND t.app_id='wx0cef797390444b75'
        group by t.event_category
    </select>


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComPropertyMapper.xml

@@ -243,4 +243,8 @@
        )
    </select>

    <select id="noticeList" resultType="com.panzhihua.common.model.vos.community.ComActAnnouncementVO">
        select * from com_act_announcement where property_id=#{propertyId}
    </select>

</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSanshuoExpertDao.xml

@@ -48,6 +48,7 @@
        introduction,street_id,industry_center_id,
        unit_id,unit from com_sanshuo_expert
        where del_flag=1
        AND app_id=#{appId}
            <if test="keyWord != null and keyWord != ''">
                AND unit like concat('%',#{keyWord},'%')
                OR name like concat('%',#{keyWord},'%')
@@ -157,6 +158,7 @@
        introduction,street_id,industry_center_id,
        unit_id,unit from com_sanshuo_expert
        where del_flag=1
        AND app_id=#{appId}
        <if test="level != null">
            <if test="level == 2">
                AND level = 2

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerEvaluateDAO.xml

New file
@@ -0,0 +1,22 @@
<?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.panzhihua.service_community.dao.ComShopFlowerEvaluateDAO">
  <resultMap id="BaseResultMap" type="com.panzhihua.service_community.model.dos.ComShopFlowerEvaluateDO">
    <!--@mbg.generated-->
    <!--@Table com_shop_flower_evaluate-->
    <id column="id" jdbcType="BIGINT" property="id" />
    <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
    <result column="goods_id" jdbcType="VARCHAR" property="goodsId" />
    <result column="user_id" jdbcType="BIGINT" property="userId" />
    <result column="evaluate_time" jdbcType="TIMESTAMP" property="evaluateTime" />
    <result column="evaluate_type" jdbcType="TINYINT" property="evaluateType" />
    <result column="evaluate_content" jdbcType="VARCHAR" property="evaluateContent" />
    <result column="evaluate_pic" jdbcType="VARCHAR" property="evaluatePic" />
    <result column="create_at" jdbcType="TIMESTAMP" property="createAt" />
  </resultMap>
  <sql id="Base_Column_List">
    <!--@mbg.generated-->
    id, order_no, goods_id, user_id, evaluate_time, evaluate_type, evaluate_content, 
    evaluate_pic, create_at
  </sql>
</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerGoodsMapper.xml

@@ -31,7 +31,7 @@
        price, unit, `order`, stock, details, remark, goods_describe, delivery_type, delete_status,
        create_at, update_at
    </sql>
    <select id="pageShopGoods" resultType="com.panzhihua.common.model.vos.shop.ComShopFlowerGoodsVO">
    <select id="pageShopGoods" resultType="com.panzhihua.common.model.vos.shop.PageShopFlowerGoodsVO">
        select c.id,c.type_id,ccm.name as
        storeName,c.name,c.store_id,c.goods_pic,c.images,c.status,c.sale,c.original_price,c.price,c.unit,c.order,c.stock,c.details,c.remark,c.goods_describe,c.delivery_type,c.delete_status,c.create_at,c.update_at
        from com_shop_flower_goods c

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerOrderDAO.xml

New file
@@ -0,0 +1,41 @@
<?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.panzhihua.service_community.dao.ComShopFlowerOrderDAO">
  <resultMap id="BaseResultMap" type="com.panzhihua.service_community.model.dos.ComShopFlowerOrderDO">
    <!--@mbg.generated-->
    <!--@Table com_shop_flower_order-->
    <id column="id" jdbcType="BIGINT" property="id" />
    <result column="store_id" jdbcType="BIGINT" property="storeId" />
    <result column="user_id" jdbcType="BIGINT" property="userId" />
    <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
    <result column="pay_no" jdbcType="VARCHAR" property="payNo" />
    <result column="wx_tarde_no" jdbcType="VARCHAR" property="wxTardeNo" />
    <result column="status" jdbcType="TINYINT" property="status" />
    <result column="pay_status" jdbcType="TINYINT" property="payStatus" />
    <result column="receiver_id" jdbcType="BIGINT" property="receiverId" />
    <result column="delete_status" jdbcType="TINYINT" property="deleteStatus" />
    <result column="total_amount" jdbcType="DECIMAL" property="totalAmount" />
    <result column="discount_amount" jdbcType="DECIMAL" property="discountAmount" />
    <result column="pay_amount" jdbcType="DECIMAL" property="payAmount" />
    <result column="pay_type" jdbcType="TINYINT" property="payType" />
    <result column="pay_time" jdbcType="TIMESTAMP" property="payTime" />
    <result column="delivery_type" jdbcType="TINYINT" property="deliveryType" />
    <result column="delivery_status" jdbcType="TINYINT" property="deliveryStatus" />
    <result column="remark" jdbcType="VARCHAR" property="remark" />
    <result column="logistics_company" jdbcType="VARCHAR" property="logisticsCompany" />
    <result column="logistics_no" jdbcType="VARCHAR" property="logisticsNo" />
    <result column="create_at" jdbcType="TIMESTAMP" property="createAt" />
    <result column="update_at" jdbcType="TIMESTAMP" property="updateAt" />
    <result column="delivery_time" jdbcType="TIMESTAMP" property="deliveryTime" />
    <result column="service_time" jdbcType="TIMESTAMP" property="serviceTime" />
    <result column="receiving_time" jdbcType="TIMESTAMP" property="receivingTime" />
    <result column="refund_time" jdbcType="TIMESTAMP" property="refundTime" />
  </resultMap>
  <sql id="Base_Column_List">
    <!--@mbg.generated-->
    id, store_id, user_id, order_no, pay_no, wx_tarde_no, `status`, pay_status, receiver_id, 
    delete_status, total_amount, discount_amount, pay_amount, pay_type, pay_time, delivery_type, 
    delivery_status, remark, logistics_company, logistics_no, create_at, update_at, delivery_time, 
    service_time, receiving_time, refund_time
  </sql>
</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerOrderGoodsDAO.xml

New file
@@ -0,0 +1,30 @@
<?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.panzhihua.service_community.dao.ComShopFlowerOrderGoodsDAO">
  <resultMap id="BaseResultMap" type="com.panzhihua.service_community.model.dos.ComShopFlowerOrderGoodsDO">
    <!--@mbg.generated-->
    <!--@Table com_shop_flower_order_goods-->
    <id column="id" jdbcType="BIGINT" property="id" />
    <result column="store_id" jdbcType="BIGINT" property="storeId" />
    <result column="order_id" jdbcType="BIGINT" property="orderId" />
    <result column="user_id" jdbcType="BIGINT" property="userId" />
    <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
    <result column="goods_id" jdbcType="BIGINT" property="goodsId" />
    <result column="goods_attr_id" jdbcType="BIGINT" property="goodsAttrId" />
    <result column="goods_attr_name" jdbcType="VARCHAR" property="goodsAttrName" />
    <result column="amount" jdbcType="INTEGER" property="amount" />
    <result column="goods_attr_price" jdbcType="DECIMAL" property="goodsAttrPrice" />
    <result column="goods_attr_pic" jdbcType="VARCHAR" property="goodsAttrPic" />
    <result column="price" jdbcType="DECIMAL" property="price" />
    <result column="free_shipping_price" jdbcType="DECIMAL" property="freeShippingPrice" />
    <result column="collate_price" jdbcType="DECIMAL" property="collatePrice" />
    <result column="goods_name" jdbcType="VARCHAR" property="goodsName" />
    <result column="create_at" jdbcType="TIMESTAMP" property="createAt" />
  </resultMap>
  <sql id="Base_Column_List">
    <!--@mbg.generated-->
    id, store_id, order_id, user_id, order_no, goods_id, goods_attr_id, goods_attr_name, 
    amount, goods_attr_price, goods_attr_pic, price, free_shipping_price, collate_price, 
    goods_name, create_at
  </sql>
</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerOrderOperateDAO.xml

New file
@@ -0,0 +1,19 @@
<?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.panzhihua.service_community.dao.ComShopFlowerOrderOperateDAO">
  <resultMap id="BaseResultMap" type="com.panzhihua.service_community.model.dos.ComShopFlowerOrderOperateDO">
    <!--@mbg.generated-->
    <!--@Table com_shop_flower_order_operate-->
    <id column="id" jdbcType="BIGINT" property="id" />
    <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
    <result column="operation_by" jdbcType="VARCHAR" property="operationBy" />
    <result column="operation_time" jdbcType="TIMESTAMP" property="operationTime" />
    <result column="operation_type" jdbcType="TINYINT" property="operationType" />
    <result column="operation_content" jdbcType="VARCHAR" property="operationContent" />
    <result column="create_at" jdbcType="TIMESTAMP" property="createAt" />
  </resultMap>
  <sql id="Base_Column_List">
    <!--@mbg.generated-->
    id, order_no, operation_by, operation_time, operation_type, operation_content, create_at
  </sql>
</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerOrderPayDAO.xml

New file
@@ -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.panzhihua.service_community.dao.ComShopFlowerOrderPayDAO">
  <resultMap id="BaseResultMap" type="com.panzhihua.service_community.model.dos.ComShopFlowerOrderPayDO">
    <!--@mbg.generated-->
    <!--@Table com_shop_flower_order_pay-->
    <id column="id" jdbcType="BIGINT" property="id" />
    <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
    <result column="pay_no" jdbcType="VARCHAR" property="payNo" />
    <result column="wx_trade_no" jdbcType="VARCHAR" property="wxTradeNo" />
    <result column="pay_status" jdbcType="TINYINT" property="payStatus" />
    <result column="order_amount" jdbcType="DECIMAL" property="orderAmount" />
    <result column="pay_amount" jdbcType="DECIMAL" property="payAmount" />
    <result column="pay_time" jdbcType="TIMESTAMP" property="payTime" />
    <result column="create_at" jdbcType="TIMESTAMP" property="createAt" />
    <result column="update_at" jdbcType="TIMESTAMP" property="updateAt" />
  </resultMap>
  <sql id="Base_Column_List">
    <!--@mbg.generated-->
    id, order_no, pay_no, wx_trade_no, pay_status, order_amount, pay_amount, pay_time, 
    create_at, update_at
  </sql>
</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerRefundOrderDAO.xml

New file
@@ -0,0 +1,32 @@
<?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.panzhihua.service_community.dao.ComShopFlowerRefundOrderDAO">
  <resultMap id="BaseResultMap" type="com.panzhihua.service_community.model.dos.ComShopFlowerRefundOrderDO">
    <!--@mbg.generated-->
    <!--@Table com_shop_flower_refund_order-->
    <id column="id" jdbcType="BIGINT" property="id" />
    <result column="store_id" jdbcType="BIGINT" property="storeId" />
    <result column="user_id" jdbcType="BIGINT" property="userId" />
    <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
    <result column="order_id" jdbcType="VARCHAR" property="orderId" />
    <result column="refund_order_no" jdbcType="VARCHAR" property="refundOrderNo" />
    <result column="status" jdbcType="TINYINT" property="status" />
    <result column="delete_status" jdbcType="TINYINT" property="deleteStatus" />
    <result column="pay_amount" jdbcType="DECIMAL" property="payAmount" />
    <result column="refund_amount" jdbcType="DECIMAL" property="refundAmount" />
    <result column="refund_reason" jdbcType="VARCHAR" property="refundReason" />
    <result column="refund_pic" jdbcType="VARCHAR" property="refundPic" />
    <result column="create_at" jdbcType="TIMESTAMP" property="createAt" />
    <result column="update_at" jdbcType="TIMESTAMP" property="updateAt" />
    <result column="handle_time" jdbcType="TIMESTAMP" property="handleTime" />
    <result column="refund_time" jdbcType="TIMESTAMP" property="refundTime" />
    <result column="handle_result" jdbcType="VARCHAR" property="handleResult" />
    <result column="remark" jdbcType="VARCHAR" property="remark" />
  </resultMap>
  <sql id="Base_Column_List">
    <!--@mbg.generated-->
    id, store_id, user_id, order_no, order_id, refund_order_no, `status`, delete_status, 
    pay_amount, refund_amount, refund_reason, refund_pic, create_at, update_at, handle_time, 
    refund_time, handle_result, remark
  </sql>
</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerUserAddressDAO.xml

New file
@@ -0,0 +1,28 @@
<?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.panzhihua.service_community.dao.ComShopFlowerUserAddressDAO">
  <resultMap id="BaseResultMap" type="com.panzhihua.service_community.model.dos.ComShopFlowerUserAddressDO">
    <!--@mbg.generated-->
    <!--@Table com_shop_flower_user_address-->
    <id column="id" jdbcType="BIGINT" property="id" />
    <result column="user_id" jdbcType="BIGINT" property="userId" />
    <result column="name" jdbcType="VARCHAR" property="name" />
    <result column="phone" jdbcType="VARCHAR" property="phone" />
    <result column="province_code" jdbcType="VARCHAR" property="provinceCode" />
    <result column="province_name" jdbcType="VARCHAR" property="provinceName" />
    <result column="city_code" jdbcType="VARCHAR" property="cityCode" />
    <result column="city_name" jdbcType="VARCHAR" property="cityName" />
    <result column="district_code" jdbcType="VARCHAR" property="districtCode" />
    <result column="district_name" jdbcType="VARCHAR" property="districtName" />
    <result column="detail_address" jdbcType="VARCHAR" property="detailAddress" />
    <result column="is_default" jdbcType="TINYINT" property="isDefault" />
    <result column="create_at" jdbcType="TIMESTAMP" property="createAt" />
    <result column="update_at" jdbcType="TIMESTAMP" property="updateAt" />
    <result column="delete_status" jdbcType="TINYINT" property="deleteStatus" />
  </resultMap>
  <sql id="Base_Column_List">
    <!--@mbg.generated-->
    id, user_id, `name`, phone, province_code, province_name, city_code, city_name, district_code, 
    district_name, detail_address, is_default, create_at, update_at, delete_status
  </sql>
</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java

@@ -1457,6 +1457,11 @@
        return userService.getCommunityList(name,id);
    }

    @GetMapping("/getAllCommunityList")
    public R getAllCommunityList(){
        return userService.getAllCommunityList();
    }

    @GetMapping("/resetPasswordAccount")
    public R resetPasswordAccount(@RequestParam("type")Integer type,@RequestParam("account")String account,@RequestParam("appId")String appId){
        return userService.resetPassword(type,account,appId);

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java

@@ -435,4 +435,9 @@
     * 是否为党员
     * */
    int isDpcMember(@Param("phone") String phone,@Param("name")String name);

    /**
     * 是否为物业公司后台账号
     * */
    Long isPropertyAccount(String phone);
}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java

@@ -916,6 +916,12 @@
    R getCommunityList(String name,Long id);

    /**
     * 获取所有城镇或村落列表
     * @return
     */
    R getAllCommunityList();

    /**
     * 重置密码
     * @param type
     * @param account

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java

@@ -792,6 +792,13 @@
        //是否是防疫工作人员
        loginUserInfoVO.setIsAcidMember(0);
        ComActAcidMemberVO acidMember = userDao.selectAcidMemberByPhone(loginUserInfoVO.getPhone());
        //是否为普达物业公司后台账号
        if (nonNull(sysUserDO.getPhone())){
            Long propertyAccount = userDao.isPropertyAccount(sysUserDO.getPhone());
            if (nonNull(propertyAccount)){
                loginUserInfoVO.setPropertyId(propertyAccount);
            }
        }
        if (nonNull(acidMember)) {
            if (acidMember.getRelationName().equals("panzhihua") || acidMember.getRelationName().equals("西区") || acidMember.getRelationName().equals("东区") || acidMember.getRelationName().equals("仁和区") || acidMember.getRelationName().equals("米易县") || acidMember.getRelationName().equals("盐边县")) {
                loginUserInfoVO.setIsAcidMember(1);
@@ -1354,6 +1361,11 @@
                this.putMenuRole(menuRoleVO);
            }
        }
        log.info("======================type"+administratorsUserVO.getType());
        if (administratorsUserVO.getType().equals(20)){
            roleId=1559112102373756548L;
        }
        log.info("=======================roleId"+roleId);
        SysRoleDO roleDO = roleDAO.selectById(roleId);
        if (ObjectUtils.isEmpty(roleDO)) {
            return R.fail("角色不存在");
@@ -1374,7 +1386,6 @@
            } else if (e.getMessage().contains("23000")) {
                throw new ServiceException("手机号已存在");
            }

        }
        if (insert > 0) {
            SysUserDO sysUserDO1 = userDao
@@ -3707,6 +3718,27 @@
    }

    @Override
    public R getAllCommunityList() {
        List<Integer> areaList = areaCodeList();
        List<AreaVOS> areaVOList = new ArrayList<>();
        for (Integer code : areaList) {
            AreaVOS areaVO = new AreaVOS();
            areaVO.setId(code);
            areaVO.setName(areaCodeToName(code.longValue()));
            List<StreetVOS> streetVOS = userDao.selectStreetByAreaCode(code);
            Iterator<StreetVOS> iterator = streetVOS.listIterator();
            while (iterator.hasNext()) {
                StreetVOS vo = iterator.next();
                List<CommunityVO> communityVOS = userDao.selectCommunityByStreetId(vo.getId(), 3);
                vo.setChildList(communityVOS);

            }
            areaVO.setChildList(streetVOS);
            areaVOList.add(areaVO);
        }
        return R.ok(areaVOList);
    }
    @Override
    public R getCommunityList(String name, Long id) {
        //区级账号名
        String[] streetList = {"bingcaogangjiedao", "donghuajiedao", "nongnongpingjiedao", "dadukoujiedaojiedao", "guazipingjiedao",
@@ -3714,7 +3746,7 @@
                "jingjiangzhen", "renhezhen", "pingdizhen", "datianzhen", "tongdezhen", "futianzhen", "qianjinzhen", "panlianzhen", "binguzhen", "baimazhen",
                "salianzhen", "puweizhen", "deshizhen", "wanqiuyizuxiang", "caochangzhen", "xinshanlisuzuxiang", "tongzilinzhen", "yongxingzhen", "yumenzhen",
                "honggezhen", "hongguoyizuxiang"};
        List<Integer> ids = userDao.selectIdsByAccount(streetList);
//        List<Integer> ids = userDao.selectIdsByAccount(streetList);
        //村或社区账号
        Integer type = isVilliage(name);
        //是否为市级账号

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/UserDao.xml

@@ -838,4 +838,7 @@
    <select id="isDpcMember" resultType="Integer">
         select count(id) from com_act_dpc where name =#{name} and phone=#{phone}
    </select>
    <select id="isPropertyAccount" resultType="java.lang.Long">
        select id from com_property where phone=#{phone}
    </select>
</mapper>