fix:调整技师地址数据结构

nightFragrance-massage/src/main/java/com/ylx/massage/domain/TJs.java

@@ -228,6 +228,14 @@ public class TJs implements Serializable {
     @ApiModelProperty("创建时间")
     private LocalDateTime dtCreateTime;
 
+    @TableField("name")
+    @ApiModelProperty("地址详细")
+    private String name;
+
+    @TableField("address")
+    @ApiModelProperty("创建时间")
+    private String address;
+
     @ApiModelProperty("是否删除0否1是")
     @TableLogic
     private Integer isDelete;

nightFragrance-massage/src/main/java/com/ylx/massage/service/impl/TJsServiceImpl.java

@@ -79,14 +79,14 @@ public class TJsServiceImpl extends ServiceImpl<TJsMapper, TJs> implements TJsSe
         if (StringUtils.isBlank(js.getcPhone())) {
             throw new ServiceException("手机号不能为空");
         }
-        if (StringUtils.isBlank(js.getcAddress())) {
+        if (StringUtils.isBlank(js.getName())) {
             throw new ServiceException("地址不能为空");
         }
-        log.info("js:{}", js);
-        JSONObject jsonObject = new JSONObject(js.getcAddress());
-        Object latitude = jsonObject.get("latitude");
-        Object longitude = jsonObject.get("longitude");
-        locationUtil.geoAdd(js.getcOpenId(), Double.parseDouble(longitude.toString()), Double.parseDouble(latitude.toString()));
+//        log.info("js:{}", js);
+//        JSONObject jsonObject = new JSONObject(js.getcAddress());
+//        Object latitude = jsonObject.get("latitude");
+//        Object longitude = jsonObject.get("longitude");
+        locationUtil.geoAdd(js.getcOpenId(), Double.parseDouble(js.getLongitude().toString()), Double.parseDouble(js.getLatitude().toString()));
     }
 
 
@@ -118,13 +118,13 @@ public class TJsServiceImpl extends ServiceImpl<TJsMapper, TJs> implements TJsSe
         if (StringUtils.isBlank(js.getcOpenId())) {
             throw new ServiceException("技师OpenID不能为空");
         }
-        if (StringUtils.isBlank(js.getcAddress())) {
+        if (StringUtils.isBlank(js.getName())) {
             throw new ServiceException("地址不能为空");
         }
-        JSONObject jsonObject = new JSONObject(js.getcAddress());
-        Object latitude = jsonObject.get("latitude");
-        Object longitude = jsonObject.get("longitude");
-        locationUtil.geoAdd(js.getcOpenId(), Double.parseDouble(longitude.toString()), Double.parseDouble(latitude.toString()));
+//        JSONObject jsonObject = new JSONObject(js.getcAddress());
+//        Object latitude = jsonObject.get("latitude");
+//        Object longitude = jsonObject.get("longitude");
+        locationUtil.geoAdd(js.getcOpenId(), Double.parseDouble(js.getLongitude().toString()), Double.parseDouble(js.getLatitude().toString()));
         LambdaQueryWrapper<TJs> objectLambdaQueryWrapper = new LambdaQueryWrapper<>();
         objectLambdaQueryWrapper.eq(TJs::getcOpenId, js.getcOpenId());
         return this.update(js, objectLambdaQueryWrapper);

nightFragrance-massage/src/main/resources/mapper/massage/TJsMapper.xml

@@ -33,6 +33,8 @@
         <result column="n_b1" property="nB1"/>
         <result column="n_b2" property="nB2"/>
         <result column="n_b3" property="nB3"/>
+        <result column="name" property="name"/>
+        <result column="address" property="address"/>
         <result column="dt_create_time" property="dtCreateTime"/>
         <result column="nNumber" property="number"/>