From e0395c5454534e7cf657b10045d00e4042dc7e71 Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Mon, 28 Sep 2020 15:51:08 +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 | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 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 631c727..d17e295 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
@@ -23,10 +23,7 @@
import org.springframework.stereotype.Service;
import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
//import com.kidgrow.recordcenter.feign.ChildService;
@@ -164,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("-",""));
@@ -177,10 +178,10 @@
if(byObject==null){
return ResultBody.failed().msg("该部门或医院没有开通单次支付");
}
-// saasClientPay.setPayPrice(byObject.getPayPrice()*100);
- saasClientPay.setPayPrice(1);
- saasClientPay.setPayKidgrow(byObject.getPayKidgrow()*100);
- saasClientPay.setPayCustom(byObject.getPayCustom()*100);
+ saasClientPay.setPayPrice(byObject.getPayPrice());
+// saasClientPay.setPayPrice(1);
+ saasClientPay.setPayKidgrow(byObject.getPayKidgrow());
+ saasClientPay.setPayCustom(byObject.getPayCustom());
saasClientPay.setPayStatus(0);
String str="";
Map<String, String> wxCode = this.getWxCode(saasClientPay, request);
@@ -193,7 +194,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(byObject.getPayPrice().toString())/100;
+ map.put("payPrice",v);
+ return ResultBody.ok().data(map);
}
/**
* 获取微信的二维码
--
Gitblit v1.8.0