|
|
@@ -17,6 +17,8 @@
|
|
|
package com.qunzhixinxi.hnqz.admin.service.impl;
|
|
|
|
|
|
import cn.hutool.core.collection.CollectionUtil;
|
|
|
+import cn.hutool.core.util.ArrayUtil;
|
|
|
+import cn.hutool.core.util.StrUtil;
|
|
|
import com.alibaba.csp.sentinel.util.StringUtil;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
@@ -80,20 +82,16 @@ public class WmDaPharmacyServiceImpl extends ServiceImpl<WmDaPharmacyMapper, WmD
|
|
|
WmDaPharmacy query = new WmDaPharmacy();
|
|
|
// 省市区
|
|
|
if (StringUtil.isNotBlank(wmTaskContent.getTemp7())) {
|
|
|
- String[] citys = wmTaskContent.getTemp7().split("-");
|
|
|
- if (citys.length == 3) {
|
|
|
- query.setProvince(citys[0]);
|
|
|
- query.setCity(citys[1]);
|
|
|
- query.setArea(citys[2]);
|
|
|
- } else {
|
|
|
- String[] citys1 = wmTaskContent.getTemp7().split(",");
|
|
|
- if (citys1.length == 3) {
|
|
|
- query.setProvince(citys1[0]);
|
|
|
- query.setCity(citys1[1]);
|
|
|
- query.setArea(citys1[2]);
|
|
|
- } else {
|
|
|
- throw new RuntimeException("查询药店数据异常");
|
|
|
- }
|
|
|
+ if (StrUtil.contains(wmTaskContent.getTemp7(), "-")) {
|
|
|
+ String[] citys = wmTaskContent.getTemp7().split("-");
|
|
|
+ query.setProvince(ArrayUtil.get(citys, 0));
|
|
|
+ query.setCity(ArrayUtil.get(citys, 1));
|
|
|
+ query.setArea(ArrayUtil.get(citys, 2));
|
|
|
+ } else if (StrUtil.contains(wmTaskContent.getTemp7(), ",")) {
|
|
|
+ String[] citys = wmTaskContent.getTemp7().split(",");
|
|
|
+ query.setProvince(ArrayUtil.get(citys, 0));
|
|
|
+ query.setCity(ArrayUtil.get(citys, 1));
|
|
|
+ query.setArea(ArrayUtil.get(citys, 2));
|
|
|
}
|
|
|
}
|
|
|
// 详细地址
|
