Commit 3a2c8028 by huluobin

to autowired

parent de22889a
...@@ -34,5 +34,9 @@ public interface MarketService { ...@@ -34,5 +34,9 @@ public interface MarketService {
*/ */
void setterOrderMarket(Integer orderId); void setterOrderMarket(Integer orderId);
/**
*
* @param orderId
*/
void setterOrder(Integer orderId); void setterOrder(Integer orderId);
} }
...@@ -251,7 +251,6 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order ...@@ -251,7 +251,6 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
orderServe.setProduceName(null); orderServe.setProduceName(null);
} }
//折扣金额
orderServe.setDiscountPrice(BigDecimal.ZERO); orderServe.setDiscountPrice(BigDecimal.ZERO);
if (orderServeParam.getServeChangePrice() != null) { if (orderServeParam.getServeChangePrice() != null) {
orderServe.setServeChangePrice(orderServeParam.getServeChangePrice()); orderServe.setServeChangePrice(orderServeParam.getServeChangePrice());
...@@ -287,6 +286,9 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order ...@@ -287,6 +286,9 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
orderServeMapper.deleteBatchIds(deleteOrderServeIdList); orderServeMapper.deleteBatchIds(deleteOrderServeIdList);
} }
orderManage.setChangePrice(orderServeList.stream().map(OrderServe::getServeChangePrice).reduce(BigDecimal.ZERO, BigDecimal::add));
orderManageMapper.updateById(orderManage);
marketService.setterOrder(orderManage.getId()); marketService.setterOrder(orderManage.getId());
} }
......
...@@ -41,7 +41,6 @@ import com.gogirl.infrastructure.mapper.store.oa.TakeLeaveEventMapper; ...@@ -41,7 +41,6 @@ import com.gogirl.infrastructure.mapper.store.oa.TakeLeaveEventMapper;
import com.gogirl.infrastructure.mapper.store.store.StoreManageMapper; import com.gogirl.infrastructure.mapper.store.store.StoreManageMapper;
import com.gogirl.infrastructure.mapper.store.store.StoreTechnicianMapper; import com.gogirl.infrastructure.mapper.store.store.StoreTechnicianMapper;
import com.gogirl.infrastructure.util.MapDistance; import com.gogirl.infrastructure.util.MapDistance;
import com.gogirl.infrastructure.util.SessionUtils;
import com.gogirl.shared.order.serve.command.schedule.*; import com.gogirl.shared.order.serve.command.schedule.*;
import com.gogirl.shared.order.serve.query.dto.IdleTimeDTO; import com.gogirl.shared.order.serve.query.dto.IdleTimeDTO;
import com.gogirl.shared.order.serve.query.qry.*; import com.gogirl.shared.order.serve.query.qry.*;
...@@ -961,7 +960,6 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper, ...@@ -961,7 +960,6 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
scheduleManage.setDepartmentId(scheduleManageCommand.getDepartmentId()); scheduleManage.setDepartmentId(scheduleManageCommand.getDepartmentId());
//预约服务补充 //预约服务补充
StoreManage storeManage = storeManageMapper.selectById(scheduleManageCommand.getDepartmentId()); StoreManage storeManage = storeManageMapper.selectById(scheduleManageCommand.getDepartmentId());
//获取预约号 //获取预约号
...@@ -996,7 +994,6 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper, ...@@ -996,7 +994,6 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
BeanUtils.copyProperties(scheduleManageCommand, scheduleManage); BeanUtils.copyProperties(scheduleManageCommand, scheduleManage);
List<ScheduleServe> scheduleServeList = scheduleManageCommand.getScheduleServeDTOList().stream().map(scheduleServeDTO -> { List<ScheduleServe> scheduleServeList = scheduleManageCommand.getScheduleServeDTOList().stream().map(scheduleServeDTO -> {
ScheduleServe scheduleServe = new ScheduleServe(); ScheduleServe scheduleServe = new ScheduleServe();
BeanUtils.copyProperties(scheduleServeDTO, scheduleServe); BeanUtils.copyProperties(scheduleServeDTO, scheduleServe);
......
...@@ -17,4 +17,7 @@ public class SubmitScheduleCommand implements Serializable { ...@@ -17,4 +17,7 @@ public class SubmitScheduleCommand implements Serializable {
//美甲师方案参数 //美甲师方案参数
private final List<TreeProgram> defaultNodeList; private final List<TreeProgram> defaultNodeList;
//leisure -
private String source;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment