diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProjectOrderInfo.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProjectOrderInfo.java index 4c5f92d7..b62a777d 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProjectOrderInfo.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProjectOrderInfo.java @@ -162,6 +162,10 @@ public class ProjectOrderInfo extends BaseEntity { private String partnerUserName; private String partnerPhone; private String level; + /** + * 订单处理方式 + */ + private String processType; /** diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/DeliveryListServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/DeliveryListServiceImpl.java index 32919771..f3711c40 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/DeliveryListServiceImpl.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/DeliveryListServiceImpl.java @@ -244,7 +244,7 @@ public class DeliveryListServiceImpl implements IDeliveryListService { private static Date updateStartTimeAndAddList(DeliveryInfoVo deliveryInfoVo, ProductInfo productInfo, Date startTime, List serviceInfoList) { int year = productInfo.getValue() == null ? 0 : Integer.parseInt(productInfo.getValue()); DeliveryInfoVo.ServiceInfo serviceInfo = deliveryInfoVo.new ServiceInfo(); - serviceInfo.setServiceLevel(productInfo.getValue()); + serviceInfo.setServiceLevel(productInfo.getProductCode()); serviceInfo.setServiceDescribe(productInfo.getDescription()); serviceInfo.setServiceStartTime(startTime); serviceInfo.setServiceEndTime(DateUtils.addYears(startTime, year)); diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OrderInfoServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OrderInfoServiceImpl.java index 1258e597..37abd601 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OrderInfoServiceImpl.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OrderInfoServiceImpl.java @@ -363,6 +363,7 @@ public class OrderInfoServiceImpl implements IOrderInfoService if (orderList.getDiscount()!=null){ amount = amount.multiply(orderList.getDiscount()).setScale(2, RoundingMode.HALF_UP); } + orderList.setDiscount(orderList.getDiscount().setScale(3, RoundingMode.HALF_UP)); orderList.setAmount(amount); } return orderListList; diff --git a/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml b/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml index c1a61260..91edbe90 100644 --- a/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml +++ b/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml @@ -151,7 +151,7 @@ select delivery_id from delivery_list where serial_number=#{serialNumber})) - order by t1.created_at desc + order by ISNULL(t1.project_code)||t1.project_code='' ,t1.project_code