fix: 退款修改

This commit is contained in:
张松
2024-11-28 13:57:21 +08:00
parent c1dbd68616
commit 04473738b7
27 changed files with 1044 additions and 29 deletions

View File

@@ -16,6 +16,7 @@ import com.chaozhanggui.system.cashierservice.entity.TbOrderDetail;
import com.chaozhanggui.system.cashierservice.entity.TbOrderInfo;
import com.chaozhanggui.system.cashierservice.entity.TbShopInfo;
import com.chaozhanggui.system.cashierservice.entity.dto.ReturnGroupOrderDto;
import com.chaozhanggui.system.cashierservice.entity.dto.ReturnOrderDTO;
import com.chaozhanggui.system.cashierservice.entity.dto.VipPayDTO;
import com.chaozhanggui.system.cashierservice.model.PaymentReq;
import com.chaozhanggui.system.cashierservice.service.PayService;
@@ -34,10 +35,7 @@ import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.*;
@CrossOrigin(origins = "*")
@RestController
@@ -247,7 +245,20 @@ public class PayController {
@RequestBody List<TbOrderDetail> list,
@RequestParam("pwd") String pwd,
@RequestParam(defaultValue = "true") boolean isOnline) {
return payService.returnOrder(list, token, pwd, isOnline);
ReturnOrderDTO returnOrderDTO = new ReturnOrderDTO();
returnOrderDTO.setOrderId(list.get(0).getOrderId());
returnOrderDTO.setNote(list.get(0).getRemark());
returnOrderDTO.setPwd(pwd);
ArrayList<ReturnOrderDTO.OrderDetail> orderDetails = new ArrayList<>();
list.forEach(item -> {
ReturnOrderDTO.OrderDetail orderDetail = new ReturnOrderDTO.OrderDetail();
orderDetail.setId(item.getId());
orderDetail.setNum(item.getNum());
orderDetails.add(orderDetail);
});
returnOrderDTO.setOrderDetails(orderDetails);
returnOrderDTO.setIsOnline(isOnline);
return Result.success(CodeEnum.SUCCESS, payService.returnOrder(returnOrderDTO));
}