记得上下班打卡 | git大法好,push需谨慎

Commit 6822fa74 authored by 张国柄's avatar 张国柄

fix:会员订单列表只展示成功订单;

支付宝成功后returnUrl拼接订单号处理;
parent ae037915
...@@ -98,7 +98,7 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe ...@@ -98,7 +98,7 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
// 取消支付,点击取消支付宝回调地址 // 取消支付,点击取消支付宝回调地址
payParam.add("show_url", param.getShowUrl()); payParam.add("show_url", param.getShowUrl());
// 支付成功,点击完成支付宝回调地址 // 支付成功,点击完成支付宝回调地址
payParam.add("return_url", param.getReturnUrl()); payParam.add("return_url", param.getReturnUrl() + orderNo);
break; break;
case "/app/iappay": case "/app/iappay":
if (StringUtils.isEmpty(param.getOpenId())) { if (StringUtils.isEmpty(param.getOpenId())) {
...@@ -399,7 +399,7 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe ...@@ -399,7 +399,7 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
@Override @Override
public PageInfo<AdamMemberOrderSimpleVo> queryPage(String uid, int pageNo, int pageSize) { public PageInfo<AdamMemberOrderSimpleVo> queryPage(String uid, int pageNo, int pageSize) {
Query query = Query.query(Criteria.where("uid").is(uid)); Query query = Query.query(Criteria.where("uid").is(uid).and("state").is(1));
long count = mongoTemplate.count(query, AdamMemberOrderVo.class.getSimpleName()); long count = mongoTemplate.count(query, AdamMemberOrderVo.class.getSimpleName());
......
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