ufo / yohoufo-fore · Commits

Go to a project

Authored by wujiexiang
Commit 490b73a497580827c17e31d9cc0369c485815735 1 parent 28a826af

SellerWalletDetail.Type 重复定义

Inline Side-by-side
Showing 3 changed files with 2 additions and 3 deletions
@@ -54,7 +54,7 @@ public class SellerWalletDetail { @@ -54,7 +54,7 @@ public class SellerWalletDetail {
54 BUYER_CANCEL_DELIVERY("买家取消（有物流）", 42), 54 BUYER_CANCEL_DELIVERY("买家取消（有物流）", 42),
55 APPRAISE_OK("鉴定通过", 51), 55 APPRAISE_OK("鉴定通过", 51),
56 APPRAISE_UNSURE("商品无法鉴定", 52), 56 APPRAISE_UNSURE("商品无法鉴定", 52),
57 - DETECTION_NOT_PASS("商品检测不通过", 53), 57 + DETECTION_NOT_PASS("商品检测不通过", 54),
58 MERCHANT_EXIT("商家退出入驻", 61), 58 MERCHANT_EXIT("商家退出入驻", 61),
59 CANCEL_DELIVER("不寄了", 71), 59 CANCEL_DELIVER("不寄了", 71),
60 FLAW("瑕疵品",72); 60 FLAW("瑕疵品",72);
@@ -963,7 +963,7 @@ public class MerchantOrderPaymentService extends AbstractOrderPaymentService { @@ -963,7 +963,7 @@ public class MerchantOrderPaymentService extends AbstractOrderPaymentService {
963 MerchantOrderAttachInfo attach, SellerWalletDetail.Type type) { 963 MerchantOrderAttachInfo attach, SellerWalletDetail.Type type) {
964 Supplier<Object[]> logSuppplier = ()-> new Object[]{type.getName(), orderCode, uid}; 964 Supplier<Object[]> logSuppplier = ()-> new Object[]{type.getName(), orderCode, uid};
965 money = fixMoneyScale(money, logSuppplier); 965 money = fixMoneyScale(money, logSuppplier);
966 - logger.info("{}修改钱包表入口，orderCode={}，uid={}，money={},type={}", type.getName(), orderCode, uid, money, type); 966 + logger.info("{}修改钱包表入口，orderCode={}，uid={}，money={}", type.getName(), orderCode, uid, money);
967 String message = type.getName(); 967 String message = type.getName();
968 // 使用钱包余额，支付保证金 968 // 使用钱包余额，支付保证金
969 SellerWallet sw = sellerWalletMapper.selectByUidAndType(uid, 1); 969 SellerWallet sw = sellerWalletMapper.selectByUidAndType(uid, 1);
@@ -42,7 +42,6 @@ public class WalletPayService extends AbstractPayService { @@ -42,7 +42,6 @@ public class WalletPayService extends AbstractPayService {
42 42
43 43
44 public PayRefundBo refundOpenApi(PayRefundBo refundBo) { 44 public PayRefundBo refundOpenApi(PayRefundBo refundBo) {
45 - logger.info("refundOpenApi,type:{}",refundBo.getAttach().getType());  
46 try { 45 try {
47 SellerWalletDetail.Type type = SellerWalletDetail.Type.of(refundBo.getAttach().getType()); 46 SellerWalletDetail.Type type = SellerWalletDetail.Type.of(refundBo.getAttach().getType());
48 BigDecimal amount = new BigDecimal(Double.toString(refundBo.getAmount())); 47 BigDecimal amount = new BigDecimal(Double.toString(refundBo.getAmount()));