ufo / yohoufo-fore · Commits

Go to a project

Authored by Lixiaodi
Commit 861e2d3c66c26c20c50a08c769449f47a2cf22ac 1 parent 315f5454

bug修改

Inline Side-by-side
Showing 1 changed file with 3 additions and 3 deletions
@@ -367,11 +367,11 @@ public class MerchantOrderPaymentService extends AbstractOrderPaymentService { @@ -367,11 +367,11 @@ public class MerchantOrderPaymentService extends AbstractOrderPaymentService {
367 } else { 367 } else {
368 result.put("amount", detail.getAmount().setScale(2).toString()); 368 result.put("amount", detail.getAmount().setScale(2).toString());
369 } 369 }
370 - result.put("type", sw.getType());  
371 - if (sw.getType() == 1) { 370 + result.put("type", detail.getType());
  371 + if (detail.getType() == 1) {
372 result.put("name", "充值保证金"); 372 result.put("name", "充值保证金");
373 } 373 }
374 - if (sw.getType() / 10 == 3 || sw.getType() == 61) { 374 + if (detail.getType() / 10 == 3 || detail.getType() == 61) {
375 result.put("name", "支付保证金"); 375 result.put("name", "支付保证金");
376 } 376 }
377 result.put("info", SellerWalletDetail.Type.of(sw.getType()).getName()); 377 result.put("info", SellerWalletDetail.Type.of(sw.getType()).getName());