Commit e248d63c by 王祖波

营销活动订单

parent 94f2398b
...@@ -106,6 +106,7 @@ public class GicOrderController { ...@@ -106,6 +106,7 @@ public class GicOrderController {
// 发货订单列表 (0全部,待发货2+待收货3,部分发货7) // 发货订单列表 (0全部,待发货2+待收货3,部分发货7)
@RequestMapping("list-order") @RequestMapping("list-order")
public RestResponse<Object> orderList(String enterpriseId, String storeId, String clerkId, String search, public RestResponse<Object> orderList(String enterpriseId, String storeId, String clerkId, String search,
@RequestParam(required = false) Integer businessType,
@RequestParam(defaultValue = "0") int status, BasePageInfo pageInfo) { @RequestParam(defaultValue = "0") int status, BasePageInfo pageInfo) {
String strStatus = "" + status; String strStatus = "" + status;
if (status == 0) { if (status == 0) {
...@@ -122,6 +123,7 @@ public class GicOrderController { ...@@ -122,6 +123,7 @@ public class GicOrderController {
qdto.setDeliveryChannel(1); qdto.setDeliveryChannel(1);
// 库存 - 门店库存2 // 库存 - 门店库存2
qdto.setDeliveryMode(2); qdto.setDeliveryMode(2);
qdto.setBusinessType(businessType);
if (StringUtils.isNotEmpty(search)) { if (StringUtils.isNotEmpty(search)) {
qdto.setSearchOrderType(SearchOrderTypeEnum.GOODS_NAME_OR_ORDER_NUMBER.getType()); qdto.setSearchOrderType(SearchOrderTypeEnum.GOODS_NAME_OR_ORDER_NUMBER.getType());
qdto.setSearchOrderParam(search); qdto.setSearchOrderParam(search);
...@@ -134,7 +136,7 @@ public class GicOrderController { ...@@ -134,7 +136,7 @@ public class GicOrderController {
// 数量查询(待发货+待收货) // 数量查询(待发货+待收货)
// orderType:2待发货 3待收货 // orderType:2待发货 3待收货
@RequestMapping("order-deliver-count") @RequestMapping("order-deliver-count")
public RestResponse<Object> orderCount(String enterpriseId, String storeId) { public RestResponse<Object> orderCount(String enterpriseId, String storeId,@RequestParam(required = false) Integer businessType) {
OrderCountVO vo = new OrderCountVO(); OrderCountVO vo = new OrderCountVO();
if (StringUtils.isEmpty(storeId)) { if (StringUtils.isEmpty(storeId)) {
return RestResponse.successResult(vo); return RestResponse.successResult(vo);
...@@ -146,6 +148,7 @@ public class GicOrderController { ...@@ -146,6 +148,7 @@ public class GicOrderController {
// 库存 - 门店库存2 // 库存 - 门店库存2
qdto.setDeliveryMode(2); qdto.setDeliveryMode(2);
qdto.setBelongStoreId(storeId); qdto.setBelongStoreId(storeId);
qdto.setBusinessType(businessType);
ServiceResponse<List<OrderStatusDTO>> resp = this.webOrderManageApiService.countOrderStatus(qdto); ServiceResponse<List<OrderStatusDTO>> resp = this.webOrderManageApiService.countOrderStatus(qdto);
List<OrderStatusDTO> list = resp.getResult(); List<OrderStatusDTO> list = resp.getResult();
if (CollectionUtils.isNotEmpty(list)) { if (CollectionUtils.isNotEmpty(list)) {
...@@ -169,6 +172,7 @@ public class GicOrderController { ...@@ -169,6 +172,7 @@ public class GicOrderController {
// status 0全部 1待核销 2已核销 // status 0全部 1待核销 2已核销
@RequestMapping("list-verification-order") @RequestMapping("list-verification-order")
public RestResponse<Object> mallOrderList(String enterpriseId, String storeId, String clerkId, public RestResponse<Object> mallOrderList(String enterpriseId, String storeId, String clerkId,
@RequestParam(required = false) Integer businessType,
@RequestParam(defaultValue = "0") int status, String search, BasePageInfo pageInfo) { @RequestParam(defaultValue = "0") int status, String search, BasePageInfo pageInfo) {
// 查询门店 // 查询门店
ListOrderManageQDTO qdto = new ListOrderManageQDTO(); ListOrderManageQDTO qdto = new ListOrderManageQDTO();
...@@ -185,6 +189,7 @@ public class GicOrderController { ...@@ -185,6 +189,7 @@ public class GicOrderController {
qdto.setDeliveryOptType(1); qdto.setDeliveryOptType(1);
} }
qdto.setSearchOrderParam(search); qdto.setSearchOrderParam(search);
qdto.setBusinessType(businessType);
return this.orderListSelect(qdto, pageInfo, false); return this.orderListSelect(qdto, pageInfo, false);
} }
...@@ -354,6 +359,7 @@ public class GicOrderController { ...@@ -354,6 +359,7 @@ public class GicOrderController {
@RequestMapping("list-member-order") @RequestMapping("list-member-order")
public RestResponse<Object> orderList(String enterpriseId, String memberId, String search, public RestResponse<Object> orderList(String enterpriseId, String memberId, String search,
@RequestParam(defaultValue = "-1") int status, @RequestParam(defaultValue = "0") int deliveryChannel, @RequestParam(defaultValue = "-1") int status, @RequestParam(defaultValue = "0") int deliveryChannel,
@RequestParam(required = false) Integer businessType,
@RequestParam(defaultValue = "-1") int orderType, BasePageInfo pageInfo, String startTime, String endTime) { @RequestParam(defaultValue = "-1") int orderType, BasePageInfo pageInfo, String startTime, String endTime) {
if (StringUtils.isEmpty(memberId)) { if (StringUtils.isEmpty(memberId)) {
return RestResponse.failure("9999", "memberId为空"); return RestResponse.failure("9999", "memberId为空");
...@@ -383,6 +389,7 @@ public class GicOrderController { ...@@ -383,6 +389,7 @@ public class GicOrderController {
qdto.setMemberId(memberId); qdto.setMemberId(memberId);
qdto.setStartDate(startDate); qdto.setStartDate(startDate);
qdto.setEndDate(endDate); qdto.setEndDate(endDate);
qdto.setBusinessType(businessType);
if (StringUtils.isNotEmpty(search)) { if (StringUtils.isNotEmpty(search)) {
qdto.setSearchOrderType(SearchOrderTypeEnum.ORDER_NUMBER.getType()); qdto.setSearchOrderType(SearchOrderTypeEnum.ORDER_NUMBER.getType());
qdto.setSearchOrderParam(search); qdto.setSearchOrderParam(search);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment