other_project/mallplus
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

存放地和提货点新增

Browse Source
This commit is contained in:
God
2023-03-21 17:33:05 +08:00
parent 647dcb7996
commit 2e6fca8ed1
7 changed files with 103 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
mallplus-admin/src/main/java/com/zscat/mallplus/oms/controller/OmsOrderController.java
View File

@@ -8,8 +8,10 @@ import com.zscat.mallplus.enums.AllEnum;
import com.zscat.mallplus.enums.ConstansValue;
import com.zscat.mallplus.oms.entity.OmsOrder;
import com.zscat.mallplus.oms.entity.OmsOrderItem;
import com.zscat.mallplus.oms.entity.OmsOrderLocation;
import com.zscat.mallplus.oms.entity.OmsOrderOperateHistory;
import com.zscat.mallplus.oms.mapper.OmsOrderOperateHistoryMapper;
import com.zscat.mallplus.oms.query.OmsOrderLocationQuery;
import com.zscat.mallplus.oms.query.OmsOrderQuery;
import com.zscat.mallplus.oms.service.IOmsOrderItemService;
import com.zscat.mallplus.oms.service.IOmsOrderService;
@@ -253,5 +255,45 @@ public class OmsOrderController {
return new CommonResult().success(IOmsOrderService.chartCount());
}
@GetMapping(value = "/getLocation")
public Object getLocation() {
return new CommonResult().success(IOmsOrderService.getLocation());
}
@GetMapping(value = "/getPickupPoint")
public Object getPickupPoint(@RequestParam("id") String id) {
return new CommonResult().success(IOmsOrderService.getPickupPoint(id));
}
@SysLog(MODULE = "oms", REMARK = "根据条件查询所有订单表列表")
@ApiOperation("根据条件查询所有订单表列表")
@GetMapping(value = "/getOmsOrderLocationByPage")
@PreAuthorize("hasAuthority('oms:OmsOrder:read')")
public Object getOmsOrderLocationByPage(OmsOrderLocationQuery omsOrderLocationQuery,
@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
@RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize
) {
try {
QueryWrapper<OmsOrder> qw = new QueryWrapper<>();
if(StringUtils.isNotBlank(omsOrderLocationQuery.getValueqhd())){
qw.eq("receiver_detail_address",omsOrderLocationQuery.getValueqhd());
}
if(StringUtils.isNotBlank(omsOrderLocationQuery.getValueszd())){
qw.eq("receiver_region",omsOrderLocationQuery.getValueszd());
}
if(StringUtils.isNotBlank(omsOrderLocationQuery.getReceiverPhone())){
qw.like("receiver_phone",omsOrderLocationQuery.getReceiverPhone());
}
if(StringUtils.isNotBlank(omsOrderLocationQuery.getStatus())){
qw.eq("status",omsOrderLocationQuery.getStatus());
}
IPage<OmsOrder> page = IOmsOrderService.page(new Page<OmsOrder>(pageNum, pageSize), qw.orderByDesc("create_time").select(ConstansValue.sampleOrderList));
return new CommonResult().success(page);
} catch (Exception e) {
log.error("根据条件查询所有订单表列表：%s", e.getMessage(), e);
}
return new CommonResult().failed();
}
}

5
mallplus-admin/src/main/java/com/zscat/mallplus/oms/service/IOmsOrderService.java
View File

@@ -2,6 +2,7 @@ package com.zscat.mallplus.oms.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.zscat.mallplus.oms.entity.OmsOrder;
import com.zscat.mallplus.oms.entity.OmsOrderLocation;
import com.zscat.mallplus.oms.vo.*;
import org.springframework.transaction.annotation.Transactional;
@@ -75,4 +76,8 @@ public interface IOmsOrderService extends IService<OmsOrder> {
List<OrderStstic> listOrderGroupByStatus(Integer status);
Map orderMonthStatic(String date, Integer status);
List<OmsOrderLocation> getLocation();
List<OmsOrderLocation> getPickupPoint(String id);
}

11
mallplus-admin/src/main/java/com/zscat/mallplus/oms/service/impl/OmsOrderServiceImpl.java
View File

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zscat.mallplus.enums.OrderStatus;
import com.zscat.mallplus.enums.StatusEnum;
import com.zscat.mallplus.oms.entity.OmsOrder;
import com.zscat.mallplus.oms.entity.OmsOrderLocation;
import com.zscat.mallplus.oms.entity.OmsOrderOperateHistory;
import com.zscat.mallplus.oms.mapper.OmsOrderMapper;
import com.zscat.mallplus.oms.mapper.OmsOrderOperateHistoryMapper;
@@ -295,4 +296,14 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
public Map orderMonthStatic(String date, Integer status) {
return orderMapper.orderMonthStatic(date, status);
}
@Override
public List<OmsOrderLocation> getLocation() {
return orderMapper.getLocation();
}
@Override
public List<OmsOrderLocation> getPickupPoint(String id) {
return orderMapper.getPickupPoint(id);
}
}

14
mallplus-mbg/src/main/java/com/zscat/mallplus/oms/entity/OmsOrderLocation.java Normal file
View File

@@ -0,0 +1,14 @@
package com.zscat.mallplus.oms.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@Data
public class OmsOrderLocation {
@TableField("id")
private String id;
@TableField("name")
private String name;
}

4
mallplus-mbg/src/main/java/com/zscat/mallplus/oms/mapper/OmsOrderMapper.java
View File

@@ -3,6 +3,7 @@ package com.zscat.mallplus.oms.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zscat.mallplus.oms.entity.OmsOrder;
import com.zscat.mallplus.oms.entity.OmsOrderItem;
import com.zscat.mallplus.oms.entity.OmsOrderLocation;
import com.zscat.mallplus.oms.vo.OmsOrderDeliveryParam;
import com.zscat.mallplus.oms.vo.OmsOrderDetail;
import com.zscat.mallplus.oms.vo.OrderStstic;
@@ -75,4 +76,7 @@ public interface OmsOrderMapper extends BaseMapper<OmsOrder> {
List<OrderStstic> listOrderGroupByStatus(Integer status);
List<OmsOrderLocation> getLocation();
List<OmsOrderLocation> getPickupPoint(String id);
}

20
mallplus-mbg/src/main/java/com/zscat/mallplus/oms/query/OmsOrderLocationQuery.java Normal file
View File

@@ -0,0 +1,20 @@
package com.zscat.mallplus.oms.query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author dimengzhe
* @Date 2023/3/14 16:49
* @Description
*/
@Data
public class OmsOrderLocationQuery {
@ApiModelProperty(value = "所在地id",required = false)
private String valueszd;
@ApiModelProperty(value = "取货点id",required = false)
private String valueqhd;
@ApiModelProperty(value = "收货人电话",required = false)
private String receiverPhone;
private String status;
}

7
mallplus-mbg/src/main/resources/mapper/oms/OmsOrderDao.xml
View File

@@ -230,4 +230,11 @@
</select>
<select id="getPickupPoint" resultType="com.zscat.mallplus.oms.entity.OmsOrderLocation">
select id,name from building_community where company_id = #{id}
</select>
<select id="getLocation" resultType="com.zscat.mallplus.oms.entity.OmsOrderLocation">
select id,name from build_wuye_company
</select>
</mapper>