|
|
@@ -88,7 +88,7 @@ public class UserDeliverOrderController extends BaseApiController {
|
|
|
private IShippingTemplateRuleService shippingTemplateRuleService;
|
|
|
|
|
|
@Value("${shipping.user}")
|
|
|
- public String shippingTemplateId;
|
|
|
+ public Long shippingTemplateId;
|
|
|
|
|
|
/**
|
|
|
* 订单列表
|
|
|
@@ -180,7 +180,7 @@ public class UserDeliverOrderController extends BaseApiController {
|
|
|
// 计算运费
|
|
|
UserAddr userAddr = orderSettleVO.getAddr();
|
|
|
// TODO: 4L上线需要调整,后期放开就是取的商品里配的运费模板id
|
|
|
- ShippingTemplateCalculateVO shippingTemplateCalculateVO = shippingTemplateRuleService.getShippingTemplateRuleByTemplateIdAndAreaInfo(Long.getLong(shippingTemplateId), userAddr.getProvinceId(), userAddr.getCityId());
|
|
|
+ ShippingTemplateCalculateVO shippingTemplateCalculateVO = shippingTemplateRuleService.getShippingTemplateRuleByTemplateIdAndAreaInfo(shippingTemplateId, userAddr.getProvinceId(), userAddr.getCityId());
|
|
|
// 无法查到运费模板则默认为0
|
|
|
if (Objects.nonNull(shippingTemplateCalculateVO)) {
|
|
|
|
cup