wangyingyang

fix

No preview for this file type
......@@ -24,6 +24,7 @@ public class PayDTO {
private String openId;
private String hospitalCode;
private String price;
private String phone;
}
@Data
......@@ -65,6 +66,17 @@ public class PayDTO {
@Data
@Builder
@ApiModel(description = "支付状态修改dto")
@NoArgsConstructor
@AllArgsConstructor
public static class PayStatusUpdateRequestDto {
private Boolean success;
private String error;
private PayResult result;
}
@Data
@Builder
@ApiModel(description = "第三方支付平台通知请求dto")
@NoArgsConstructor
@AllArgsConstructor
......
......@@ -36,10 +36,10 @@ public class PayServiceClient {
jsonData.setTradeId(payRequestDto.getOrderId());
String requestDate = DateUtil.formatDate(LocalDateTime.now(), DateUtil.YMDHMS);
jsonData.setRequestDate(requestDate);
jsonData.setRequestSource("");
jsonData.setRequestSource("OFWXApplet");
jsonData.setPayerOpenId(payRequestDto.getOpenId());
jsonData.setHospitalCode(payRequestDto.getHospitalCode());
jsonData.setPID("");
jsonData.setPID(payRequestDto.getPhone());
jsonData.setRemark("");
jsonData.setTransAmount(payRequestDto.getPrice());
jsonData.setTradeDesc("");
......
......@@ -199,16 +199,21 @@ public class KdsServiceImpl implements KdsService {
List<KdsMealDetailDto> kdsMealDetailDtoList = new ArrayList<>();
for(Integer mealId: mealIds) {
final var meal = allMeals.stream().filter(m -> m.getId() == mealId).findFirst();
if(meal.isEmpty()) {
String mealName = "";
if(meal.isEmpty() && mealId != 0) {
continue;
}
if (meal.isPresent()) {
mealName = meal.get().getName();
}
final var totalCount = orderDetailList.stream()
.filter(od -> od.getMealId() == mealId)
.mapToInt(SingleClientCustomerOrderDetailRpcResponse::getCount)
.sum();
final var mealDetail = KdsMealDetailDto.builder()
.mealId(meal.get().getId())
.mealName(meal.get().getName())
.mealId(mealId)
.mealName(mealName)
.totalCount(totalCount)
.build();
kdsMealDetailDtoList.add(mealDetail);
......