Skip to content

GitLab

Q
qk_backend
Commit 790e049b authored by shiyu's avatar shiyu
Browse files
Options

Merge branch 'quanku_12-14' into quanku_change_user_by_wwdz

parents c3267062 c357b289
Show whitespace changes
Inline Side-by-side
Showing with 31 additions and 16 deletions
ch-admin-api/src/main/java/com/wwdz/ch/admin/config/ShiroConfig.java
View file @ 790e049b
......@@ -117,6 +117,7 @@ public class ShiroConfig {
filterChainDefinitionMap.put("/admin/sysIM/**", "anon");
filterChainDefinitionMap.put("/admin/sysAiAssistant/**", "anon");
filterChainDefinitionMap.put("/admin/sysIMRecord/**", "anon");
filterChainDefinitionMap.put("/admin/consignSaleManage/**", "anon");
filterChainDefinitionMap.put("/admin/invitationCode/**", "anon");
// filterChainDefinitionMap.put("/admin/**", "anon");
......
ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/ConsignSaleServiceImpl.java
View file @ 790e049b
......@@ -7,6 +7,7 @@ import com.wwdz.ch.admin.entity.vo.ItemVo;
import com.wwdz.ch.admin.service.ConsignSaleService;
import com.wwdz.ch.admin.service.ItemService;
import com.wwdz.ch.core.consts.ConsignSaleEnum;
import com.wwdz.ch.core.consts.ItemStateEnum;
import com.wwdz.ch.core.entity.ConsignSaleVo;
import com.wwdz.ch.core.type.Result;
import com.wwdz.ch.core.util.MediaUtil;
......@@ -159,7 +160,7 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
ConsignSaleRecord consignSaleRecord = new ConsignSaleRecord();
consignSaleRecord.setSaleId(dto.getSaleId());
consignSaleRecord.setCreateTime(new Date());
consignSaleRecord.setContent("实物鉴定: " + dto.getImgValuation() + " 元");
consignSaleRecord.setContent("实物鉴定: " + dto.getValuation() + " 元");
consignSaleRecord.setRemark(dto.getRemark());
consignSaleRecord.setType(ConsignSaleEnum.OperateTypeEnum.IDENTIFY.getCode());
consignSaleRecordDao.insert(consignSaleRecord);
......@@ -184,15 +185,14 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
consignSaleDao.update(consignSale);
//卖出后商品下架
itemDao.updateOnSale(itemId);
itemDao.updateOnSale(itemId, ItemStateEnum.SALED.getCode());
//插入操作记录
ConsignSaleRecord consignSaleRecord = new ConsignSaleRecord();
consignSaleRecord.setSaleId(dto.getSaleId());
consignSaleRecord.setCreateTime(new Date());
consignSaleRecord.setContent("成交金额: " + dto.getImgValuation() + " 元");
consignSaleRecord.setRemark("成交平台: " + dto.getRemark());
consignSaleRecord.setType(ConsignSaleEnum.OperateTypeEnum.VALUATE.getCode());
consignSaleRecord.setContent("成交金额: " + dto.getDealPrice() + " 元");
consignSaleRecord.setRemark("成交平台: " + dto.getRemark() == null ? "" : dto.getRemark());
consignSaleRecord.setType(ConsignSaleEnum.OperateTypeEnum.FINISH.getCode());
consignSaleRecordDao.insert(consignSaleRecord);
return Result.success();
} catch (Exception e) {
......@@ -213,7 +213,7 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
consignSale.setSystemState(ConsignSaleEnum.SaleForSysStateEnum.CANCEL.getCode());
consignSaleDao.update(consignSale);
//商品下架
itemDao.updateOnSale(itemId);
itemDao.updateOnSale(itemId, ItemStateEnum.SHELVE.getCode());
//插入记录
ConsignSaleRecord consignSaleRecord = new ConsignSaleRecord();
......
ch-admin-api/src/main/java/com/wwdz/ch/admin/job/SynCoinJob.java
View file @ 790e049b
......@@ -198,7 +198,7 @@ public class SynCoinJob {
CoinRequestDto coinRequestDto = new CoinRequestDto();
coinRequestDto.setPage(1);
coinRequestDto.setLimit(100);
coinRequestDto.setKind(ItemKindEnum.NEPHRITE.getCode());
// coinRequestDto.setKind(ItemKindEnum.NEPHRITE.getCode());
PageInfo<Item> pageInfo = itemDao.findPageExcludeFilter(coinRequestDto);
int totalPageNum = pageInfo.getPages();
logger.info("total page : {}, total : {}", totalPageNum, pageInfo.getTotal());
......
ch-core/src/main/java/com/wwdz/ch/core/consts/ConsignSaleEnum.java
View file @ 790e049b
......@@ -90,7 +90,7 @@ public class ConsignSaleEnum {
public enum OperateTypeEnum {
VALUATE(1, "图文估价"),
IDENTIFY(4, "实物鉴定"),
WAIT_TAKE(10, "寄售单完成"),
FINISH(10, "寄售单完成"),
CUSTOM_CANCEL(20, "用户取消寄售"),
SYS_CANCEL(21, "平台取消寄售"),
;
......
ch-core/src/main/java/com/wwdz/ch/core/consts/ItemStateEnum.java
View file @ 790e049b
......@@ -9,6 +9,7 @@ public enum ItemStateEnum {
SHELVE(1, "暂不处理"),
DELETED(9, "已删除"),
FINISH(10, "已完成"),
SALED(20, "已完成寄售"),
;
private int code;
......
ch-dao/src/main/java/com/wwdz/ch/db/dao/ItemDao.java
View file @ 790e049b
......@@ -138,10 +138,10 @@ public interface ItemDao {
/**
* 商品下架
* @param itemId
* @param itemId, state
* @return
*/
boolean updateOnSale(long itemId);
boolean updateOnSale(long itemId, int state);
//--------------------------承接原来用户发布商品关联表--------------------------//
......
ch-dao/src/main/java/com/wwdz/ch/db/impl/ItemDaoImpl.java
View file @ 790e049b
......@@ -107,6 +107,7 @@ public class ItemDaoImpl implements ItemDao {
ItemExample.Criteria criteria = example.createCriteria();
JdbcHelper.ifPresent(coinRequestDto.getUserId(), criteria::andUserIdEqualTo);
JdbcHelper.ifPresent(coinRequestDto.getIsOnSale(), criteria::andIsOnSaleEqualTo);
criteria.andStateNotEqualTo(coinRequestDto.getState());
criteria.andIsDeletedEqualTo(false);
example.setOrderByClause("update_time desc");
PageHelper.startPage(coinRequestDto.getPage(), coinRequestDto.getLimit());
......@@ -155,7 +156,7 @@ public class ItemDaoImpl implements ItemDao {
public PageInfo<Item> findPageExcludeFilter(CoinRequestDto coinRequestDto) {
ItemExample example = new ItemExample();
ItemExample.Criteria criteria = example.createCriteria();
criteria.andKindEqualTo(coinRequestDto.getKind());
JdbcHelper.ifPresent(coinRequestDto.getKind(), criteria :: andKindEqualTo);
PageHelper.startPage(coinRequestDto.getPage(), coinRequestDto.getLimit());
List<Item> list = itemMapper.selectByExampleWithBLOBs(example);
return new PageInfo<>(list);
......@@ -407,9 +408,10 @@ public class ItemDaoImpl implements ItemDao {
}
@Override
public boolean updateOnSale(long itemId) {
public boolean updateOnSale(long itemId, int state) {
Item item = new Item();
item.setIsOnSale(false);
item.setState(state);
item.setId(itemId);
return updateById(item) > 0;
}
......
ch-wx-api/src/main/java/com/wwdz/ch/wx/config/WebMvcConfiguration.java
View file @ 790e049b
......@@ -40,7 +40,7 @@ public class WebMvcConfiguration implements WebMvcConfigurer {
.excludePathPatterns("/*.html", "/**/*.html", "/**/*.css", "/**/*.js"
, "/wx/user/loginByWx", "/wx/user/loginByMobile", "/wx/user/loginRegCaptcha", "/wx/user/updateRegCaptcha", "/wx/user/login", "/wx/user/fillCode",
"/officialAccountCallback/**",
"/imCallback/**"
"/imCallback/**", "/wx/category/**", "/wx/consignSale/**", "/wx/item/**"
/* "/wx/officialAccount/**",
"/wx/item/**",
"/wx/aiAssistant/**",
......
ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/ConsignSaleServiceImpl.java
View file @ 790e049b
......@@ -2,6 +2,7 @@ package com.wwdz.ch.wx.impl;
import com.github.pagehelper.PageInfo;
import com.wwdz.ch.core.consts.ConsignSaleEnum;
import com.wwdz.ch.core.consts.ItemStateEnum;
import com.wwdz.ch.core.entity.ConsignSaleVo;
import com.wwdz.ch.core.type.PageSearchResult;
import com.wwdz.ch.core.type.Result;
......@@ -115,6 +116,9 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
List<Long> itemIds = items.stream().map(Item::getId).collect(Collectors.toList());
if (!CollectionUtils.isEmpty(itemIds)) {
dto.setItemIds(itemIds);
} else {
//没有对应名称的商品则直接返回空数据
return Result.success();
}
} else {
dto.setSaleId(dto.getSearchParam());
......@@ -158,13 +162,19 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
@Override
public Result customCancel(ConsignSaleRequestDto dto) {
try {
//检测该寄售单是否已完成，已完成不能取消
ConsignSale consignSaleInfo = consignSaleDao.findById(dto.getSaleId());
if (consignSaleInfo.getSystemState().intValue() == ConsignSaleEnum.SaleForSysStateEnum.FINISH.getCode()) {
return Result.failed("该寄售单已完成不能取消");
}
ConsignSale consignSale = new ConsignSale();
consignSale.setSaleId(dto.getSaleId());
consignSale.setCustomState(ConsignSaleEnum.SaleForUserStateEnum.CANCEL.getCode());
consignSale.setSystemState(ConsignSaleEnum.SaleForSysStateEnum.CANCEL.getCode());
consignSaleDao.update(consignSale);
//商品下架
itemDao.updateOnSale(dto.getItemId());
itemDao.updateOnSale(dto.getItemId(), ItemStateEnum.SHELVE.getCode());
//插入操作记录
ConsignSaleRecord consignSaleRecord = new ConsignSaleRecord();
......
ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/ItemServiceImpl.java
View file @ 790e049b
......@@ -491,6 +491,7 @@ public class ItemServiceImpl implements ItemService {
CoinRequestDto coinRequestDto = new CoinRequestDto();
coinRequestDto.setUserId(dto.getUserId());
coinRequestDto.setIsOnSale(false);
coinRequestDto.setState(ItemStateEnum.SALED.getCode());
coinRequestDto.setPage(dto.getPage());
coinRequestDto.setLimit(dto.getSize());
List<Item> itemList = itemDao.findListByPageForSale(coinRequestDto);
......@@ -952,7 +953,7 @@ public class ItemServiceImpl implements ItemService {
if (Objects.isNull(item)) {
return Result.failed("数据异常，该藏品不存在");
}
List<ConsignSale> consignSales = consignSaleDao.findByItemId(dto.getItemId());
List<ConsignSale> consignSales = consignSaleDao.findByItemId(dto.getId());
long count = consignSales.stream().filter(consignSale -> consignSale.getCustomState().intValue() == ConsignSaleEnum.SaleForUserStateEnum.CONSIGN_SALEING.getCode()).count();
if (count > 0) {
return Result.failed("该藏品正在寄售中，不能编辑");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment