hhyykk/ipms-sjy
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy.git synced 2025-07-25 16:35:06 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

优化 pay 支付成功后的回调逻辑

Browse Source
This commit is contained in:
YunaiV
2022-11-23 21:09:16 +08:00
parent 73d847ae2e
commit 8798944069
18 changed files with 151 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.http
View File

@ -8,18 +8,20 @@ GET {{shop-api-base-url}}/trade-order/confirm-create-order-info-from-cart
Content-Type: application/x-www-form-urlencoded
Authorization: Bearer {{user-access-token}}
### /trade-order/confirm-create-order-info-from-cart 基于商品，创建订单
POST {{shop-api-base-url}}/trade-order/create
### /trade-order/create 基于商品，创建订单
POST {{appApi}}/trade/order/create
Content-Type: application/json
Authorization: Bearer {{user-access-token}}
Authorization: Bearer {{appToken}}
tenant-id: {{appTenentId}}
{
"userAddressId": 19,
"addressId": 21,
"remark": "我是备注",
"orderItems": [
"fromCart": false,
"items": [
{
"skuId": 3,
"quantity": 1
"skuId": 29,
"count": 1
}
]
}

2
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderCreateReqVO.java
View File

@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.Valid;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
@ -31,6 +32,7 @@ public class AppTradeOrderCreateReqVO {
* 订单商品项列表
*/
@NotEmpty(message = "必须选择购买的商品")
@Valid
private List<Item> items;
@ApiModel(value = "订单商品项")

1
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java
View File

@ -30,6 +30,7 @@ public interface TradeOrderConvert {
TradeOrderConvert INSTANCE = Mappers.getMapper(TradeOrderConvert.class);
@Mappings({
@Mapping(target = "id", ignore = true),
@Mapping(source = "createReqVO.couponId", target = "couponId"),
@Mapping(target = "remark", ignore = true),
@Mapping(source = "createReqVO.remark", target = "userRemark"),

2
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderServiceImpl.java
View File

@ -167,7 +167,7 @@ public class TradeOrderServiceImpl implements TradeOrderService {
* @return 收件地址
*/
private AddressRespDTO validateAddress(Long userId, Long addressId) {
AddressRespDTO address = addressApi.getAddress(userId, addressId);
AddressRespDTO address = addressApi.getAddress(addressId, userId);
if (Objects.isNull(address)) {
throw exception(ErrorCodeConstants.ORDER_CREATE_ADDRESS_NOT_FOUND);
}