From cc996d8db61f793e473bb9d0a3589285d0b1d38b Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Fri, 11 Apr 2025 18:47:12 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/mapper/WarehouseInfoMapper.java | 3 +- .../resources/mapper/WarehouseInfoMapper.xml | 3 ++ .../PlatformBuildExtraFieldResponse.java | 44 +++++++++++++++++++ .../store/service/WarehouseInfoService.java | 2 +- .../impl/WarehouseInfoServiceImpl.java | 4 +- .../webb/PCPlatformBuildController.java | 2 + .../webb/PCWarehouseInfoController.java | 5 ++- 7 files changed, 57 insertions(+), 6 deletions(-) create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/response/PlatformBuildExtraFieldResponse.java diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/WarehouseInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/WarehouseInfoMapper.java index d6a4273e1..af848df51 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/WarehouseInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/WarehouseInfoMapper.java @@ -1,6 +1,7 @@ package com.cool.store.mapper; import com.cool.store.entity.WarehouseInfoDO; +import org.apache.ibatis.annotations.Param; import tk.mybatis.mapper.common.Mapper; import java.util.List; @@ -13,5 +14,5 @@ import java.util.List; */ public interface WarehouseInfoMapper extends Mapper { - List getAllAndActive(); + List getAllAndActive(@Param("keyword") String keyword); } diff --git a/coolstore-partner-dao/src/main/resources/mapper/WarehouseInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/WarehouseInfoMapper.xml index 697bda07e..b25588537 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/WarehouseInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/WarehouseInfoMapper.xml @@ -13,5 +13,8 @@ \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/response/PlatformBuildExtraFieldResponse.java b/coolstore-partner-model/src/main/java/com/cool/store/response/PlatformBuildExtraFieldResponse.java new file mode 100644 index 000000000..e7a95bc84 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/response/PlatformBuildExtraFieldResponse.java @@ -0,0 +1,44 @@ +package com.cool.store.response; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author: WangShuo + * @Date: 2025/04/11/17:13 + * @Version 1.0 + * @注释: + */ +@Data +public class PlatformBuildExtraFieldResponse { + @ApiModelProperty("门店编码") + private String shopCode; + @ApiModelProperty("门店名称") + private String shopName; + @ApiModelProperty("加盟品牌") + private String franchiseBrand; + @ApiModelProperty("新管家对应组织") + private String xgjRegionName; + @ApiModelProperty("门店门头照片") + private String shopDoorwayPhoto; + @ApiModelProperty("门店内景照片") + private String shopInteriorPhoto; + @ApiModelProperty("营业执照照片") + private String creditUrl; + @ApiModelProperty("食品经营许可证") + private String foodBusinessLicenseUrl; + @ApiModelProperty("法人姓名") + private String legalName; + @ApiModelProperty("法人身份证正面") + private String legalIdCardFront; + @ApiModelProperty("法人身份证反面") + private String legalIdCardBack; + @ApiModelProperty("门店营业电话") + private String businessMobile; + @ApiModelProperty("门店省市区") + private String shopProvinceCityDistrict; + @ApiModelProperty("门店详细地址") + private String shopAddress; + + +} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/WarehouseInfoService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/WarehouseInfoService.java index 575910f91..aeee1cd85 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/WarehouseInfoService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/WarehouseInfoService.java @@ -12,5 +12,5 @@ import java.util.List; */ public interface WarehouseInfoService { - List getAllAndActive(); + List getAllAndActive(String keyword); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WarehouseInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WarehouseInfoServiceImpl.java index d496afc63..6462427f9 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WarehouseInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WarehouseInfoServiceImpl.java @@ -21,7 +21,7 @@ public class WarehouseInfoServiceImpl implements WarehouseInfoService { @Resource private WarehouseInfoMapper warehouseInfoMapper; @Override - public List getAllAndActive() { - return warehouseInfoMapper.getAllAndActive(); + public List getAllAndActive(String keyword) { + return warehouseInfoMapper.getAllAndActive(keyword); } } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCPlatformBuildController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCPlatformBuildController.java index 06a7b5960..b5d4807ee 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCPlatformBuildController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCPlatformBuildController.java @@ -89,4 +89,6 @@ public class PCPlatformBuildController { return ResponseResult.success(operationLogService.getAuditInfo(shopId, shopSubStageList)); } + + } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCWarehouseInfoController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCWarehouseInfoController.java index 731d9bd30..67bca1453 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCWarehouseInfoController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCWarehouseInfoController.java @@ -7,6 +7,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; @@ -28,7 +29,7 @@ public class PCWarehouseInfoController { @GetMapping("/getAllAndActive") @ApiOperation(value = "获取正新鸡排仓库配置") - public ResponseResult> getAllAndActive() { - return ResponseResult.success(warehouseInfoService.getAllAndActive()); + public ResponseResult> getAllAndActive(@RequestParam("keyword")String keyword ) { + return ResponseResult.success(warehouseInfoService.getAllAndActive(keyword)); } } From 841dcb1d0d815ad4f4f20d6c996575a3cc70d131 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Fri, 11 Apr 2025 18:57:10 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/cool/store/mapper/WarehouseInfoMapper.java | 2 ++ .../src/main/resources/mapper/WarehouseInfoMapper.xml | 3 +++ .../com/cool/store/response/BuildInformationResponse.java | 3 +++ .../cool/store/service/impl/BuildInformationServiceImpl.java | 5 +++++ 4 files changed, 13 insertions(+) diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/WarehouseInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/WarehouseInfoMapper.java index af848df51..b338fe0bd 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/WarehouseInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/WarehouseInfoMapper.java @@ -15,4 +15,6 @@ import java.util.List; public interface WarehouseInfoMapper extends Mapper { List getAllAndActive(@Param("keyword") String keyword); + + WarehouseInfoDO getByCode(@Param("code") String code); } diff --git a/coolstore-partner-dao/src/main/resources/mapper/WarehouseInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/WarehouseInfoMapper.xml index b25588537..ed40a8ffa 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/WarehouseInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/WarehouseInfoMapper.xml @@ -17,4 +17,7 @@ and ( warehouse_name like concat('%',#{keyword},'%')) + \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/response/BuildInformationResponse.java b/coolstore-partner-model/src/main/java/com/cool/store/response/BuildInformationResponse.java index 2730f0877..efc67da1c 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/response/BuildInformationResponse.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/response/BuildInformationResponse.java @@ -141,6 +141,9 @@ public class BuildInformationResponse { @ApiModelProperty(value = "报货物流仓库（编码）" ) private String declareGoodsLogisticsWarehouse; + @ApiModelProperty(value = "报货物流仓库" ) + private String declareGoodsLogisticsWarehouseName; + @ApiModelProperty(value = "报货日期" ) private String declareGoodsDate; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java index d04fdbafe..630c3b445 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java @@ -10,6 +10,7 @@ import com.cool.store.enums.UserRoleEnum; import com.cool.store.enums.point.ShopSubStageEnum; import com.cool.store.enums.point.ShopSubStageStatusEnum; import com.cool.store.exception.ServiceException; +import com.cool.store.mapper.WarehouseInfoMapper; import com.cool.store.request.BuildInformationRequest; import com.cool.store.response.BuildInformationResponse; import com.cool.store.service.BuildInformationService; @@ -53,6 +54,8 @@ public class BuildInformationServiceImpl implements BuildInformationService{ private UserAuthMappingService userAuthMappingService; @Autowired private OrderSysInfoDAO orderSysInfoDAO; + @Resource + private WarehouseInfoMapper warehouseInfoMapper; @Override public BuildInformationResponse getBuildInformation(Long shopId) { BuildInformationResponse response = new BuildInformationResponse(); @@ -91,6 +94,8 @@ public class BuildInformationServiceImpl implements BuildInformationService{ response.setReceivingMsBankAccount(orderSysInfoDO.getReceivingMsBankAccount()); response.setReceivingMsBankBranch(orderSysInfoDO.getReceivingMsBankBranch()); response.setBankUnionPayAccount(orderSysInfoDO.getBankUnionPayAccount()); + WarehouseInfoDO warehouseInfoDO = warehouseInfoMapper.getByCode(orderSysInfoDO.getDeclareGoodsLogisticsWarehouse()); + response.setDeclareGoodsLogisticsWarehouseName(warehouseInfoDO.getWarehouseName()); } return response;