From 5698fef448d17df14055d2b64cedf20f46bac205 Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Tue, 29 Sep 2020 11:17:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pay_master' into pay_master
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/SaasClientPayServiceImpl.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/SaasClientPayServiceImpl.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/SaasClientPayServiceImpl.java
index db582cd..4bb773e 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/SaasClientPayServiceImpl.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/SaasClientPayServiceImpl.java
@@ -161,7 +161,11 @@
List<String> list=new ArrayList<>();
list.add(str);
list.add(aliCode);
- return ResultBody.ok().data(list);
+ Map<String,Object> map=new HashMap<>();
+ map.put("list",list);
+ double v = Double.parseDouble(modelByObject.getPayPrice().toString())/100;
+ map.put("payPrice",v);
+ return ResultBody.ok().data(map);
}
saasClientPay.setId(UUID.randomUUID().toString().replace("-",""));
saasClientPay.setOutTradeNo(UUID.randomUUID().toString().replace("-",""));
@@ -174,10 +178,11 @@
if(byObject==null){
return ResultBody.failed().msg("该部门或医院没有开通单次支付");
}
- saasClientPay.setPayPrice(byObject.getPayPrice());
+
+ saasClientPay.setPayPrice(Double.valueOf(byObject.getPayPrice()).intValue());
// saasClientPay.setPayPrice(1);
- saasClientPay.setPayKidgrow(byObject.getPayKidgrow());
- saasClientPay.setPayCustom(byObject.getPayCustom());
+ saasClientPay.setPayKidgrow(Double.valueOf(byObject.getPayKidgrow()).intValue());
+ saasClientPay.setPayCustom(Double.valueOf(byObject.getPayCustom()).intValue());
saasClientPay.setPayStatus(0);
String str="";
Map<String, String> wxCode = this.getWxCode(saasClientPay, request);
@@ -192,7 +197,8 @@
list.add(aliCode);
Map<String,Object> map=new HashMap<>();
map.put("list",list);
- map.put("payPrice",byObject.getPayPrice());
+ double v = byObject.getPayPrice() / 100;
+ map.put("payPrice",v);
return ResultBody.ok().data(map);
}
/**
--
Gitblit v1.8.0