cxc/yshopb2c
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

springboot升级2.4.2,代码优化去掉无用代码

Browse Source
This commit is contained in:
taochengbo
2021-01-16 22:22:56 +08:00
committed by xuwenbo
parent aaeb0ddee5
commit ef8b3e55a7
36 changed files with 81 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
yshop-shop/src/main/java/co/yixiang/modules/customer/rest/YxStoreCustomerController.java
View File

@ -63,7 +63,9 @@ public class YxStoreCustomerController {
@PreAuthorize("@el.check('admin','yxStoreCustomer:add')")
public ResponseEntity<Object> create(@Validated @RequestBody YxStoreCustomer resources){
int count = yxStoreCustomerService.count(new LambdaQueryWrapper<YxStoreCustomer>().eq(YxStoreCustomer::getOpenId, resources.getOpenId()));
if (count > 0) throw new BadRequestException("当前用户已存在，请勿重复提交");
if (count > 0) {
throw new BadRequestException("当前用户已存在，请勿重复提交");
}
return new ResponseEntity<>(yxStoreCustomerService.save(resources),HttpStatus.CREATED);
}

6
yshop-shop/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java
View File

@ -388,8 +388,8 @@ public class StoreOrderController {
private YxStoreOrderQueryCriteria handleQuery(YxStoreOrderQueryCriteria criteria,String orderStatus,
String orderType){
criteria.setShippingType(OrderInfoEnum.SHIPPIING_TYPE_1.getValue());//默认查询所有快递订单
//默认查询所有快递订单
criteria.setShippingType(OrderInfoEnum.SHIPPIING_TYPE_1.getValue());
//订单状态查询
if (StrUtil.isNotEmpty(orderStatus)) {
switch (orderStatus) {
@ -426,6 +426,7 @@ public class StoreOrderController {
criteria.setPaid(OrderInfoEnum.PAY_STATUS_1.getValue());
criteria.setRefundStatus(OrderInfoEnum.REFUND_STATUS_2.getValue());
break;
default:
}
}
//订单类型查询
@ -448,6 +449,7 @@ public class StoreOrderController {
case "5":
criteria.setShippingType(2);
break;
default:
}
}