1、地址管理调整类名

gly-base-core/build.gradle

@@ -122,16 +122,6 @@ task iasProtocol(type:Jar){
     into('cn/com/taiji/core/model/comm/protocol/ias')
     dependsOn(classes)
 }
-
-task iawProtocol(type:Jar){
-    archiveBaseName='tj'
-    archiveAppendix='iaw-protocol'
-    archiveVersion='1.0.0-SNAPSHOT'
-    archiveExtension='jar'
-    from("build/classes/java/main/cn/com/taiji/core/model/comm/protocol/iaw")
-    into('cn/com/taiji/core/model/comm/protocol/iaw')
-    dependsOn(classes)
-}
 task odsProtocol(type:Jar){
     archiveBaseName='tj'
     archiveAppendix='ods-protocol'
@@ -244,13 +234,6 @@ publishing {
             artifact iasProtocol
             artifact packageCoreSrc
         }
-        myPublicationIawProtocol(MavenPublication) {
-            groupId ="${groupname}"
-            artifactId ='iaw-protocol'
-            version ='1.0.0-SNAPSHOT'
-            artifact iawProtocol
-            artifact packageCoreSrc
-        }
         myPublicationOdsProtocol(MavenPublication) {
             groupId ="${groupname}"
             artifactId ='ods-protocol'

zhywpt-app-iaw/build.gradle

@@ -9,7 +9,6 @@ dependencies {
     implementation "${groupname}:entity-core:1.0.0-SNAPSHOT"
     implementation "${groupname}:comm-core:1.0.0-SNAPSHOT"
     implementation "${groupname}:sample-protocol:1.0.0-SNAPSHOT"
-    implementation "${groupname}:iaw-protocol:1.0.0-SNAPSHOT"
     implementation "${groupname}:smp-protocol:1.0.0-SNAPSHOT"
     implementation('cn.com.taiji.common:sso-client:2.3.10.7')
     implementation "org.springframework.boot:spring-boot-starter-security"

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/api/comm/AddressController.java

@@ -3,7 +3,7 @@ package cn.com.taiji.iaw.api.comm;
 import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.common.model.dao.Pagination;
 import cn.com.taiji.common.web.ApiResponse;
-import cn.com.taiji.core.entity.issue.IssueOrderAddress;
+import cn.com.taiji.core.entity.comm.AddressInfo;
 import cn.com.taiji.iaw.api.MyValidController;
 import cn.com.taiji.iaw.dto.comm.*;
 import cn.com.taiji.iaw.manager.comm.AddressManager;
@@ -33,13 +33,13 @@ public class AddressController extends MyValidController {
 
     @ApiOperation("地址查询")
     @PostMapping("/findById")
-    public ApiResponse<IssueOrderAddress> findById(@Valid @RequestBody AddressInfoRequestDTO dto) throws ManagerException {
+    public ApiResponse<AddressInfo> findById(@Valid @RequestBody AddressInfoRequestDTO dto) throws ManagerException {
         return ApiResponse.of(manager.findById(dto));
     }
 
     @ApiOperation("地址添加、修改")
     @PostMapping("/add")
-    public ApiResponse<IssueOrderAddress> add(@Valid @RequestBody AddressAddRequestDTO dto) throws ManagerException {
+    public ApiResponse<AddressInfo> add(@Valid @RequestBody AddressAddRequestDTO dto) throws ManagerException {
         return ApiResponse.of(manager.add(dto));
     }
 

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/dto/comm/AddressQueryRequestDTO.java

@@ -1,8 +1,5 @@
 package cn.com.taiji.iaw.dto.comm;
 
-import cn.com.taiji.common.pub.dao.HqlBuilder;
-import cn.com.taiji.common.valid.ViolationValidator;
-import cn.com.taiji.core.entity.issue.IssueOrderAddress;
 import cn.com.taiji.iaw.dto.AbstractBizRequestDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/manager/comm/AddressManager.java

@@ -3,7 +3,7 @@ package cn.com.taiji.iaw.manager.comm;
 
 import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.common.model.dao.Pagination;
-import cn.com.taiji.core.entity.issue.IssueOrderAddress;
+import cn.com.taiji.core.entity.comm.AddressInfo;
 import cn.com.taiji.iaw.dto.comm.*;
 
 public interface AddressManager {
@@ -11,9 +11,9 @@ public interface AddressManager {
 
     Pagination page(AddressQueryRequestDTO dto) throws ManagerException;
 
-    IssueOrderAddress findById(AddressInfoRequestDTO dto) throws ManagerException;
+    AddressInfo findById(AddressInfoRequestDTO dto) throws ManagerException;
 
-    IssueOrderAddress add(AddressAddRequestDTO dto) throws ManagerException;
+    AddressInfo add(AddressAddRequestDTO dto) throws ManagerException;
 
     void delete(AddressInfoRequestDTO dto) throws ManagerException;
 

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/manager/comm/AddressManagerImpl.java

@@ -3,14 +3,14 @@ package cn.com.taiji.iaw.manager.comm;
 import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.common.model.dao.Pagination;
 import cn.com.taiji.common.pub.BeanTools;
+import cn.com.taiji.core.entity.comm.AddressInfo;
 import cn.com.taiji.core.entity.dict.basic.SourceType;
-import cn.com.taiji.core.entity.issue.IssueOrderAddress;
 import cn.com.taiji.core.entity.user.AccountInfo;
-import cn.com.taiji.core.repo.jpa.issue.IssueOrderAddressRepo;
+import cn.com.taiji.core.repo.jpa.comm.AddressInfoRepo;
 import cn.com.taiji.core.repo.jpa.user.AccountInfoRepo;
 import cn.com.taiji.iaw.dto.comm.*;
 import cn.com.taiji.iaw.manager.AbstractCommManager;
-import cn.com.taiji.iaw.repo.jpa.request.comm.IssueOrderAddressPageRequest;
+import cn.com.taiji.iaw.repo.jpa.request.comm.AddressInfoPageRequest;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import org.apache.commons.compress.utils.Lists;
@@ -27,7 +27,7 @@ public class AddressManagerImpl extends AbstractCommManager implements AddressMa
     @Autowired
     private AccountInfoRepo accountInfoRepo;
     @Autowired
-    private IssueOrderAddressRepo repo;
+    private AddressInfoRepo repo;
 
 //    @Autowired
 //    private QtkPromptTextRepo qtkPromptTextRepo;
@@ -39,7 +39,7 @@ public class AddressManagerImpl extends AbstractCommManager implements AddressMa
     @Override
     public Pagination page(AddressQueryRequestDTO dto) throws ManagerException {
         dto.validate();
-        IssueOrderAddressPageRequest req = new IssueOrderAddressPageRequest();
+        AddressInfoPageRequest req = new AddressInfoPageRequest();
         BeanTools.copyProperties(dto, req);
         List<String> openIds = Lists.newArrayList();
         if (SourceType.WECHAT.equals(dto.getOrderSource()) || SourceType.ALI.equals(dto.getOrderSource())) {
@@ -60,15 +60,15 @@ public class AddressManagerImpl extends AbstractCommManager implements AddressMa
     }
 
     @Override
-    public IssueOrderAddress findById(AddressInfoRequestDTO dto) throws ManagerException {
+    public AddressInfo findById(AddressInfoRequestDTO dto) throws ManagerException {
         dto.validate();
         return repo.findById(dto.getId()).orElse(null);
     }
 
     @Override
-    public IssueOrderAddress add(AddressAddRequestDTO dto) throws ManagerException {
+    public AddressInfo add(AddressAddRequestDTO dto) throws ManagerException {
         dto.validate();
-        IssueOrderAddress entity = new IssueOrderAddress();
+        AddressInfo entity = new AddressInfo();
         if (hasText(dto.getId())) {
             entity = repo.findById(dto.getId()).orElse(null);
             if (entity == null) {
@@ -97,10 +97,10 @@ public class AddressManagerImpl extends AbstractCommManager implements AddressMa
         return entity;
     }
 
-    private void changeDefault(IssueOrderAddress entity) {
-        List<IssueOrderAddress> managementList = repo.listDefault(entity.getOpenId(), entity.getDefaultAddress(), entity.getStatus());
+    private void changeDefault(AddressInfo entity) {
+        List<AddressInfo> managementList = repo.listDefault(entity.getOpenId(), entity.getDefaultAddress(), entity.getStatus());
         if (!CollectionUtil.isEmpty(managementList)) {
-            for (IssueOrderAddress vo : managementList) {
+            for (AddressInfo vo : managementList) {
                 if (!vo.getId().equals(entity.getId())) {
                     vo.setDefaultAddress(2);
                 }
@@ -112,7 +112,7 @@ public class AddressManagerImpl extends AbstractCommManager implements AddressMa
     @Override
     public void delete(AddressInfoRequestDTO dto) throws ManagerException {
         dto.validate();
-        IssueOrderAddress entity = repo.findById(dto.getId()).orElse(null);
+        AddressInfo entity = repo.findById(dto.getId()).orElse(null);
         if (entity == null) {
             throw new ManagerException("地址不存在");
         } else if (!dto.getOpenId().equals(entity.getOpenId())) {

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/repo/jpa/request/comm/IssueOrderAddressPageRequest.java → zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/repo/jpa/request/comm/AddressInfoPageRequest.java

@@ -2,7 +2,7 @@ package cn.com.taiji.iaw.repo.jpa.request.comm;
 
 import cn.com.taiji.common.pub.dao.HqlBuilder;
 import cn.com.taiji.common.repo.request.jpa.JpaDatePageableDataRequest;
-import cn.com.taiji.core.entity.issue.IssueOrderAddress;
+import cn.com.taiji.core.entity.comm.AddressInfo;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
@@ -12,13 +12,13 @@ import java.util.List;
 @Getter
 @Setter
 @Accessors(chain = true)
-public class IssueOrderAddressPageRequest extends JpaDatePageableDataRequest<IssueOrderAddress> {
+public class AddressInfoPageRequest extends JpaDatePageableDataRequest<AddressInfo> {
 
     private List<String> openIds; // openId列表
 
     @Override
     public HqlBuilder toSelectHql() {
-        HqlBuilder hql = new HqlBuilder("from " + IssueOrderAddress.class.getName() + " a where 1=1 AND status = 1");
+        HqlBuilder hql = new HqlBuilder("from " + AddressInfo.class.getName() + " a where 1=1 AND status = 1");
         hql.append(" and openId IN :openId", openIds);
         hql.append(" ORDER BY defaultAddress ASC, insertTime DESC");
         return hql;