删除多余项

ruoyi-modules/yingpaipay-order/src/main/java/org/dromara/order/controller/SysSubOrderController.java

@@ -48,11 +48,6 @@ public class SysSubOrderController extends BaseController {
         return subOrderService.list(bo, pageQuery);
     }
 
-//    @GetMapping("/listOnMerchant")
-//    public TableDataInfo<SysSubOrderListPageVo> listOnMerchant(SysSubOrderListPageBo bo, PageQuery pageQuery) {
-//        return subOrderService.listOnMerchant(bo, pageQuery);
-//    }
-
     @GetMapping("/getInfo")
     public R<SysSubOrderVo> getInfo(@RequestParam Long id) {
         return R.ok(subOrderService.getInfo(id));
@@ -182,8 +177,8 @@ public class SysSubOrderController extends BaseController {
                 excel.setCreateTime(Optional.ofNullable(e.getCreateTime()).map(DateUtils::formatDateTime).orElse("-"));
                 excel.setStatus(OrderStatusEnum.getLabel(e.getStatus()));
                 excel.setFulfillerName(e.getFulfillerName());
-                excel.setPrice(Optional.ofNullable(e.getPrice())
-                        .map(price -> new BigDecimal(price).multiply(new BigDecimal("0.01")))
+                excel.setFulfillmentCommission(Optional.ofNullable(e.getFulfillmentCommission())
+                        .map(fulfillmentCommission -> new BigDecimal(fulfillmentCommission).multiply(new BigDecimal("0.01")))
                         .orElse(null));
                 return excel;
             }).toList();

ruoyi-modules/yingpaipay-order/src/main/java/org/dromara/order/domain/excel/SysSubOrderListExcel.java

@@ -67,6 +67,6 @@ public class SysSubOrderListExcel implements Serializable {
     @ExcelProperty(value = "履约者")
     private String fulfillerName;
     @ExcelProperty(value = "服务费")
-    private BigDecimal price;
+    private BigDecimal fulfillmentCommission;
 
 }

ruoyi-modules/yingpaipay-order/src/main/java/org/dromara/order/service/ISysSubOrderService.java

@@ -16,8 +16,6 @@ public interface ISysSubOrderService {
 
     SysSubOrderVo getInfo(Long id);
 
-//    TableDataInfo<SysSubOrderListPageVo> listOnMerchant(SysSubOrderListPageBo bo, PageQuery pageQuery);
-
     TableDataInfo<SysSubOrderPendingAcceptPageVo> listPendingAccept(SysSubOrderPendingAcceptPageBo bo, PageQuery pageQuery);
 
     boolean accept(SysSubOrderAcceptBo bo);

ruoyi-modules/yingpaipay-order/src/main/java/org/dromara/order/service/impl/SysSubOrderServiceImpl.java

@@ -254,96 +254,6 @@ public class SysSubOrderServiceImpl implements ISysSubOrderService {
         return baseMapper.selectVoById(id);
     }
 
-//    @Override
-//    public TableDataInfo<SysSubOrderListPageVo> listOnMerchant(SysSubOrderListPageBo bo, PageQuery pageQuery) {
-//
-//        LambdaQueryWrapper<SysSubOrder> orderWrapper = Wrappers.lambdaQuery(SysSubOrder.class);
-//
-//        if (StringUtils.isNotBlank(bo.getContent())) {
-//            List<Long> storeIds = remoteStoreService.selectIdsByName(bo.getContent());
-//            List<Long> userIds = remoteUserService.selectUserIdsByName(bo.getContent());
-//            List<Long> customerIds = remoteCustomerService.selectIdsByName(bo.getContent());
-//            orderWrapper.and(w -> w
-//                .in(SysSubOrder::getStore, WrapperUtils.convertIds(storeIds))
-//                .or()
-//                .in(SysSubOrder::getOrderPlacer, WrapperUtils.convertIds(userIds))
-//                .or()
-//                .in(SysSubOrder::getUsrCustomer, WrapperUtils.convertIds(customerIds))
-//            );
-//        }
-//
-//        Page<SysSubOrder> page = baseMapper.selectPage(
-//            pageQuery.build(),
-//            orderWrapper.orderByDesc(SysSubOrder::getId)
-//                .eq(bo.getStatus() != null, SysSubOrder::getStatus, bo.getStatus())
-//                .eq(bo.getService() != null, SysSubOrder::getService, bo.getService())
-//        );
-//
-//        List<Long> petIds = new ArrayList<>();
-//        List<Long> storeIds = new ArrayList<>();
-//        List<Long> customerIds = new ArrayList<>();
-//        List<Long> userIds = new ArrayList<>();
-//        List<Long> fulfillerIds = new ArrayList<>();
-//        page.getRecords().forEach(e -> {
-//            petIds.add(e.getUsrPet());
-//            customerIds.add(e.getUsrCustomer());
-//            storeIds.add(e.getStore());
-//            userIds.add(e.getOrderPlacer());
-//            if (e.getFulfiller() != null) {
-//                fulfillerIds.add(e.getFulfiller());
-//            }
-//        });
-//        Map<Long, RemotePetVo> petMap = new HashMap<>();
-//        Map<Long, RemoteStoreVo> storeMap = new HashMap<>();
-//        Map<Long, RemoteCustomerVo> customerMap = new HashMap<>();
-//        Map<Long, RemoteUserVo> userMap = new HashMap<>();
-//        Map<Long, RemoteFulfillerVo> fulfillerMap = new HashMap<>();
-//        remotePetService.getByIds(petIds).forEach(e -> petMap.put(e.getId(), e));
-//        remoteStoreService.getByIds(storeIds).forEach(e -> storeMap.put(e.getId(), e));
-//        remoteUserService.getByIds(userIds).forEach(e -> userMap.put(e.getUserId(), e));
-//        remoteCustomerService.getByIds(customerIds).forEach(e -> customerMap.put(e.getId(), e));
-//        remoteFulfillerService.getByIds(fulfillerIds).forEach(e -> fulfillerMap.put(e.getId(), e));
-//
-//        return TableDataInfo.build(page.convert(e -> {
-//            SysSubOrderListPageVo vo = new SysSubOrderListPageVo();
-//            vo.setId(e.getId());
-//            vo.setCode(e.getCode());
-//            vo.setService(e.getService());
-//            vo.setServiceTime(e.getServiceTime());
-//            vo.setMode(e.getMode());
-//            vo.setType(e.getType());
-//            vo.setPet(e.getUsrPet());
-//            RemotePetVo pet = petMap.get(e.getUsrPet());
-//            vo.setPetName(pet.getName());
-//            vo.setPetBreed(pet.getBreed());
-//            vo.setCustomer(e.getUsrCustomer());
-//            RemoteCustomerVo customer = customerMap.get(e.getUsrCustomer());
-//            vo.setCustomerName(customer.getName());
-//            vo.setToAddress(e.getToAddress());
-//            vo.setSite(e.getStoreSite());
-//            vo.setStore(e.getStore());
-//            RemoteStoreVo store = storeMap.get(e.getStore());
-//            vo.setStoreName(store.getName());
-//            vo.setPlacer(e.getOrderPlacer());
-//            RemoteUserVo placer = userMap.get(e.getOrderPlacer());
-//            vo.setPlacerUsername(placer.getUserName());
-//            vo.setCreateTime(e.getCreateTime());
-//            vo.setStatus(e.getStatus());
-//            vo.setFulfiller(e.getFulfiller());
-//            RemoteFulfillerVo fulfiller = fulfillerMap.get(e.getFulfiller());
-//            if (fulfiller != null) {
-//                vo.setFulfillerName(fulfiller.getName());
-//                vo.setFulfillerStatus(fulfiller.getStatus());
-//            }
-//            vo.setFulfillmentCommission(e.getFulfillmentCommission());
-//            vo.setRemark(e.getRemark());
-//            vo.setNursingSummary(e.getNursingSummary());
-//            vo.setNursingSummaryTime(e.getNursingSummaryTime());
-//            return vo;
-//        }));
-//
-//    }
-
     @Override
     public TableDataInfo<SysSubOrderPendingAcceptPageVo> listPendingAccept(SysSubOrderPendingAcceptPageBo bo, PageQuery pageQuery) {
 
@@ -1026,7 +936,7 @@ public class SysSubOrderServiceImpl implements ISysSubOrderService {
                 vo.setFulfillerName(fulfiller.getName());
                 vo.setFulfillerStatus(fulfiller.getStatus());
             }
-            vo.setPrice(e.getPrice());
+            vo.setFulfillmentCommission(e.getFulfillmentCommission());
             vo.setRemark(e.getRemark());
             vo.setNursingSummary(e.getNursingSummary());
             vo.setNursingSummaryTime(e.getNursingSummaryTime());