Merge branch 'test6.8.5' of http://git.yoho.cn/ufo/yohoufo-fore into test6.8.5

@@ -24,5 +24,7 @@ public class SellerWallet {
     private Integer createTime;
     private Integer createTime;
 
 
     private Integer updateTime;
     private Integer updateTime;
+    
+    private BigDecimal allAmount;
 
 
 }
 }

@@ -704,6 +704,9 @@ public class MerchantOrderPaymentService extends AbstractOrderPaymentService {
     	logger.info("增加钱包明细汇总记录，bean={}", swd);
     	logger.info("增加钱包明细汇总记录，bean={}", swd);
     	sellerWalletDetailMapper.insert(swd);
     	sellerWalletDetailMapper.insert(swd);
     	logger.info("增加钱包明细汇总记录成功，bean={}", swd);
     	logger.info("增加钱包明细汇总记录成功，bean={}", swd);
+    	
+		// 设置当前总金额
+		sw.setAllAmount(swd.getAvailAmount().add(swd.getLockAmount()));
 		return sw;
 		return sw;
 	}
 	}