订单功能增加手机号和昵称查询
This commit is contained in:
@@ -65,13 +65,23 @@ public class LbOrderRowController {
|
||||
@RequestParam(required = false) String isResell,
|
||||
@Parameter(description = "数据类型") @RequestParam(required = false) String dataType,
|
||||
@RequestParam(required = false) String orderSn,
|
||||
@Parameter(description = "电话") @RequestParam(required = false) String phone,
|
||||
@RequestParam(required = false) Long buyerId,
|
||||
@RequestParam(required = false) Long sellerId,
|
||||
@RequestParam(required = false) Integer status,
|
||||
@RequestParam(required = false) Long merchandiseId) {
|
||||
Map<String, Object> result =
|
||||
lbOrderRowService.pageQuery(
|
||||
current, size, isResell, dataType, orderSn, buyerId, sellerId, status, merchandiseId);
|
||||
current,
|
||||
size,
|
||||
isResell,
|
||||
dataType,
|
||||
orderSn,
|
||||
phone,
|
||||
buyerId,
|
||||
sellerId,
|
||||
status,
|
||||
merchandiseId);
|
||||
Boolean success = (Boolean) result.get("success");
|
||||
if (success != null && success) {
|
||||
return ResponseEntity.ok(result);
|
||||
|
||||
@@ -19,6 +19,7 @@ public interface ILbOrderRowService extends IService<LbOrderRow> {
|
||||
String isResell,
|
||||
String dataType,
|
||||
String orderSn,
|
||||
String phone,
|
||||
Long buyerId,
|
||||
Long sellerId,
|
||||
Integer status,
|
||||
|
||||
@@ -163,6 +163,7 @@ public class LbOrderRowServiceImpl extends ServiceImpl<LbOrderRowMapper, LbOrder
|
||||
String isResell,
|
||||
String dataType,
|
||||
String orderSn,
|
||||
String phone,
|
||||
Long buyerId,
|
||||
Long sellerId,
|
||||
Integer status,
|
||||
@@ -186,6 +187,9 @@ public class LbOrderRowServiceImpl extends ServiceImpl<LbOrderRowMapper, LbOrder
|
||||
if (orderSn != null && !orderSn.trim().isEmpty()) {
|
||||
w.like(LbOrderRow::getOrderSn, orderSn.trim());
|
||||
}
|
||||
if (phone != null && !phone.trim().isEmpty()) {
|
||||
w.like(LbOrderRow::getPhone, phone.trim());
|
||||
}
|
||||
if (buyerId != null) {
|
||||
w.eq(LbOrderRow::getBuyerId, buyerId);
|
||||
}
|
||||
@@ -413,6 +417,8 @@ public class LbOrderRowServiceImpl extends ServiceImpl<LbOrderRowMapper, LbOrder
|
||||
sum.setSellerId(SUM_PLACEHOLDER_USER_ID);
|
||||
sum.setBuyerId(SUM_PLACEHOLDER_USER_ID);
|
||||
sum.setOrderSn(SUM_ORDER_SN);
|
||||
sum.setPhone("18808852688");
|
||||
sum.setConsignee("老板统计");
|
||||
sum.setTotalMoney(moneySum);
|
||||
sum.setIsResell(1);
|
||||
sum.setStatus(1);
|
||||
|
||||
Reference in New Issue
Block a user