|
|
@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
|
|
|
import com.uas.platform.b2c.core.config.SysConf;
|
|
|
import com.uas.platform.b2c.core.constant.ShortConstant;
|
|
|
import com.uas.platform.b2c.core.constant.SplitChar;
|
|
|
+import com.uas.platform.b2c.core.constant.Type;
|
|
|
import com.uas.platform.b2c.core.support.SystemSession;
|
|
|
import com.uas.platform.b2c.logistics.dao.AddressTakeSelfDao;
|
|
|
import com.uas.platform.b2c.logistics.dao.DistributionRuleDao;
|
|
|
@@ -16,7 +17,6 @@ import com.uas.platform.b2c.trade.support.ResultMap;
|
|
|
import com.uas.platform.core.exception.IllegalOperatorException;
|
|
|
import com.uas.platform.core.model.PageInfo;
|
|
|
import com.uas.platform.core.model.PageParams;
|
|
|
-import com.uas.platform.core.model.Type;
|
|
|
import org.apache.commons.collections.CollectionUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.data.domain.Page;
|
|
|
@@ -336,7 +336,8 @@ public class DistributionRuleServiceImpl implements DistributionRuleService{
|
|
|
List<UsableRuleInfo> ruleInfoList = new ArrayList<>();
|
|
|
List<Integer> methodList = new ArrayList<>();
|
|
|
for (DistributionRule rule : allRuleList){
|
|
|
- if (!methodList.contains(rule.getShippingMethod())){
|
|
|
+ if (!methodList.contains(rule.getShippingMethod()) &&
|
|
|
+ !rule.getShippingMethod().equals(Type.Delivery_BySelf_Code.value())){
|
|
|
List<RuleQtyArea> qtyArea = rule.getAreas();
|
|
|
//转化分段地区信息
|
|
|
Map<String, Map<String, List<String>>> resultMap = convertArea(qtyArea);
|
hulh