refactor(sip): 优化订单相关功能

- 修改服务等级设置错误:将产品值改为产品代码
- 调整订单列表排序方式:按项目编号是否为空及项目编号排序
- 修正折扣计算:保留三位小数- 添加订单处理方式字段
master
chenhao 2025-06-09 14:07:35 +08:00
parent 76801aca85
commit 543dfc25f8
4 changed files with 7 additions and 2 deletions

View File

@ -162,6 +162,10 @@ public class ProjectOrderInfo extends BaseEntity {
private String partnerUserName;
private String partnerPhone;
private String level;
/**
*
*/
private String processType;
/**

View File

@ -244,7 +244,7 @@ public class DeliveryListServiceImpl implements IDeliveryListService {
private static Date updateStartTimeAndAddList(DeliveryInfoVo deliveryInfoVo, ProductInfo productInfo, Date startTime, List<DeliveryInfoVo.ServiceInfo> 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));

View File

@ -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;

View File

@ -151,7 +151,7 @@
select delivery_id from delivery_list where serial_number=#{serialNumber}))
</if>
</where>
order by t1.created_at desc
order by ISNULL(t1.project_code)||t1.project_code='' ,t1.project_code
</select>
<select id="selectOrderInfoById" parameterType="Long" resultMap="OrderInfoOrderListResult">