From b4d15f5d6ab04909874ee4da4877184e9e9f8cd5 Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Wed, 13 Sep 2023 20:18:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=BE=8E=E9=A2=9C&=E7=BA=BF?= =?UTF-8?q?=E7=B4=A2=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/enums/ErrorCodeEnum.java | 1 + .../store/dao/BeautyCameraSettingDAO.java | 46 +++++++++++ .../store/dao/HyPartnerIntentInfoDAO.java | 7 ++ .../cool/store/dao/HyPartnerUserInfoDAO.java | 7 ++ .../mapper/BeautyCameraSettingMapper.java | 26 ++++++ .../mapper/HyPartnerIntentInfoMapper.java | 3 + .../store/mapper/HyPartnerUserInfoMapper.java | 2 + .../mapper/BeautyCameraSettingMapper.xml | 79 +++++++++++++++++++ .../mapper/HyPartnerIntentInfoMapper.xml | 67 +++++++++++++++- .../mapper/HyPartnerUserInfoMapper.xml | 52 ++++++++++++ .../store/entity/BeautyCameraSettingDO.java | 49 ++++++++++++ .../store/request/EditBaseInfoRequest.java | 30 +++++++ .../beauty/AddBeautyCameraSettingRequest.java | 42 ++++++++++ .../vo/beauty/BeautyCameraSettingVO.java | 42 ++++++++++ .../vo/partner/PartnerSimpleBaseInfoVO.java | 54 +++++++++++++ .../service/BeautyCameraSettingService.java | 29 +++++++ .../service/HyPartnerLineInfoService.java | 14 ++++ .../impl/BeautyCameraSettingServiceImpl.java | 35 ++++++++ .../impl/HyPartnerLineInfoServiceImpl.java | 52 +++++++++++- .../BeautyCameraSettingController.java | 41 ++++++++++ .../cool/store/controller/DeskController.java | 13 +++ 21 files changed, 689 insertions(+), 2 deletions(-) create mode 100644 coolstore-partner-dao/src/main/java/com/cool/store/dao/BeautyCameraSettingDAO.java create mode 100644 coolstore-partner-dao/src/main/java/com/cool/store/mapper/BeautyCameraSettingMapper.java create mode 100644 coolstore-partner-dao/src/main/resources/mapper/BeautyCameraSettingMapper.xml create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/entity/BeautyCameraSettingDO.java create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/request/EditBaseInfoRequest.java create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/request/beauty/AddBeautyCameraSettingRequest.java create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/vo/beauty/BeautyCameraSettingVO.java create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/vo/partner/PartnerSimpleBaseInfoVO.java create mode 100644 coolstore-partner-service/src/main/java/com/cool/store/service/BeautyCameraSettingService.java create mode 100644 coolstore-partner-service/src/main/java/com/cool/store/service/impl/BeautyCameraSettingServiceImpl.java create mode 100644 coolstore-partner-webb/src/main/java/com/cool/store/controller/BeautyCameraSettingController.java diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java index 7374ef0f7..3be33da95 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java @@ -67,6 +67,7 @@ public enum ErrorCodeEnum { NO_TRANSFER_REQUIRED(500013, "招商经理现有私海线索无需转让，请检查后重试！", null), NO_BATCH_TRANSFER_REQUIRED(500014, "已选线索包含此招商经理现有私海线索，无需转让，请检查后重试!", null), PARTNER_MOBILE_EXIST(500010, "手机号码已存在，请核实！", null), + PARTNER_MOBILE_EXIST_0(500016, "手机号码已存在", null), INTERVIEW_ENTER_FAIL(1021101, "进入面试间失败", null), DINGDING_USER_NOT_EXIST(1021102, "用户钉钉信息不存在，无法发起资质审核！", null), diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/BeautyCameraSettingDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/BeautyCameraSettingDAO.java new file mode 100644 index 000000000..7df2dd4a7 --- /dev/null +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/BeautyCameraSettingDAO.java @@ -0,0 +1,46 @@ +package com.cool.store.dao; + +import com.cool.store.entity.BeautyCameraSettingDO; +import com.cool.store.mapper.BeautyCameraSettingMapper; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Repository; + +import javax.annotation.Resource; + +/** + * @author zhangchenbiao + * @FileName: BeautyCameraSettingDAO + * @Description: + * @date 2023-09-11 14:46 + */ +@Repository +public class BeautyCameraSettingDAO { + + @Resource + private BeautyCameraSettingMapper beautyCameraSettingMapper; + + /** + * 插入或更新 + * @param param + * @return + */ + public Long insertOrUpdateBeautyCameraSetting(BeautyCameraSettingDO param){ + if(StringUtils.isBlank(param.getUserId())){ + return 0L; + } + return beautyCameraSettingMapper.insertOrUpdateBeautyCameraSetting(param); + } + + /** + * 获取用户美颜配置 + * @param userId + * @return + */ + public BeautyCameraSettingDO getBeautyCameraSetting(String userId){ + if(StringUtils.isBlank(userId)){ + return null; + } + return beautyCameraSettingMapper.getBeautyCameraSetting(userId); + } + +} diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerIntentInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerIntentInfoDAO.java index fe3a33c4e..29d7f6659 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerIntentInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerIntentInfoDAO.java @@ -71,4 +71,11 @@ public class HyPartnerIntentInfoDAO { return hyPartnerIntentInfoMapper.updateLineId(newPartnerId,newLineId, oldLineId); } + public int updateByPartnerLineId(HyPartnerIntentInfoDO record){ + if(Objects.isNull(record.getPartnerLineId())){ + return 0; + } + return hyPartnerIntentInfoMapper.updateByPartnerLineId(record); + } + } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerUserInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerUserInfoDAO.java index f03520321..45bff81e6 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerUserInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerUserInfoDAO.java @@ -75,5 +75,12 @@ public class HyPartnerUserInfoDAO { return hyPartnerUserInfoMapper.updateJoinKnowById(isWritePartnerKnow, id); } + public int updateByPartnerId(HyPartnerUserInfoDO record){ + if(StringUtils.isBlank(record.getPartnerId())){ + return 0; + } + return hyPartnerUserInfoMapper.updateByPartnerId(record); + } + } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/BeautyCameraSettingMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/BeautyCameraSettingMapper.java new file mode 100644 index 000000000..b59d1f080 --- /dev/null +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/BeautyCameraSettingMapper.java @@ -0,0 +1,26 @@ +package com.cool.store.mapper; + +import com.cool.store.entity.BeautyCameraSettingDO; +import org.apache.ibatis.annotations.Param; +import tk.mybatis.mapper.common.Mapper; + +/** + * @author zhangchenbiao + * @date 2023-09-11 02:20 + */ +public interface BeautyCameraSettingMapper extends Mapper { + + /** + * 插入或更新 + * @param param + * @return + */ + Long insertOrUpdateBeautyCameraSetting(@Param("record") BeautyCameraSettingDO param); + + /** + * 获取美颜配置 + * @param userId + * @return + */ + BeautyCameraSettingDO getBeautyCameraSetting(@Param("userId") String userId); +} \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerIntentInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerIntentInfoMapper.java index da7c61c7a..00f99c3a2 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerIntentInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerIntentInfoMapper.java @@ -64,4 +64,7 @@ public interface HyPartnerIntentInfoMapper { * @return */ int updateLineId(@Param("newPartnerId")String newPartnerId,@Param("newLineId") Long newLineId, @Param("oldLineId") Long oldLineId); + + + int updateByPartnerLineId(@Param("record") HyPartnerIntentInfoDO record); } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerUserInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerUserInfoMapper.java index b2dbe1142..1257fc124 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerUserInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerUserInfoMapper.java @@ -47,4 +47,6 @@ public interface HyPartnerUserInfoMapper { List selectByHourDate(@Param("selectTime") String hourDayDate, @Param("now") String now,@Param("limit1")Integer limit1,@Param("limit2")Integer limit2); int selectByHourDateCount(@Param("selectTime") String hourDayDate, @Param("now") String now); + + int updateByPartnerId(@Param("record") HyPartnerUserInfoDO record); } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/BeautyCameraSettingMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/BeautyCameraSettingMapper.xml new file mode 100644 index 000000000..e92f6d17f --- /dev/null +++ b/coolstore-partner-dao/src/main/resources/mapper/BeautyCameraSettingMapper.xml @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + id, user_id, beauty_status, beauty, brightness, ruddy, deleted, create_time, update_time + + + + insert into beauty_camera_setting + + + user_id, + + + beauty_status, + + + beauty, + + + brightness, + + + ruddy, + + + deleted, + + + create_time, + + + update_time, + + + + + #{record.userId}, + + + #{record.beautyStatus}, + + + #{record.beauty}, + + + #{record.brightness}, + + + #{record.ruddy}, + + + #{record.deleted}, + + + #{record.createTime}, + + + #{record.updateTime}, + + + ON DUPLICATE KEY UPDATE beauty_status = values(beauty_status), beauty = values(beauty), brightness = values(brightness), ruddy = values(ruddy) + + + + \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerIntentInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerIntentInfoMapper.xml index ad7c17f26..373c0185c 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerIntentInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerIntentInfoMapper.xml @@ -337,6 +337,71 @@ where partner_line_id = #{oldLineId} - + + update hy_partner_intent_info + + + live_area = #{record.liveArea}, + + + want_shop_area = #{record.wantShopArea}, + + + accept_adjust_type = #{record.acceptAdjustType}, + + + is_have_want_shop = #{record.isHaveWantShop}, + + + want_shop_info = #{record.wantShopInfo}, + + + max_budget = #{record.maxBudget}, + + + money_source = #{record.moneySource}, + + + money_prove = #{record.moneyProve}, + + + education = #{record.education}, + + + work_year = #{record.workYear}, + + + is_have_work_exp = #{record.isHaveWorkExp}, + + + work_exp = #{record.workExp}, + + + is_consumer = #{record.isConsumer}, + + + other_band = #{record.otherBand}, + + + brand_strength = #{record.brandStrength}, + + + need_improve = #{record.needImprove}, + + + strength = #{record.strength}, + + + weakness = #{record.weakness}, + + + create_time = #{record.createTime}, + + + update_time = #{record.updateTime}, + + + where partner_line_id = #{record.partnerLineId} + \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml index 4142e993f..0101fa549 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml @@ -282,4 +282,56 @@ where id=#{id,jdbcType=BIGINT} + + update hy_partner_user_info + + + mobile = #{record.mobile}, + + + username = #{record.username}, + + + live_area = #{record.liveArea}, + + + want_shop_area = #{record.wantShopArea}, + + + accept_adjust_type = #{record.acceptAdjustType}, + + + invite_code = #{record.inviteCode}, + + + is_write_partner_know = #{record.isWritePartnerKnow}, + + + create_time = #{record.createTime}, + + + update_time = #{record.updateTime}, + + + shop_code = #{record.shopCode}, + + + shop_name = #{record.shopName}, + + + shop_id = #{record.shopId}, + + + recommend_partner_id = #{record.recommendPartnerId}, + + + recommend_partner_name = #{record.recommendPartnerName}, + + + recommend_partner_mobile = #{record.recommendPartnerMobile}, + + + where partner_id = #{record.partnerId} + + \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/BeautyCameraSettingDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/BeautyCameraSettingDO.java new file mode 100644 index 000000000..3623223ce --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/BeautyCameraSettingDO.java @@ -0,0 +1,49 @@ +package com.cool.store.entity; + +import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; +import java.util.Date; +import javax.persistence.Table; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * + * @author zhangchenbiao + * @date 2023-09-11 02:20 + */ +@Table(name = "beauty_camera_setting") +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class BeautyCameraSettingDO implements Serializable { + @ApiModelProperty("主键id") + private Long id; + + @ApiModelProperty("用户id") + private String userId; + + @ApiModelProperty("美颜状态0未开启,1开启") + private Boolean beautyStatus; + + @ApiModelProperty("美颜度") + private Integer beauty; + + @ApiModelProperty("明亮度") + private Integer brightness; + + @ApiModelProperty("红润") + private Integer ruddy; + + @ApiModelProperty("删除标识") + private Boolean deleted; + + @ApiModelProperty("用户创建时间") + private Date createTime; + + @ApiModelProperty("修改时间") + private Date updateTime; +} \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/EditBaseInfoRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/EditBaseInfoRequest.java new file mode 100644 index 000000000..8dcda1890 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/EditBaseInfoRequest.java @@ -0,0 +1,30 @@ +package com.cool.store.request; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author zhangchenbiao + * @FileName: EditBaseInfoRequest + * @Description: + * @date 2023-09-13 10:29 + */ +@Data +public class EditBaseInfoRequest { + + @ApiModelProperty("线索id") + private Long partnerLineId; + + @ApiModelProperty("姓名") + private String username; + + @ApiModelProperty("手机号") + private String mobile; + + @ApiModelProperty("意向区域") + private String wantShopArea; + + @ApiModelProperty("调剂方式") + private Integer acceptAdjustType; + +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/beauty/AddBeautyCameraSettingRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/beauty/AddBeautyCameraSettingRequest.java new file mode 100644 index 000000000..f7aa1b6fe --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/beauty/AddBeautyCameraSettingRequest.java @@ -0,0 +1,42 @@ +package com.cool.store.request.beauty; + +import com.cool.store.entity.BeautyCameraSettingDO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * @author zhangchenbiao + * @FileName: AddBeautyCameraSettingRequest + * @Description: 新增美颜配置 + * @date 2023-09-11 14:31 + */ +@Data +public class AddBeautyCameraSettingRequest { + + @ApiModelProperty("美颜状态0未开启,1开启") + private Boolean beautyStatus; + + @ApiModelProperty("美颜度") + private Integer beauty; + + @ApiModelProperty("明亮度") + private Integer brightness; + + @ApiModelProperty("红润") + private Integer ruddy; + + + public static BeautyCameraSettingDO convertDO(String userId, AddBeautyCameraSettingRequest request){ + BeautyCameraSettingDO result = new BeautyCameraSettingDO(); + result.setUserId(userId); + result.setBeautyStatus(request.getBeautyStatus()); + result.setBeauty(request.getBeauty()); + result.setBrightness(request.getBrightness()); + result.setRuddy(request.getRuddy()); + result.setCreateTime(new Date()); + return result; + } + +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/beauty/BeautyCameraSettingVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/beauty/BeautyCameraSettingVO.java new file mode 100644 index 000000000..dd3b55979 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/beauty/BeautyCameraSettingVO.java @@ -0,0 +1,42 @@ +package com.cool.store.vo.beauty; + +import com.cool.store.entity.BeautyCameraSettingDO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Objects; + +/** + * @author zhangchenbiao + * @FileName: BeautyCameraSettingVO + * @Description: + * @date 2023-09-11 14:40 + */ +@Data +public class BeautyCameraSettingVO { + + @ApiModelProperty("美颜状态0未开启,1开启") + private Boolean beautyStatus; + + @ApiModelProperty("美颜度") + private Integer beauty; + + @ApiModelProperty("明亮度") + private Integer brightness; + + @ApiModelProperty("红润") + private Integer ruddy; + + public static BeautyCameraSettingVO convertVO(BeautyCameraSettingDO request){ + if(Objects.isNull(request)){ + return null; + } + BeautyCameraSettingVO result = new BeautyCameraSettingVO(); + result.setBeautyStatus(request.getBeautyStatus()); + result.setBeauty(request.getBeauty()); + result.setBrightness(request.getBrightness()); + result.setRuddy(request.getRuddy()); + return result; + } + +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/partner/PartnerSimpleBaseInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/partner/PartnerSimpleBaseInfoVO.java new file mode 100644 index 000000000..0fa1f84af --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/partner/PartnerSimpleBaseInfoVO.java @@ -0,0 +1,54 @@ +package com.cool.store.vo.partner; + +import com.cool.store.dto.partner.UserPortraitDTO; +import com.cool.store.entity.HyPartnerUserInfoDO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; +import java.util.Objects; + +/** + * @author zhangchenbiao + * @FileName: PartnerBaseInfoVO + * @Description: + * @date 2023-09-13 16:47 + */ +@Data +public class PartnerSimpleBaseInfoVO { + + @ApiModelProperty("线索id") + private Long partnerLineId; + + @ApiModelProperty("姓名") + private String username; + + @ApiModelProperty("手机号") + private String mobile; + + @ApiModelProperty("意向区域") + private String wantShopArea; + + @ApiModelProperty("调剂方式") + private Integer acceptAdjustType; + + @ApiModelProperty("加盟申请基本信息ID") + private Long partnerBaseInfoId; + + @ApiModelProperty("用户画像") + private List userPortrait; + + public static PartnerSimpleBaseInfoVO convertVO(Long partnerLineId, HyPartnerUserInfoDO partnerUserInfo){ + if(Objects.isNull(partnerUserInfo)){ + return null; + } + PartnerSimpleBaseInfoVO result = new PartnerSimpleBaseInfoVO(); + result.setPartnerLineId(partnerLineId); + result.setUsername(partnerUserInfo.getUsername()); + result.setMobile(partnerUserInfo.getMobile()); + result.setWantShopArea(partnerUserInfo.getWantShopArea()); + result.setAcceptAdjustType(partnerUserInfo.getAcceptAdjustType()); + return result; + } + +} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/BeautyCameraSettingService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/BeautyCameraSettingService.java new file mode 100644 index 000000000..42da54d91 --- /dev/null +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/BeautyCameraSettingService.java @@ -0,0 +1,29 @@ +package com.cool.store.service; + +import com.cool.store.request.beauty.AddBeautyCameraSettingRequest; +import com.cool.store.vo.beauty.BeautyCameraSettingVO; + +/** + * @author zhangchenbiao + * @FileName: BeautyCameraSettingService + * @Description: 美颜配置service + * @date 2023-09-11 14:23 + */ +public interface BeautyCameraSettingService { + + /** + * AddBeautyCameraSettingRequest request + * @param userId + * @param request + * @return + */ + Long saveBeautyCameraSetting(String userId, AddBeautyCameraSettingRequest request); + + /** + * 获取美颜配置 + * @param userId + * @return + */ + BeautyCameraSettingVO queryBeautyCameraSetting(String userId); + +} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerLineInfoService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerLineInfoService.java index d0d3edaa0..f442fb768 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerLineInfoService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerLineInfoService.java @@ -6,6 +6,7 @@ import com.cool.store.exception.ApiException; import com.cool.store.request.*; import com.cool.store.vo.*; import com.cool.store.vo.interview.InterviewVO; +import com.cool.store.vo.partner.PartnerSimpleBaseInfoVO; import com.github.pagehelper.PageInfo; import java.util.List; @@ -162,4 +163,17 @@ public interface HyPartnerLineInfoService { Long checkGenerateNewLineId(Long lineId); + /** + * 编辑加盟商基本信息 + * @param request + * @return + */ + Integer editBaseInfo(EditBaseInfoRequest request); + + /** + * 获取加盟商基本信息 + * @param partnerLineId + * @return + */ + PartnerSimpleBaseInfoVO queryBaseInfo(Long partnerLineId); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BeautyCameraSettingServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BeautyCameraSettingServiceImpl.java new file mode 100644 index 000000000..533d0dd58 --- /dev/null +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BeautyCameraSettingServiceImpl.java @@ -0,0 +1,35 @@ +package com.cool.store.service.impl; + +import com.cool.store.dao.BeautyCameraSettingDAO; +import com.cool.store.entity.BeautyCameraSettingDO; +import com.cool.store.request.beauty.AddBeautyCameraSettingRequest; +import com.cool.store.service.BeautyCameraSettingService; +import com.cool.store.vo.beauty.BeautyCameraSettingVO; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + +/** + * @author zhangchenbiao + * @FileName: BeautyCameraSettingServiceImpl + * @Description: + * @date 2023-09-11 14:23 + */ +@Service +public class BeautyCameraSettingServiceImpl implements BeautyCameraSettingService { + + @Resource + private BeautyCameraSettingDAO beautyCameraSettingDAO; + + @Override + public Long saveBeautyCameraSetting(String userId, AddBeautyCameraSettingRequest request) { + BeautyCameraSettingDO beautyCameraSettingDO = AddBeautyCameraSettingRequest.convertDO(userId, request); + return beautyCameraSettingDAO.insertOrUpdateBeautyCameraSetting(beautyCameraSettingDO); + } + + @Override + public BeautyCameraSettingVO queryBeautyCameraSetting(String userId) { + BeautyCameraSettingDO beautyCameraSetting = beautyCameraSettingDAO.getBeautyCameraSetting(userId); + return BeautyCameraSettingVO.convertVO(beautyCameraSetting); + } +} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java index a97408ac9..469346863 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java @@ -23,9 +23,9 @@ import com.cool.store.utils.RedisUtilPool; import com.cool.store.utils.StringUtil; import com.cool.store.vo.*; import com.cool.store.vo.interview.InterviewVO; +import com.cool.store.vo.partner.PartnerSimpleBaseInfoVO; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -93,6 +93,8 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { private SmsService smsService; @Resource HyFollowTaskDAO hyFollowTaskDAO; + @Resource + private HyPartnerIntentInfoDAO hyPartnerIntentInfoDAO; @Override public StageCountVO selectStagePendingCount(String userId) { @@ -850,6 +852,54 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { return hyPartnerLineInfoDO.getId(); } + @Override + @Transactional(rollbackFor = Exception.class) + public Integer editBaseInfo(EditBaseInfoRequest request) { + HyPartnerLineInfoDO lineInfo = hyPartnerLineInfoDAO.selectByPrimaryKeySelective(request.getPartnerLineId()); + if(Objects.isNull(lineInfo)){ + throw new ServiceException(ErrorCodeEnum.LINE_ID_IS_NOT_EXIST); + } + HyPartnerUserInfoDO partnerUserInfo = hyPartnerUserInfoDAO.selectByMobile(request.getMobile()); + if(Objects.nonNull(partnerUserInfo) && !lineInfo.getPartnerId().equals(partnerUserInfo.getPartnerId())){ + throw new ServiceException(ErrorCodeEnum.PARTNER_MOBILE_EXIST_0); + } + HyPartnerUserInfoDO update = new HyPartnerUserInfoDO(); + update.setPartnerId(lineInfo.getPartnerId()); + update.setUsername(request.getUsername()); + update.setMobile(request.getMobile()); + update.setWantShopArea(request.getWantShopArea()); + update.setAcceptAdjustType(request.getAcceptAdjustType()); + hyPartnerUserInfoDAO.updateByPartnerId(update); + hyPartnerBaseInfoDAO.updateByPartnerId(request.getUsername(), request.getMobile(), lineInfo.getPartnerId()); + HyPartnerIntentInfoDO updateIntentInfo = new HyPartnerIntentInfoDO(); + updateIntentInfo.setPartnerLineId(request.getPartnerLineId()); + updateIntentInfo.setAcceptAdjustType(request.getAcceptAdjustType()); + updateIntentInfo.setWantShopArea(request.getWantShopArea()); + hyPartnerIntentInfoDAO.updateByPartnerLineId(updateIntentInfo); + return null; + } + + @Override + public PartnerSimpleBaseInfoVO queryBaseInfo(Long partnerLineId) { + HyPartnerLineInfoDO lineInfo = hyPartnerLineInfoDAO.selectByPrimaryKeySelective(partnerLineId); + if(Objects.isNull(lineInfo)){ + return null; + } + HyPartnerUserInfoDO partnerUserInfo = hyPartnerUserInfoDAO.selectByPartnerId(lineInfo.getPartnerId()); + HyPartnerBaseInfoDO partnerBaseInfo = hyPartnerBaseInfoDAO.getByPartnerLineId(partnerLineId); + PartnerSimpleBaseInfoVO result = PartnerSimpleBaseInfoVO.convertVO(partnerLineId, partnerUserInfo); + String userPortrait = Optional.ofNullable(partnerBaseInfo).map(o->o.getUserPortrait()).orElse(null); + if (StringUtils.isNotEmpty(userPortrait) && Objects.nonNull(result)){ + Map userPortraitMap = labelService.getUserPortraitMap(Arrays.asList(userPortrait)); + List userPortraitList = userPortraitMap.entrySet().stream() + .map(entry -> new UserPortraitDTO(entry.getKey(), entry.getValue())) + .collect(Collectors.toList()); + result.setPartnerBaseInfoId(partnerBaseInfo.getId()); + result.setUserPortrait(userPortraitList); + } + return result; + } + /** * convertPartnerBlackListDTOToVo diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/BeautyCameraSettingController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/BeautyCameraSettingController.java new file mode 100644 index 000000000..b870e4f66 --- /dev/null +++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/BeautyCameraSettingController.java @@ -0,0 +1,41 @@ +package com.cool.store.controller; + +import com.cool.store.context.CurrentUserHolder; +import com.cool.store.request.beauty.AddBeautyCameraSettingRequest; +import com.cool.store.response.ResponseResult; +import com.cool.store.service.BeautyCameraSettingService; +import com.cool.store.vo.beauty.BeautyCameraSettingVO; +import io.swagger.annotations.Api; +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.RestController; + +import javax.annotation.Resource; + +/** + * @author zhangchenbiao + * @FileName: BeautyCameraSettingController + * @Description: 美颜配置 + * @date 2023-09-11 14:21 + */ +@RestController +@Api(tags = "美颜配置") +public class BeautyCameraSettingController { + + @Resource + private BeautyCameraSettingService beautyCameraSettingService; + + + @PostMapping("/saveBeautyCameraSetting") + public ResponseResult saveBeautyCameraSetting(@RequestBody AddBeautyCameraSettingRequest request){ + Long result = beautyCameraSettingService.saveBeautyCameraSetting(CurrentUserHolder.getUserId(), request); + return ResponseResult.success(result); + } + + @PostMapping("/queryBeautyCameraSetting") + public ResponseResult queryBeautyCameraSetting(){ + return ResponseResult.success(beautyCameraSettingService.queryBeautyCameraSetting(CurrentUserHolder.getUserId())); + } + +} diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java index 9f655c7fe..eb430598f 100644 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java +++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java @@ -11,6 +11,7 @@ import com.cool.store.response.ResponseResult; import com.cool.store.service.*; import com.cool.store.vo.*; import com.cool.store.vo.interview.InterviewVO; +import com.cool.store.vo.partner.PartnerSimpleBaseInfoVO; import com.github.pagehelper.PageInfo; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -314,4 +315,16 @@ public class DeskController { @RequestParam(value = "needDevelopmentDirector",required = false)Boolean needDevelopmentDirector) throws ApiException { return ResponseResult.success(hyPartnerLineInfoService.getInterviewInfo(lineId,needDevelopmentDirector)); } + + @PostMapping(path = "/editBaseInfo") + @ApiOperation("修改接口") + public ResponseResult editBaseInfo(@RequestBody EditBaseInfoRequest request){ + return ResponseResult.success(hyPartnerLineInfoService.editBaseInfo(request)); + } + + @GetMapping(path = "/queryBaseInfo") + @ApiOperation("获取数据接口") + public ResponseResult queryBaseInfo(@RequestParam(value = "partnerLineId")Long partnerLineId){ + return ResponseResult.success(hyPartnerLineInfoService.queryBaseInfo(partnerLineId)); + } }