jiujian / client-customer-order-api

Go to a project
Toggle navigation Toggle navigation pinning
wangyingyang
f24bbdda 1 parent 3d0eb933

fix

Inline Side-by-side
Showing 4 changed files with 22 additions and 5 deletions
No preview for this file type
...@@ -24,6 +24,7 @@ public class PayDTO { ...@@ -24,6 +24,7 @@ public class PayDTO {
24 private String openId; 24 private String openId;
25 private String hospitalCode; 25 private String hospitalCode;
26 private String price; 26 private String price;
27 + private String phone;
27 } 28 }
28 29
29 @Data 30 @Data
...@@ -65,6 +66,17 @@ public class PayDTO { ...@@ -65,6 +66,17 @@ public class PayDTO {
65 66
66 @Data 67 @Data
67 @Builder 68 @Builder
69 + @ApiModel(description = "支付状态修改dto")
70 + @NoArgsConstructor
71 + @AllArgsConstructor
72 + public static class PayStatusUpdateRequestDto {
73 + private Boolean success;
74 + private String error;
75 + private PayResult result;
76 + }
77 +
78 + @Data
79 + @Builder
68 @ApiModel(description = "第三方支付平台通知请求dto") 80 @ApiModel(description = "第三方支付平台通知请求dto")
69 @NoArgsConstructor 81 @NoArgsConstructor
70 @AllArgsConstructor 82 @AllArgsConstructor
......
...@@ -36,10 +36,10 @@ public class PayServiceClient { ...@@ -36,10 +36,10 @@ public class PayServiceClient {
36 jsonData.setTradeId(payRequestDto.getOrderId()); 36 jsonData.setTradeId(payRequestDto.getOrderId());
37 String requestDate = DateUtil.formatDate(LocalDateTime.now(), DateUtil.YMDHMS); 37 String requestDate = DateUtil.formatDate(LocalDateTime.now(), DateUtil.YMDHMS);
38 jsonData.setRequestDate(requestDate); 38 jsonData.setRequestDate(requestDate);
39 - jsonData.setRequestSource(""); 39 + jsonData.setRequestSource("OFWXApplet");
40 jsonData.setPayerOpenId(payRequestDto.getOpenId()); 40 jsonData.setPayerOpenId(payRequestDto.getOpenId());
41 jsonData.setHospitalCode(payRequestDto.getHospitalCode()); 41 jsonData.setHospitalCode(payRequestDto.getHospitalCode());
42 - jsonData.setPID(""); 42 + jsonData.setPID(payRequestDto.getPhone());
43 jsonData.setRemark(""); 43 jsonData.setRemark("");
44 jsonData.setTransAmount(payRequestDto.getPrice()); 44 jsonData.setTransAmount(payRequestDto.getPrice());
45 jsonData.setTradeDesc(""); 45 jsonData.setTradeDesc("");
......
...@@ -199,16 +199,21 @@ public class KdsServiceImpl implements KdsService { ...@@ -199,16 +199,21 @@ public class KdsServiceImpl implements KdsService {
199 List<KdsMealDetailDto> kdsMealDetailDtoList = new ArrayList<>(); 199 List<KdsMealDetailDto> kdsMealDetailDtoList = new ArrayList<>();
200 for(Integer mealId: mealIds) { 200 for(Integer mealId: mealIds) {
201 final var meal = allMeals.stream().filter(m -> m.getId() == mealId).findFirst(); 201 final var meal = allMeals.stream().filter(m -> m.getId() == mealId).findFirst();
202 - if(meal.isEmpty()) { 202 + String mealName = "";
203 + if(meal.isEmpty() && mealId != 0) {
203 continue; 204 continue;
204 } 205 }
206 + if (meal.isPresent()) {
207 + mealName = meal.get().getName();
208 + }
209 +
205 final var totalCount = orderDetailList.stream() 210 final var totalCount = orderDetailList.stream()
206 .filter(od -> od.getMealId() == mealId) 211 .filter(od -> od.getMealId() == mealId)
207 .mapToInt(SingleClientCustomerOrderDetailRpcResponse::getCount) 212 .mapToInt(SingleClientCustomerOrderDetailRpcResponse::getCount)
208 .sum(); 213 .sum();
209 final var mealDetail = KdsMealDetailDto.builder() 214 final var mealDetail = KdsMealDetailDto.builder()
210 - .mealId(meal.get().getId()) 215 + .mealId(mealId)
211 - .mealName(meal.get().getName()) 216 + .mealName(mealName)
212 .totalCount(totalCount) 217 .totalCount(totalCount)
213 .build(); 218 .build();
214 kdsMealDetailDtoList.add(mealDetail); 219 kdsMealDetailDtoList.add(mealDetail);
......