ufo / yohoufo-fore · Commits

Go to a project

Authored by Lixiaodi
Commit 6df274c5d2a1e966015d333b3a30ac41426458af 2 parents 9c6c8388 388c574a

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

# Conflicts:
#	order/src/main/java/com/yohoufo/order/service/impl/TradeBillsService.java
Inline Side-by-side
Showing 2 changed files with 4 additions and 2 deletions
@@ -290,6 +290,7 @@ public class BuyerOrderCancelService { @@ -290,6 +290,7 @@ public class BuyerOrderCancelService {
290 BillLogEvent.BillLogEventBuilder blebOfBuyer = BillLogEvent.builder() 290 BillLogEvent.BillLogEventBuilder blebOfBuyer = BillLogEvent.builder()
291 .buyerUid(buyerUid).sellerUid(sellerUid).orderCode(orderCode) 291 .buyerUid(buyerUid).sellerUid(sellerUid).orderCode(orderCode)
292 .payType(buyerOrder.getPayment()).refundCase(RefundCase.BUYER_GOODS_MONEY) 292 .payType(buyerOrder.getPayment()).refundCase(RefundCase.BUYER_GOODS_MONEY)
  293 + .amount(leftBuyerMoney)
293 .skup(skup); 294 .skup(skup);
294 logger.info("in BuyerCancelAfterProcessTask call begin payRefundService.refund buyer, buyerUid {}, orderCode {}, skup {} refundReqOfSeller {}", 295 logger.info("in BuyerCancelAfterProcessTask call begin payRefundService.refund buyer, buyerUid {}, orderCode {}, skup {} refundReqOfSeller {}",
295 buyerUid, orderCode, skup, rprOfBuyer ); 296 buyerUid, orderCode, skup, rprOfBuyer );
@@ -108,12 +108,13 @@ public class TradeBillsService { @@ -108,12 +108,13 @@ public class TradeBillsService {
108 try { 108 try {
109 JSONObject metavalue = JSON.parseObject(meta.getMetaValue()); 109 JSONObject metavalue = JSON.parseObject(meta.getMetaValue());
110 BigDecimal rate = metavalue.getJSONObject("serviceFeeRate").getBigDecimal("payChannelRate"); 110 BigDecimal rate = metavalue.getJSONObject("serviceFeeRate").getBigDecimal("payChannelRate");
111 - amount = amount.multiply(BigDecimal.ONE.subtract(rate)).multiply(new BigDecimal("-1")).setScale(2, BigDecimal.ROUND_HALF_UP); 111 + BigDecimal samount = amount.multiply(BigDecimal.ONE.subtract(rate)).multiply(new BigDecimal("-1")).setScale(2, BigDecimal.ROUND_HALF_UP);
  112 + record.setSystemAmount(samount);// 有货收入
112 } catch (Exception e) { 113 } catch (Exception e) {
113 logger.error("PayRecordErr计费信息不完整, uid is {}, skup is {}, err is {}", uid, skup, e.getMessage()); 114 logger.error("PayRecordErr计费信息不完整, uid is {}, skup is {}, err is {}", uid, skup, e.getMessage());
114 // return; 115 // return;
115 } 116 }
116 - record.setSystemAmount(amount);// 有货收入 117 +
117 record.setTradeStatus(tradeStatus);//0:订单未完结;1:订单完结 118 record.setTradeStatus(tradeStatus);//0:订单未完结;1:订单完结
118 record.setCreateTime((int) (System.currentTimeMillis() / 1000)); 119 record.setCreateTime((int) (System.currentTimeMillis() / 1000));
119 addTradeBills(record); 120 addTradeBills(record);