This commit is contained in:
2023-08-26 18:01:25 +08:00
parent 85ae33240f
commit ef8cd011e4
10 changed files with 1089 additions and 928 deletions

View File

@@ -20,6 +20,7 @@ import com.jsowell.pile.dto.SettleOrderReportDTO;
import com.jsowell.pile.service.*;
import com.jsowell.pile.vo.uniapp.MemberBalanceVO;
import com.jsowell.service.OrderService;
import com.jsowell.service.TempService;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -37,6 +38,9 @@ import java.util.Map;
@RequestMapping("/temp")
public class TempController extends BaseController {
@Autowired
private TempService tempService;
@Autowired
private IOrderBasicInfoService orderBasicInfoService;
@@ -73,7 +77,7 @@ public class TempController extends BaseController {
logger.info("临时刷数据接口 param:{}", dto);
RestApiResponse<?> response = null;
try {
String s = orderBasicInfoService.tempUpdateVirtualAmount(dto);
String s = tempService.tempUpdateVirtualAmount(dto);
response = new RestApiResponse<>(s);
} catch (BusinessException e) {
logger.warn("临时刷数据接口 warn", e);
@@ -355,7 +359,7 @@ public class TempController extends BaseController {
logger.info("查询未分账订单param:{}", JSON.toJSONString(dto));
RestApiResponse<?> response;
try {
Map<String, Object> map = settleOrderReportService.queryUndividedOrder(dto);
Map<String, Object> map = tempService.queryUndividedOrder(dto);
response = new RestApiResponse<>(map);
} catch (BusinessException e) {
logger.error("查询未分账订单接口 error,", e);
@@ -378,7 +382,7 @@ public class TempController extends BaseController {
public RestApiResponse<?> splitTheBillForOrderTemp(@RequestBody QueryOrderDTO dto) {
RestApiResponse<?> response;
try {
orderBasicInfoService.splitTheBillForOrderTemp(dto.getMerchantId(), dto.getOrderCodeList());
tempService.splitTheBillForOrderTemp(dto.getMerchantId(), dto.getOrderCodeList());
response = new RestApiResponse<>();
} catch (BusinessException e) {
logger.error("余额支付订单分账工具 error,", e);