|
|
@@ -358,11 +358,12 @@ public class HuiFuServiceImpl implements HuiFuService {
|
|
|
if(StringUtils.isEmpty(confirm.getDivHfId()) && confirm.getDivAmt() == null){
|
|
|
//其它分账信息没有 全部都进入中医院
|
|
|
//中医院分账信息
|
|
|
- ysyAmount = confirm.getTotalAmount().subtract(confirm.getYsyDivAmt().multiply(new BigDecimal("0.003"))).setScale(2, RoundingMode.HALF_UP);
|
|
|
+ //ysyAmount = confirm.getTotalAmount().subtract(confirm.getYsyDivAmt().multiply(new BigDecimal("0.003"))).setScale(2, RoundingMode.HALF_UP);
|
|
|
JSONObject acct_ysy = new JSONObject();
|
|
|
acct_ysy.put("huifu_id",confirm.getMainHfId());
|
|
|
- acct_ysy.put("div_amt",df.format(ysyAmount));
|
|
|
+ acct_ysy.put("div_amt",df.format(confirm.getYsyDivAmt()));
|
|
|
acct_infos.add(acct_ysy);
|
|
|
+ ysyAmount = confirm.getYsyDivAmt();
|
|
|
zyyHuifuId = confirm.getMainHfId();
|
|
|
} else {
|
|
|
otherHuifuId = confirm.getDivHfId();
|
|
|
@@ -384,7 +385,7 @@ public class HuiFuServiceImpl implements HuiFuService {
|
|
|
acct_split_bunch.put("acct_infos",acct_infos);
|
|
|
extendInfoMap.put("acct_split_bunch",JSON.toJSONString(acct_split_bunch));
|
|
|
request.setExtendInfo(extendInfoMap);
|
|
|
- logger.info("交易确认传参："+request);
|
|
|
+ logger.info("交易确认传参："+JSON.toJSONString(request));
|
|
|
Map<String, Object> response = doExecute(request);
|
|
|
logger.info("交易确认返回："+response);
|
|
|
String jsonString = JSONObject.toJSONString(response);
|
