diff --git a/db/800pjcloudx_hardware.sql b/db/800pjcloudx_hardware.sql index 2bbe880d5..fbf0a0cbe 100644 --- a/db/800pjcloudx_hardware.sql +++ b/db/800pjcloudx_hardware.sql @@ -105,6 +105,8 @@ CREATE TABLE hard_door_flow id bigint NOT NULL COMMENT '编号', user_id bigint NOT NULL COMMENT '用户编号', biz_type varchar(32) NOT NULL COMMENT '业务类型', + hard_door_id bigint DEFAULT NULL COMMENT '智能柜id', + cabinet_no int DEFAULT NULL COMMENT '货柜编号', order_id bigint DEFAULT NULL COMMENT '订单编号', auth_id bigint DEFAULT NULL COMMENT '授权编号', # 请求开门 @@ -367,6 +369,7 @@ CREATE TABLE hard_auth auth_type varchar(32) DEFAULT NULL COMMENT '授权类型如微信小程序、支付宝、浙政钉', user_id bigint NOT NULL COMMENT '预定用户', hard_id bigint NOT NULL COMMENT '硬件id', + cabinet_no int DEFAULT NULL COMMENT '货柜编号', auth_status char(1) DEFAULT '0' COMMENT '是否授权', auth_time datetime DEFAULT NULL COMMENT '授权时间', is_done char(1) DEFAULT '0' COMMENT '是否完成', diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/HardAuthAppDto.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/HardAuthAppDto.java index bc73575e5..4274a461a 100644 --- a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/HardAuthAppDto.java +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/HardAuthAppDto.java @@ -13,16 +13,10 @@ public class HardAuthAppDto { private Long userId; /** - * 智能柜设备id + * 授权id */ - @NotNull(message = "智能柜设备id不能为空") - private Long doorHardId; - - /** - * 货柜编号 - */ - @NotNull(message = "货柜编号不能为空") - private Integer cabinetNo; + @NotNull(message = "授权id不能为空") + private Long authId; /** * 是否授权 diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/HardDoorFlowOpenDto.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/HardDoorFlowOpenDto.java index 84180e1e5..555761f46 100644 --- a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/HardDoorFlowOpenDto.java +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/HardDoorFlowOpenDto.java @@ -2,7 +2,6 @@ package com.bsd.pjcloud.hard.api.dto; import com.bsd.pjcloud.hard.api.constant.HardDoorFlowEnum; import com.bsd.pjcloud.hard.api.constant.HardDoorOpenTypeEnum; -import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; import lombok.Data; @@ -21,6 +20,11 @@ public class HardDoorFlowOpenDto { @NotNull(message = "货柜编号不能为空") private Integer cabinetNo; + /** + * 智能柜子流程id + */ + private Long hardDoorFlowId; + /** * 流程类型 */ diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/HardGetAuthAppDto.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/HardGetAuthAppDto.java new file mode 100644 index 000000000..151512293 --- /dev/null +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/HardGetAuthAppDto.java @@ -0,0 +1,26 @@ +package com.bsd.pjcloud.hard.api.dto; + +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +@Data +public class HardGetAuthAppDto { + + /** + * 用户id + */ + private Long userId; + + /** + * 智能柜设备id + */ + @NotNull(message = "智能柜设备id不能为空") + private Long doorHardId; + + /** + * 货柜编号 + */ + @NotNull(message = "货柜编号不能为空") + private Integer cabinetNo; +} diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/spu/HardSpuJoinDto.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/spu/HardSpuJoinDto.java index a0224e31e..bd32dafdf 100644 --- a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/spu/HardSpuJoinDto.java +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/spu/HardSpuJoinDto.java @@ -5,4 +5,10 @@ import lombok.Data; @Data public class HardSpuJoinDto extends HardSpuJoinEntity { + + /** + * 是否有商品 + */ + private Boolean isSpu = false; + } diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/HardAuthEntity.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/HardAuthEntity.java index 9e0dbdd3e..131de71b3 100644 --- a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/HardAuthEntity.java +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/HardAuthEntity.java @@ -41,6 +41,12 @@ public class HardAuthEntity extends Model { @Schema(description = "硬件id") private Long hardId; + /** + * 货柜编号 + */ + @Schema(description = "货柜编号") + private Integer cabinetNo; + /** * 授权类型 */ diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/HardDoorFlowEntity.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/HardDoorFlowEntity.java index 045e7223a..8053f8557 100644 --- a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/HardDoorFlowEntity.java +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/HardDoorFlowEntity.java @@ -43,6 +43,18 @@ public class HardDoorFlowEntity extends Model { @Schema(description = "业务类型") private String bizType; + /** + * 智能柜id + */ + @Schema(description = "智能柜id") + private Long hardDoorId; + + /** + * 货柜编号 + */ + @Schema(description = "货柜编号") + private Integer cabinetNo; + /** * 订单编号 */ diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/HardGetAuthAppVo.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/HardGetAuthAppVo.java new file mode 100644 index 000000000..deb630cf2 --- /dev/null +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/HardGetAuthAppVo.java @@ -0,0 +1,18 @@ +package com.bsd.pjcloud.hard.api.vo; + +import lombok.Data; + +@Data +public class HardGetAuthAppVo { + + /** + * 授权id + */ + private Long authId; + + /** + * 授权信息 + */ + private String authDesc; + +} diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/HardAuthController.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/HardAuthController.java index f6118c23c..174e75f38 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/HardAuthController.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/HardAuthController.java @@ -11,8 +11,10 @@ import com.bsd.pjcloud.common.security.service.PjcloudUser; import com.bsd.pjcloud.common.security.util.SecurityUtils; import com.bsd.pjcloud.hard.api.dto.HardAuthAppDto; import com.bsd.pjcloud.hard.api.dto.HardAuthDto; +import com.bsd.pjcloud.hard.api.dto.HardGetAuthAppDto; import com.bsd.pjcloud.hard.api.entity.HardAuthEntity; import com.bsd.pjcloud.hard.api.vo.HardAuthVo; +import com.bsd.pjcloud.hard.api.vo.HardGetAuthAppVo; import com.bsd.pjcloud.hard.service.HardAuthService; import jakarta.validation.Valid; import org.springframework.security.access.prepost.PreAuthorize; @@ -41,6 +43,14 @@ public class HardAuthController { /* ************************************* start app start ************************************* */ + @Operation(summary = "app获取智能柜授权信息", description = "app获取智能柜授权信息") + @PostMapping("/app/get-auth-hard-door") + public R appGetAuthHardDoor(@Valid @RequestBody HardGetAuthAppDto dto) { + PjcloudUser user = SecurityUtils.getUser(); + dto.setUserId(user.getId()); + return R.ok(hardAuthService.appGetAuthHardDoor(dto)); + } + @Operation(summary = "app智能柜授权", description = "app智能柜授权") @PostMapping("/app/auth-hard-door") public R appAuthHardDoor(@Valid @RequestBody HardAuthAppDto dto) { diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardAuthService.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardAuthService.java index 2aecdcc16..0964bec58 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardAuthService.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardAuthService.java @@ -5,13 +5,21 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.bsd.pjcloud.common.data.datascope.DataScope; import com.bsd.pjcloud.hard.api.dto.HardAuthAppDto; import com.bsd.pjcloud.hard.api.dto.HardAuthDto; +import com.bsd.pjcloud.hard.api.dto.HardGetAuthAppDto; import com.bsd.pjcloud.hard.api.entity.HardAuthEntity; import com.bsd.pjcloud.hard.api.vo.HardAuthVo; +import com.bsd.pjcloud.hard.api.vo.HardGetAuthAppVo; +import jakarta.validation.Valid; public interface HardAuthService extends IService { Page scopePageJoin(Page page, HardAuthDto dto, DataScope dataScope); + /** + * app获取智能柜授权信息 + */ + HardGetAuthAppVo appGetAuthHardDoor(@Valid HardGetAuthAppDto dto); + /** * app智能柜授权 */ diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardDoorFlowService.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardDoorFlowService.java index 4d83685ee..2073568d5 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardDoorFlowService.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardDoorFlowService.java @@ -25,7 +25,7 @@ public interface HardDoorFlowService extends IService { /** * 购买开门 */ - void openDoorPay(HardDoorFlowOpenDto dto); + void openDoorPay(HardDoorFlowOpenDto dto, HardDoorManagerVo hardDoorDetail); /** * 上架开门 diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardDoorManagerService.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardDoorManagerService.java index 8268f7612..8b0eab83b 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardDoorManagerService.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardDoorManagerService.java @@ -17,6 +17,11 @@ public interface HardDoorManagerService extends IService */ HardDoorManagerVo getByHardId(Long hardId); + /** + * 根据硬件设备编号查询详情 + */ + HardDoorManagerVo getByDeviceCode(String deviceCode); + /** * 绑定设备 */ diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardSpuJoinService.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardSpuJoinService.java index 14880723c..3396cf18e 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardSpuJoinService.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardSpuJoinService.java @@ -10,4 +10,6 @@ import java.util.List; public interface HardSpuJoinService extends IService { List scopeList(HardSpuJoinDto dto); + + List getSpuList(Long hardDoorId, Integer cabinetNo); } \ No newline at end of file diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardAuthServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardAuthServiceImpl.java index d4a76a80b..e5cdb314e 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardAuthServiceImpl.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardAuthServiceImpl.java @@ -11,19 +11,24 @@ import com.bsd.pjcloud.common.core.util.CollectionUtils; import com.bsd.pjcloud.common.core.util.R; import com.bsd.pjcloud.common.data.datascope.DataScope; import com.bsd.pjcloud.hard.api.constant.HardAuthTypeEnum; +import com.bsd.pjcloud.hard.api.constant.HardDoorFlowEnum; +import com.bsd.pjcloud.hard.api.constant.HardDoorOpenTypeEnum; import com.bsd.pjcloud.hard.api.dto.HardAuthAppDto; import com.bsd.pjcloud.hard.api.dto.HardAuthDto; +import com.bsd.pjcloud.hard.api.dto.HardDoorFlowOpenDto; +import com.bsd.pjcloud.hard.api.dto.HardGetAuthAppDto; import com.bsd.pjcloud.hard.api.dto.manager.HardManagerDto; import com.bsd.pjcloud.hard.api.entity.HardAuthEntity; -import com.bsd.pjcloud.hard.api.entity.manager.HardDoorManagerEntity; import com.bsd.pjcloud.hard.api.entity.manager.HardManagerEntity; import com.bsd.pjcloud.hard.api.utils.HardUtil; import com.bsd.pjcloud.hard.api.vo.HardAuthVo; +import com.bsd.pjcloud.hard.api.vo.HardGetAuthAppVo; import com.bsd.pjcloud.hard.api.vo.manager.HardDoorManagerVo; import com.bsd.pjcloud.hard.mapper.HardAuthMapper; import com.bsd.pjcloud.hard.mapper.manager.HardDoorManagerMapper; import com.bsd.pjcloud.hard.mapper.manager.HardManagerMapper; import com.bsd.pjcloud.hard.service.HardAuthService; +import com.bsd.pjcloud.hard.service.HardDoorFlowService; import com.bsd.pjcloud.hard.service.HardDoorManagerService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -44,6 +49,7 @@ import java.util.List; public class HardAuthServiceImpl extends ServiceImpl implements HardAuthService { private final HardDoorManagerService hardDoorManagerService; + private final HardDoorFlowService hardDoorFlowService; private final HardManagerMapper hardManagerMapper; private final HardDoorManagerMapper hardDoorManagerMapper; @@ -57,23 +63,59 @@ public class HardAuthServiceImpl extends ServiceImpl list, HardAuthDto dto) { @@ -97,4 +139,26 @@ public class HardAuthServiceImpl extends ServiceImpl spuList = hardSpuJoinService.getSpuList(hardDoorDetail.getId(), dto.getCabinetNo()); + if (ObjectUtil.isEmpty(spuList) || spuList.isEmpty()) throw new RuntimeException("货柜商品信息为空,请上架"); + DoorOpenDto openDto = new DoorOpenDto(); + openDto.setDeviceCode(hardDoorDetail.getDeviceCode()); + openDto.setCabinetNo(dto.getCabinetNo()); + openDto.setOutOpenNo(String.valueOf(dto.getHardDoorFlowId())); + DoorOpenVo openVo = thirdDoorApiService.open(openDto).getData(); + if (ObjectUtil.isEmpty(openVo) || !openVo.isSuccess()) { + throw new RuntimeException("开门失败"); + } + HardDoorFlowEntity updateObj = HardDoorFlowEntity.builder() + .id(dto.getHardDoorFlowId()) + .hardDoorId(dto.getHardDoorId()) + .cabinetNo(dto.getCabinetNo()) + .requestOpenDto(JSONUtil.toJsonStr(dto)) + .requestOpenVo(JSONUtil.toJsonStr(openVo)) + .build(); + baseMapper.updateById(updateObj); } /** @@ -156,15 +193,41 @@ public class HardDoorFlowServiceImpl extends ServiceImpl videoList = dto.getVideoList().stream().map(DoorVideoCallbackDto.Video::getVideoUrl).toList(); + // 提交柜子商品信息 + List spuList = hardSpuJoinService.getSpuList(flowDetail.getHardDoorId(), flowDetail.getCabinetNo()); + Map ksMap = new HashMap<>(); + List> ksSpuMap = new ArrayList<>(); + for (HardSpuJoinVo v : spuList) { + if (ObjectUtil.isEmpty(v.getSpuDetail())) continue; + Map map = new HashMap<>(); + map.put("sku_id", v.getSpuDetail().getKsSkuId()); + map.put("floor_num", v.getHardDoorNumber()); + ksSpuMap.add(map); + } + ksMap.put("origin_time", System.currentTimeMillis()); + ksMap.put("sku_scope", ksSpuMap); // 更新流程 - HardDoorFlowEntity updateObj = HardDoorFlowEntity.builder() - .id(flowDetail.getId()) - .videoCallbackVo(JSONUtil.toJsonStr(dto)) - .videoCallbackTime(LocalDateTime.now()) - .build(); - baseMapper.updateById(updateObj); + HardDoorFlowEntity vodeoUpdateObj = HardDoorFlowEntity.builder().id(flowDetail.getId()).videoCallbackVo(JSONUtil.toJsonStr(dto)).videoCallbackTime(LocalDateTime.now()).build(); + baseMapper.updateById(vodeoUpdateObj); // 提交识别 - + KsRecognitionDto ksRecognitionDto = new KsRecognitionDto(); + ksRecognitionDto.setRecog_id(String.valueOf(flowDetail.getId())); + ksRecognitionDto.setExtra_params(JSONUtil.toJsonStr(ksMap)); + ksRecognitionDto.setResource_type("1"); + ksRecognitionDto.setResource_urls(JSONUtil.toJsonStr(videoList)); + // third服务生成 + ksRecognitionDto.setNotify_url(""); + ksRecognitionDto.setSub_mch_id(String.valueOf(flowDetail.getOrderId())); + KsRecognitionVo ksRecognitionVo = thirdKsService.recognition(ksRecognitionDto).getData(); + if (ObjectUtil.isEmpty(ksRecognitionVo) || !ksRecognitionVo.isSuccess()) { + log.info("|{}|disposeVideoCallback 提交识别错误dto|{}|vo|{}|", TAG, JSONUtil.toJsonStr(ksRecognitionDto), JSONUtil.toJsonStr(ksRecognitionVo)); + return; + } + // 更新流程 + HardDoorFlowEntity ksSubmitUpdateObj = HardDoorFlowEntity.builder().id(flowDetail.getId()).skuSubmitDto(JSONUtil.toJsonStr(ksRecognitionDto)).skuSubmitVo(JSONUtil.toJsonStr(ksRecognitionVo)).skuSubmitTime(LocalDateTime.now()).build(); + baseMapper.updateById(ksSubmitUpdateObj); } /** @@ -173,7 +236,18 @@ public class HardDoorFlowServiceImpl extends ServiceImpl() + .eq(HardDoorManagerEntity::getDeviceCode, deviceCode) + ); + if (ObjectUtil.isEmpty(hardDoor)) return null; + HardDoorManagerVo hardDoorVo = BeanUtil.toBean(hardDoor, HardDoorManagerVo.class); + if (ObjectUtil.isNotEmpty(hardDoorVo)) { + List cabinetList = hardDoorCabinetService.getListByHardDoorId(hardDoor.getId()); + if (ObjectUtil.isNotEmpty(cabinetList)) { + hardDoorVo.setCabinetList(cabinetList); + } + } + return hardDoorVo; + } + /** * 绑定设备 */ diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/spu/HardSpuJoinServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/spu/HardSpuJoinServiceImpl.java index e78e9dc22..8ef814549 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/spu/HardSpuJoinServiceImpl.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/spu/HardSpuJoinServiceImpl.java @@ -33,9 +33,10 @@ public class HardSpuJoinServiceImpl extends ServiceImpl scopeList(HardSpuJoinDto dto) { List list = baseMapper.selectList(new LambdaQueryWrapper() - .eq(HardSpuJoinEntity::getHardDoorNumber, dto.getHardDoorNumber()) - .eq(HardSpuJoinEntity::getHardDoorId, dto.getHardDoorId()) - .eq(HardSpuJoinEntity::getCabinetNo, dto.getCabinetNo()) + .eq(ObjectUtil.isNotEmpty(dto.getHardDoorNumber()), HardSpuJoinEntity::getHardDoorNumber, dto.getHardDoorNumber()) + .eq(ObjectUtil.isNotEmpty(dto.getHardDoorId()), HardSpuJoinEntity::getHardDoorId, dto.getHardDoorId()) + .eq(ObjectUtil.isNotEmpty(dto.getCabinetNo()), HardSpuJoinEntity::getCabinetNo, dto.getCabinetNo()) + .isNotNull(ObjectUtil.isNotEmpty(dto.getIsSpu()) && dto.getIsSpu(), HardSpuJoinEntity::getSpuId) .orderByDesc(HardSpuJoinEntity::getSpuId) ); if (ObjectUtil.isEmpty(list)) return List.of(); @@ -51,4 +52,12 @@ public class HardSpuJoinServiceImpl extends ServiceImpl getSpuList(Long hardDoorId, Integer cabinetNo) { + HardSpuJoinDto queryDto = new HardSpuJoinDto(); + queryDto.setHardDoorId(hardDoorId); + queryDto.setCabinetNo(String.valueOf(cabinetNo)); + return scopeList(queryDto); + } } \ No newline at end of file diff --git a/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/vo/ks/KsRecognitionVo.java b/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/vo/ks/KsRecognitionVo.java index 9a2820771..5fb5030fc 100644 --- a/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/vo/ks/KsRecognitionVo.java +++ b/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/vo/ks/KsRecognitionVo.java @@ -3,7 +3,7 @@ package com.bsd.pjcloud.thirdparty.vo.ks; import lombok.Data; @Data -public class KsRecognitionVo { +public class KsRecognitionVo extends KsBaseInnerVo { /** * 识别任务唯一ID，用于结果获取、重新发起售后识别 diff --git a/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/vo/ks/KsSkuSubmitVo.java b/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/vo/ks/KsSkuSubmitVo.java index a2ed32c81..78d2a05ad 100644 --- a/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/vo/ks/KsSkuSubmitVo.java +++ b/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/vo/ks/KsSkuSubmitVo.java @@ -3,7 +3,7 @@ package com.bsd.pjcloud.thirdparty.vo.ks; import lombok.Data; @Data -public class KsSkuSubmitVo { +public class KsSkuSubmitVo extends KsBaseInnerVo { private String ks_sku_id;