Merge branch 'develop'

csf-common/csf-common-model/src/main/java/com/mmc/csf/infomation/vo/RequirementsInfoVO.java

@@ -58,12 +58,10 @@ public class RequirementsInfoVO implements Serializable {
     private String taskAddress;
 
 
-    @ApiModelProperty(value = "任务经度", example = "23.344324", required = true)
-    @NotNull(message = "任务经度不能为空", groups = {Insert.class, Update.class})
+    @ApiModelProperty(value = "任务经度", example = "23.344324")
     private Double longitude;
 
-    @ApiModelProperty(value = "任务纬度", example = "44.344324", required = true)
-    @NotNull(message = "任务纬度不能为空", groups = {Insert.class, Update.class})
+    @ApiModelProperty(value = "任务纬度", example = "44.344324")
     private Double latitude;
 
 

csf-common/csf-common-model/src/main/java/com/mmc/csf/infomation/vo/ServiceRequirementsEditVO.java

@@ -48,12 +48,10 @@ public class ServiceRequirementsEditVO implements Serializable {
     private String taskAddress;
 
 
-    @ApiModelProperty(value = "飞行位置——任务经度", example = "23.344324", required = true)
-    @NotNull(message = "任务经度不能为空", groups = {Insert.class, Update.class})
+    @ApiModelProperty(value = "飞行位置——任务经度", example = "23.344324")
     private Double longitude;
 
-    @ApiModelProperty(value = "飞行位置——任务纬度", example = "44.344324", required = true)
-    @NotNull(message = "任务纬度不能为空", groups = {Insert.class, Update.class})
+    @ApiModelProperty(value = "飞行位置——任务纬度", example = "44.344324")
     private Double latitude;
 
 
@@ -103,4 +101,12 @@ public class ServiceRequirementsEditVO implements Serializable {
     @ApiModelProperty(value = "地区编码", example = "307013")
     private String adcode;
 
+    @ApiModelProperty(value = "省份编码", required = false)
+    //@NotNull(message = "省份编码不能为空", groups = {Insert.class})
+    private Integer provinceCode;
+    @ApiModelProperty(value = "市编码", required = false)
+    private Integer cityCode;
+    @ApiModelProperty(value = "区编码", required = false)
+    private Integer districtCode;
+
 }

csf-common/csf-common-model/src/main/java/com/mmc/csf/infomation/vo/ServiceRequirementsVO.java

@@ -52,11 +52,9 @@ public class ServiceRequirementsVO implements Serializable {
 
 
     @ApiModelProperty(value = "飞行位置——任务经度", example = "23.344324", required = true)
-    @NotNull(message = "任务经度不能为空", groups = {Insert.class, Update.class})
     private Double longitude;
 
     @ApiModelProperty(value = "飞行位置——任务纬度", example = "44.344324", required = true)
-    @NotNull(message = "任务纬度不能为空", groups = {Insert.class, Update.class})
     private Double latitude;
 
 
@@ -107,5 +105,12 @@ public class ServiceRequirementsVO implements Serializable {
     @ApiModelProperty(value = "地区编码", example = "307013")
     private String adcode;
 
+    @ApiModelProperty(value = "省份编码", required = false)
+    //@NotNull(message = "省份编码不能为空", groups = {Insert.class})
+    private Integer provinceCode;
+    @ApiModelProperty(value = "市编码", required = false)
+    private Integer cityCode;
+    @ApiModelProperty(value = "区编码", required = false)
+    private Integer districtCode;
 
 }

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/ims
-  newTag: 7429f937a414da8a2d066de06290a0dd31637c35
+  newTag: 5b768dd050a69db88baacd372d9ebf0fb137f30a

release-service/src/main/java/com/mmc/csf/release/entity/requirements/RequirementsInfoDO.java

@@ -246,6 +246,9 @@ public class RequirementsInfoDO implements Serializable {
         this.adcode = requirementsEditVO.getAdcode();
         this.orderAmount = requirementsEditVO.getOrderAmount();
         this.insurance=requirementsEditVO.getInsurance();
+        this.provinceCode = requirementsEditVO.getProvinceCode();
+        this.cityCode = requirementsEditVO.getCityCode();
+        this.districtCode = requirementsEditVO.getDistrictCode();
     }
 
 

release-service/src/main/java/com/mmc/csf/release/entity/requirements/ServiceRequirementsDO.java

@@ -50,14 +50,19 @@ public class ServiceRequirementsDO {
     private String taskAddress;
 
 
-    @ApiModelProperty(value = "飞行位置——任务经度", example = "23.344324", required = true)
-    @NotNull(message = "任务经度不能为空", groups = {Insert.class, Update.class})
+    @ApiModelProperty(value = "飞行位置——任务经度", example = "23.344324")
     private Double longitude;
 
-    @ApiModelProperty(value = "飞行位置——任务纬度", example = "44.344324", required = true)
-    @NotNull(message = "任务纬度不能为空", groups = {Insert.class, Update.class})
+    @ApiModelProperty(value = "飞行位置——任务纬度", example = "44.344324")
     private Double latitude;
 
+    @ApiModelProperty(value = "省份编码", required = false)
+    //@NotNull(message = "省份编码不能为空", groups = {Insert.class})
+    private Integer provinceCode;
+    @ApiModelProperty(value = "市编码", required = false)
+    private Integer cityCode;
+    @ApiModelProperty(value = "区编码", required = false)
+    private Integer districtCode;
 
     @ApiModelProperty(value = "需求描述", example = "描述一下", required = true)
     @NotNull(message = "需求描述不能为空", groups = {Insert.class})
@@ -164,5 +169,8 @@ public class ServiceRequirementsDO {
         this.weChat = serviceRequirementsVO.getWeChat();
         this.paymentType = serviceRequirementsVO.getPaymentType();
         this.adcode = serviceRequirementsVO.getAdcode();
+        this.provinceCode = serviceRequirementsVO.getProvinceCode();
+        this.cityCode = serviceRequirementsVO.getCityCode();
+        this.districtCode = serviceRequirementsVO.getDistrictCode();
     }
 }

release-service/src/main/java/com/mmc/csf/release/service/impl/RequirementsServiceImpl.java

@@ -2931,18 +2931,19 @@ public class RequirementsServiceImpl implements RequirementsService {
     @Override
     public ResultBody arriveAtTheScene(ServiceArriveSceneVO serviceArriveSceneVO) {
         ServiceArriveSceneDO serviceArriveSceneDO = new ServiceArriveSceneDO(serviceArriveSceneVO);
-        RequirementsInfoDO requirementsInfoDO = requirementsDao.detailPublish(serviceArriveSceneDO.getRequirementsInfoId());
-        GlobalCoordinates source = new GlobalCoordinates(Double.parseDouble(String.valueOf(requirementsInfoDO.getLatitude())), Double.parseDouble(String.valueOf(requirementsInfoDO.getLongitude())));
-        GlobalCoordinates target = new GlobalCoordinates(Double.parseDouble(String.valueOf(serviceArriveSceneDO.getLatitude())), Double.parseDouble(String.valueOf(serviceArriveSceneDO.getLongitude())));
-        double geoCurve = getDistanceMeter(source, target, Ellipsoid.Sphere);
-        //100米
-        if (geoCurve > 500) {
-            return ResultBody.error(ResultEnum.FALL_OUTSIDE_OF);
-        } else {
-            requirementsDao.arriveAtTheScene(serviceArriveSceneDO);
-            requirementsDao.updateScene(serviceArriveSceneDO.getRequirementsInfoId(), 3);
-            requirementsDao.updateInfo(serviceArriveSceneDO.getRequirementsInfoId(), 3);
-        }
+        //注释部分是飞手到任务地点距离判断 后续可能用
+//        RequirementsInfoDO requirementsInfoDO = requirementsDao.detailPublish(serviceArriveSceneDO.getRequirementsInfoId());
+//        GlobalCoordinates source = new GlobalCoordinates(Double.parseDouble(String.valueOf(requirementsInfoDO.getLatitude())), Double.parseDouble(String.valueOf(requirementsInfoDO.getLongitude())));
+//        GlobalCoordinates target = new GlobalCoordinates(Double.parseDouble(String.valueOf(serviceArriveSceneDO.getLatitude())), Double.parseDouble(String.valueOf(serviceArriveSceneDO.getLongitude())));
+//        double geoCurve = getDistanceMeter(source, target, Ellipsoid.Sphere);
+//        //100米
+//        if (geoCurve > 500) {
+//            return ResultBody.error(ResultEnum.FALL_OUTSIDE_OF);
+//        } else {
+        requirementsDao.arriveAtTheScene(serviceArriveSceneDO);
+        requirementsDao.updateScene(serviceArriveSceneDO.getRequirementsInfoId(), 3);
+        requirementsDao.updateInfo(serviceArriveSceneDO.getRequirementsInfoId(), 3);
+//        }
         return ResultBody.success();
     }
 

release-service/src/main/resources/mapper/requirements/RequirementsDao.xml

@@ -248,6 +248,15 @@
             <if test="serviceName!='' and  serviceName != null ">
                 service_name = #{serviceName},
             </if>
+            <if test="provinceCode != null">
+                province_code = #{provinceCode},
+            </if>
+            <if test="cityCode != null">
+                city_code = #{cityCode},
+            </if>
+            <if test="districtCode != null">
+                district_code = #{districtCode},
+            </if>
             update_time=NOW(),
             service_flow_id=1
         </set>
@@ -538,12 +547,12 @@
                                       require_description, create_time,
                                       update_time, task_start_time, task_end_time, task_address, longitude,
                                       latitude, publisher_number, insurance, publish,
-                                      service_flow_id, adcode, order_level_amount, openid, service_name)
+                                      service_flow_id, adcode, order_level_amount, openid, service_name,province_code,city_code,district_code)
         VALUES (#{serviceId}, #{userAccountId}, #{publishName}, #{publishPhone},
                 #{requireDescription}, NOW(),
                 NOW(), #{taskStartTime}, #{taskEndTime}, #{taskAddress}, #{longitude},
                 #{latitude}, #{publisherNumber}, #{insurance}, 1, 1, #{adcode}, #{orderLevelAmount}, #{openid},
-                #{serviceName});
+                #{serviceName},#{provinceCode},#{cityCode},#{districtCode});
     </insert>
 
     <insert id="addAmount" parameterType="com.mmc.csf.release.entity.requirements.RequirementsAmountDO"