广誉源商户端-登录-我的技能,城市管理,状态切换,我的资料

nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/MaTechnicianController.java

@@ -659,15 +659,10 @@ public class MaTechnicianController extends BaseController {
      * 支持 Tab 切换：all(全部), active(已开通), applying(申请中), rejected(驳回)
      */
     @PostMapping("/getSkillList")
-    public TableDataInfo getSkillList(@RequestBody MaProjectGetVo req) {
-        startPage();
+    public Result<List<MaProject>> getSkillList(@RequestBody MaProjectGetVo req) {
+
         List<MaProject> list = maTechnicianService.selectMaTechnicianListBy(req.getUserId(), req.getAuditStatus());
-        if (ObjectUtils.isEmpty(list)) {
-            List<Project> projectslist = maTechnicianService.selectTechnicianListBy(req.getTypeId());
-            return getDataTable(projectslist);
-        } else {
-            return getDataTable(list);
-        }
+        return Result.ok(list);
     }
 
     /**
@@ -760,4 +755,15 @@ public class MaTechnicianController extends BaseController {
         return Result.ok(maTechnicianService.getTechnicianList(userId));
     }
 
+    /**
+     * 查询商户合同记录信息
+     *
+     * @param userId
+     * @return
+     */
+
+    @GetMapping("/getContractRecords")
+    public Result<?> getContractRecords(@RequestParam(value = "userId") Long userId) {
+        return Result.ok(maTechnicianService.getContractRecords(userId));
+    }
 }

nightFragrance-massage/src/main/java/com/ylx/massage/domain/dto/MerchantApplyFileRequestDto.java

@@ -1,10 +1,18 @@
 package com.ylx.massage.domain.dto;
 
+import com.ylx.massage.domain.MaTechnician;
 import lombok.Data;
 
 import java.util.List;
 
 @Data
 public class MerchantApplyFileRequestDto {
-    private List<MerchantApplyFileDto> req;
+    /**
+     * 商家信息
+     */
+    private MaTechnician technician;
+    /**
+     * 申请入驻文件
+     */
+    private  List<MerchantApplyFileDto> req;
 }

nightFragrance-massage/src/main/java/com/ylx/massage/service/IMaTechnicianService.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ylx.common.core.domain.AjaxResult;
 import com.ylx.common.core.domain.model.LoginUser;
+import com.ylx.massage.domain.ContractRecord;
 import com.ylx.massage.domain.MaProject;
 import com.ylx.massage.domain.MaTechnician;
 import com.ylx.massage.domain.dto.*;
@@ -269,4 +270,12 @@ public interface IMaTechnicianService extends IService<MaTechnician> {
      * @return
      */
     MerchantAuditFile getTechnicianList(Long userId);
+
+    /**
+     * 查询商户合同记录信息
+     *
+     * @param userId
+     * @return
+     */
+    List<ContractRecord> getContractRecords(Long userId);
 }

nightFragrance-massage/src/main/java/com/ylx/massage/service/impl/MaTechnicianServiceImpl.java

@@ -118,6 +118,8 @@ public class MaTechnicianServiceImpl extends ServiceImpl<MaTechnicianMapper, MaT
     private MerchantApplyFileMapper merchantApplyFileMapper;
     @Resource
     private TOrderMapper orderMapper;
+    @Autowired
+    private IMaTechnicianService maTechnicianService;
     @Resource
     private  CityOperationApplicationMapper cityOperationApplicationMapper;
 
@@ -195,6 +197,11 @@ public class MaTechnicianServiceImpl extends ServiceImpl<MaTechnicianMapper, MaT
 
 
         }
+        LambdaUpdateWrapper<MaTechnician> updateWrapper = new LambdaUpdateWrapper<>();
+        updateWrapper.eq(MaTechnician::getId, req.getTechnician().getId());
+        updateWrapper.set(MaTechnician::getTeNickName, req.getTechnician().getTeNickName());
+        updateWrapper.set(MaTechnician::getTeBrief, req.getTechnician().getTeBrief());
+        maTechnicianService.update(updateWrapper);
     }
 
     /**
@@ -915,6 +922,30 @@ public class MaTechnicianServiceImpl extends ServiceImpl<MaTechnicianMapper, MaT
         merchantAuditFile.setMerchantAuditFile(merchantApplyFile);
         return merchantAuditFile;
     }
+    /**
+     * 查询商户合同记录信息
+     *
+     * @param userId
+     * @return
+     */
+    @Override
+   public List<ContractRecord> getContractRecords(Long userId){
+        LambdaQueryWrapper<ContractRecord> query = new LambdaQueryWrapper<>();
+        query.eq(ContractRecord::getMerchantId, userId);
+        List<ContractRecord> contractRecordList = contractRecordMapper.selectList(query);
+        if(contractRecordList.size() == 0) {
+            return new ArrayList<>();
+        }else {
+            Set<String> seen = new HashSet<>();
+            contractRecordList = contractRecordList.stream()
+                                                        .filter(record -> record.getContractName() != null && seen.add(record.getContractName()))
+                                                        .collect(Collectors.toList());
+
+        }
+
+        return contractRecordList;
+
+    }
 
     private void extracted(MaProjectSaveDto dto) {
         LambdaQueryWrapper<Project> query = new LambdaQueryWrapper<>();

nightFragrance-massage/src/main/java/com/ylx/massage/service/impl/TAddressServiceImpl.java

@@ -6,7 +6,10 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ylx.common.utils.StringUtils;
+import com.ylx.massage.domain.dto.CoordinateDTO;
+import com.ylx.massage.domain.vo.CityInfoVo;
 import com.ylx.massage.domain.vo.UserAddressListVO;
+import com.ylx.massage.service.AreaService;
 import com.ylx.useradress.domain.dto.UserAddressAddDto;
 import com.ylx.useradress.domain.dto.UserAddressDeleteDto;
 import com.ylx.useradress.domain.dto.UserAddressDto;
@@ -16,6 +19,7 @@ import com.ylx.massage.mapper.TAddressMapper;
 import com.ylx.massage.domain.TAddress;
 import com.ylx.massage.service.TAddressService;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -43,6 +47,8 @@ public class TAddressServiceImpl extends ServiceImpl<TAddressMapper, TAddress> i
     private static final Integer IS_DEFAULT = 1;
     //0=不是默认地址
     private static final Integer NO_DEFAULT = 0;
+    @Autowired
+    private AreaService areaService;
 
 
     @Override
@@ -119,9 +125,9 @@ public class TAddressServiceImpl extends ServiceImpl<TAddressMapper, TAddress> i
      @Override
     @Transactional(rollbackFor = Exception.class)
     public Object insertVirtualAddress(TAddress tAddress) {
-//        if (StringUtils.isBlank(tAddress.getOpenid())) {
-//            throw new RuntimeException("openid不能为空");
-//        }
+        if (StringUtils.isBlank(tAddress.getOpenid())) {
+            throw new RuntimeException("openid不能为空");
+        }
         //检查用户类型是否为空
         if (Objects.isNull(tAddress.getUserType())) {
             throw new RuntimeException("用户类型不能为空");
@@ -139,10 +145,20 @@ public class TAddressServiceImpl extends ServiceImpl<TAddressMapper, TAddress> i
          if (Objects.isNull(tAddress.getType())) {
              throw new RuntimeException("地址类型不能为空");
          }
-//         //检查地址类型是否为1或2
-//         if (tAddress.getType() != 2) {
-//             throw new RuntimeException("地址类型错误，地址类型只能为2");
-//         }
+         //检查地址类型是否为1或2
+         if (tAddress.getType() != 2) {
+             throw new RuntimeException("地址类型错误，地址类型只能为2");
+         }
+         if(StrUtil.isBlank(tAddress.getCityCode())){
+             CoordinateDTO dto = new CoordinateDTO();
+             dto.setLongitude(tAddress.getLongitude());
+             dto.setLatitude(tAddress.getLatitude());
+             CityInfoVo cityInfoVo = areaService.getCityInfoByCoordinates(dto);
+             tAddress.setCityCode(cityInfoVo.getCityCode());
+         }
+         if (StringUtils.isBlank(tAddress.getDetailAddress())){
+             tAddress.setDetailAddress(tAddress.getAddress());
+         }
         return this.save(tAddress);
     }