Merge remote-tracking branch 'origin/master'

doum

10 小时以前 59b1f0e9967902aa10f5e017d5a0bdfd1b60c9ea

 server/services/src/main/java/com/doumee/service/business/impl/AreasServiceImpl.java

@@ -14,7 +14,9 @@
import com.doumee.core.utils.PinYinUtil;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.AreasMapper;
import com.doumee.dao.business.PricingRuleMapper;
import com.doumee.dao.business.model.Areas;
import com.doumee.dao.business.model.PricingRule;
import com.doumee.service.business.AreasService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.commons.lang3.StringUtils;
@@ -45,6 +47,9 @@
    private AreasMapper areasMapper;

    @Autowired
    private PricingRuleMapper pricingRuleMapper;

    @Autowired
    RestTemplate restTemplate ;


@@ -63,6 +68,7 @@
            }
        }*/
        areas.setIsdeleted(Constants.ZERO);
        areas.setCreateDate(new Date());
        areasMapper.insert(areas);
        areas.setCode(areas.getId().toString());
        areasMapper.updateById(areas);
@@ -74,6 +80,11 @@
    @Override
    public void deleteById(Integer id) {
        areasMapper.deleteById(id);
        // 同步删除该城市关联的计价规则配置
        PricingRule deleteRule = new PricingRule();
        deleteRule.setCityId(id);
        QueryWrapper<PricingRule> deleteWrapper = new QueryWrapper<>(deleteRule);
        pricingRuleMapper.delete(deleteWrapper);
        //刷新缓存数据
        cacheData();
    }
@@ -119,6 +130,11 @@
        }
        //刷新缓存数据
        cacheData();
    }

    @Override
    public Areas getById(Integer id) {
       return areasMapper.selectById(id);
    }

    @Override
@@ -552,4 +568,15 @@
        return areasMapper.selectOne(qw);
    }

    @Override
    public void updateStatus(Areas areas) {
        if (areas == null || areas.getId() == null) {
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        Areas update = new Areas();
        update.setId(areas.getId());
        update.setStatus(areas.getStatus());
        areasMapper.updateById(update);
    }

}