提交 dcb9f242 作者: 刘明祎-运维用途

添加查询未确认订单总数

上级 f76058a1
流水线 #7612 已通过 于阶段
in 3 分 8 秒
...@@ -8,10 +8,7 @@ import com.mmc.oms.model.dto.uav.*; ...@@ -8,10 +8,7 @@ import com.mmc.oms.model.dto.uav.*;
import com.mmc.oms.model.qo.uav.UavOrderQO; import com.mmc.oms.model.qo.uav.UavOrderQO;
import com.mmc.oms.model.vo.uav.*; import com.mmc.oms.model.vo.uav.*;
import com.mmc.oms.service.uav.UavOrderService; import com.mmc.oms.service.uav.UavOrderService;
import io.swagger.annotations.Api; import io.swagger.annotations.*;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
...@@ -66,6 +63,13 @@ public class UavOrderController extends BaseController { ...@@ -66,6 +63,13 @@ public class UavOrderController extends BaseController {
return uavOrderService.list(uavOrderQO, this.getCurrentAccount(request)); return uavOrderService.list(uavOrderQO, this.getCurrentAccount(request));
} }
@ApiOperation(value = "获取未确认订单有多少")
@ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
@GetMapping("getCountNewOrder")
public ResultBody getCountNewOrder() {
return uavOrderService.getCountNewOrder();
}
@ApiOperation(value = "个人订单列表") @ApiOperation(value = "个人订单列表")
@ApiResponses({@ApiResponse(code = 200, message = "OK", response = UavOrderDTO.class)}) @ApiResponses({@ApiResponse(code = 200, message = "OK", response = UavOrderDTO.class)})
@PostMapping("listByUid") @PostMapping("listByUid")
......
...@@ -41,7 +41,7 @@ public class AuthSignatureFilter implements AuthFilter { ...@@ -41,7 +41,7 @@ public class AuthSignatureFilter implements AuthFilter {
*/ */
private static final String[] IGNORE_URLS = {"/oms/swagger-resources", "/oms/v2/api-docs", "/oms/doc.html", private static final String[] IGNORE_URLS = {"/oms/swagger-resources", "/oms/v2/api-docs", "/oms/doc.html",
"/oms/mallorder/listStatus","/oms/actuator/health/readiness", "/oms/uav-order/finishSign", "/oms/uav-order/statusList", "/oms/mallorder/listStatus","/oms/actuator/health/readiness", "/oms/uav-order/finishSign", "/oms/uav-order/statusList",
"/oms/uav-order/listGoodsRemark" "/oms/uav-order/listGoodsRemark", "/oms/uav-order/getCountNewOrder"
}; };
/*无需加密狗无需登录白名单*/ /*无需加密狗无需登录白名单*/
......
...@@ -24,6 +24,12 @@ public interface UavOrderService { ...@@ -24,6 +24,12 @@ public interface UavOrderService {
ResultBody list(UavOrderQO uavOrderQO, BaseAccountDTO currentAccount); ResultBody list(UavOrderQO uavOrderQO, BaseAccountDTO currentAccount);
/**
* 查询未确定的商城订单个数
* @return {@link ResultBody}
*/
ResultBody getCountNewOrder();
ResultBody listByUid(UavOrderQO uavOrderQO, BaseAccountDTO currentAccount); ResultBody listByUid(UavOrderQO uavOrderQO, BaseAccountDTO currentAccount);
ResultBody pay(Integer id, BaseAccountDTO currentAccount, HttpServletRequest request); ResultBody pay(Integer id, BaseAccountDTO currentAccount, HttpServletRequest request);
...@@ -58,4 +64,7 @@ public interface UavOrderService { ...@@ -58,4 +64,7 @@ public interface UavOrderService {
ResultBody deductWallet(BigDecimal allShareAmount, BigDecimal allSalaryAmount, BaseAccountDTO currentAccount); ResultBody deductWallet(BigDecimal allShareAmount, BigDecimal allSalaryAmount, BaseAccountDTO currentAccount);
List<UavOrderRemarkDTO> listGoodsRemark(Integer remarkType, Integer goodsId); List<UavOrderRemarkDTO> listGoodsRemark(Integer remarkType, Integer goodsId);
} }
...@@ -888,4 +888,17 @@ public class UavOrderServiceImpl implements UavOrderService { ...@@ -888,4 +888,17 @@ public class UavOrderServiceImpl implements UavOrderService {
return CollectionUtils.isNotEmpty(remarkDOS) ? remarkDOS.stream() return CollectionUtils.isNotEmpty(remarkDOS) ? remarkDOS.stream()
.map(UavOrderRemarkDO::buildUavOrderRemarkDTO).collect(Collectors.toList()) : null; .map(UavOrderRemarkDO::buildUavOrderRemarkDTO).collect(Collectors.toList()) : null;
} }
/**
* 查询未确定的商城订单个数
*
* @return {@link ResultBody}
*/
@Override
public ResultBody getCountNewOrder() {
UavOrderQO uavOrderQO = new UavOrderQO();
uavOrderQO.setStatusCode(UavOrderStatus.CONFIRM.getCode());
int count = uavOrderDao.countList(uavOrderQO);
return ResultBody.success(count);
}
} }
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论