Merge branch 'master' of http://82.156.35.112:3000/qiubinghui/zhywpt-issuer

gly-base-core/src/main/java/cn/com/taiji/core/repo/jpa/issue/IssueProductPromotionRepo.java

@@ -26,7 +26,7 @@ public interface IssueProductPromotionRepo extends AbstractJpaRepo<IssueProductP
     List<String> findReleaseIds(String agencyId, LocalDateTime time, OrderType type);
 
     //查询启用状态的产品编号(不分渠道)
-    @Query("select releaseId from IssueProductPromotion where status = 'ENABLE' and dateOfListing <= ?2 and dateOfDelist >= ?2 and orderType = ?3")
+    @Query("select releaseId from IssueProductPromotion where status = 'ENABLE' and dateOfListing <= ?1 and dateOfDelist >= ?1 and orderType = ?2")
     List<String> findReleaseIds(LocalDateTime time, OrderType type);
 
 }

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/api/ServiceHallController.java

@@ -13,6 +13,7 @@ import cn.com.taiji.userw.model.serviceHall.ServiceHallSonQueryModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -111,8 +112,8 @@ public class ServiceHallController extends MyValidController{
 
     @ApiOperation(value = "网点位置删除")
     @PostMapping(value = "/locationDelete")
-    public ApiResponse<?> locationDelete(@RequestBody String id) throws ManagerException {
-        manager.locationDelete(id);
+    public ApiResponse<?> locationDelete(@Valid @RequestBody ServiceLocalDeleteReqDTO reqDTO) throws ManagerException {
+        manager.locationDelete(reqDTO);
         return ApiResponse.success();
     }
 

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/serviceHall/ServiceLocalDeleteReqDTO.java

@@ -0,0 +1,23 @@
+package cn.com.taiji.userw.dto.serviceHall;
+
+import cn.com.taiji.core.dto.AbstractStaffBizRequestDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @Author：ChenChao
+ * @Date：2025/9/22 9:38
+ * @Filename：ServiceLocalDeleteReqDTO
+ * @description:
+ */
+@Data
+@ApiModel(description = "删除办理点")
+public class ServiceLocalDeleteReqDTO extends AbstractStaffBizRequestDTO {
+
+    @NotBlank
+    @ApiModelProperty(value = "办理点主键ID")
+    private String id;
+}

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/manager/serviceHall/ServiceHallManager.java

@@ -44,5 +44,5 @@ public interface ServiceHallManager {
 
     void locationAdd(ServiceHallLocationModel reqDto) throws ServiceHandleException;
 
-    void locationDelete(String id);
+    void locationDelete(ServiceLocalDeleteReqDTO reqDTO);
 }

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/manager/serviceHall/ServiceHallManagerImpl.java

@@ -184,8 +184,8 @@ public class ServiceHallManagerImpl extends AbstractUserwManager implements Serv
     }
 
     @Override
-    public void locationDelete(String id) {
-        locationRepo.deleteById(id);
+    public void locationDelete(ServiceLocalDeleteReqDTO reqDTO) {
+        locationRepo.deleteById(reqDTO.getId());
     }
 
     private ServiceHallExcelModel converExcel(QtkServiceHall hall) {