禁止办理点异常提示精确到办理点

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/ass/SignChangeCollectManager.java

@@ -67,6 +67,8 @@ public class SignChangeCollectManager extends AbstractAssManager<SignChangeColle
         if (hasText(sBuilder.toString())) {
             //人工审核
             assOrderinfo.setOrderStep(AssOrderStep.WAITING_AUDIT);
+        }else {
+            assOrderinfo.setOrderStep(AssOrderStep.WAITING_PAY);
         }
         dataStream.put(ORDER,assOrderinfo);
     }
@@ -74,6 +76,7 @@ public class SignChangeCollectManager extends AbstractAssManager<SignChangeColle
     @Override
     protected void persistInternal(SignChangeCollectRequest req, ServiceLogEvent event, Map<String, Object> dataStream) throws ServiceHandleException {
         AssOrderinfo assOrderinfo = (AssOrderinfo) dataStream.get(ORDER);
+        orderInfoRepo.merge(assOrderinfo);
         //收集信息保存
         AssSignChange assSignChange = assSignChangeRepo.findByOrderNo(assOrderinfo.getOrderNo());
         assSignChange.setVehiclePlate(req.getVehiclePlate());
@@ -119,6 +122,7 @@ public class SignChangeCollectManager extends AbstractAssManager<SignChangeColle
         AssOrderinfo assOrderinfo = (AssOrderinfo) dataStream.get(ORDER);
         SignChangeCollectResponse response = new SignChangeCollectResponse();
         response.setId(assOrderinfo.getId());
+        response.setOrderStep(assOrderinfo.getOrderStep());
         response.setOrderNo(assOrderinfo.getOrderNo());
         response.setReceiveTime(getReceiveTimeStr(event));
         return response;

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/ass/assSign/AbsAssSignManager.java

@@ -127,8 +127,6 @@ public abstract class AbsAssSignManager {
     }
 
     /**
-     * 获取参数
-     *
      * @param accountInfo 用户信息
      * @param productId   产品编号
      * @param vehicleId

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/ass/assSign/AssSignChangeManager.java

@@ -43,7 +43,7 @@ public class AssSignChangeManager extends AbsAssSignManager {
     public String getAgencyId(AssOrderinfo orderinfo, Map<String, Object> dataStream) throws ServiceHandleException {
         AssSignChange assSignChange = assSignChangeRepo.findByOrderNo(orderinfo.getOrderNo());
         if(assSignChange == null){
-            throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException("签约产品编号不存在");
+            throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException("签约变更信息不存在");
         }
         dataStream.put(SIGNCHANGE,assSignChange);
         return assSignChange.getAgencyId();

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/order/AbstractOrderManager.java

@@ -159,9 +159,9 @@ public abstract class AbstractOrderManager<T extends AbstractSignTypeRequest<?>>
             double s = calculateDistance(aDouble, point);
             //只要有一个符合距离要求，距离校验就符合要求
             if (s < location.getRadial()) {
-                logger.error("用户经纬度：" + longitude + "," + latitude + ";渠道禁办点'" + location.getServicehallName() + "'经纬度："
+                logger.error("用户经纬度：" + longitude + "," + latitude + ";渠道禁办点'" + location.getName() + "'经纬度："
                         + location.getLongitude() + "," + location.getLatitude() + ";相距" + s + "米");
-                throw newBusinessException("距离'" + location.getServicehallName() + "'网点" + ((int) s - 1) + "米，处于禁办范围");
+                throw newBusinessException("距离'" + location.getName() + "'网点" + ((int) s - 1) + "米，处于禁办范围");
             }
         }
         //到此已经排除禁止网点，即在网点范围就表示通过校验，否则走后面的办理点校验