|
@@ -103,7 +103,7 @@ public class OpenApiOrderServiceImpl implements OpenApiOrderService {
|
|
Member member = iMemberService.getOne(new QueryWrapper<Member>().eq("deleted", 0)
|
|
Member member = iMemberService.getOne(new QueryWrapper<Member>().eq("deleted", 0)
|
|
.eq("merchant_id", merchant.getId()).eq("member_type", MemberTypeEnum.MERCHANT.getType()));
|
|
.eq("merchant_id", merchant.getId()).eq("member_type", MemberTypeEnum.MERCHANT.getType()));
|
|
|
|
|
|
- Order order = iOrderService.getOne(new QueryWrapper<Order>().eq("deleted", 0).eq("out_trade_no", pushReq.getOutOrderSn()));
|
|
|
|
|
|
+ Order order = iOrderService.getOne(new QueryWrapper<Order>().eq("deleted", 0).eq("out_order_sn", pushReq.getOutOrderSn()));
|
|
if (order == null) {
|
|
if (order == null) {
|
|
order = new Order();
|
|
order = new Order();
|
|
}
|
|
}
|
|
@@ -111,7 +111,7 @@ public class OpenApiOrderServiceImpl implements OpenApiOrderService {
|
|
// 添加订单其它属性
|
|
// 添加订单其它属性
|
|
order.setMemberId(member.getId());
|
|
order.setMemberId(member.getId());
|
|
order.setMerchantId(merchant.getId());
|
|
order.setMerchantId(merchant.getId());
|
|
- order.setOutTradeNo(pushReq.getOutOrderSn());
|
|
|
|
|
|
+ order.setOutOrderSn(pushReq.getOutOrderSn());
|
|
order.setProductId(pushReq.getCategoryId().longValue());
|
|
order.setProductId(pushReq.getCategoryId().longValue());
|
|
Product product = iProductService.getById(order.getProductId());
|
|
Product product = iProductService.getById(order.getProductId());
|
|
order.setProductName(product.getName());
|
|
order.setProductName(product.getName());
|