Merge branch 'master' of https://gogs.ywtinfo.com/guochengfeng/alipay-mp-service

onemini-hospital-empty/src/main/java/com/ywt/alipaympapi/service/impl/InpatientServiceImpl.java

@@ -63,6 +63,7 @@ import sun.util.calendar.BaseCalendar;
 
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @author
@@ -368,20 +369,20 @@ public class InpatientServiceImpl implements InpatientService {
                     .build();
             GetCashListResponse res = taiheServiceBlockingStub.getCashList(requ);
             if (res.getCode() == BaseResponse.SUCCEED) {
-                List<CashListItem> list = res.getListList();
-                DepositTradeListResponseData da = new DepositTradeListResponseData();
-                for (CashListItem i : list) {
-                    da = new DepositTradeListResponseData();
-                    da.setInpatientName(Checker.getStringValue(i.getPayUserName()));
-                    da.setAmount(String.format("%.2f", i.getPayAmout() / 100d));
-                    da.setOutTradeNo(i.getReceiptNo());
-                    da.setPayTime(i.getPayDate() + "," + i.getPayTime());
+                List<CashListItem> list =  res.getListList();
+                for (int size = list.size(), i = 0; i < size; i++) {
+                    CashListItem item = list.get(size - i - 1);
+                    DepositTradeListResponseData da = new DepositTradeListResponseData();
+                    da.setInpatientName(Checker.getStringValue(request.getName()));
+                    da.setAmount(String.format("%.2f", item.getPayAmout() / 100d));
+                    da.setOutTradeNo(item.getReceiptNo());
+                    da.setPayTime(item.getPayDate() + "  " + item.getPayTime());
                     da.setTradeNo(Checker.getStringValue(""));
                     da.setDepositId(Checker.getStringValue(""));
                     String depositBalance = String.format("%.2f", resp.getDepositBalance() / 100d);
                     da.setDepositBalance(depositBalance);
                     da.setStatus(Checker.getStringValue(""));
-                    da.setDepositId(Checker.getStringValue(i.getReceiptNo()));
+                    da.setDepositId(Checker.getStringValue(item.getReceiptNo()));
                     da.setAdmNo(Checker.getStringValue(admNo));
                     da.setHisPatientId(hisPatientId);
                     depositList.add(da);
@@ -422,7 +423,7 @@ public class InpatientServiceImpl implements InpatientService {
                 for (CashListItem i : list) {
                     if (request.getReceiptNo().equals(i.getReceiptNo())) {
                         da = new DepositTradeDetailsResponseData();
-                        da.setInpatientName(Checker.getStringValue(i.getPayUserName()));
+                        da.setInpatientName(Checker.getStringValue(request.getName()));
                         da.setAmount(String.format("%.2f", i.getPayAmout() / 100d));
                         da.setOutTradeNo(i.getReceiptNo());
                         da.setPayTime(i.getPayDate() + "" + i.getPayTime());

onemini-hospital-sdk/src/main/java/com/ywt/request/inpatient/DepositTradeDetailsRequest.java

@@ -22,6 +22,8 @@ public class DepositTradeDetailsRequest implements IsvRequest<DepositTradeDetail
 
     private String receiptNo; //收据号码
 
+    private String name;
+
     @Override
     public String serviceName() {
         return "isvRequest.deposit.details";

onemini-hospital-sdk/src/main/java/com/ywt/request/inpatient/DepositTradeListRequest.java

@@ -22,6 +22,8 @@ public class DepositTradeListRequest implements IsvRequest<DepositTradeListRespo
 
     private String inpatientId;//查询筛选条件，住院记录id
 
+    private String name;
+
     @Override
     public String serviceName() {
         return "isvRequest.deposit.list";