Commit c796bbc9 authored by zhangfeng's avatar zhangfeng

bug-555: 订单V值规则渠道保存异常修复

parent 52486990
...@@ -166,7 +166,7 @@ public class OrderVStrategy extends AbstractScoreRuleStrategy { ...@@ -166,7 +166,7 @@ public class OrderVStrategy extends AbstractScoreRuleStrategy {
* @param orderId * @param orderId
* @return * @return
*/ */
private Integer getScoreCount(Integer transportId, Long channelId, String allowChannels, List<ScoreRuleOrderVExtraVO.OrderVRule> orderVRules, Long orderId) { private Integer getScoreCount(Integer transportId, Long channelId, List<Long> allowChannels, List<ScoreRuleOrderVExtraVO.OrderVRule> orderVRules, Long orderId) {
Integer scoreCount = 0; Integer scoreCount = 0;
List<OrderItemRespDTO> orderItems = orderApi.getOrderItemsByOrderId(orderId); List<OrderItemRespDTO> orderItems = orderApi.getOrderItemsByOrderId(orderId);
if (orderItems == null) { if (orderItems == null) {
...@@ -185,8 +185,7 @@ public class OrderVStrategy extends AbstractScoreRuleStrategy { ...@@ -185,8 +185,7 @@ public class OrderVStrategy extends AbstractScoreRuleStrategy {
} else if (transportId == TransportTypeEnum.SPECIAL_LINE_AIR_FREIGHT.getValue()) { } else if (transportId == TransportTypeEnum.SPECIAL_LINE_AIR_FREIGHT.getValue()) {
// 空运校验渠道 // 空运校验渠道
// 渠道id // 渠道id
String[] channels = allowChannels.split(","); if (!allowChannels.contains(channelId)) {
if (!ArrayUtil.contains(channels, channelId.toString())) {
return 0; return 0;
} }
// 空运算重量 // 空运算重量
......
...@@ -22,7 +22,7 @@ public class ScoreRuleOrderVExtraVO { ...@@ -22,7 +22,7 @@ public class ScoreRuleOrderVExtraVO {
@ApiModelProperty(value = "提货点列表(第一级提货点,第二级国家,城市,仓库id)", required = true) @ApiModelProperty(value = "提货点列表(第一级提货点,第二级国家,城市,仓库id)", required = true)
private List<List<Long>> receiveAddrList; private List<List<Long>> receiveAddrList;
@ApiModelProperty(value = "渠道,运输方式选择海运时,渠道隐藏,可多选,逗号拼接") @ApiModelProperty(value = "渠道,运输方式选择海运时,渠道隐藏,可多选,逗号拼接")
private String channel; private List<Long> channel;
@ApiModelProperty(value = "积分规则列表", required = true) @ApiModelProperty(value = "积分规则列表", required = true)
private List<OrderVRule> orderVRule; private List<OrderVRule> orderVRule;
@ApiModelProperty(value = "订单入口(1后台,2APP,3WEB)可多选,逗号拼", required = true) @ApiModelProperty(value = "订单入口(1后台,2APP,3WEB)可多选,逗号拼", required = true)
......
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