sgb
/
zsw-farm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修复订单多选查询

sj
sj 2 years ago
parent
8525c5399e
commit
769de337e7
6 changed files with 132 additions and 51 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      yudao-server/src/main/resources/application-local.yaml
  2. 8
      zsw-bxg/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCombinationServiceImpl.java
  3. 10
      zsw-bxg/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreSeckillServiceImpl.java
  4. 2
      zsw-bxg/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java
  5. 2
      zsw-bxg/src/main/java/co/yixiang/modules/order/service/YxStoreOrderService.java
  6. 159
      zsw-bxg/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java

2
yudao-server/src/main/resources/application-local.yaml
Unescape View File

@ -270,7 +270,7 @@ dubbo:
bxg:
shop:
# API_URL: http://192.168.10.113:48080/bxgApp
API_URL: http://6fa9fbb0.cpolar.top
API_URL: http://675b568e.r6.cpolar.top
SITE_URL: http://192.168.10.113:48080/bxgApp
UNI_SITE_URL: http://192.168.10.113:48080/bxgApp
ADMIN_API_URL: http://192.168.10.113:48080/bxg

8
zsw-bxg/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCombinationServiceImpl.java
Unescape View File

@ -37,6 +37,7 @@ import co.yixiang.modules.activity.service.mapper.YxStoreVisitMapper;
import co.yixiang.modules.activity.vo.CombinationQueryVo;
import co.yixiang.modules.activity.vo.StoreCombinationVo;
import co.yixiang.modules.activity.vo.YxStoreCombinationQueryVo;
import co.yixiang.modules.product.domain.YxStoreProduct;
import co.yixiang.modules.product.domain.YxStoreProductAttrValue;
import co.yixiang.modules.product.service.YxStoreProductAttrService;
import co.yixiang.modules.product.service.YxStoreProductAttrValueService;
@ -83,6 +84,8 @@ public class YxStoreCombinationServiceImpl extends BaseServiceImpl<YxStoreCombin
@Autowired
private IGenerator generator;
@Autowired
private YxStoreProductService yxStoreProductService;
@Autowired
private YxStorePinkMapper yxStorePinkMapper;
@Autowired
@ -239,6 +242,11 @@ public class YxStoreCombinationServiceImpl extends BaseServiceImpl<YxStoreCombin
List<YxStoreCombinationDto> combinationDTOS = generator.convert(page.getList(),YxStoreCombinationDto.class);
for (YxStoreCombinationDto combinationDTO : combinationDTOS) {
//这里把商品的售价放入到拼团的原价中，方便后台列表查看
YxStoreProduct yxStoreProduct=yxStoreProductService.getById(combinationDTO.getProductId());
if (ObjectUtil.isNotEmpty(yxStoreProduct)){
combinationDTO.setProductPrice(yxStoreProduct.getPrice());
};
//参与人数
combinationDTO.setCountPeopleAll(yxStorePinkMapper.selectCount(new LambdaQueryWrapper<YxStorePink>()
.eq(YxStorePink::getCid,combinationDTO.getId())));

10
zsw-bxg/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreSeckillServiceImpl.java
Unescape View File

@ -31,9 +31,11 @@ import co.yixiang.modules.activity.service.mapper.YxStoreSeckillMapper;
import co.yixiang.modules.activity.vo.SeckillConfigVo;
import co.yixiang.modules.activity.vo.StoreSeckillVo;
import co.yixiang.modules.activity.vo.YxStoreSeckillQueryVo;
import co.yixiang.modules.product.domain.YxStoreProduct;
import co.yixiang.modules.product.domain.YxStoreProductAttrValue;
import co.yixiang.modules.product.service.YxStoreProductAttrService;
import co.yixiang.modules.product.service.YxStoreProductReplyService;
import co.yixiang.modules.product.service.YxStoreProductService;
import co.yixiang.modules.product.service.dto.FromatDetailDto;
import co.yixiang.modules.product.service.dto.ProductFormatDto;
import co.yixiang.modules.product.service.dto.ProductResultDto;
@ -103,6 +105,9 @@ public class YxStoreSeckillServiceImpl extends BaseServiceImpl<YxStoreSeckillMap
@Autowired
private YxStoreSeckillService yxStoreSeckillService;
@Autowired
private YxStoreProductService yxStoreProductService;
@Override
public SeckillConfigVo getStoreSeckil() {
//获取秒杀配置
@ -417,6 +422,11 @@ public class YxStoreSeckillServiceImpl extends BaseServiceImpl<YxStoreSeckillMap
PageInfo<YxStoreSeckill> page = new PageInfo<>(queryAll(criteria));
List<YxStoreSeckillDto> storeSeckillDTOS = generator.convert(page.getList(),YxStoreSeckillDto.class);
for (YxStoreSeckillDto storeSeckillDTO : storeSeckillDTOS){
//这里把商品的售价放入到秒杀的原价中，方便后台列表
YxStoreProduct yxStoreProduct=yxStoreProductService.getById(storeSeckillDTO.getProductId());
if (ObjectUtil.isNotEmpty(yxStoreProduct)){
storeSeckillDTO.setOtPrice(yxStoreProduct.getPrice());
}
String statusStr = OrderUtil.checkActivityStatus(storeSeckillDTO.getStartTime(),
storeSeckillDTO.getStopTime(), storeSeckillDTO.getStatus());
storeSeckillDTO.setStatusStr(statusStr);

2
zsw-bxg/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java
Unescape View File

@ -126,7 +126,7 @@ public class StoreOrderController {
Map<String,Object> map;
String[] orderTypeList=orderType.split(",");
if(orderTypeList.length>1){//多选方法
map=yxStoreOrderService.queryManyType(orderTypeList, pageable,criteria);
map=yxStoreOrderService.queryManyType(orderTypeList, pageable,criteria,orderStatus);
}else {
YxStoreOrderQueryCriteria newCriteria = this.handleQuery(criteria,orderStatus,orderType);
map=yxStoreOrderService.queryAll(newCriteria, pageable);

2
zsw-bxg/src/main/java/co/yixiang/modules/order/service/YxStoreOrderService.java
Unescape View File

@ -257,7 +257,7 @@ public interface YxStoreOrderService extends BaseService<YxStoreOrder>{
* @param pageable 分页参数
* @return Map<String,Object>
*/
Map<String,Object> queryManyType(String[] typeList, Pageable pageable,YxStoreOrderQueryCriteria criteria);
Map<String,Object> queryManyType(String[] typeList, Pageable pageable,YxStoreOrderQueryCriteria criteria,String orderStatus);
/**
* 查询数据分页

159
zsw-bxg/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java
Unescape View File

@ -110,6 +110,7 @@ import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.function.Consumer;
import java.util.stream.Collectors;
@ -2409,78 +2410,140 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<StoreOrderMapper, Y
@Override
public Map<String, Object> queryManyType(String[] typeList, Pageable pageable,YxStoreOrderQueryCriteria criteria) {
public Map<String, Object> queryManyType(String[] typeList, Pageable pageable,YxStoreOrderQueryCriteria criteria,String orderStatus) {
LambdaQueryWrapper<YxStoreOrder> queryWrapper =new LambdaQueryWrapper<>();
if(StringUtils.isNotBlank(criteria.getOrderId())){
queryWrapper.and(wrapper->{
wrapper.like(YxStoreOrder::getOrderId,criteria.getOrderId());
});
// queryWrapper.like(YxStoreOrder::getOrderId,criteria.getOrderId());
queryWrapper.like(YxStoreOrder::getOrderId,criteria.getOrderId());
}
if(StringUtils.isNotBlank(criteria.getUserPhone())){
queryWrapper.and(wrapper->{
wrapper.like(YxStoreOrder::getUserPhone,criteria.getUserPhone());
});
// queryWrapper.like(YxStoreOrder::getUserPhone,criteria.getUserPhone());
queryWrapper.like(YxStoreOrder::getUserPhone,criteria.getUserPhone());
}
if(StringUtils.isNotBlank(criteria.getUserAddress())){
queryWrapper.like(YxStoreOrder::getUserAddress,criteria.getUserAddress());
}
for (String orderType:typeList){
switch (orderType) {
case "1": //普通
// criteria.setBargainId(0);
// criteria.setCombinationId(0);
// criteria.setSeckillId(0);
queryWrapper .or((wrapper)->{
wrapper.eq(YxStoreOrder::getBargainId,0)
.eq(YxStoreOrder::getCombinationId,0)
.eq(YxStoreOrder::getSeckillId,0);
queryWrapper.like(YxStoreOrder::getUserAddress,criteria.getUserAddress()); //地址模糊查询
}
if (StrUtil.isNotEmpty(orderStatus)){ //选择了订单状态
switch (orderStatus) {
case "0": //未支付
queryWrapper.and((wrapper)->{
wrapper.eq(YxStoreOrder::getPaid,OrderInfoEnum.PAY_STATUS_0.getValue())
.eq(YxStoreOrder::getStatus,OrderInfoEnum.STATUS_0.getValue())
.eq(YxStoreOrder::getRefundStatus,OrderInfoEnum.REFUND_STATUS_0.getValue());
});
break;
case "2": //拼团
// criteria.setNewCombinationId(0);
queryWrapper.or((wrapper)->{
wrapper.ne(YxStoreOrder::getCombinationId,0);
case "1": //未发货（待审核）
queryWrapper.and((wrapper)->{
wrapper.eq(YxStoreOrder::getPaid,OrderInfoEnum.PAY_STATUS_1.getValue())
.eq(YxStoreOrder::getStatus,OrderInfoEnum.STATUS_0.getValue())
.eq(YxStoreOrder::getRefundStatus,OrderInfoEnum.REFUND_STATUS_0.getValue());
});
break;
case "3": //秒杀
// criteria.setNewSeckillId(0);
queryWrapper.or((wrapper)->{
wrapper.ne(YxStoreOrder::getSeckillId,0);
case "5": //拣货中（通过审核，原未发货）
queryWrapper.and((wrapper)->{
wrapper.eq(YxStoreOrder::getPaid,OrderInfoEnum.PAY_STATUS_1.getValue())
.eq(YxStoreOrder::getStatus,OrderInfoEnum.STATUS_5.getValue())
.eq(YxStoreOrder::getRefundStatus,OrderInfoEnum.REFUND_STATUS_0.getValue());
});
break;
case "4": //砍价
// criteria.setNewBargainId(0);
queryWrapper.or((wrapper)->{
wrapper.ne(YxStoreOrder::getBargainId,0);
case "2": //待收货
queryWrapper.and((wrapper)->{
wrapper.eq(YxStoreOrder::getPaid,OrderInfoEnum.PAY_STATUS_1.getValue())
.eq(YxStoreOrder::getStatus,OrderInfoEnum.STATUS_1.getValue())
.eq(YxStoreOrder::getRefundStatus,OrderInfoEnum.REFUND_STATUS_0.getValue());
});
break;
case "5": //核销
// criteria.setShippingType(2);
queryWrapper.or((wrapper)->{
wrapper.ne(YxStoreOrder::getShippingType,2);
case "3":
queryWrapper.and((wrapper)->{
wrapper.eq(YxStoreOrder::getPaid,OrderInfoEnum.PAY_STATUS_1.getValue())
.eq(YxStoreOrder::getStatus,OrderInfoEnum.STATUS_2.getValue())
.eq(YxStoreOrder::getRefundStatus,OrderInfoEnum.REFUND_STATUS_0.getValue());
});
break;
case "6": //积分
// criteria.setPayIntegral(new BigDecimal("0.00"));
queryWrapper.or((wrapper)->{
wrapper.gt(YxStoreOrder::getPayIntegral,new BigDecimal("0.00"));
case "4":
queryWrapper.and((wrapper)->{
wrapper.eq(YxStoreOrder::getPaid,OrderInfoEnum.PAY_STATUS_1.getValue())
.eq(YxStoreOrder::getStatus,OrderInfoEnum.STATUS_3.getValue())
.eq(YxStoreOrder::getRefundStatus,OrderInfoEnum.REFUND_STATUS_0.getValue());
});
break;
case "-1":
queryWrapper.and((wrapper)->{
wrapper.eq(YxStoreOrder::getPaid,OrderInfoEnum.PAY_STATUS_1.getValue())
.eq(YxStoreOrder::getRefundStatus,OrderInfoEnum.REFUND_STATUS_1.getValue());
});
break;
case "-2":
queryWrapper.and((wrapper)->{
wrapper.eq(YxStoreOrder::getPaid,OrderInfoEnum.PAY_STATUS_1.getValue())
.eq(YxStoreOrder::getRefundStatus,OrderInfoEnum.REFUND_STATUS_2.getValue());
});
break;
case "-9":
queryWrapper.and((wrapper)->{
wrapper.eq(YxStoreOrder::getRefundStatus,OrderInfoEnum.REFUND_STATUS_0.getValue());
});
break;
default:
}
}
//时间
if (ObjectUtil.isNotEmpty(criteria.getCreateTime())){
queryWrapper.between(YxStoreOrder::getCreateTime,criteria.getCreateTime().get(0),criteria.getCreateTime().get(1));
}
queryWrapper.and(wrapper->{
for (String orderType:typeList){ //筛选了订单类型
switch (orderType) {
case "1": //普通
wrapper.or((wrapper1)->{
wrapper1.eq(YxStoreOrder::getBargainId,0)
.eq(YxStoreOrder::getCombinationId,0)
.eq(YxStoreOrder::getSeckillId,0);
});
break;
case "2": //拼团
// criteria.setNewCombinationId(0);
wrapper.or((wrapper1)->{
wrapper1.ne(YxStoreOrder::getCombinationId,0);
});
break;
case "3": //秒杀
// criteria.setNewSeckillId(0);
wrapper.or((wrapper1)->{
wrapper1.ne(YxStoreOrder::getSeckillId,0);
});
break;
case "4": //砍价
// criteria.setNewBargainId(0);
wrapper.or((wrapper1)->{
wrapper1.ne(YxStoreOrder::getBargainId,0);
});
break;
case "5": //核销
// criteria.setShippingType(2);
wrapper.or((wrapper1)->{
wrapper1.ne(YxStoreOrder::getShippingType,2);
});
break;
case "6": //积分
// criteria.setPayIntegral(new BigDecimal("0.00"));
wrapper.or((wrapper1)->{
wrapper1.gt(YxStoreOrder::getPayIntegral,new BigDecimal("0.00"));
});
break;
default:
}
}
});
getPage(pageable);
PageInfo<YxStoreOrder> page = new PageInfo<>(storeOrderMapper.selectList(queryWrapper));
List<YxStoreOrderDto> storeOrderDTOS = new ArrayList<>();
for (YxStoreOrder yxStoreOrder : page.getList()) {
this.orderList(storeOrderDTOS, yxStoreOrder);
}
// List<YxStoreOrderDto> list=this.newAssemble(page.getList());
// List<YxStoreOrderDto> storeOrderDTOS = new ArrayList<>();
// for (YxStoreOrder yxStoreOrder : page.getList()) {
// this.orderList(storeOrderDTOS, yxStoreOrder);
// }
List<YxStoreOrderDto> list=this.newAssemble(page.getList());
Map<String, Object> map = new LinkedHashMap<>(2);
map.put("content", storeOrderDTOS);
// map.put("content", list);
// map.put("content", storeOrderDTOS);
map.put("content", list);
map.put("totalElements", page.getTotal());
return map;
}

Write Preview
Loading…
Cancel
Save