cxc/yshopb2c
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

规范命名

Browse Source
This commit is contained in:
taochengbo
2020-11-26 23:56:41 +08:00
parent 9754fc53fe
commit 46f05999ae
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
yshop-app/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java
View File

@ -401,7 +401,7 @@ public class StoreOrderController {
@ApiOperation(value = "订单核销",notes = "订单核销") @ApiOperation(value = "订单核销",notes = "订单核销")
public ApiResult<Object> orderVerify( @RequestBody OrderVerifyParam param){ public ApiResult<Object> orderVerify( @RequestBody OrderVerifyParam param){
Long uid = LocalUser.getUser().getUid(); Long uid = LocalUser.getUser().getUid();
YxStoreOrderQueryVo orderQueryVo = storeOrderService.verificOrder(param.getVerifyCode(), YxStoreOrderQueryVo orderQueryVo = storeOrderService.verifyOrder(param.getVerifyCode(),
param.getIsConfirm(),uid); param.getIsConfirm(),uid);
if(orderQueryVo != null) { if(orderQueryVo != null) {
return ApiResult.ok(orderQueryVo); return ApiResult.ok(orderQueryVo);

2
yshop-mall/src/main/java/co/yixiang/modules/order/service/YxStoreOrderService.java
View File

@ -146,7 +146,7 @@ public interface YxStoreOrderService extends BaseService<YxStoreOrder>{
* @param uid uid * @param uid uid
* @return YxStoreOrderQueryVo * @return YxStoreOrderQueryVo
*/ */
YxStoreOrderQueryVo verificOrder(String verifyCode,Integer isConfirm ,Long uid); YxStoreOrderQueryVo verifyOrder(String verifyCode, Integer isConfirm , Long uid);
/** /**
* 订单列表 * 订单列表

2
yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java
View File

@ -923,7 +923,7 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<StoreOrderMapper, Y
* @return YxStoreOrderQueryVo * @return YxStoreOrderQueryVo
*/ */
@Override @Override
public YxStoreOrderQueryVo verificOrder(String verifyCode,Integer isConfirm ,Long uid) { public YxStoreOrderQueryVo verifyOrder(String verifyCode,Integer isConfirm ,Long uid) {
YxStoreOrder order = this.getOne(Wrappers.<YxStoreOrder>lambdaQuery() YxStoreOrder order = this.getOne(Wrappers.<YxStoreOrder>lambdaQuery()
.eq(YxStoreOrder::getVerifyCode,verifyCode) .eq(YxStoreOrder::getVerifyCode,verifyCode)

2
yshop-shop/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java
View File

@ -165,7 +165,7 @@ public class StoreOrderController {
throw new BadRequestException("订单未支付"); throw new BadRequestException("订单未支付");
} }
yxStoreOrderService.verificOrder(resources.getVerifyCode(), yxStoreOrderService.verifyOrder(resources.getVerifyCode(),
OrderInfoEnum.CONFIRM_STATUS_1.getValue(),null); OrderInfoEnum.CONFIRM_STATUS_1.getValue(),null);
return new ResponseEntity(HttpStatus.NO_CONTENT); return new ResponseEntity(HttpStatus.NO_CONTENT);