feat1
This commit is contained in:
parent
2d9d863efa
commit
16d61d6de3
@ -5,6 +5,7 @@ import com.alibaba.fastjson2.JSONObject;
|
||||
import com.baomidou.mybatisplus.core.conditions.Wrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
import lombok.SneakyThrows;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
@ -40,9 +41,7 @@ import java.util.List;
|
||||
*/
|
||||
@Service
|
||||
@Slf4j
|
||||
public class OrderService {
|
||||
@Autowired
|
||||
private OrderMapper orderMapper;
|
||||
public class OrderService extends ServiceImpl<OrderMapper,Order> implements OrderServiceInter {
|
||||
@Autowired
|
||||
private StoreMapper storeMapper;
|
||||
@Autowired
|
||||
@ -50,13 +49,13 @@ public class OrderService {
|
||||
|
||||
public R<String> addOrder(Order order) {
|
||||
order.setOrderTime(new Date());
|
||||
int insert = this.orderMapper.insert(order);
|
||||
return insert == 1 ? R.success("订单添加成功") : R.failed(HttpCodes.HTTP_CODES555, "订单添加失败,请联系服务器管理员");
|
||||
boolean insert = this.save(order);
|
||||
return insert ? R.success("订单添加成功") : R.failed(HttpCodes.HTTP_CODES555, "订单添加失败,请联系服务器管理员");
|
||||
}
|
||||
|
||||
public R<JSONObject> getOrder(Integer page, Integer num) {
|
||||
Page<Order> orderPage = new Page<>((long)page, (long)num);
|
||||
Page<Order> orderPage1 = this.orderMapper.selectPage(orderPage, null);
|
||||
Page<Order> orderPage1 = this.page(orderPage, null);
|
||||
orderPage1.getRecords().forEach(e -> {
|
||||
LambdaQueryWrapper<Store> orderVOLambdaQueryWrapper = new LambdaQueryWrapper<>();
|
||||
orderVOLambdaQueryWrapper.eq(Store::getId,e.getStoreId());
|
||||
@ -83,7 +82,7 @@ public class OrderService {
|
||||
public R<Boolean> getOrderUserInfo(String content) {
|
||||
LambdaQueryWrapper<Order> orderLambdaQueryWrapper = new LambdaQueryWrapper<>();
|
||||
orderLambdaQueryWrapper.eq(Order::getWechatNo, content).or().eq(Order::getWangNo, content).or().eq(Order::getAlipayNo, content).or().eq(Order::getPhoneNumber, content).or().eq(Order::getAlipayName, content);
|
||||
List<Order> orders = this.orderMapper.selectList(orderLambdaQueryWrapper);
|
||||
List<Order> orders = this.list(orderLambdaQueryWrapper);
|
||||
return orders.size() == 0 ? R.success(false) : R.success(true);
|
||||
}
|
||||
|
||||
@ -103,7 +102,7 @@ public class OrderService {
|
||||
}
|
||||
|
||||
Page<Order> orderPage = new Page<>((long)page, (long)num);
|
||||
Page<Order> orderPage1 = this.orderMapper.selectPage(orderPage, orderLambdaQueryWrapper);
|
||||
Page<Order> orderPage1 = this.page(orderPage, orderLambdaQueryWrapper);
|
||||
JSONObject jsonObject = new JSONObject();
|
||||
jsonObject.fluentPut("info", orderPage1.getRecords()).fluentPut("total", orderPage1.getTotal());
|
||||
return R.success(jsonObject);
|
||||
@ -124,26 +123,26 @@ public class OrderService {
|
||||
order.setId(orderId);
|
||||
order.setFlag(flagId);
|
||||
order.setFlagRemark(flagRemark);
|
||||
int update = this.orderMapper.updateById(order);
|
||||
return update == 1 ? R.success("订单插旗成功," + flagId + "号旗") : R.failed(HttpCodes.HTTP_CODES555, "订单插旗失败,请联系服务器管理员");
|
||||
boolean update = this.updateById(order);
|
||||
return update ? R.success("订单插旗成功," + flagId + "号旗") : R.failed(HttpCodes.HTTP_CODES555, "订单插旗失败,请联系服务器管理员");
|
||||
}
|
||||
|
||||
public R<String> changeOrder(Order order) {
|
||||
int update = this.orderMapper.updateById(order);
|
||||
return update == 1 ? R.success("订单修改成功") : R.failed(HttpCodes.HTTP_CODES555, "订单修改失败,请联系服务器管理员");
|
||||
boolean update = this.updateById(order);
|
||||
return update ? R.success("订单修改成功") : R.failed(HttpCodes.HTTP_CODES555, "订单修改失败,请联系服务器管理员");
|
||||
}
|
||||
|
||||
public R<String> delOrder(Integer orderId) {
|
||||
int delete = this.orderMapper.deleteById(orderId);
|
||||
return delete == 1 ? R.success("删除订单成功") : R.failed(HttpCodes.HTTP_CODES555, "删除订单失败,请联系服务器管理员");
|
||||
boolean delete = this.removeById(orderId);
|
||||
return delete ? R.success("删除订单成功") : R.failed(HttpCodes.HTTP_CODES555, "删除订单失败,请联系服务器管理员");
|
||||
}
|
||||
|
||||
public R<String> confirm(OrderStatus orderStatus, Integer orderId) {
|
||||
Order order = new Order();
|
||||
order.setId(orderId);
|
||||
order.setOrderStatus(orderStatus.name());
|
||||
int update = this.orderMapper.updateById(order);
|
||||
return update == 1 ? R.success("订单确认成功,当前状态:" + orderStatus.name()) : R.failed(HttpCodes.HTTP_CODES555, "订单确认失败,请联系服务器管理员");
|
||||
boolean update = this.updateById(order);
|
||||
return update ? R.success("订单确认成功,当前状态:" + orderStatus.name()) : R.failed(HttpCodes.HTTP_CODES555, "订单确认失败,请联系服务器管理员");
|
||||
}
|
||||
|
||||
@SneakyThrows
|
||||
@ -172,7 +171,7 @@ public class OrderService {
|
||||
@SneakyThrows
|
||||
public void uploadBatch(MultipartFile file) {
|
||||
try {
|
||||
EasyExcel.read(file.getInputStream(), Order.class, new ExcelParserUtil(this.orderMapper)).sheet().doRead();
|
||||
EasyExcel.read(file.getInputStream(), Order.class, new ExcelParserUtil(this)).sheet().doRead();
|
||||
} catch (Throwable var3) {
|
||||
throw var3;
|
||||
}
|
||||
|
8
src/main/java/top/xinsin/service/OrderServiceInter.java
Normal file
8
src/main/java/top/xinsin/service/OrderServiceInter.java
Normal file
@ -0,0 +1,8 @@
|
||||
package top.xinsin.service;
|
||||
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import top.xinsin.pojo.Order;
|
||||
|
||||
public interface OrderServiceInter extends IService<Order> {
|
||||
}
|
@ -28,7 +28,7 @@ public class ExcelParserUtil extends AnalysisEventListener<Order> {
|
||||
/**
|
||||
* 泛型bean属性
|
||||
*/
|
||||
private OrderMapper dynamicService;
|
||||
private OrderService dynamicService;
|
||||
|
||||
/**
|
||||
* 可接收任何参数的泛型List集合
|
||||
@ -43,7 +43,7 @@ public class ExcelParserUtil extends AnalysisEventListener<Order> {
|
||||
*
|
||||
* @param dynamicService
|
||||
*/
|
||||
public ExcelParserUtil(OrderMapper dynamicService) {
|
||||
public ExcelParserUtil(OrderService dynamicService) {
|
||||
this.dynamicService = dynamicService;
|
||||
}
|
||||
|
||||
@ -74,13 +74,7 @@ public class ExcelParserUtil extends AnalysisEventListener<Order> {
|
||||
*/
|
||||
private void saveData() {
|
||||
log.info(" ==> 数据保存开始: {}", list.size());
|
||||
ArrayList<Order> ts = new ArrayList<>();
|
||||
list.forEach(order -> {
|
||||
if (order.getOrderNo() != null && order.getOrderTime() != null && order.getWangNo() != null && order.getPayAmt() != null && order.getShopId() != null && order.getAddress() != null){
|
||||
ts.add(order);
|
||||
}
|
||||
});
|
||||
ts.forEach(dynamicService::insert);
|
||||
dynamicService.saveBatch(list);
|
||||
log.info(" ==> 数据保存结束 <==");
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user