suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev/feat/partner1.6_20231226' into dev/feat/partner1.6_20231226

Browse Source
This commit is contained in:
feng.li
2023-12-22 11:32:28 +08:00
parent bb6c152e5f d8a2e6532d
commit b32efa8277
9 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java
View File

@@ -68,6 +68,7 @@ public class CommonConstants {
public static final String SQUAREBRACKETSRIGHT = "]";
public static final String PATH_SPILT = "/";
public static final String PATH_BAR = "-";
public static final String ROOT_REGION_PATH = "/1/";
/**

2
coolstore-partner-dao/src/main/resources/mapper/HyExhibitionMapper.xml
View File

@@ -322,6 +322,8 @@
start_date as startDate,
close_time as closeTime,
location as location,
closed_type as closedType,
creator as creator,
exhibition_name as exhibitionName,
collaborators as collaboratorStr
from hy_exhibition

4
coolstore-partner-dao/src/main/resources/mapper/HyPartnerExhibitionMapper.xml
View File

@@ -426,10 +426,10 @@
on hpe.partner_id = hpui.partner_id
<where>
<if test="partnerName!=null and partnerName!=''">
hpui.username like concat("%", #{partnerName}, "%")
and hpui.username like concat("%", #{partnerName}, "%")
</if>
<if test="id!=null">
hpe.exhibition_id = #{id}
and hpe.exhibition_id = #{id}
</if>
</where>
</select>

4
coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/ExhibitionDTO.java
View File

@@ -27,6 +27,10 @@ public class ExhibitionDTO {
private String collaboratorStr;
private String creator;
private Integer closedType;
private List<CollaboratorDTO> collaborators;
}

2
coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/ExhibitionLineDTO.java
View File

@@ -22,7 +22,7 @@ public class ExhibitionLineDTO {
private Integer wantShopArea;
private Integer wantShopAreaName;
private String wantShopAreaName;
private Integer participationStatus;

2
coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/ExhibitionLineVO.java
View File

@@ -22,7 +22,7 @@ public class ExhibitionLineVO {
private Integer wantShopArea;
private Integer wantShopAreaName;
private String wantShopAreaName;
private Integer participationStatus;

4
coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/ExhibitionVO.java
View File

@@ -18,6 +18,10 @@ public class ExhibitionVO {
private String startDate;
private Integer closedType;
private String createId;
private Integer id;
private List<CollaboratorVO> collaborators;

17
coolstore-partner-service/src/main/java/com/cool/store/service/impl/exhibition/ExhibitionServiceImpl.java
View File

@@ -35,6 +35,7 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -85,8 +86,8 @@ public class ExhibitionServiceImpl implements ExhibitionService {
@Resource
HyPartnerUserInfoDAO hyPartnerUserInfoDAO;
// @Value("${offline.exhibition.channel.id}")
// private Integer offlineExhibition;
@Value("${offline.exhibition.channel.id:null}")
private String offlineExhibition;
@Override
@Transactional
@@ -279,7 +280,7 @@ public class ExhibitionServiceImpl implements ExhibitionService {
myExhibitionVO.setLocation(x.getLocation());
myExhibitionVO.setId(x.getId());
myExhibitionVO.setClosedType(x.getClosedType());
myExhibitionVO.setStartDate(DateUtils.format(x.getStartDate(),DateUtils.DATE_FORMAT_10));
myExhibitionVO.setStartDate(DateUtils.format(x.getStartDate(),CoolDateUtils.DATE_FORMAT_DAY_2));
if (StringUtils.isNotEmpty(x.getCollaborators())){
List<String> userIdList = Arrays.asList(x.getCollaborators().substring(1).split(Constants.COMMA));
List<CollaboratorVO> coll = new ArrayList<>();
@@ -329,7 +330,9 @@ public class ExhibitionServiceImpl implements ExhibitionService {
list.forEach(exhibitionDTO->{
ExhibitionVO exhibitionVO = new ExhibitionVO();
exhibitionVO.setExhibitionName(exhibitionDTO.getExhibitionName());
exhibitionVO.setStartDate(exhibitionDTO.getStartDate());
exhibitionVO.setCreateId(exhibitionDTO.getCreator());
exhibitionVO.setClosedType(exhibitionDTO.getClosedType());
exhibitionVO.setStartDate(exhibitionDTO.getStartDate().replace(CommonConstants.PATH_BAR,CommonConstants.PATH_SPILT));
exhibitionVO.setId(exhibitionDTO.getId());
exhibitionVOS.add(exhibitionVO);
});
@@ -367,8 +370,10 @@ public class ExhibitionServiceImpl implements ExhibitionService {
exhibitionDTOS.forEach(exhibitionDTO->{
ExhibitionVO exhibitionVO = new ExhibitionVO();
exhibitionVO.setExhibitionName(exhibitionDTO.getExhibitionName());
exhibitionVO.setStartDate(exhibitionDTO.getStartDate());
exhibitionVO.setStartDate(exhibitionDTO.getStartDate().replace(CommonConstants.PATH_BAR,CommonConstants.PATH_SPILT));
exhibitionVO.setLocation(exhibitionDTO.getLocation());
exhibitionVO.setClosedType(exhibitionDTO.getClosedType());
exhibitionVO.setCreateId(exhibitionDTO.getCreator());
exhibitionVO.setId(exhibitionDTO.getId());
//需要加载协作人才加载 不需要的时候 不加载
if (includeCollaborators&&StringUtils.isNotEmpty(exhibitionDTO.getCollaboratorStr())){
@@ -528,7 +533,7 @@ public class ExhibitionServiceImpl implements ExhibitionService {
partnerId = UUIDUtils.get32UUID();
HyPartnerUserInfoDO resultUser = new HyPartnerUserInfoDO();
resultUser.setUsername(signUpExhibitionDTO.getPartnerName()).setMobile(signUpExhibitionDTO.getMobile()).setPartnerId(partnerId).setCreateTime(new Date())
.setWantShopArea(signUpExhibitionDTO.getWantShopArea()).setUserChannelId(111111111);
.setWantShopArea(signUpExhibitionDTO.getWantShopArea()).setUserChannelId(Integer.valueOf(offlineExhibition));
hyPartnerUserInfoDAO.insertSelective(resultUser);
}
HyPartnerLineInfoDO resultLine = new HyPartnerLineInfoDO();

4
coolstore-partner-webb/src/main/java/com/cool/store/controller/ExhibitionController.java
View File

@@ -45,12 +45,12 @@ public class ExhibitionController {
@GetMapping(value = "/getMyExhibitionList")
@ApiOperation("我的会销")
public ResponseResult getMyExhibitionList(@RequestParam(required = false,value = "closedTye") String closedTye,
public ResponseResult getMyExhibitionList(@RequestParam(required = false,value = "closedType") String closedType,
@RequestParam(required = false,value = "startDate") String startDate,
@RequestParam(required = false,value = "pageNum") Integer pageNum,
@RequestParam(required = false,value = "pageSize") Integer pageSize) {
LoginUserInfo user = CurrentUserHolder.getUser();
return ResponseResult.success(exhibitionService.getMyExhibitionList(user.getUserId(),closedTye,startDate,pageSize,pageNum));
return ResponseResult.success(exhibitionService.getMyExhibitionList(user.getUserId(),startDate ,closedType,pageSize,pageNum));
}
@GetMapping(value = "/getMyExhibitionGroupList")