diff --git a/db/800pjcloudx_hardware.sql b/db/800pjcloudx_hardware.sql index 416b038d5..e050e7d03 100644 --- a/db/800pjcloudx_hardware.sql +++ b/db/800pjcloudx_hardware.sql @@ -52,11 +52,13 @@ CREATE TABLE hard_door_manager power_status int DEFAULT NULL COMMENT '1：通电；2：断电', net_status int DEFAULT NULL COMMENT '在线状态。1：在线；2：离线', sale_status int DEFAULT NULL COMMENT '售卖状态。1：在售；2：停售', + sim_sn varchar(32) NOT NULL COMMENT 'sim 卡号。设备有上报会返回，若一次上报都没有，则返回 null', signal_intensity int DEFAULT NULL COMMENT 'sim 信号强度。大于-95 表示信号强度好；-95 到-105 表示信号强度中等；小于-105 表示信号差；', signal_ratio int DEFAULT NULL COMMENT '信噪比，体现信道传输质量的参数。大于 15 表示质量好；15 到 0 表示质量中等；小于等于 0 表示质量差；', - signal_time int DEFAULT NULL COMMENT 'sim 信号值更新时间。yyyy-MM-dd HH:mm:ss', - cabinet_list text DEFAULT NULL COMMENT '货柜列表JSON', + signal_time datetime DEFAULT NULL COMMENT 'sim 信号值更新时间。yyyy-MM-dd HH:mm:ss', restart_time datetime DEFAULT NULL COMMENT '上次重启时间', + system_volume int DEFAULT 0 COMMENT '系统音量', + media_volume int DEFAULT 0 COMMENT '媒体音量', create_by varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', create_time datetime DEFAULT NULL COMMENT '创建时间', update_by varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '修改人', @@ -68,6 +70,87 @@ CREATE TABLE hard_door_manager DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT ='柜子设备管理'; +-- ---------------------------- +-- Table structure for hard_door_cabinet +-- ---------------------------- +DROP TABLE IF EXISTS `hard_door_cabinet`; +CREATE TABLE hard_door_cabinet +( + id bigint NOT NULL COMMENT '编号', + hard_door_id bigint NOT NULL COMMENT '智能柜编号', + cabinet_no int NOT NULL COMMENT '货柜编号(1,2)', + is_lock_online varchar(16) NOT NULL COMMENT '锁在线1:在线;2:离线;', + lock_status int NOT NULL COMMENT '锁状态1:开锁;2:关锁;', + door_status int NOT NULL COMMENT '门状态1:门关;2:门开', + sale_status int NOT NULL COMMENT '货柜售卖状态1:在售;2:停售', + qr_code varchar(256) DEFAULT NULL COMMENT '二维码', + # 其他字段 + create_by varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + create_time datetime DEFAULT NULL COMMENT '创建时间', + update_by varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '修改人', + update_time datetime DEFAULT NULL COMMENT '修改时间', + del_flag char(1) COLLATE utf8mb4_general_ci DEFAULT '0' COMMENT '删除标记', + tenant_id bigint DEFAULT NULL COMMENT '租户ID', + PRIMARY KEY (id) +) ENGINE = InnoDB + DEFAULT CHARSET = utf8mb4 + COLLATE = utf8mb4_general_ci COMMENT ='智能柜货柜'; + +-- ---------------------------- +-- Table structure for hard_door_flow +-- ---------------------------- +DROP TABLE IF EXISTS `hard_door_flow`; +CREATE TABLE hard_door_flow +( + id bigint NOT NULL COMMENT '编号', + user_id bigint NOT NULL COMMENT '用户编号', + biz_type varchar(32) NOT NULL COMMENT '业务类型', + hard_id bigint DEFAULT NULL COMMENT '硬件id', + 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 '授权编号', + # 请求开门 + request_open_dto varchar(512) DEFAULT NULL COMMENT '请求开门参数', + request_open_vo varchar(512) DEFAULT NULL COMMENT '请求开门返回', + request_open_time datetime DEFAULT NULL COMMENT '请求开门时间', + # 请求开门回调 + is_open varchar(32) DEFAULT NULL COMMENT '是否开门', + open_callback_time datetime DEFAULT NULL COMMENT '开门回调时间', + open_callback_vo varchar(512) DEFAULT NULL COMMENT '开门回调结果', + # 视频回调 + video_callback_vo varchar(512) DEFAULT NULL COMMENT '视频回调结果', + video_callback_time datetime DEFAULT NULL COMMENT '视频回调时间', + # sku识别 + sku_submit_dto varchar(512) DEFAULT NULL COMMENT 'sku识别提交参数', + sku_submit_vo varchar(512) DEFAULT NULL COMMENT 'sku识别提交结果', + sku_submit_recog_id varchar(32) DEFAULT NULL COMMENT 'sku识别提交id(用于查询)', + sku_submit_time datetime DEFAULT NULL COMMENT 'sku识别提交时间', + # sku识别回调 + sku_callback_vo varchar(512) DEFAULT NULL COMMENT 'sku识别回调结果', + sku_callback_time datetime DEFAULT NULL COMMENT 'sku识别回调时间', + # sku主动获取 + sku_driving_dto varchar(512) DEFAULT NULL COMMENT 'sku识别主动获取参数', + sku_driving_vo varchar(512) DEFAULT NULL COMMENT 'sku识别主动获取结果', + sku_driving_time datetime DEFAULT NULL COMMENT 'sku识别主动获取时间', + # 流程相关 + flow_status varchar(32) DEFAULT NULL COMMENT '流程状态', + error varchar(512) DEFAULT NULL COMMENT '流程错误信息', + error_desc varchar(64) DEFAULT NULL COMMENT '流程错误描述(展示)', + # 购买成功 + pay_time datetime DEFAULT NULL COMMENT '购买成功时间', + # 其他字段 + create_by varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + create_time datetime DEFAULT NULL COMMENT '创建时间', + update_by varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '修改人', + update_time datetime DEFAULT NULL COMMENT '修改时间', + del_flag char(1) COLLATE utf8mb4_general_ci DEFAULT '0' COMMENT '删除标记', + tenant_id bigint DEFAULT NULL COMMENT '租户ID', + PRIMARY KEY (id) +) ENGINE = InnoDB + DEFAULT CHARSET = utf8mb4 + COLLATE = utf8mb4_general_ci COMMENT ='柜子订单流程'; + -- ---------------------------- -- Table structure for hard_group -- ---------------------------- @@ -266,6 +349,7 @@ CREATE TABLE hard_broadcast user_id bigint NOT NULL COMMENT '预定用户', hard_id bigint NOT NULL COMMENT '硬件id', topic varchar(128) NOT NULL COMMENT 'mq主题', + biz_type varchar(64) NOT NULL COMMENT '关联业务类型', biz_id varchar(64) NOT NULL COMMENT '关联业务编号', title varchar(64) NOT NULL COMMENT '预定标题', content varchar(128) NOT NULL COMMENT '广播内容', @@ -289,20 +373,24 @@ CREATE TABLE hard_broadcast DROP TABLE IF EXISTS hard_auth; CREATE TABLE hard_auth ( - id bigint NOT NULL AUTO_INCREMENT COMMENT '编号', - auth_type varchar(32) DEFAULT NULL COMMENT '授权类型如微信小程序、支付宝、浙政钉', - user_id bigint NOT NULL COMMENT '预定用户', - hard_id bigint NOT NULL COMMENT '硬件id', - auth_status char(1) DEFAULT '0' COMMENT '是否授权', - auth_time datetime DEFAULT NULL COMMENT '授权时间', - is_done char(1) DEFAULT '0' COMMENT '是否完成', - is_done_time datetime DEFAULT NULL COMMENT '完成时间', - create_by varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', - create_time datetime DEFAULT NULL COMMENT '创建时间', - update_by varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '修改人', - update_time datetime DEFAULT NULL COMMENT '修改时间', - del_flag char(1) COLLATE utf8mb4_general_ci DEFAULT '0' COMMENT '删除标记', - tenant_id bigint DEFAULT NULL COMMENT '租户ID', + id bigint NOT NULL AUTO_INCREMENT COMMENT '编号', + 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 '是否完成', + is_done_time datetime DEFAULT NULL COMMENT '完成时间', + is_manual_change varchar(32) DEFAULT NULL COMMENT '是否人工处理', + manual_change_time datetime DEFAULT NULL COMMENT '人工处理时间', + manual_change_remark varchar(512) DEFAULT NULL COMMENT '人工处理备注', + create_by varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + create_time datetime DEFAULT NULL COMMENT '创建时间', + update_by varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '修改人', + update_time datetime DEFAULT NULL COMMENT '修改时间', + del_flag char(1) COLLATE utf8mb4_general_ci DEFAULT '0' COMMENT '删除标记', + tenant_id bigint DEFAULT NULL COMMENT '租户ID', PRIMARY KEY (id) ) ENGINE = InnoDB COMMENT ='硬件授权'; @@ -313,9 +401,10 @@ DROP TABLE IF EXISTS hard_spu; CREATE TABLE hard_spu ( id bigint NOT NULL AUTO_INCREMENT COMMENT '编号', - spu_category_id bigint NOT NULL COMMENT '商品分类id', + spu_category_id bigint DEFAULT NULL COMMENT '商品分类id', name varchar(64) NOT NULL COMMENT '商品名', - pic varchar(256) NOT NULL COMMENT '商品图片', + cover varchar(256) NOT NULL COMMENT '商品封面图片', + pic varchar(1024) NOT NULL COMMENT '商品图片用于识别', price int NOT NULL COMMENT '单价(分)', sales_count int DEFAULT 0 NOT NULL COMMENT '销量', repertory_count int DEFAULT 0 NOT NULL COMMENT '库存', @@ -325,13 +414,16 @@ CREATE TABLE hard_spu specs_taste varchar(128) DEFAULT NULL COMMENT '规格-口味', specs_capacity varchar(128) DEFAULT NULL COMMENT '规格-容量', specs_weight varchar(128) DEFAULT NULL COMMENT '规格-重量', - sku_type varchar(32) DEFAULT NULL COMMENT 'sku类型,0:标准库;1:私有库 ', + sku_type varchar(32) DEFAULT NULL COMMENT 'sku类型,0:标准库;1:私有库', + ks_sku_id varchar(32) DEFAULT NULL COMMENT '旷世skuid', + ks_res_sku_id varchar(32) DEFAULT NULL COMMENT '旷世返回的业务方sku_id', ks_barcode varchar(32) DEFAULT NULL COMMENT '69码', ks_has_sub_sku varchar(128) DEFAULT NULL COMMENT '是否为集合SKU', - ks_sub_sku text DEFAULT NULL COMMENT '集合SKU的子SKU信息', + ks_sub_sku_json text DEFAULT NULL COMMENT '集合SKU的子SKU信息JSON', ks_status char(1) DEFAULT NULL COMMENT '旷世审核状态', ks_status_title varchar(64) DEFAULT NULL COMMENT '旷世审核状态标题', ks_comments varchar(512) DEFAULT NULL COMMENT '旷世审核状态描述', + version int DEFAULT 0 NOT NULL COMMENT '乐观锁', create_by varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', create_time datetime DEFAULT NULL COMMENT '创建时间', update_by varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '修改人', @@ -389,10 +481,10 @@ CREATE TABLE hard_spu_repertory ( id bigint NOT NULL AUTO_INCREMENT COMMENT '编号', user_id bigint NOT NULL COMMENT '用户id', - hard_id bigint NOT NULL COMMENT '设备id', spu_id bigint NOT NULL COMMENT '商品id', before_count int NOT NULL COMMENT '更新前的库存数量', count int DEFAULT 0 COMMENT '更新库存数量', + biz_id bigint DEFAULT NULL COMMENT '上架业务关联id', biz_type tinytext NOT NULL COMMENT '上架类型', create_by varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', create_time datetime DEFAULT NULL COMMENT '创建时间', diff --git a/db/800pjcloudx_wallet.sql b/db/800pjcloudx_wallet.sql index e32f569cb..ac38462b1 100644 --- a/db/800pjcloudx_wallet.sql +++ b/db/800pjcloudx_wallet.sql @@ -415,6 +415,7 @@ CREATE TABLE wallet_code_use status char(1) DEFAULT '0' NOT NULL COMMENT '是否使用', code varchar(1024) DEFAULT NULL COMMENT '二维码', code_content varchar(1024) DEFAULT NULL COMMENT '二维码内容', + short_code varchar(32) DEFAULT '' COMMENT '短码', use_time timestamp NULL COMMENT '使用时间', create_by varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', create_time datetime DEFAULT NULL COMMENT '创建时间', diff --git a/pjcloud-common/pjcloud-common-core/src/main/java/com/bsd/pjcloud/common/core/constant/enums/MerchantTypeEnum.java b/pjcloud-common/pjcloud-common-core/src/main/java/com/bsd/pjcloud/common/core/constant/enums/MerchantTypeEnum.java index 81fb03f69..e65f74aad 100644 --- a/pjcloud-common/pjcloud-common-core/src/main/java/com/bsd/pjcloud/common/core/constant/enums/MerchantTypeEnum.java +++ b/pjcloud-common/pjcloud-common-core/src/main/java/com/bsd/pjcloud/common/core/constant/enums/MerchantTypeEnum.java @@ -6,7 +6,8 @@ import lombok.RequiredArgsConstructor; @RequiredArgsConstructor @Getter public enum MerchantTypeEnum { - CANTEEN("1", "食堂"), + OTHER_CANTEEN("0", "其他食堂"), + CANTEEN("1", "自营食堂"), SUPERMARKET("2", "合作商家"), SELF_SUPERMARKET("3", "自营商家"), ; diff --git a/pjcloud-hardware/pjcloud-hardware-api/pom.xml b/pjcloud-hardware/pjcloud-hardware-api/pom.xml index e83d25029..f52a08999 100644 --- a/pjcloud-hardware/pjcloud-hardware-api/pom.xml +++ b/pjcloud-hardware/pjcloud-hardware-api/pom.xml @@ -52,5 +52,11 @@ org.apache.commons commons-lang3 + + com.bsd + pjcloud-thirdparty-api + 5.7.0 + compile + diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/constant/HardAuthTypeEnum.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/constant/HardAuthTypeEnum.java new file mode 100644 index 000000000..3b2ac1d89 --- /dev/null +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/constant/HardAuthTypeEnum.java @@ -0,0 +1,27 @@ +package com.bsd.pjcloud.hard.api.constant; + + +import cn.hutool.core.util.ObjectUtil; +import lombok.AllArgsConstructor; +import lombok.Getter; + +import java.util.Arrays; + +/** + * 硬件授权类型 + */ +@AllArgsConstructor +@Getter +public enum HardAuthTypeEnum { + + HARD_DDOR_AUTH("10", "智能柜授权"), + ; + private final String type; + private final String description; + + public static HardAuthTypeEnum valueOfByType(String type) { + if (ObjectUtil.isEmpty(type)) return null; + return Arrays.stream(values()).filter(v -> ObjectUtil.equals(type, v.getType())).findFirst().get(); + } + +} diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/constant/HardBroadcastEnum.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/constant/HardBroadcastEnum.java new file mode 100644 index 000000000..208d2a45f --- /dev/null +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/constant/HardBroadcastEnum.java @@ -0,0 +1,24 @@ +package com.bsd.pjcloud.hard.api.constant; + +import cn.hutool.core.util.ObjectUtil; +import lombok.AllArgsConstructor; +import lombok.Getter; + +import java.util.Arrays; + +/** + * 硬件广播类型 + */ +@AllArgsConstructor +@Getter +public enum HardBroadcastEnum { + OFFLINE_CANTEEN_RESERVE("1", "线下食堂订餐广播"), + ; + private final String type; + private final String description; + + public static HardBroadcastEnum valueOfByType(String type) { + if (ObjectUtil.isEmpty(type)) return null; + return Arrays.stream(values()).filter(v -> ObjectUtil.equals(type, v.getType())).findFirst().get(); + } +} diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/constant/HardDoorOpenTypeEnum.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/constant/HardDoorOpenTypeEnum.java new file mode 100644 index 000000000..cba8a33d4 --- /dev/null +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/constant/HardDoorOpenTypeEnum.java @@ -0,0 +1,31 @@ +package com.bsd.pjcloud.hard.api.constant; + +import cn.hutool.core.util.ObjectUtil; +import lombok.AllArgsConstructor; +import lombok.Getter; + +import java.util.Arrays; +import java.util.List; + +/** + * 开门类型 + */ +@AllArgsConstructor +@Getter +public enum HardDoorOpenTypeEnum { + RECORD_VIDEO("1", "录制视频"), + NO_RECORD_VIDEO("4", "不录制视频"), + MAINTENANCE_UNLOCK("5", "检修开锁"), + MAINTENANCE_LOCK("6", "检修关锁");; + private final String type; + private final String description; + + public static List getMaintenanceListCodes() { + return List.of(MAINTENANCE_UNLOCK.getType(), MAINTENANCE_LOCK.getType()); + } + + public static HardDoorOpenTypeEnum valueOfByType(String type) { + if (ObjectUtil.isEmpty(type)) return null; + return Arrays.stream(values()).filter(v -> ObjectUtil.equals(type, v.getType())).findFirst().get(); + } +} diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/constant/flow/HardDoorFlowBizEnum.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/constant/flow/HardDoorFlowBizEnum.java new file mode 100644 index 000000000..686ea367f --- /dev/null +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/constant/flow/HardDoorFlowBizEnum.java @@ -0,0 +1,26 @@ +package com.bsd.pjcloud.hard.api.constant.flow; + +import cn.hutool.core.util.ObjectUtil; +import lombok.AllArgsConstructor; +import lombok.Getter; + +import java.util.Arrays; + +/** + * 智能柜开门流程 + */ +@AllArgsConstructor +@Getter +public enum HardDoorFlowBizEnum { + PAY_OPEN("10", "购买开门"), + REPERTORY_OPEN("20", "上架开门"), + ACCESS_OPEN("30", "检修开门"), + ; + private final String type; + private final String description; + + public static HardDoorFlowBizEnum valueOfByType(String type) { + if (ObjectUtil.isEmpty(type)) return null; + return Arrays.stream(values()).filter(v -> ObjectUtil.equals(type, v.getType())).findFirst().get(); + } +} diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/constant/flow/HardDoorFlowEnum.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/constant/flow/HardDoorFlowEnum.java new file mode 100644 index 000000000..4511e3cd2 --- /dev/null +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/constant/flow/HardDoorFlowEnum.java @@ -0,0 +1,39 @@ +package com.bsd.pjcloud.hard.api.constant.flow; + +import cn.hutool.core.util.ObjectUtil; +import lombok.AllArgsConstructor; +import lombok.Getter; + +import java.util.Arrays; + +/** + * 智能柜流程 + */ +@AllArgsConstructor +@Getter +public enum HardDoorFlowEnum { + FLOW_AUTH("10", "用户授权", "20"), + FLOW_APPLY_OPEN("20", "智能柜申请开门", "30"), + FLOW_CALLBACK_OPEN("30", "智能柜开门响应", "40"), + FLOW_CALLBACK_VIDEO("40", "智能柜视频回调", "50"), + FLOW_SUBMIT_RECOGNITION("50", "旷世提交识别", "60"), + FLOW_CALLBACK_RECOGNITION("60", "旷世识别响应", "70"), + FLOW_PAY_ORDER("70", "订单结算", null), + ; + private final String type; + private final String description; + private final String nextType; + + public static HardDoorFlowEnum valueOfByType(String type) { + if (ObjectUtil.isEmpty(type)) return null; + return Arrays.stream(values()).filter(v -> ObjectUtil.equals(type, v.getType())).findFirst().get(); + } + + public static HardDoorFlowEnum getNextType(HardDoorFlowEnum type) { + if (ObjectUtil.isEmpty(type)) return null; + HardDoorFlowEnum currentFlow = valueOfByType(type.getType()); + if (ObjectUtil.isEmpty(currentFlow) || ObjectUtil.isEmpty(currentFlow.getNextType())) return null; + return valueOfByType(currentFlow.getNextType()); + } + +} diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/constant/order/HardOrderStatusEnum.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/constant/order/HardOrderStatusEnum.java index 7f3596b26..dead384ac 100644 --- a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/constant/order/HardOrderStatusEnum.java +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/constant/order/HardOrderStatusEnum.java @@ -19,6 +19,7 @@ public enum HardOrderStatusEnum { OFFLINE_PAY("6", "没有网络本地支付"), REFUND("10", "退款"), CANCEL("20", "已核销"), + UNFOLLOW("30", "已取消(智能柜使用)"), ; private final String type; private final String description; diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/constant/order/HardPayTypeEnum.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/constant/order/HardPayTypeEnum.java index 46b997263..e051ec26a 100644 --- a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/constant/order/HardPayTypeEnum.java +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/constant/order/HardPayTypeEnum.java @@ -23,6 +23,7 @@ public enum HardPayTypeEnum { FOREIGN_TICKET_QR_CODE("6", "外来人员二维码支付"), RESERVE_QR_CODE("7", "线上订餐二维码支付"), CASH("8", "现金支付"), + HARD_DOOR_FREE_PAY("9", "智能柜免密支付"), ; private final String type; private final String description; diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/constant/spu/HardSpuRepertoryTypeEnum.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/constant/spu/HardSpuRepertoryTypeEnum.java index 0efb77ebf..ebd15f5c3 100644 --- a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/constant/spu/HardSpuRepertoryTypeEnum.java +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/constant/spu/HardSpuRepertoryTypeEnum.java @@ -13,7 +13,7 @@ import java.util.Arrays; @Getter public enum HardSpuRepertoryTypeEnum { HANDLER("10", "手动上架"), - AUTO("20", "自动上架"), + PERSION("20", "上架员上架"), ; private final String type; private final String description; 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 new file mode 100644 index 000000000..4274a461a --- /dev/null +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/HardAuthAppDto.java @@ -0,0 +1,27 @@ +package com.bsd.pjcloud.hard.api.dto; + +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +@Data +public class HardAuthAppDto { + + /** + * 用户id + */ + private Long userId; + + /** + * 授权id + */ + @NotNull(message = "授权id不能为空") + private Long authId; + + /** + * 是否授权 + */ + @NotEmpty(message = "是否授权不能为空") + private String authStatus; + +} diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/HardDoorFlowDto.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/HardDoorFlowDto.java new file mode 100644 index 000000000..37ec0c8fe --- /dev/null +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/HardDoorFlowDto.java @@ -0,0 +1,13 @@ +package com.bsd.pjcloud.hard.api.dto; + +import com.bsd.pjcloud.hard.api.entity.HardDoorFlowEntity; +import lombok.Data; + +import java.time.LocalDate; + +@Data +public class HardDoorFlowDto extends HardDoorFlowEntity { + + private LocalDate[] createTimeList; + +} 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 new file mode 100644 index 000000000..5f54cfff6 --- /dev/null +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/HardDoorFlowOpenDto.java @@ -0,0 +1,48 @@ +package com.bsd.pjcloud.hard.api.dto; + +import com.bsd.pjcloud.hard.api.constant.flow.HardDoorFlowBizEnum; +import com.bsd.pjcloud.hard.api.constant.HardDoorOpenTypeEnum; +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +@Data +public class HardDoorFlowOpenDto { + + /** + * 柜子id + */ + @NotNull(message = "hardDoorId不能为空") + private Long hardDoorId; + + /** + * 智能柜编号 + */ + @NotNull(message = "货柜编号不能为空") + private Integer cabinetNo; + + /** + * 智能柜子流程id + */ + private Long hardDoorFlowId; + + /** + * 流程类型 + */ + private HardDoorFlowBizEnum flowType; + + /** + * 开门操作类型 + */ + private HardDoorOpenTypeEnum openType; + + /** + * 开门用户id + */ + private Long userId; + + /** + * 授权id + */ + private Long authId; + +} 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/order/HardAdminRefundDto.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardAdminRefundDto.java index 1e2d46b6f..754c80203 100644 --- a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardAdminRefundDto.java +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardAdminRefundDto.java @@ -22,7 +22,8 @@ public class HardAdminRefundDto { @Schema(description = "相关描述") private String applyDescription; - @Schema(description="补充凭证图片") + @Schema(description = "补充凭证图片") + @NotNull(message = "补充凭证图片不能为空") private String applyPicUrls; } diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/spu/DeductionSpuRepertoryDto.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/spu/DeductionSpuRepertoryDto.java new file mode 100644 index 000000000..2512548ac --- /dev/null +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/spu/DeductionSpuRepertoryDto.java @@ -0,0 +1,37 @@ +package com.bsd.pjcloud.hard.api.dto.spu; + +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import org.springframework.web.bind.annotation.RequestParam; + +import java.util.List; + + +@Data +public class DeductionSpuRepertoryDto { + + /** + * 流程id + */ + @NotNull(message = "流程id不能为空") + private Long flowId; + + /** + * 上架数量 + */ + @NotEmpty(message = "商品列表不能为空") + private List list; + + @Data + public static class Item { + + @NotNull(message = "商品id不能为空") + private Long hardSpuId; + + @NotNull(message = "增加库存不能为空") + private Integer plusCount; + + } + +} diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/spu/DeductionSpuStockDto.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/spu/DeductionSpuStockDto.java new file mode 100644 index 000000000..691dca346 --- /dev/null +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/spu/DeductionSpuStockDto.java @@ -0,0 +1,15 @@ +package com.bsd.pjcloud.hard.api.dto.spu; + +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +import java.util.List; + +@Data +public class DeductionSpuStockDto { + + private Long hardSpuId; + + private Integer incrCount; + +} diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/spu/HardPutawayDto.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/spu/HardPutawayDto.java new file mode 100644 index 000000000..2565a3ebd --- /dev/null +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/spu/HardPutawayDto.java @@ -0,0 +1,21 @@ +package com.bsd.pjcloud.hard.api.dto.spu; + +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +@Data +public class HardPutawayDto { + + /** + * 绑定id + */ + @NotNull(message = "绑定id不能为空") + private Long id; + + /** + * 商品id + */ + @NotNull(message = "商品id") + private Long hardSpuId; + +} diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/spu/HardSpuDto.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/spu/HardSpuDto.java index dc5fbface..d5940b6d3 100644 --- a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/spu/HardSpuDto.java +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/spu/HardSpuDto.java @@ -1,18 +1,12 @@ package com.bsd.pjcloud.hard.api.dto.spu; import com.bsd.pjcloud.hard.api.entity.spu.HardSpuEntity; -import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; -import lombok.NoArgsConstructor; import java.time.LocalDateTime; import java.util.List; @Data -@Builder -@AllArgsConstructor -@NoArgsConstructor public class HardSpuDto extends HardSpuEntity { private List spuIdList; 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 22742289a..b043e4801 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 @@ -3,8 +3,7 @@ package com.bsd.pjcloud.hard.api.entity; import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; +import lombok.*; import com.bsd.pjcloud.common.core.util.TenantTable; import java.time.LocalDateTime; @@ -12,6 +11,9 @@ import java.time.LocalDateTime; /** * 硬件授权 */ +@Builder +@AllArgsConstructor +@NoArgsConstructor @Data @TenantTable @TableName("hard_auth") @@ -40,9 +42,15 @@ public class HardAuthEntity extends Model { private Long hardId; /** - * 是否授权 + * 货柜编号 */ - @Schema(description = "是否授权") + @Schema(description = "货柜编号") + private Integer cabinetNo; + + /** + * 授权类型 + */ + @Schema(description = "授权类型") private String authType; /** @@ -69,6 +77,24 @@ public class HardAuthEntity extends Model { @Schema(description = "完成时间") private LocalDateTime isDoneTime; + /** + * 是否人工处理 + */ + @Schema(description = "是否人工处理") + private String isManualChange; + + /** + * 人工处理时间 + */ + @Schema(description = "人工处理时间") + private LocalDateTime manualChangeTime; + + /** + * 人工处理备注 + */ + @Schema(description = "人工处理时间") + private String manualChangeRemark; + /** * 创建人 */ diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/HardBroadcastEntity.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/HardBroadcastEntity.java index 3ef0b6c53..25a26116f 100644 --- a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/HardBroadcastEntity.java +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/HardBroadcastEntity.java @@ -3,14 +3,17 @@ package com.bsd.pjcloud.hard.api.entity; import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; +import lombok.*; import com.bsd.pjcloud.common.core.util.TenantTable; + import java.time.LocalDateTime; /** * 设备广播 */ +@Builder +@AllArgsConstructor +@NoArgsConstructor @Data @TenantTable @TableName("hard_broadcast") @@ -19,118 +22,124 @@ import java.time.LocalDateTime; public class HardBroadcastEntity extends Model { - /** - * 编号 - */ + /** + * 编号 + */ @TableId(type = IdType.ASSIGN_ID) - @Schema(description="编号") + @Schema(description = "编号") private Long id; - /** - * 预定用户 - */ - @Schema(description="预定用户") + /** + * 预定用户 + */ + @Schema(description = "预定用户") private Long userId; - /** - * 硬件id - */ - @Schema(description="硬件id") + /** + * 硬件id + */ + @Schema(description = "硬件id") private Long hardId; - /** - * mq主题 - */ - @Schema(description="mq主题") + /** + * mq主题 + */ + @Schema(description = "mq主题") private String topic; - /** - * 关联业务编号 - */ - @Schema(description="关联业务编号") + /** + * 业务类型 + */ + @Schema(description = "业务类型") + private String bizType; + + /** + * 关联业务编号 + */ + @Schema(description = "关联业务编号") private String bizId; - /** - * 预定标题 - */ - @Schema(description="预定标题") + /** + * 预定标题 + */ + @Schema(description = "预定标题") private String title; - /** - * 广播内容 - */ - @Schema(description="广播内容") + /** + * 广播内容 + */ + @Schema(description = "广播内容") private String content; - /** - * 当前广播次数 - */ - @Schema(description="当前广播次数") + /** + * 当前广播次数 + */ + @Schema(description = "当前广播次数") private Integer broadcastCount; - /** - * 最大广播次数 - */ - @Schema(description="最大广播次数") + /** + * 最大广播次数 + */ + @Schema(description = "最大广播次数") private Integer broadcastMaxCount; - /** - * 是否广播语音 - */ - @Schema(description="是否广播语音") + /** + * 是否广播语音 + */ + @Schema(description = "是否广播语音") private String isBroadcast; - /** - * 是否完成 - */ - @Schema(description="是否完成") + /** + * 是否完成 + */ + @Schema(description = "是否完成") private String isDone; - /** - * 完成时间 - */ - @Schema(description="完成时间") + /** + * 完成时间 + */ + @Schema(description = "完成时间") private LocalDateTime isDoneTime; - /** - * 创建人 - */ - @TableField(fill = FieldFill.INSERT) - @Schema(description="创建人") + /** + * 创建人 + */ + @TableField(fill = FieldFill.INSERT) + @Schema(description = "创建人") private String createBy; - /** - * 创建时间 - */ - @TableField(fill = FieldFill.INSERT) - @Schema(description="创建时间") + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + @Schema(description = "创建时间") private LocalDateTime createTime; - /** - * 修改人 - */ - @TableField(fill = FieldFill.INSERT_UPDATE) - @Schema(description="修改人") + /** + * 修改人 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + @Schema(description = "修改人") private String updateBy; - /** - * 修改时间 - */ - @TableField(fill = FieldFill.INSERT_UPDATE) - @Schema(description="修改时间") + /** + * 修改时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + @Schema(description = "修改时间") private LocalDateTime updateTime; - /** - * 删除标记 - */ + /** + * 删除标记 + */ @TableLogic - @TableField(fill = FieldFill.INSERT) - @Schema(description="删除标记") + @TableField(fill = FieldFill.INSERT) + @Schema(description = "删除标记") private String delFlag; - /** - * 租户ID - */ - @Schema(description="租户ID") + /** + * 租户ID + */ + @Schema(description = "租户ID") private Long tenantId; } \ No newline at end of file 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 new file mode 100644 index 000000000..8e10716c4 --- /dev/null +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/HardDoorFlowEntity.java @@ -0,0 +1,244 @@ +package com.bsd.pjcloud.hard.api.entity; + +import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import com.bsd.pjcloud.common.core.util.TenantTable; + +import java.time.LocalDateTime; + +/** + * 智能柜流程 + * + * @author hard + * @date 2025-04-14 16:08:33 + */ +@Builder +@AllArgsConstructor +@NoArgsConstructor +@Data +@TenantTable +@TableName("hard_door_flow") +@EqualsAndHashCode(callSuper = true) +@Schema(description = "智能柜流程") +public class HardDoorFlowEntity extends Model { + + /** + * 编号 + */ + @TableId(type = IdType.ASSIGN_ID) + @Schema(description = "编号") + private Long id; + + /** + * 用户编号 + */ + @Schema(description = "用户编号") + private Long userId; + + /** + * 业务类型 + */ + @Schema(description = "业务类型") + private String bizType; + + /** + * 硬件id + */ + @Schema(description = "硬件id") + private Long hardId; + + /** + * 智能柜id + */ + @Schema(description = "智能柜id") + private Long hardDoorId; + + /** + * 货柜编号 + */ + @Schema(description = "货柜编号") + private Integer cabinetNo; + + /** + * 订单编号 + */ + @Schema(description = "订单编号") + private Long orderId; + + /** + * 授权编号 + */ + @Schema(description = "授权编号") + private Long authId; + + /** + * 请求开门参数 + */ + @Schema(description = "请求开门参数") + private String requestOpenDto; + + /** + * 请求开门返回 + */ + @Schema(description = "请求开门返回") + private String requestOpenVo; + + /** + * 请求开门时间 + */ + @Schema(description = "请求开门时间") + private LocalDateTime requestOpenTime; + + /** + * 是否开门 + */ + @Schema(description = "是否开门") + private String isOpen; + + /** + * 开门回调时间 + */ + @Schema(description = "开门回调时间") + private LocalDateTime openCallbackTime; + + /** + * 开门回调结果 + */ + @Schema(description = "开门回调结果") + private String openCallbackVo; + + /** + * 视频回调结果 + */ + @Schema(description = "视频回调结果") + private String videoCallbackVo; + + /** + * 视频回调时间 + */ + @Schema(description = "视频回调时间") + private LocalDateTime videoCallbackTime; + + + /** + * sku识别提交参数 + */ + @Schema(description = "sku识别提交参数") + private String skuSubmitDto; + + /** + * sku识别提交结果 + */ + @Schema(description = "sku识别提交结果") + private String skuSubmitVo; + + /** + * sku识别提交id(用于查询) + */ + @Schema(description = "sku识别提交id(用于查询)") + private String skuSubmitRecogId; + + /** + * sku识别提交时间 + */ + @Schema(description = "sku识别提交时间") + private LocalDateTime skuSubmitTime; + + /** + * sku识别回调结果 + */ + @Schema(description = "sku识别回调结果") + private String skuCallbackVo; + + /** + * sku识别回调时间 + */ + @Schema(description = "sku识别回调时间") + private LocalDateTime skuCallbackTime; + + /** + * sku识别主动获取参数 + */ + @Schema(description = "sku识别主动获取参数") + private String skuDrivingDto; + + /** + * sku识别主动获取结果 + */ + @Schema(description = "sku识别主动获取结果") + private String skuDrivingVo; + + /** + * sku识别主动获取时间 + */ + @Schema(description = "sku识别主动获取时间") + private LocalDateTime skuDrivingTime; + + /** + * 支付时间 + */ + @Schema(description = "支付时间") + private LocalDateTime payTime; + + /** + * 流程状态 + */ + @Schema(description = "流程状态") + private String flowStatus; + + /** + * 流程错误信息 + */ + @Schema(description = "流程错误信息") + private String error; + + /** + * 流程错误描述(展示) + */ + @Schema(description = "流程错误描述(展示)") + private String errorDesc; + + /** + * 创建人 + */ + @TableField(fill = FieldFill.INSERT) + @Schema(description = "创建人") + private String createBy; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + @Schema(description = "创建时间") + private LocalDateTime createTime; + + /** + * 修改人 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + @Schema(description = "修改人") + private String updateBy; + + /** + * 修改时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + @Schema(description = "修改时间") + private LocalDateTime updateTime; + + /** + * 删除标记 + */ + @TableLogic + @TableField(fill = FieldFill.INSERT) + @Schema(description = "删除标记") + private String delFlag; + + /** + * 租户ID + */ + @Schema(description = "租户ID") + private Long tenantId; +} \ No newline at end of file diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/manager/HardDoorCabinetEntity.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/manager/HardDoorCabinetEntity.java new file mode 100644 index 000000000..a3a54b0e2 --- /dev/null +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/manager/HardDoorCabinetEntity.java @@ -0,0 +1,115 @@ +package com.bsd.pjcloud.hard.api.entity.manager; + +import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import com.bsd.pjcloud.common.core.util.TenantTable; +import java.time.LocalDateTime; + +/** + * 智能柜货柜 + * + * @author dzc + * @date 2025-04-15 18:28:46 + */ +@Data +@TenantTable +@TableName("hard_door_cabinet") +@EqualsAndHashCode(callSuper = true) +@Schema(description = "智能柜货柜") +public class HardDoorCabinetEntity extends Model { + + + /** + * 编号 + */ + @TableId(type = IdType.ASSIGN_ID) + @Schema(description="编号") + private Long id; + + /** + * 智能柜编号 + */ + @Schema(description="智能柜编号") + private Long hardDoorId; + + /** + * 货柜编号(1,2) + */ + @Schema(description="货柜编号(1,2)") + private Integer cabinetNo; + + /** + * 锁在线1:在线;2:离线; + */ + @Schema(description="锁在线1:在线;2:离线;") + private String isLockOnline; + + /** + * 锁状态1:开锁;2:关锁; + */ + @Schema(description="锁状态1:开锁;2:关锁;") + private Integer lockStatus; + + /** + * 门状态1:门关;2:门开 + */ + @Schema(description="门状态1:门关;2:门开") + private Integer doorStatus; + + /** + * 货柜售卖状态1:在售;2:停售 + */ + @Schema(description="货柜售卖状态1:在售;2:停售") + private Integer saleStatus; + + /** + * 二维码 + */ + @Schema(description="二维码") + private String qrCode; + + /** + * 创建人 + */ + @TableField(fill = FieldFill.INSERT) + @Schema(description="创建人") + private String createBy; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + @Schema(description="创建时间") + private LocalDateTime createTime; + + /** + * 修改人 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + @Schema(description="修改人") + private String updateBy; + + /** + * 修改时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + @Schema(description="修改时间") + private LocalDateTime updateTime; + + /** + * 删除标记 + */ + @TableLogic + @TableField(fill = FieldFill.INSERT) + @Schema(description="删除标记") + private String delFlag; + + /** + * 租户ID + */ + @Schema(description="租户ID") + private Long tenantId; +} \ No newline at end of file diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/manager/HardDoorManagerEntity.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/manager/HardDoorManagerEntity.java index fe36eee33..5e21a10fb 100644 --- a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/manager/HardDoorManagerEntity.java +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/manager/HardDoorManagerEntity.java @@ -7,6 +7,7 @@ import lombok.*; import com.bsd.pjcloud.common.core.util.TenantTable; import java.time.LocalDateTime; +import java.util.List; /** * 智能柜设置 @@ -89,6 +90,12 @@ public class HardDoorManagerEntity extends Model { @Schema(description = "售卖状态。1：在售；2：停售") private Integer saleStatus; + /** + * sim 卡号。设备有上报会返回，若一次上报都没有，则返回 null。 + */ + @Schema(description = "sim 卡号。设备有上报会返回，若一次上报都没有，则返回 null。") + private String simSn; + /** * sim 信号强度。大于-95 表示信号强度好；-95 到-105 表示信号强度中等；小于-105 表示信号差； */ @@ -105,13 +112,7 @@ public class HardDoorManagerEntity extends Model { * sim 信号值更新时间。yyyy-MM-dd HH:mm:ss */ @Schema(description = "sim 信号值更新时间。yyyy-MM-dd HH:mm:ss") - private Integer signalTime; - - /** - * 货柜列表JSON - */ - @Schema(description = "货柜列表JSON") - private String cabinetList; + private LocalDateTime signalTime; /** * 上次重启时间 @@ -119,6 +120,18 @@ public class HardDoorManagerEntity extends Model { @Schema(description = "上次重启时间") private LocalDateTime restartTime; + /** + * 系统音量 + */ + @Schema(description = "系统音量") + private Integer systemVolume; + + /** + * 媒体音量 + */ + @Schema(description = "媒体音量") + private Integer mediaVolume; + /** * 创建人 */ diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/order/HardOrderEntity.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/order/HardOrderEntity.java index 1dddd5400..89d20818b 100644 --- a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/order/HardOrderEntity.java +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/order/HardOrderEntity.java @@ -178,11 +178,17 @@ public class HardOrderEntity extends Model { private String refundStatus; /** - * 订单取消时间 + * 订单取消时间(退款订单) */ @Schema(description = "订单取消时间") private LocalDateTime applyCancelTime; + /** + * 订单取消时间(智能柜) + */ + @Schema(description = "订单取消时间(智能柜)") + private LocalDateTime unfollowTime; + /** * 设备上的唯一订单号 */ diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/spu/HardSpuEntity.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/spu/HardSpuEntity.java index 0cb22e5b4..b13f3518d 100644 --- a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/spu/HardSpuEntity.java +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/spu/HardSpuEntity.java @@ -7,8 +7,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.Min; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; -import lombok.Data; -import lombok.EqualsAndHashCode; +import lombok.*; import com.bsd.pjcloud.common.core.util.TenantTable; import java.time.LocalDateTime; @@ -16,6 +15,9 @@ import java.time.LocalDateTime; /** * 硬件商品 */ +@Builder +@AllArgsConstructor +@NoArgsConstructor @Data @TenantTable @TableName("hard_spu") @@ -46,9 +48,15 @@ public class HardSpuEntity extends Model { private String name; /** - * 商品图片 + * 商品封面图片 */ - @Schema(description = "商品图片") + @Schema(description = "商品封面图片") + private String cover; + + /** + * 商品图片用于识别 + */ + @Schema(description = "商品图片用于识别") private String pic; /** @@ -109,11 +117,24 @@ public class HardSpuEntity extends Model { /** * sku类型,0:标准库;1:私有库 + * * @see HardKsSkuTypeEnum */ @Schema(description = "sku类型,0:标准库;1:私有库") private String skuType; + /** + * 旷世skuid + */ + @Schema(description = "旷世skuid") + private String ksSkuId; + + /** + * 旷世返回的业务方sku_id + */ + @Schema(description = "旷世返回的业务方sku_id") + private String ksResSkuId; + /** * 69码 */ @@ -130,7 +151,7 @@ public class HardSpuEntity extends Model { * 是否为集合SKU */ @Schema(description = "是否为集合SKU") - private String ksSubSku; + private String ksSubSkuJson; /** * 旷世审核状态 @@ -144,6 +165,12 @@ public class HardSpuEntity extends Model { @Schema(description = "旷世审核状态标题") private String ksStatusTitle; + /** + * 乐观锁 + */ + @Version + private Integer version; + /** * 旷世审核状态描述 */ diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/spu/HardSpuRepertoryEntity.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/spu/HardSpuRepertoryEntity.java index 96512745f..ce612b977 100644 --- a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/spu/HardSpuRepertoryEntity.java +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/spu/HardSpuRepertoryEntity.java @@ -36,12 +36,6 @@ public class HardSpuRepertoryEntity extends Model { @Schema(description = "用户id") private Long userId; - /** - * 设备id - */ - @Schema(description = "设备id") - private Long hardId; - /** * 商品id */ @@ -63,6 +57,12 @@ public class HardSpuRepertoryEntity extends Model { @Schema(description = "更新库存数量") private Integer count; + /** + * 上架业务关联id + */ + @Schema(description = "上架业务关联id") + private Long bizId; + /** * 上架类型 */ diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/feign/RemoteHardDoorService.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/feign/RemoteHardDoorService.java new file mode 100644 index 000000000..0f52acaf8 --- /dev/null +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/feign/RemoteHardDoorService.java @@ -0,0 +1,45 @@ +package com.bsd.pjcloud.hard.api.feign; + + +import com.bsd.pjcloud.common.core.constant.ServiceNameConstants; +import com.bsd.pjcloud.common.feign.annotation.NoToken; +import com.bsd.pjcloud.thirdparty.dto.door.DoorOpenCallbackDto; +import com.bsd.pjcloud.thirdparty.dto.door.DoorStatusCallbackDto; +import com.bsd.pjcloud.thirdparty.dto.door.DoorVideoCallbackDto; +import com.bsd.pjcloud.thirdparty.dto.ks.KsRecognitionCallbackDto; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + + +@FeignClient(contextId = "remoteHardDoorService", value = ServiceNameConstants.HARDWARE_SERVICE) +public interface RemoteHardDoorService { + + /** + * 处理柜子开门回调 + */ + @NoToken + @PostMapping("/hard-door-flow/dispose-locak-callback") + void disposeLocakCallback(@RequestBody DoorOpenCallbackDto dto); + + /** + * 处理柜子视频回调 + */ + @NoToken + @PostMapping("/hard-door-flow/dispose-video-callback") + void disposeVideoCallback(@RequestBody DoorVideoCallbackDto dto); + + /** + * 处理柜子视频回调 + */ + @NoToken + @PostMapping("/hard-door-flow/dispose-status-callback") + void disposeStatusCallback(@RequestBody DoorStatusCallbackDto dto); + + /** + * 处理旷世识别回调 + */ + @NoToken + @PostMapping("/hard-door-flow/dispose-recognition-callback") + void disposeRecognitionCallback(@RequestBody KsRecognitionCallbackDto dto); +} diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/HardDoorFlowVo.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/HardDoorFlowVo.java new file mode 100644 index 000000000..581280235 --- /dev/null +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/HardDoorFlowVo.java @@ -0,0 +1,36 @@ +package com.bsd.pjcloud.hard.api.vo; + +import com.bsd.pjcloud.admin.api.vo.base.BaseUserDeptInterface; +import com.bsd.pjcloud.hard.api.entity.HardDoorFlowEntity; +import com.bsd.pjcloud.hard.api.vo.base.BaseHardInterface; +import lombok.Data; + +import java.util.List; + +@Data +public class HardDoorFlowVo extends HardDoorFlowEntity implements BaseHardInterface, BaseUserDeptInterface { + + /** + * 设备相关 + */ + private String hardName; + + private String hardType; + + private List hardTypeCodes; + + /** + * 用户相关 + */ + private String username; + + private String userMobile; + + private String userAvatar; + + private Long userDeptId; + + private String userDeptName; + + +} 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-api/src/main/java/com/bsd/pjcloud/hard/api/vo/manager/HardDoorCabinetCodeVo.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/manager/HardDoorCabinetCodeVo.java new file mode 100644 index 000000000..b8a2343dc --- /dev/null +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/manager/HardDoorCabinetCodeVo.java @@ -0,0 +1,18 @@ +package com.bsd.pjcloud.hard.api.vo.manager; + +import lombok.Data; + +@Data +public class HardDoorCabinetCodeVo { + + /** + * 智能柜id + */ + private String hardDoorId; + + /** + * 货柜编号 + */ + private String cabinetNo; + +} diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/manager/HardDoorManagerVo.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/manager/HardDoorManagerVo.java index 40565e1ae..756e33517 100644 --- a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/manager/HardDoorManagerVo.java +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/manager/HardDoorManagerVo.java @@ -1,10 +1,14 @@ package com.bsd.pjcloud.hard.api.vo.manager; +import com.bsd.pjcloud.hard.api.entity.manager.HardDoorCabinetEntity; import com.bsd.pjcloud.hard.api.entity.manager.HardDoorManagerEntity; +import com.bsd.pjcloud.hard.api.vo.base.BaseHardInterface; import lombok.Data; +import java.util.List; + @Data -public class HardDoorManagerVo extends HardDoorManagerEntity { +public class HardDoorManagerVo extends HardDoorManagerEntity implements BaseHardInterface { /** * 硬件设备相关 */ @@ -12,4 +16,8 @@ public class HardDoorManagerVo extends HardDoorManagerEntity { private String hardType; + private List hardTypeCodes; + + private List cabinetList; + } diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/spu/HardSpuRepertoryVo.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/spu/HardSpuRepertoryVo.java index 77b6be85c..15826858f 100644 --- a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/spu/HardSpuRepertoryVo.java +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/spu/HardSpuRepertoryVo.java @@ -2,12 +2,11 @@ package com.bsd.pjcloud.hard.api.vo.spu; import com.bsd.pjcloud.admin.api.vo.base.BaseUserInterface; import com.bsd.pjcloud.hard.api.entity.spu.HardSpuRepertoryEntity; -import com.bsd.pjcloud.hard.api.vo.base.BaseHardInterface; import com.bsd.pjcloud.wallet.api.vo.base.BaseMchInterface; import lombok.Data; @Data -public class HardSpuRepertoryVo extends HardSpuRepertoryEntity implements BaseMchInterface, BaseHardInterface, BaseUserInterface { +public class HardSpuRepertoryVo extends HardSpuRepertoryEntity implements BaseMchInterface, BaseUserInterface { /** * 商品相关 @@ -34,13 +33,6 @@ public class HardSpuRepertoryVo extends HardSpuRepertoryEntity implements BaseMc private String logoPic; - /** - * 设备相关 - */ - private String hardName; - - private String hardType; - /** * 用户相关 */ diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/resources/META-INF/spring/org.springframework.cloud.openfeign.FeignClient.imports b/pjcloud-hardware/pjcloud-hardware-api/src/main/resources/META-INF/spring/org.springframework.cloud.openfeign.FeignClient.imports index 66471f54e..910612a76 100644 --- a/pjcloud-hardware/pjcloud-hardware-api/src/main/resources/META-INF/spring/org.springframework.cloud.openfeign.FeignClient.imports +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/resources/META-INF/spring/org.springframework.cloud.openfeign.FeignClient.imports @@ -1,2 +1,3 @@ +com.bsd.pjcloud.hard.api.feign.RemoteHardDoorService com.bsd.pjcloud.hard.api.feign.RemoteHardOrderService com.bsd.pjcloud.hard.api.feign.RemoteHardThirdSelfZyService \ No newline at end of file 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 e136e13a4..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 @@ -2,16 +2,21 @@ package com.bsd.pjcloud.hard.controller; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.collection.CollUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.bsd.pjcloud.common.core.util.R; import com.bsd.pjcloud.common.data.datascope.DataScope; import com.bsd.pjcloud.common.log.annotation.SysLog; +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; import com.bsd.pjcloud.common.excel.annotation.ResponseExcel; import io.swagger.v3.oas.annotations.security.SecurityRequirement; @@ -23,7 +28,6 @@ import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; import java.util.List; -import java.util.Objects; /** * 硬件授权 @@ -37,6 +41,26 @@ public class HardAuthController { private final HardAuthService hardAuthService; + /* ************************************* 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) { + PjcloudUser user = SecurityUtils.getUser(); + dto.setUserId(user.getId()); + return R.ok(hardAuthService.appAuthHardDoor(dto)); + } + + /* ************************************* end app end ************************************* */ + @Operation(summary = "分页查询", description = "分页查询") @GetMapping("/page-join") @PreAuthorize("@pms.hasPermission('hard_hardAuth_view')") diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/HardDoorFlowController.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/HardDoorFlowController.java new file mode 100644 index 000000000..4af5e79ca --- /dev/null +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/HardDoorFlowController.java @@ -0,0 +1,178 @@ +package com.bsd.pjcloud.hard.controller; + +import cn.hutool.core.util.ArrayUtil; +import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.bsd.pjcloud.common.core.util.R; +import com.bsd.pjcloud.common.data.datascope.DataScope; +import com.bsd.pjcloud.common.log.annotation.SysLog; +import com.bsd.pjcloud.common.security.annotation.Inner; +import com.bsd.pjcloud.common.security.service.PjcloudUser; +import com.bsd.pjcloud.common.security.util.SecurityUtils; +import com.bsd.pjcloud.hard.api.constant.flow.HardDoorFlowBizEnum; +import com.bsd.pjcloud.hard.api.constant.HardDoorOpenTypeEnum; +import com.bsd.pjcloud.hard.api.dto.HardDoorFlowDto; +import com.bsd.pjcloud.hard.api.dto.HardDoorFlowOpenDto; +import com.bsd.pjcloud.hard.api.entity.HardDoorFlowEntity; +import com.bsd.pjcloud.hard.api.vo.HardDoorFlowVo; +import com.bsd.pjcloud.hard.service.HardDoorFlowService; +import com.bsd.pjcloud.thirdparty.dto.door.DoorOpenCallbackDto; +import com.bsd.pjcloud.thirdparty.dto.door.DoorStatusCallbackDto; +import com.bsd.pjcloud.thirdparty.dto.door.DoorVideoCallbackDto; +import com.bsd.pjcloud.thirdparty.dto.ks.KsRecognitionCallbackDto; +import org.springframework.security.access.prepost.PreAuthorize; +import com.bsd.pjcloud.common.excel.annotation.ResponseExcel; +import io.swagger.v3.oas.annotations.security.SecurityRequirement; +import org.springdoc.core.annotations.ParameterObject; +import org.springframework.http.HttpHeaders; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Operation; +import lombok.RequiredArgsConstructor; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 智能柜流程 + */ +@RestController +@RequiredArgsConstructor +@RequestMapping("/hard-door-flow") +@Tag(description = "hard-door-flow", name = "智能柜流程管理") +@SecurityRequirement(name = HttpHeaders.AUTHORIZATION) +public class HardDoorFlowController { + + private final HardDoorFlowService hardDoorFlowService; + + /* ************************************* start 远程调用 start ************************************* */ + + /** + * 处理柜子开门回调 + */ + @Inner() + @PostMapping("/dispose-locak-callback") + public void disposeLocakCallback(@RequestBody DoorOpenCallbackDto dto) { + hardDoorFlowService.disposeLocakCallback(dto); + } + + /** + * 处理柜子视频回调 + */ + @Inner() + @PostMapping("/dispose-video-callback") + public void disposeVideoCallback(@RequestBody DoorVideoCallbackDto dto) { + hardDoorFlowService.disposeVideoCallback(dto); + } + + /** + * 处理柜子状态回调 + */ + @Inner() + @PostMapping("/dispose-status-callback") + public void disposeStatusCallback(@RequestBody DoorStatusCallbackDto dto) { + hardDoorFlowService.disposeStatusCallback(dto); + } + + /** + * 处理旷世识别回调 + */ + @Inner() + @PostMapping("/dispose-recognition-callback") + public void disposeRecognitionCallback(@RequestBody KsRecognitionCallbackDto dto) { + hardDoorFlowService.disposeRecognitionCallback(dto); + } + + /* ************************************* end 远程调用 end ************************************* */ + + /* ************************************* start app start ************************************* */ + + @Operation(summary = "上架开门", description = "上架开门") + @PostMapping("/app/open-repertory") + public R openRepertory(@Validated @RequestBody HardDoorFlowOpenDto dto) { + PjcloudUser user = SecurityUtils.getUser(); + dto.setFlowType(HardDoorFlowBizEnum.REPERTORY_OPEN); + dto.setOpenType(HardDoorOpenTypeEnum.NO_RECORD_VIDEO); + dto.setUserId(user.getId()); + return R.ok(hardDoorFlowService.openDoorRepertory(dto)); + } + + /* ************************************* end app end ************************************* */ + + @Operation(summary = "检修开门", description = "检修开门") + @PostMapping("/open-access") + public R openAccess(@Validated @RequestBody HardDoorFlowOpenDto dto) { + PjcloudUser user = SecurityUtils.getUser(); + dto.setFlowType(HardDoorFlowBizEnum.ACCESS_OPEN); + dto.setOpenType(HardDoorOpenTypeEnum.MAINTENANCE_UNLOCK); + dto.setUserId(user.getId()); + hardDoorFlowService.openDoorAccess(dto); + return R.ok(); + } + + @Operation(summary = "检修关门", description = "检修关门") + @PostMapping("/close-access") + public R closeAccess(@Validated @RequestBody HardDoorFlowOpenDto dto) { + PjcloudUser user = SecurityUtils.getUser(); + dto.setFlowType(HardDoorFlowBizEnum.ACCESS_OPEN); + dto.setOpenType(HardDoorOpenTypeEnum.MAINTENANCE_LOCK); + dto.setUserId(user.getId()); + hardDoorFlowService.closeAccess(dto); + return R.ok(); + } + + @Operation(summary = "复杂查询", description = "复杂查询") + @GetMapping("/page-join") + @PreAuthorize("@pms.hasPermission('dzc_hardDoorFlow_view')") + public R> pageJoin(@ParameterObject Page page, @ParameterObject HardDoorFlowDto dto) { + DataScope dataScope = null; + return R.ok(hardDoorFlowService.scopePageJoin(page, dto, dataScope)); + } + + @Operation(summary = "通过id查询", description = "通过id查询") + @GetMapping("/{id}") + @PreAuthorize("@pms.hasPermission('dzc_hardDoorFlow_view')") + public R join(@PathVariable("id") Long id) { + return R.ok(hardDoorFlowService.join(id)); + } + + @Operation(summary = "通过订单id查询流程", description = "通过订单id查询流程") + @GetMapping("/get-by-order-id") + @PreAuthorize("@pms.hasPermission('dzc_hardDoorFlow_view')") + public R getByOrderId(@RequestParam Long orderId) { + return R.ok(hardDoorFlowService.getByOrderId(orderId)); + } + + + @Operation(summary = "新增智能柜流程", description = "新增智能柜流程") + @SysLog("新增智能柜流程") + @PostMapping + @PreAuthorize("@pms.hasPermission('dzc_hardDoorFlow_add')") + public R save(@RequestBody HardDoorFlowEntity hardDoorFlow) { + return R.ok(hardDoorFlowService.save(hardDoorFlow)); + } + + @Operation(summary = "修改智能柜流程", description = "修改智能柜流程") + @SysLog("修改智能柜流程") + @PutMapping + @PreAuthorize("@pms.hasPermission('dzc_hardDoorFlow_edit')") + public R updateById(@RequestBody HardDoorFlowEntity hardDoorFlow) { + return R.ok(hardDoorFlowService.updateById(hardDoorFlow)); + } + + @Operation(summary = "通过id删除智能柜流程", description = "通过id删除智能柜流程") + @SysLog("通过id删除智能柜流程") + @DeleteMapping + @PreAuthorize("@pms.hasPermission('dzc_hardDoorFlow_del')") + public R removeById(@RequestBody Long[] ids) { + return R.ok(hardDoorFlowService.removeBatchByIds(CollUtil.toList(ids))); + } + + @ResponseExcel + @GetMapping("/export") + @PreAuthorize("@pms.hasPermission('dzc_hardDoorFlow_export')") + public List export(HardDoorFlowEntity hardDoorFlow, Long[] ids) { + return hardDoorFlowService.list(Wrappers.lambdaQuery(hardDoorFlow).in(ArrayUtil.isNotEmpty(ids), HardDoorFlowEntity::getId, ids)); + } +} \ No newline at end of file diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/manager/HardDoorManagerController.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/manager/HardDoorManagerController.java index c697e13f5..d82c03d22 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/manager/HardDoorManagerController.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/manager/HardDoorManagerController.java @@ -13,8 +13,8 @@ import com.bsd.pjcloud.hard.api.dto.manager.HardDoorManagerDto; import com.bsd.pjcloud.hard.api.dto.spu.HardChangeVolume; import com.bsd.pjcloud.hard.api.entity.manager.HardDoorManagerEntity; import com.bsd.pjcloud.hard.api.vo.manager.HardDoorManagerVo; +import com.bsd.pjcloud.hard.service.HardDoorCabinetService; import com.bsd.pjcloud.hard.service.HardDoorManagerService; -import com.bsd.pjcloud.thirdparty.dto.door.DoorVolumeDto; import org.springframework.security.access.prepost.PreAuthorize; import com.bsd.pjcloud.common.excel.annotation.ResponseExcel; import io.swagger.v3.oas.annotations.security.SecurityRequirement; @@ -39,16 +39,39 @@ import java.util.List; public class HardDoorManagerController { private final HardDoorManagerService hardDoorManagerService; + private final HardDoorCabinetService hardDoorCabinetService; + + /* ************************************* start APP start ************************************* */ + + @Operation(summary = "app查询智能柜列表", description = "app查询智能柜列表") + @GetMapping("/app/page") + public R> appPage(@ParameterObject Page page, @ParameterObject HardDoorManagerDto dto) { + DataScope dataScope = null; + return R.ok(hardDoorManagerService.scopePageJoin(page, dto, dataScope)); + } + + @Operation(summary = "app查询智能柜详情", description = "app查询智能柜详情") + @GetMapping("/app/detail") + public R appDetail(@RequestParam Long hardDoorId) { + return R.ok(hardDoorManagerService.getByHardDoorId(hardDoorId)); + } + + /* ************************************* start APP start ************************************* */ @Operation(summary = "绑定设备", description = "绑定设备") @PostMapping("/bind") public R bind(@RequestBody HardDoorManagerEntity dto) { if (ObjectUtil.isEmpty(dto.getImei())) throw new RuntimeException("设备IMEI卡号不能为空"); - if (ObjectUtil.isEmpty(dto.getDeviceCode())) throw new RuntimeException("设备内置设备编号不能为空"); hardDoorManagerService.bind(dto); return R.ok(); } + @Operation(summary = "刷新智能柜货柜二维码", description = "刷新智能柜货柜二维码") + @GetMapping("/refresh-qr-code") + public R refreshQrCode(@RequestParam Long hardDoorId, @RequestParam Integer cabinetNo) { + return R.ok(hardDoorCabinetService.refreshQrCode(hardDoorId, cabinetNo)); + } + @Operation(summary = "音量修改", description = "音量修改") @PostMapping("/change-volume") public R changeVolume(@Validated @RequestBody HardChangeVolume dto) { @@ -83,7 +106,7 @@ public class HardDoorManagerController { @GetMapping("/get-by-hard-id") @PreAuthorize("@pms.hasPermission('hard_hardDoorManager_view')") public R getByHardId(@RequestParam Long hardId) { - return R.ok(hardDoorManagerService.getByHardId(hardId)); + return R.ok(hardDoorManagerService.getByHardDoorId(hardId)); } @Operation(summary = "通过id删除智能柜设置", description = "通过id删除智能柜设置") diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/spu/HardSpuController.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/spu/HardSpuController.java index 462e0713c..e05999487 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/spu/HardSpuController.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/spu/HardSpuController.java @@ -8,10 +8,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.bsd.pjcloud.common.core.util.R; import com.bsd.pjcloud.common.data.datascope.DataScope; import com.bsd.pjcloud.common.log.annotation.SysLog; +import com.bsd.pjcloud.hard.api.dto.spu.HardPutawayDto; import com.bsd.pjcloud.hard.api.dto.spu.HardSpuDto; import com.bsd.pjcloud.hard.api.entity.spu.HardSpuEntity; import com.bsd.pjcloud.hard.api.vo.spu.HardSpuJoinVo; import com.bsd.pjcloud.hard.service.HardSpuService; +import jakarta.validation.Valid; import org.springframework.security.access.prepost.PreAuthorize; import com.bsd.pjcloud.common.excel.annotation.ResponseExcel; import io.swagger.v3.oas.annotations.security.SecurityRequirement; @@ -39,6 +41,36 @@ public class HardSpuController { private final HardSpuService hardSpuService; + /* ************************************* start APP start ************************************* */ + + @Operation(summary = "app上架", description = "上架") + @PostMapping("/app/putaway") + public R appPutaway(@Valid @RequestBody HardPutawayDto dto) { + hardSpuService.putaway(dto); + return R.ok(); + } + + @Operation(summary = "app下架", description = "下架") + @PostMapping("/app/un-putaway") + public R appUnPutaway(@Valid @RequestBody HardPutawayDto dto) { + hardSpuService.unPutaway(dto); + return R.ok(); + } + + @Operation(summary = "app查询货柜补货商品列表", description = "查询货柜补货商品列表") + @GetMapping("/app/cabinet-putaway-list") + public R appCabinetPutawayList(@RequestParam Long hardDoorId, @RequestParam String cabinetNo) { + return R.ok(hardSpuService.appCabinetPutawayList(hardDoorId, cabinetNo)); + } + + @Operation(summary = "app查询货柜商品列表", description = "查询货柜商品列表") + @GetMapping("/app/cabinet-list") + public R appCabinetList(@RequestParam Long hardId, @RequestParam String cabinetNo) { + return R.ok(hardSpuService.getByCabinetNo(hardId, cabinetNo)); + } + + /* ************************************* end APP end ************************************* */ + @Operation(summary = "拉取旷世商品", description = "拉取旷世商品") @GetMapping("/async-all") public R asyncAll() { @@ -52,6 +84,21 @@ public class HardSpuController { return R.ok(hardSpuService.getByCabinetNo(hardId, cabinetNo)); } + @Operation(summary = "上架", description = "上架") + @PostMapping("/putaway") + public R putaway(@RequestBody HardPutawayDto dto) { + hardSpuService.putaway(dto); + return R.ok(); + } + + @Operation(summary = "下架", description = "下架") + @PostMapping("/un-putaway") + public R unPutaway(@RequestBody HardPutawayDto dto) { + hardSpuService.unPutaway(dto); + return R.ok(); + } + + @Operation(summary = "下拉查询", description = "下拉查询") @GetMapping("/select") public R select(@ParameterObject Page page, @ParameterObject HardSpuDto dto) { diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/spu/HardSpuRepertoryController.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/spu/HardSpuRepertoryController.java index 894c97338..e8d4b5ba6 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/spu/HardSpuRepertoryController.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/spu/HardSpuRepertoryController.java @@ -10,9 +10,11 @@ import com.bsd.pjcloud.common.data.datascope.DataScope; import com.bsd.pjcloud.common.log.annotation.SysLog; import com.bsd.pjcloud.common.security.service.PjcloudUser; import com.bsd.pjcloud.common.security.util.SecurityUtils; +import com.bsd.pjcloud.hard.api.dto.spu.DeductionSpuRepertoryDto; import com.bsd.pjcloud.hard.api.dto.spu.HardSpuRepertoryDto; import com.bsd.pjcloud.hard.api.entity.spu.HardSpuRepertoryEntity; import com.bsd.pjcloud.hard.service.HardSpuRepertoryService; +import jakarta.validation.Valid; import org.springframework.security.access.prepost.PreAuthorize; import com.bsd.pjcloud.common.excel.annotation.ResponseExcel; import io.swagger.v3.oas.annotations.security.SecurityRequirement; @@ -25,7 +27,6 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import java.util.List; -import java.util.Objects; /** * 硬件商品库存更新记录 @@ -39,10 +40,16 @@ public class HardSpuRepertoryController { private final HardSpuRepertoryService hardSpuRepertoryService; - /* ************************************* start app start ************************************* */ + /* ************************************* start APP start ************************************* */ + @Operation(summary = "app上架完成", description = "app上架完成") + @PostMapping("/app/repertory-done") + public R appRepertoryDone(@Valid @RequestBody DeductionSpuRepertoryDto body) { + PjcloudUser user = SecurityUtils.getUser(); + return R.ok(hardSpuRepertoryService.appRepertoryDone(body, user.getId())); + } - /* ************************************* end app end ************************************* */ + /* ************************************* end APP end ************************************* */ @Operation(summary = "分页查询", description = "分页查询") @GetMapping("/page") diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/HardDoorFlowMapper.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/HardDoorFlowMapper.java new file mode 100644 index 000000000..16a988937 --- /dev/null +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/HardDoorFlowMapper.java @@ -0,0 +1,38 @@ +package com.bsd.pjcloud.hard.mapper; + +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.bsd.pjcloud.common.data.datascope.DataScope; +import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper; +import com.bsd.pjcloud.hard.api.dto.HardDoorFlowDto; +import com.bsd.pjcloud.hard.api.entity.HardDoorFlowEntity; +import com.bsd.pjcloud.hard.api.entity.order.HardOrderEntity; +import com.bsd.pjcloud.hard.api.vo.HardDoorFlowVo; +import com.github.yulichang.query.MPJLambdaQueryWrapper; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface HardDoorFlowMapper extends PjcloudBaseMapper { + + + default Page scopePageJoin(Page page, HardDoorFlowDto dto, DataScope dataScope) { + MPJLambdaQueryWrapper wrapper = new MPJLambdaQueryWrapper() + .selectAll(HardDoorFlowEntity.class) + .eq(ObjectUtil.isNotEmpty(dto.getUserId()), HardDoorFlowEntity::getUserId, dto.getUserId()) + .eq(ObjectUtil.isNotEmpty(dto.getBizType()), HardDoorFlowEntity::getBizType, dto.getBizType()) + .eq(ObjectUtil.isNotEmpty(dto.getHardDoorId()), HardDoorFlowEntity::getHardDoorId, dto.getHardDoorId()) + .eq(ObjectUtil.isNotEmpty(dto.getCabinetNo()), HardDoorFlowEntity::getCabinetNo, dto.getCabinetNo()) + .eq(ObjectUtil.isNotEmpty(dto.getOrderId()), HardDoorFlowEntity::getOrderId, dto.getOrderId()) + .eq(ObjectUtil.isNotEmpty(dto.getIsOpen()), HardDoorFlowEntity::getIsOpen, dto.getIsOpen()) + .between( + ObjectUtil.isNotEmpty(dto.getCreateTimeList()), + HardDoorFlowEntity::getCreateTime, + ObjectUtil.isNotEmpty(dto.getCreateTimeList()) ? dto.getCreateTimeList()[0] : null, + ObjectUtil.isNotEmpty(dto.getCreateTimeList()) ? dto.getCreateTimeList()[1] : null + ) + .orderByDesc(HardDoorFlowEntity::getCreateTime) + .orderByDesc(HardDoorFlowEntity::getId); + return selectJoinPage(page, HardDoorFlowVo.class, wrapper); + } +} \ No newline at end of file diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/manager/HardDoorCabinetMapper.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/manager/HardDoorCabinetMapper.java new file mode 100644 index 000000000..2ec2df75d --- /dev/null +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/manager/HardDoorCabinetMapper.java @@ -0,0 +1,11 @@ +package com.bsd.pjcloud.hard.mapper.manager; + +import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper; +import com.bsd.pjcloud.hard.api.entity.manager.HardDoorCabinetEntity; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface HardDoorCabinetMapper extends PjcloudBaseMapper { + + +} \ No newline at end of file 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 4285a5857..fc8237ff6 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 @@ -3,11 +3,30 @@ package com.bsd.pjcloud.hard.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 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智能柜授权 + */ + Long appAuthHardDoor(HardAuthAppDto dto); + + /** + * 判断当前用户信誉 + */ + boolean judgeUserCredit(Long userId); } \ No newline at end of file diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardBroadcastService.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardBroadcastService.java index eb5bf30b9..929a1c0c9 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardBroadcastService.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardBroadcastService.java @@ -5,10 +5,20 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.bsd.pjcloud.common.data.datascope.DataScope; import com.bsd.pjcloud.hard.api.dto.HardBroadcastDto; import com.bsd.pjcloud.hard.api.entity.HardBroadcastEntity; +import com.bsd.pjcloud.hard.api.entity.order.HardOrderEntity; import com.bsd.pjcloud.hard.api.vo.HardBroadcastVo; public interface HardBroadcastService extends IService { Page scopePageJoin(Page page, HardBroadcastDto dto, DataScope dataScope); + /** + * 添加线下食堂预约订单广播 + */ + void addReserveOrderTask(HardOrderEntity orderdetail); + + /** + * 完成硬件广播 + */ + void doneBroadcast(HardOrderEntity orderdetail); } \ No newline at end of file diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardCarService.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardCarService.java index d183aa688..7ed95232c 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardCarService.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardCarService.java @@ -31,27 +31,17 @@ public interface HardCarService extends IService { /** * 新增或者更新购物车 - * - * @param dto */ void saveOrUpload(HardCarSaveOrUpdateDto dto); /** - * @param userId 用户id - * @param merchantId 商户id - * @param sysType 硬件设备类型 - * @param list g购物车类表 - * @return 父购物车id + * 创建购物车 */ Long createCard(Long userId, Long merchantId, HardTypeEnum sysType, HardOrderTypeEnum orderTYpe, List list); /** * 生成购买商品的描述 - * - * @param sysType 订单类型 - * @param list 购物车列表 - * @return */ String computerCarSubject(HardTypeEnum sysType, HardOrderTypeEnum orderType, List list); } \ No newline at end of file diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardDoorCabinetService.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardDoorCabinetService.java new file mode 100644 index 000000000..aea015e21 --- /dev/null +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardDoorCabinetService.java @@ -0,0 +1,19 @@ +package com.bsd.pjcloud.hard.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.bsd.pjcloud.hard.api.entity.manager.HardDoorCabinetEntity; +import com.bsd.pjcloud.thirdparty.vo.door.DoorStatusVo; + +import java.util.List; + +public interface HardDoorCabinetService extends IService { + + void saveOrUpdate(Long hardDoorId, List list); + + List getListByHardDoorId(Long hardDoorId); + + /** + * 刷新智能柜货柜二维码 + */ + String refreshQrCode(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/HardDoorFlowService.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardDoorFlowService.java new file mode 100644 index 000000000..001fff8b7 --- /dev/null +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardDoorFlowService.java @@ -0,0 +1,69 @@ +package com.bsd.pjcloud.hard.service; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.bsd.pjcloud.common.data.datascope.DataScope; +import com.bsd.pjcloud.hard.api.dto.HardDoorFlowDto; +import com.bsd.pjcloud.hard.api.dto.HardDoorFlowOpenDto; +import com.bsd.pjcloud.hard.api.entity.HardDoorFlowEntity; +import com.bsd.pjcloud.hard.api.vo.HardDoorFlowVo; +import com.bsd.pjcloud.hard.api.vo.manager.HardDoorManagerVo; +import com.bsd.pjcloud.thirdparty.dto.door.DoorOpenCallbackDto; +import com.bsd.pjcloud.thirdparty.dto.door.DoorStatusCallbackDto; +import com.bsd.pjcloud.thirdparty.dto.door.DoorVideoCallbackDto; +import com.bsd.pjcloud.thirdparty.dto.ks.KsRecognitionCallbackDto; + +public interface HardDoorFlowService extends IService { + + /** + * 复杂查询 + */ + Page scopePageJoin(Page page, HardDoorFlowDto dto, DataScope dataScope); + + HardDoorFlowVo join(Long id); + + /** + * 通过订单id查询流程 + */ + HardDoorFlowVo getByOrderId(Long orderId); + + /** + * 检修开门 + */ + void openDoorAccess(HardDoorFlowOpenDto dto); + + /** + * 检修关门 + */ + void closeAccess(HardDoorFlowOpenDto dto); + + /** + * 购买开门 + */ + void openDoorPay(HardDoorFlowOpenDto dto, HardDoorManagerVo hardDoorDetail); + + /** + * 上架开门 + */ + Long openDoorRepertory(HardDoorFlowOpenDto dto); + + /** + * 处理开门回调 + */ + void disposeLocakCallback(DoorOpenCallbackDto dto); + + /** + * 处理柜子状态回调 + */ + void disposeStatusCallback(DoorStatusCallbackDto dto); + + /** + * 处理视频回调 + */ + void disposeVideoCallback(DoorVideoCallbackDto dto); + + /** + * 处理旷世识别回调 + */ + void disposeRecognitionCallback(KsRecognitionCallbackDto dto); +} \ No newline at end of file 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 8dce4677c..7dcc203e8 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 @@ -15,15 +15,30 @@ public interface HardDoorManagerService extends IService /** * 根据硬件id查询详情 */ - HardDoorManagerVo getByHardId(Long hardId); + HardDoorManagerVo getByHardDoorId(Long hardId); + + /** + * 根据硬件设备编号查询详情 + */ + HardDoorManagerVo getByDeviceCode(String deviceCode); /** * 绑定设备 */ void bind(HardDoorManagerEntity dto); + /** + * 刷新设备信息 + */ + HardDoorManagerEntity refresh(String deviceCode); + /** * 音量修改 */ void changeVolume(HardChangeVolume dto); + + /** + * 校验设备和货柜编号 + */ + HardDoorManagerVo checkDeviceAndCabinet(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/HardOrderService.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardOrderService.java index ea46186b9..be6a7b735 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardOrderService.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardOrderService.java @@ -7,10 +7,12 @@ import com.bsd.pjcloud.common.data.datascope.DataScope; import com.bsd.pjcloud.common.security.service.PjcloudUser; import com.bsd.pjcloud.hard.api.dto.hard.HandCancelCodeDto; import com.bsd.pjcloud.hard.api.dto.hard.HardCreateOrderDto; +import com.bsd.pjcloud.hard.api.dto.order.HardCreateCarDto; import com.bsd.pjcloud.hard.api.dto.order.HardOrderDto; import com.bsd.pjcloud.hard.api.dto.order.app.HardAppCreateOrderDto; import com.bsd.pjcloud.hard.api.entity.order.HardOrderEntity; import com.bsd.pjcloud.hard.api.vo.order.HardOrderVo; +import com.bsd.pjcloud.thirdparty.dto.ks.KsRecognitionCallbackDto; import jakarta.validation.Valid; import java.util.List; @@ -42,6 +44,21 @@ public interface HardOrderService extends IService { */ Long appCreateOrderScancode(@Valid HardAppCreateOrderDto dto); + /** + * 创建智能柜订单 + */ + Long createHardDoorOrder(Long userId, Long hardId); + + /** + * 结算智能柜订单 + */ + Long payHardDoorOrder(HardOrderEntity dto, List ksSpuList); + + /** + * 智能柜取消订单 + */ + Long cancelHardDoorOrder(Long orderId); + /** * 快速扣款,离线订单使用 */ 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/HardSpuRepertoryService.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardSpuRepertoryService.java index 8092bfb6c..305023251 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardSpuRepertoryService.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardSpuRepertoryService.java @@ -4,9 +4,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.bsd.pjcloud.common.data.datascope.DataScope; import com.bsd.pjcloud.common.security.service.PjcloudUser; +import com.bsd.pjcloud.hard.api.dto.spu.DeductionSpuRepertoryDto; import com.bsd.pjcloud.hard.api.dto.spu.HardSpuRepertoryDto; import com.bsd.pjcloud.hard.api.entity.spu.HardSpuRepertoryEntity; import com.bsd.pjcloud.hard.api.vo.spu.HardSpuRepertoryVo; +import jakarta.validation.Valid; import java.util.ArrayList; @@ -28,4 +30,9 @@ public interface HardSpuRepertoryService extends IService list); + + /** + * app上架完成 + */ + Boolean appRepertoryDone(DeductionSpuRepertoryDto body, Long userId); } \ No newline at end of file diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardSpuService.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardSpuService.java index b02be44f2..185a27b7e 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardSpuService.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardSpuService.java @@ -3,6 +3,8 @@ package com.bsd.pjcloud.hard.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.bsd.pjcloud.common.data.datascope.DataScope; +import com.bsd.pjcloud.hard.api.dto.spu.DeductionSpuStockDto; +import com.bsd.pjcloud.hard.api.dto.spu.HardPutawayDto; import com.bsd.pjcloud.hard.api.dto.spu.HardSpuDto; import com.bsd.pjcloud.hard.api.entity.spu.HardSpuEntity; import com.bsd.pjcloud.hard.api.vo.spu.HardSpuJoinVo; @@ -19,6 +21,10 @@ public interface HardSpuService extends IService { */ Page scopPageJoin(Page page, HardSpuDto dto, DataScope dataScope); + List get(List ksSpuIds); + + List getByIds(List spuIds); + /** * 新增 */ @@ -39,8 +45,33 @@ public interface HardSpuService extends IService { */ List>> getByCabinetNo(Long hardId, String cabinetNo); + /** + * 查询货柜补货商品列表 + */ + List appCabinetPutawayList(Long hardDoorId, String cabinetNo); + + /** + * 上架 + */ + void putaway(HardPutawayDto dto); + + /** + * 下架 + */ + void unPutaway(HardPutawayDto dto); + /** * 拉取旷世商品 */ void asyncAll(); + + /** + * 检验商品 + */ + HardSpuEntity validateSpu(Long hardSpuId); + + /** + * 扣减库存 + */ + Boolean deductionSpuStock(List list); } \ 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 434d0b8ad..08e273725 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 @@ -1,28 +1,42 @@ package com.bsd.pjcloud.hard.service.impl; import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.bsd.pjcloud.admin.api.feign.RemoteUserService; import com.bsd.pjcloud.admin.api.utils.DataUtil; import com.bsd.pjcloud.admin.api.vo.UserVO; +import com.bsd.pjcloud.common.core.constant.enums.YesNoEnum; 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.flow.HardDoorFlowBizEnum; +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.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; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; +import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; @@ -35,7 +49,11 @@ import java.util.List; @Service public class HardAuthServiceImpl extends ServiceImpl implements HardAuthService { + private final HardDoorManagerService hardDoorManagerService; + private final HardDoorFlowService hardDoorFlowService; + private final HardManagerMapper hardManagerMapper; + private final HardDoorManagerMapper hardDoorManagerMapper; private final RemoteUserService remoteUserService; @@ -46,6 +64,72 @@ public class HardAuthServiceImpl extends ServiceImpl() + .eq(HardAuthEntity::getUserId, userId) + .eq(HardAuthEntity::getAuthStatus, YesNoEnum.YES.getCode()) + .eq(HardAuthEntity::getIsDone, YesNoEnum.NO.getCode()) + .ne(HardAuthEntity::getIsManualChange, YesNoEnum.YES.getCode()) + ); + return count <= 5; + } + private void disposeList(List list, HardAuthDto dto) { if (ObjectUtil.isEmpty(list)) return; // 设备 @@ -67,4 +151,26 @@ public class HardAuthServiceImpl extends ServiceImpl implements HardBroadcastService { + static private final String TAG = "硬件广播"; + private final HardManagerMapper hardManagerMapper; private final RemoteUserService remoteUserService; @@ -47,6 +54,84 @@ public class HardBroadcastServiceImpl extends ServiceImpl() + .eq(HardBroadcastEntity::getBizId, orderdetail.getId()) + ); + if (ObjectUtil.isNotEmpty(broadcastDetail)) { + log.error("|{}|addReserveOrderTask发送mq消息失败,广播已存在|{}|", TAG, orderdetail.getId()); + return; + } + // 查询设备 + + HardBroadcastEntity saveObj = HardBroadcastEntity.builder() + .userId(orderdetail.getUserId()) + .hardId(orderdetail.getHardId()) + .topic("") + .bizType(HardBroadcastEnum.OFFLINE_CANTEEN_RESERVE.getType()) + .bizId(String.valueOf(orderdetail.getId())) + .title(HardBroadcastEnum.OFFLINE_CANTEEN_RESERVE.getDescription()) + .content("") + .broadcastCount(0) + .broadcastMaxCount(20) + .isBroadcast(YesNoEnum.YES.getCode()) + .isDone(YesNoEnum.NO.getCode()) + .build(); + baseMapper.insert(saveObj); + } + + /** + * 完成硬件广播 + */ + @Override + public void doneBroadcast(HardOrderEntity orderdetail) { + if (ObjectUtil.isEmpty(orderdetail)) return; + HardTypeEnum hardTypeEnum = HardTypeEnum.valueOfByType(orderdetail.getSysType()); + if (ObjectUtil.isEmpty(orderdetail)) { + log.error("|{}|doneBroadcast发送mq消息失败,设备类型错误hardType不存在hardType|{}|", TAG, orderdetail.getSysType()); + return; + } + if (ObjectUtil.notEqual(hardTypeEnum, HardTypeEnum.CANTEEN)) return; + HardOrderTypeEnum hardOrderType = HardOrderTypeEnum.valueOfByType(orderdetail.getOrderType()); + if (ObjectUtil.isEmpty(hardOrderType)) { + log.error("|{}|doneBroadcast发送mq消息失败,订餐类型错误hardType不存在hardType|{}|", TAG, orderdetail.getOrderType()); + return; + } + if (ObjectUtil.notEqual(hardOrderType, HardOrderTypeEnum.RESERVE)) return; + HardBroadcastEntity broadcastDetail = baseMapper.selectOne(new LambdaQueryWrapper() + .eq(HardBroadcastEntity::getBizId, orderdetail.getId()) + ); + if (ObjectUtil.isEmpty(broadcastDetail)) { + log.error("|{}|doneBroadcast发送mq消息失败,广播不存在|{}|", TAG, orderdetail.getId()); + return; + } + HardBroadcastEntity updateObj = HardBroadcastEntity.builder() + .id(broadcastDetail.getId()) + .isBroadcast(YesNoEnum.NO.getCode()) + .isDone(YesNoEnum.YES.getCode()) + .isDoneTime(orderdetail.getCreateTime()) + .build(); + baseMapper.updateById(updateObj); + } + private void disposeList(List list, HardBroadcastDto dto) { if (ObjectUtil.isEmpty(list)) return; // 设备 diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardDoorFlowServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardDoorFlowServiceImpl.java new file mode 100644 index 000000000..f45adffc0 --- /dev/null +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardDoorFlowServiceImpl.java @@ -0,0 +1,526 @@ +package com.bsd.pjcloud.hard.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.RandomUtil; +import cn.hutool.extra.spring.SpringUtil; +import cn.hutool.json.JSONUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.bsd.pjcloud.admin.api.feign.RemoteUserService; +import com.bsd.pjcloud.admin.api.utils.DataUtil; +import com.bsd.pjcloud.admin.api.vo.UserVO; +import com.bsd.pjcloud.common.core.constant.enums.YesNoEnum; +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.flow.HardDoorFlowBizEnum; +import com.bsd.pjcloud.hard.api.constant.flow.HardDoorFlowEnum; +import com.bsd.pjcloud.hard.api.dto.HardDoorFlowDto; +import com.bsd.pjcloud.hard.api.dto.HardDoorFlowOpenDto; +import com.bsd.pjcloud.hard.api.dto.manager.HardManagerDto; +import com.bsd.pjcloud.hard.api.entity.HardAuthEntity; +import com.bsd.pjcloud.hard.api.entity.HardDoorFlowEntity; +import com.bsd.pjcloud.hard.api.entity.manager.HardDoorManagerEntity; +import com.bsd.pjcloud.hard.api.entity.manager.HardManagerEntity; +import com.bsd.pjcloud.hard.api.entity.order.HardOrderEntity; +import com.bsd.pjcloud.hard.api.utils.HardUtil; +import com.bsd.pjcloud.hard.api.vo.HardDoorFlowVo; +import com.bsd.pjcloud.hard.api.vo.manager.HardDoorManagerVo; +import com.bsd.pjcloud.hard.api.vo.spu.HardSpuJoinVo; +import com.bsd.pjcloud.hard.mapper.HardAuthMapper; +import com.bsd.pjcloud.hard.mapper.HardDoorFlowMapper; +import com.bsd.pjcloud.hard.mapper.manager.HardManagerMapper; +import com.bsd.pjcloud.hard.service.*; +import com.bsd.pjcloud.thirdparty.api.feign.RemoterThirdDoorApiService; +import com.bsd.pjcloud.thirdparty.api.feign.RemoterThirdKsService; +import com.bsd.pjcloud.thirdparty.dto.door.*; +import com.bsd.pjcloud.thirdparty.dto.ks.KsRecognitionCallbackDto; +import com.bsd.pjcloud.thirdparty.dto.ks.KsRecognitionDto; +import com.bsd.pjcloud.thirdparty.vo.door.DoorOpenVo; +import com.bsd.pjcloud.thirdparty.vo.ks.KsRecognitionVo; +import com.bsd.pjcloud.wallet.api.feign.RemoteWalletService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.context.annotation.Lazy; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.validation.annotation.Validated; + +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 智能柜流程 + */ +@Validated +@Slf4j +@RequiredArgsConstructor +@Service +public class HardDoorFlowServiceImpl extends ServiceImpl implements HardDoorFlowService { + + private static final String TAG = "智能柜流程"; + + private final HardDoorManagerService hardDoorManagerService; + private final HardDoorCabinetService hardDoorCabinetService; + private final HardSpuJoinService hardSpuJoinService; + private final HardOrderService hardOrderService; + @Lazy + private final HardAuthService hardAuthService; + + private final HardAuthMapper hardAuthMapper; + private final HardManagerMapper hardManagerMapper; + + private final RemoterThirdDoorApiService thirdDoorApiService; + private final RemoterThirdKsService thirdKsService; + private final RemoteUserService remoteUserService; + private final RemoteWalletService remoteWalletService; + + /** + * 复杂查询 + */ + @Override + public Page scopePageJoin(Page page, HardDoorFlowDto dto, DataScope dataScope) { + Page pageList = baseMapper.scopePageJoin(page, dto, dataScope); + disposeList(pageList.getRecords(), dto); + return pageList; + } + + @Override + public HardDoorFlowVo join(Long id) { + HardDoorFlowEntity detail = baseMapper.selectById(id); + if (ObjectUtil.isEmpty(detail)) return null; + HardDoorFlowVo result = BeanUtil.toBean(detail, HardDoorFlowVo.class); + disposeList(result); + return result; + } + + /** + * 通过订单id查询流程 + */ + @Override + public HardDoorFlowVo getByOrderId(Long orderId) { + HardDoorFlowEntity detail = baseMapper.selectOne(new LambdaQueryWrapper().eq(HardDoorFlowEntity::getOrderId, orderId)); + if (ObjectUtil.isEmpty(detail)) return null; + HardDoorFlowVo result = BeanUtil.toBean(detail, HardDoorFlowVo.class); + disposeList(result); + return result; + } + + /** + * 根据旷世识别id查询 + */ + public HardDoorFlowEntity get(String ksRecogId) { + return baseMapper.selectOne(new LambdaQueryWrapper() + .eq(HardDoorFlowEntity::getSkuSubmitRecogId, ksRecogId) + ); + } + + /** + * 开门 + */ + @Transactional(rollbackFor = Exception.class) + public Long openDoor(HardDoorFlowOpenDto dto, HardDoorManagerVo hardDoorVo) { + HardDoorFlowEntity saveObj = HardDoorFlowEntity.builder().flowStatus(HardDoorFlowEnum.FLOW_AUTH.getType()).userId(dto.getUserId()).bizType(dto.getFlowType().getType()).isOpen(YesNoEnum.NO.getCode()).build(); + baseMapper.insert(saveObj); + HardDoorManagerEntity hardDoorStatus = hardDoorManagerService.refresh(hardDoorVo.getDeviceCode()); + // 校验设备和货柜编号 + hardDoorStatus = hardDoorManagerService.checkDeviceAndCabinet(dto.getHardDoorId(), dto.getCabinetNo()); + HardDoorFlowEntity updateObj = HardDoorFlowEntity.builder().id(saveObj.getId()).flowStatus(saveObj.getFlowStatus()).hardId(hardDoorStatus.getHardId()).hardDoorId(dto.getHardDoorId()).cabinetNo(dto.getCabinetNo()).build(); + // 请求开门 + DoorOpenDto openDto = BeanUtil.toBean(dto, DoorOpenDto.class); + openDto.setDeviceCode(hardDoorVo.getDeviceCode()); + openDto.setCabinetNo(dto.getCabinetNo()); + openDto.setOutOpenNo(String.valueOf(saveObj.getId())); + openDto.setEventType(Integer.valueOf(dto.getOpenType().getType())); + DoorOpenVo openVo = thirdDoorApiService.open(openDto).getData(); + if (ObjectUtil.isEmpty(openVo) || !openVo.isSuccess()) { + String errorMsg = "智能柜申请开门错误," + openVo.getMessage(); + flowStatusControl(updateObj, openDto, openVo, errorMsg); + throw new RuntimeException(errorMsg); + } + if (ObjectUtil.isNotEmpty(dto.getAuthId())) { + updateObj.setAuthId(dto.getAuthId()); + } + flowStatusControl(updateObj, openDto, openVo, null); + return updateObj.getId(); + } + + + /** + * 检修开门 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void openDoorAccess(HardDoorFlowOpenDto dto) { + // 查询智能柜 + HardDoorManagerVo doorDetail = hardDoorManagerService.checkDeviceAndCabinet(dto.getHardDoorId(), dto.getCabinetNo()); + getSelf().openDoor(dto, doorDetail); + } + + /** + * 检修关门 + */ + @Override + public void closeAccess(HardDoorFlowOpenDto dto) { + // 查询智能柜 + HardDoorManagerVo doorDetail = hardDoorManagerService.checkDeviceAndCabinet(dto.getHardDoorId(), dto.getCabinetNo()); + // 请求关门 + DoorOpenDto openDto = BeanUtil.toBean(dto, DoorOpenDto.class); + openDto.setDeviceCode(doorDetail.getDeviceCode()); + openDto.setCabinetNo(dto.getCabinetNo()); + openDto.setOutOpenNo(RandomUtil.randomString(32)); + openDto.setEventType(Integer.valueOf(dto.getOpenType().getType())); + DoorOpenVo openVo = thirdDoorApiService.open(openDto).getData(); + if (ObjectUtil.isEmpty(openVo) || !openVo.isSuccess()) { + throw new RuntimeException("关门失败"); + } + } + + /** + * 购买开门 + */ + @Override + public void openDoorPay(HardDoorFlowOpenDto dto, HardDoorManagerVo hardDoorDetail) { + if (ObjectUtil.isNotEmpty(dto.getHardDoorFlowId()) || ObjectUtil.isEmpty(hardDoorDetail)) { + return; + } + // 查看用户消费钱包余额 + String walletErrorMsg = remoteWalletService.innserIsUseDoor(dto.getUserId()).getData(); + if (ObjectUtil.isNotEmpty(walletErrorMsg)) { + throw new RuntimeException(walletErrorMsg); + } + // 查看用户信誉 + boolean userCredit = hardAuthService.judgeUserCredit(dto.getUserId()); + if (!userCredit) { + throw new RuntimeException("用户信誉不足,请联系管理员"); + } + // 查询货柜是否配置spu信息 + List spuList = hardSpuJoinService.getSpuList(hardDoorDetail.getId(), dto.getCabinetNo()); + if (ObjectUtil.isEmpty(spuList) || spuList.isEmpty()) throw new RuntimeException("货柜商品信息为空,请上架"); + getSelf().openDoor(dto, hardDoorDetail); + } + + /** + * 上架开门 + */ + @Override + public Long openDoorRepertory(HardDoorFlowOpenDto dto) { + // 查询智能柜 + HardDoorManagerVo doorDetail = hardDoorManagerService.checkDeviceAndCabinet(dto.getHardDoorId(), dto.getCabinetNo()); + return getSelf().openDoor(dto, doorDetail); + } + + /** + * 处理开门回调 + */ + @Override + public void disposeLocakCallback(DoorOpenCallbackDto dto) { + if (ObjectUtil.isEmpty(dto) || ObjectUtil.isEmpty(dto.getType()) || ObjectUtil.equals(dto.getResultCode(), "FAIL")) { + log.info("|{}|disposeLocakCallback 意外的错误,参数错误dto|{}|", TAG, JSONUtil.toJsonStr(dto)); + return; + } + // 查询流程 + HardDoorFlowEntity flowDetail = baseMapper.selectById(dto.getOutOpenNo()); + if (ObjectUtil.isEmpty(flowDetail) || ObjectUtil.isNotEmpty(flowDetail.getOpenCallbackTime())) { + log.info("|{}|disposeLocakCallback 意外的错误,流程不存在或者重复dto|{}|", TAG, JSONUtil.toJsonStr(dto)); + return; + } + boolean isOpenDoor = ObjectUtil.equals(dto.getType(), "OPEN"); + HardDoorFlowEntity updateObj = HardDoorFlowEntity.builder().id(flowDetail.getId()).flowStatus(flowDetail.getFlowStatus()).isOpen(isOpenDoor ? YesNoEnum.YES.getCode() : YesNoEnum.NO.getCode()).build(); + // 如果是购买的话 + if (ObjectUtil.equals(flowDetail.getBizType(), HardDoorFlowBizEnum.PAY_OPEN.getType())) { + // 创建订单 + Long orderId = hardOrderService.createHardDoorOrder(flowDetail.getUserId(), flowDetail.getHardId()); + updateObj.setOrderId(orderId); + } + getSelf().flowStatusControl(updateObj, null, dto, null); + } + + /** + * 处理柜子状态回调 + */ + @Override + public void disposeStatusCallback(DoorStatusCallbackDto dto) { + if (ObjectUtil.isEmpty(dto)) { + log.error("|{}|disposeStatusCallback 意外的错误,参数错误dto|{}|", TAG, JSONUtil.toJsonStr(dto)); + return; + } + HardDoorManagerVo hardDoorDetail = hardDoorManagerService.getByDeviceCode(dto.getDeviceCode()); + if (ObjectUtil.isEmpty(hardDoorDetail)) { + log.error("|{}|disposeStatusCallback 意外的错误,设备不存在dto|{}|", TAG, JSONUtil.toJsonStr(dto)); + return; + } + try { + hardDoorCabinetService.saveOrUpdate(hardDoorDetail.getId(), dto.getCabinetList()); + } catch (Exception e) { + log.error("|{}|disposeStatusCallback 更新柜子状态失败dto|{}|", TAG, JSONUtil.toJsonStr(dto), e); + } + } + + /** + * 处理视频回调 + */ + @Override + public void disposeVideoCallback(DoorVideoCallbackDto dto) { + if (ObjectUtil.isEmpty(dto) || ObjectUtil.isEmpty(dto.getVideoList()) || ObjectUtil.equals(dto.getResultCode(), "FAIL")) { + log.info("|{}|disposeVideoCallback 意外的错误,参数错误或者状态错误dto|{}|", TAG, JSONUtil.toJsonStr(dto)); + return; + } + // 查询流程 + HardDoorFlowEntity flowDetail = baseMapper.selectById(dto.getOutOpenNo()); + if (ObjectUtil.isEmpty(flowDetail) || ObjectUtil.isNotEmpty(flowDetail.getSkuSubmitTime())) { + log.info("|{}|disposeVideoCallback 意外的错误,流程不存在或重复dto|{}|", TAG, JSONUtil.toJsonStr(dto)); + return; + } + // 提交视频 + List 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); + // 更新流程 + getSelf().flowStatusControl(flowDetail, null, dto, null); + // 提交识别 + KsRecognitionDto ksRecognitionDto = new KsRecognitionDto(); + ksRecognitionDto.setRecog_id(String.valueOf(flowDetail.getId())); + ksRecognitionDto.setExtra_params(ksMap); + ksRecognitionDto.setResource_type("1"); + ksRecognitionDto.setContainer_id(String.valueOf(flowDetail.getHardDoorId())); + ksRecognitionDto.setResource_urls(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()) { + String errorMsg = String.format("|%s|disposeVideoCallback 提交识别错误dto|%s|vo|%s|", TAG, JSONUtil.toJsonStr(ksRecognitionDto), JSONUtil.toJsonStr(ksRecognitionVo)); + log.error(errorMsg); + getSelf().flowStatusControl(flowDetail, ksRecognitionDto, ksRecognitionVo, errorMsg); + return; + } + // 更新流程 + flowDetail.setSkuSubmitRecogId(ksRecognitionVo.getKs_recog_id()); + getSelf().flowStatusControl(flowDetail, ksRecognitionDto, ksRecognitionVo, null); + } + + /** + * 处理旷世识别回调 + */ + @Override + public void disposeRecognitionCallback(KsRecognitionCallbackDto dto) { + if (ObjectUtil.isEmpty(dto)) { + log.error("|{}|disposeRecognitionCallback 参数错误dto|{}|", TAG, JSONUtil.toJsonStr(dto)); + return; + } + // 更新流程 + HardDoorFlowEntity flowDetail = get(dto.getKs_recog_id()); + if (ObjectUtil.isEmpty(flowDetail) || ObjectUtil.isNotEmpty(flowDetail.getSkuCallbackTime())) { + log.error("|{}|disposeRecognitionCallback 意外的错误,流程不存在或重复dto|{}|", TAG, JSONUtil.toJsonStr(dto)); + return; + } + // 查询授权流程 + HardAuthEntity authDetail = hardAuthMapper.selectById(flowDetail.getAuthId()); + if (ObjectUtil.isEmpty(authDetail)) { + log.error("|{}|disposeRecognitionCallback 意外的错误,授权流程不存在dto|{}|", TAG, JSONUtil.toJsonStr(dto)); + return; + } + String ksFlowCode = dto.getState().getCode(); + String ksRecognitionCode = dto.getResult().getStatus().getCode(); + if (ObjectUtil.notEqual(ksFlowCode, "2") || ObjectUtil.notEqual(ksRecognitionCode, "2")) { + if (ObjectUtil.equals(ksFlowCode, "2") && ObjectUtil.notEqual(ksRecognitionCode, "2")) { + // 未拿商品取消订单 + hardOrderService.cancelHardDoorOrder(flowDetail.getOrderId()); + getSelf().flowStatusControl(flowDetail, null, dto, ""); + return; + } + String ksErrorMsg = String.format("商品识别响应错误:ksFlowCode:%s;ksRecognitionCode:%s;", ksFlowCode, ksRecognitionCode); + log.error(ksErrorMsg); + getSelf().flowStatusControl(flowDetail, null, dto, ksErrorMsg); + return; + } + KsRecognitionCallbackDto.Result result = dto.getResult(); + List resultSkuList = result.getResult(); + if (ObjectUtil.isEmpty(resultSkuList)) { + String ksErrorMsg = "商品识别响应错误,识别的商品列表为空"; + log.error(ksErrorMsg); + getSelf().flowStatusControl(flowDetail, null, dto, ksErrorMsg); + return; + } + getSelf().flowStatusControl(flowDetail, null, dto, null); + // 查询订单 + HardOrderEntity orderDetail = hardOrderService.getById(flowDetail.getOrderId()); + if (ObjectUtil.isEmpty(orderDetail)) { + String ksErrorMsg = String.format("订单结算错误,订单不存在orderId%s", flowDetail.getOrderId()); + log.error(ksErrorMsg); + getSelf().flowStatusControl(flowDetail, null, dto, ksErrorMsg); + return; + } + try { + getSelf().flowStatusControl(flowDetail, null, null, null); + Long orderId = hardOrderService.payHardDoorOrder(orderDetail, resultSkuList); + if (ObjectUtil.isNotEmpty(orderId)) { + flowDetail.setFlowStatus(HardDoorFlowEnum.FLOW_CALLBACK_RECOGNITION.getType()); + getSelf().flowStatusControl(flowDetail, null, null, null); + } + // 完成授权流程 + HardAuthEntity updateAuthObj = HardAuthEntity.builder().id(authDetail.getId()).isDone(YesNoEnum.YES.getCode()).isDoneTime(LocalDateTime.now()).build(); + hardAuthMapper.updateById(updateAuthObj); + } catch (Exception e) { + e.printStackTrace(); + String ksErrorMsg = String.format("订单结算错误,订单支付失败error%s;", e.getMessage()); + log.error(ksErrorMsg); + getSelf().flowStatusControl(flowDetail, null, dto, ksErrorMsg); + } + } + + /** + * 流程状态控制(发起流程需要手动) + */ + @Transactional(rollbackFor = Exception.class) + public void flowStatusControl(HardDoorFlowEntity flow, Object dto, Object vo, String error) { + if (!ObjectUtil.isAllNotEmpty(flow.getId(), flow.getFlowStatus())) { + log.error("|{}|flowStatusControl 意外的错误,流程id或者flowstatus为空", TAG); + return; + } + HardDoorFlowEnum flowStatus = HardDoorFlowEnum.valueOfByType(flow.getFlowStatus()); + HardDoorFlowEnum nextType = HardDoorFlowEnum.getNextType(flowStatus); + if (ObjectUtil.isEmpty(nextType)) { + log.error("|{}|flowStatusControl 意外的错误,流程状态控制错误该流程已结束", TAG); + return; + } + HardDoorFlowEntity updateObj = new HardDoorFlowEntity(); + updateObj.setId(flow.getId()); + updateObj.setError(error); + updateObj.setFlowStatus(nextType.getType()); + switch (nextType) { + // 智能柜申请开门 + case FLOW_APPLY_OPEN -> { + updateObj.setRequestOpenDto(JSONUtil.toJsonStr(dto)); + updateObj.setRequestOpenVo(JSONUtil.toJsonStr(vo)); + updateObj.setRequestOpenTime(LocalDateTime.now()); + if (ObjectUtil.isNotEmpty(flow.getAuthId())) { + updateObj.setAuthId(flow.getAuthId()); + } + if (ObjectUtil.isNotEmpty(flow.getHardId())) { + updateObj.setHardId(flow.getHardId()); + } + if (ObjectUtil.isNotEmpty(flow.getHardDoorId())) { + updateObj.setHardDoorId(flow.getHardDoorId()); + } + if (ObjectUtil.isNotEmpty(flow.getCabinetNo())) { + updateObj.setCabinetNo(flow.getCabinetNo()); + } + if (ObjectUtil.isNotEmpty(error)) { + updateObj.setErrorDesc("智能柜申请开门错误"); + } + break; + } + // 智能柜开门响应 + case FLOW_CALLBACK_OPEN -> { + updateObj.setOpenCallbackVo(JSONUtil.toJsonStr(vo)); + updateObj.setOpenCallbackTime(LocalDateTime.now()); + if (ObjectUtil.isNotEmpty(flow.getIsOpen())) { + updateObj.setIsOpen(flow.getIsOpen()); + } + if (ObjectUtil.isNotEmpty(flow.getOrderId())) { + updateObj.setOrderId(flow.getOrderId()); + } + if (ObjectUtil.isNotEmpty(error)) { + updateObj.setErrorDesc("智能柜开门响应错误"); + } + break; + } + // 智能柜视频回调 + case FLOW_CALLBACK_VIDEO -> { + updateObj.setVideoCallbackVo(JSONUtil.toJsonStr(vo)); + updateObj.setVideoCallbackTime(LocalDateTime.now()); + if (ObjectUtil.isNotEmpty(error)) { + updateObj.setErrorDesc("智能柜视频回调错误"); + } + break; + } + // 商品提交识别提交 + case FLOW_SUBMIT_RECOGNITION -> { + updateObj.setSkuSubmitDto(JSONUtil.toJsonStr(dto)); + updateObj.setSkuSubmitVo(JSONUtil.toJsonStr(vo)); + updateObj.setSkuSubmitTime(LocalDateTime.now()); + if (ObjectUtil.isNotEmpty(flow.getSkuSubmitRecogId())) { + updateObj.setSkuSubmitRecogId(flow.getSkuSubmitRecogId()); + } + if (ObjectUtil.isNotEmpty(error)) { + updateObj.setErrorDesc("商品提交识别提交错误"); + } + break; + } + // 商品识别响应 + case FLOW_CALLBACK_RECOGNITION -> { + updateObj.setSkuCallbackVo(JSONUtil.toJsonStr(vo)); + updateObj.setSkuCallbackTime(LocalDateTime.now()); + if (ObjectUtil.isNotEmpty(error)) { + updateObj.setErrorDesc("商品识别响应错误"); + } + break; + } + case FLOW_PAY_ORDER -> { + updateObj.setPayTime(LocalDateTime.now()); + if (ObjectUtil.isNotEmpty(error)) { + updateObj.setErrorDesc("商品识别响应错误"); + } + break; + } + } + baseMapper.updateById(updateObj); + } + + private void disposeList(List list, HardDoorFlowDto dto) { + if (ObjectUtil.isEmpty(list)) return; + // 设备 + List hardIds = list.stream().map(HardDoorFlowVo::getHardId).filter(ObjectUtil::isNotEmpty).distinct().toList(); + if (ObjectUtil.isNotEmpty(hardIds)) { + HardManagerDto hardManagerDto = new HardManagerDto(); + hardManagerDto.setIds(hardIds); + List hardList = hardManagerMapper.list(hardManagerDto); + if (ObjectUtil.isNotEmpty(hardList)) { + HardUtil.convertHardList(list, CollectionUtils.convertMap(hardList, HardManagerEntity::getId)); + } + } + // 用户相关 + List userIds = list.stream().map(HardDoorFlowVo::getUserId).distinct().toList(); + if (ObjectUtil.isNotEmpty(userIds)) { + R> userList = remoteUserService.getUserDeptByIds(new ArrayList<>(userIds)); + if (ObjectUtil.isNotEmpty(userList.getData())) { + DataUtil.convertUserDeptList(list, CollectionUtils.convertMap(userList.getData(), UserVO::getUserId)); + } + } + } + + private void disposeList(HardDoorFlowVo detail) { + // 用户 + List usrList = remoteUserService.getUserDeptByIds(List.of(detail.getUserId())).getData(); + if (ObjectUtil.isNotEmpty(usrList)) { + DataUtil.convertUserDept(detail, usrList.get(0)); + } + // 设备 + HardManagerEntity hardManager = hardManagerMapper.selectById(detail.getHardDoorId()); + if (ObjectUtil.isNotEmpty(hardManager)) { + HardUtil.convertHard(detail, hardManager); + } + } + + private HardDoorFlowServiceImpl getSelf() { + return SpringUtil.getBean(getClass()); + } +} \ No newline at end of file diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/manager/HardDoorCabinetServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/manager/HardDoorCabinetServiceImpl.java new file mode 100644 index 000000000..eb45e6eec --- /dev/null +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/manager/HardDoorCabinetServiceImpl.java @@ -0,0 +1,112 @@ +package com.bsd.pjcloud.hard.service.impl.manager; + +import cn.hutool.core.codec.Base64; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.json.JSONUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.bsd.pjcloud.admin.api.feign.RemoteFileService; +import com.bsd.pjcloud.common.core.util.QRCodeImageGenerator; +import com.bsd.pjcloud.common.core.util.R; +import com.bsd.pjcloud.hard.api.entity.manager.HardDoorCabinetEntity; +import com.bsd.pjcloud.hard.api.vo.manager.HardDoorCabinetCodeVo; +import com.bsd.pjcloud.hard.mapper.manager.HardDoorCabinetMapper; +import com.bsd.pjcloud.hard.service.HardDoorCabinetService; +import com.bsd.pjcloud.thirdparty.vo.door.DoorStatusVo; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.mock.web.MockMultipartFile; +import org.springframework.stereotype.Service; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.multipart.MultipartFile; + +import java.io.ByteArrayInputStream; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +/** + * 智能柜货柜 + */ +@Validated +@Slf4j +@RequiredArgsConstructor +@Service +public class HardDoorCabinetServiceImpl extends ServiceImpl implements HardDoorCabinetService { + + private final RemoteFileService remoteFileService; + + @Override + public void saveOrUpdate(Long hardDoorId, List list) { + List cabinetList = baseMapper.selectList(new LambdaQueryWrapper() + .eq(HardDoorCabinetEntity::getHardDoorId, hardDoorId) + ); + if (ObjectUtil.isEmpty(cabinetList)) { + List addList = new ArrayList<>(); + for (DoorStatusVo.Cabinet cabinet : list) { + HardDoorCabinetEntity entity = new HardDoorCabinetEntity(); + entity.setHardDoorId(hardDoorId); + entity.setCabinetNo(cabinet.getCabinetNo()); + entity.setIsLockOnline(cabinet.getIsLockOnline()); + entity.setLockStatus(cabinet.getLockStatus()); + entity.setDoorStatus(cabinet.getDoorStatus()); + entity.setSaleStatus(cabinet.getSaleStatus()); + addList.add(entity); + } + baseMapper.insert(addList); + return; + } + for (DoorStatusVo.Cabinet cabinet : list) { + cabinetList.stream().filter(i -> ObjectUtil.equals(i.getCabinetNo(), cabinet.getCabinetNo())) + .findFirst() + .ifPresent(i -> { + i.setIsLockOnline(cabinet.getIsLockOnline()); + i.setLockStatus(cabinet.getLockStatus()); + i.setDoorStatus(cabinet.getDoorStatus()); + i.setSaleStatus(cabinet.getSaleStatus()); + baseMapper.updateById(i); + }); + } + } + + @Override + public List getListByHardDoorId(Long hardDoorId) { + return baseMapper.selectList(new LambdaQueryWrapper() + .eq(HardDoorCabinetEntity::getHardDoorId, hardDoorId) + ); + } + + /** + * 刷新智能柜货柜二维码 + */ + @Override + public String refreshQrCode(Long hardDoorId, Integer cabinetNo) { + // 查找货柜 + HardDoorCabinetEntity cabinetDetail = baseMapper.selectOne(new LambdaQueryWrapper() + .eq(HardDoorCabinetEntity::getHardDoorId, hardDoorId) + .eq(HardDoorCabinetEntity::getCabinetNo, cabinetNo) + ); + if (ObjectUtil.isEmpty(cabinetDetail)) throw new RuntimeException("货柜不存在"); + HardDoorCabinetCodeVo cabinetCodeVo = new HardDoorCabinetCodeVo(); + cabinetCodeVo.setHardDoorId(String.valueOf(hardDoorId)); + cabinetCodeVo.setCabinetNo(String.valueOf(cabinetNo)); + // 生成二维码 + String coeContent = Base64.encode(JSONUtil.toJsonStr(cabinetCodeVo)); + try { + byte[] bytes = QRCodeImageGenerator.generateQrCodeImage(coeContent, 300); + MultipartFile multipartFile = new MockMultipartFile("file", hardDoorId + "-" + System.currentTimeMillis() + ".png", "image/png", new ByteArrayInputStream(bytes)); + R upload = remoteFileService.innerUpload(multipartFile, null, null, null); + Map data = (Map) upload.getData(); + String url = (String) data.get("url"); + // 更新 + HardDoorCabinetEntity updateObj = new HardDoorCabinetEntity(); + updateObj.setId(cabinetDetail.getId()); + updateObj.setQrCode(url); + baseMapper.updateById(updateObj); + return url; + } catch (Exception e) { + log.error("refreshQrCode刷新智能柜货柜二维码,hardDoorId:{},cabinetNo:{}", hardDoorId, cabinetNo, e); + throw new RuntimeException("刷新二维码失败"); + } + } +} \ No newline at end of file diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/manager/HardDoorManagerServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/manager/HardDoorManagerServiceImpl.java index 965bea5b2..b4df51f42 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/manager/HardDoorManagerServiceImpl.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/manager/HardDoorManagerServiceImpl.java @@ -1,28 +1,38 @@ package com.bsd.pjcloud.hard.service.impl.manager; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.bsd.pjcloud.common.core.util.CollectionUtils; import com.bsd.pjcloud.common.data.datascope.DataScope; import com.bsd.pjcloud.hard.api.dto.manager.HardDoorManagerDto; +import com.bsd.pjcloud.hard.api.dto.manager.HardManagerDto; import com.bsd.pjcloud.hard.api.dto.spu.HardChangeVolume; +import com.bsd.pjcloud.hard.api.entity.manager.HardDoorCabinetEntity; 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.manager.HardDoorManagerVo; import com.bsd.pjcloud.hard.mapper.manager.HardDoorManagerMapper; +import com.bsd.pjcloud.hard.mapper.manager.HardManagerMapper; +import com.bsd.pjcloud.hard.service.HardDoorCabinetService; import com.bsd.pjcloud.hard.service.HardDoorManagerService; import com.bsd.pjcloud.thirdparty.api.feign.RemoterThirdDoorApiService; -import com.bsd.pjcloud.thirdparty.dto.door.DoorBindDto; -import com.bsd.pjcloud.thirdparty.dto.door.DoorRegisterDto; -import com.bsd.pjcloud.thirdparty.dto.door.DoorVideoDto; -import com.bsd.pjcloud.thirdparty.dto.door.DoorVolumeDto; +import com.bsd.pjcloud.thirdparty.dto.door.*; import com.bsd.pjcloud.thirdparty.vo.door.DoorBindVo; import com.bsd.pjcloud.thirdparty.vo.door.DoorRegisterVo; +import com.bsd.pjcloud.thirdparty.vo.door.DoorStatusVo; import com.bsd.pjcloud.thirdparty.vo.door.DoorVolumeVo; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; +import java.util.List; + /** * 智能柜设置 */ @@ -32,51 +42,75 @@ import org.springframework.validation.annotation.Validated; @Service public class HardDoorManagerServiceImpl extends ServiceImpl implements HardDoorManagerService { + private final HardDoorCabinetService hardDoorCabinetService; + + private final HardManagerMapper hardManagerMapper; + private final RemoterThirdDoorApiService thirdDoorApiService; @Override public Page scopePageJoin(Page page, HardDoorManagerDto dto, DataScope dataScope) { - return baseMapper.scopePageJoin(page, dto, dataScope); + Page pageList = baseMapper.scopePageJoin(page, dto, dataScope); + disposeList(pageList.getRecords(), dto); + return pageList; } /** * 根据硬件id查询详情 */ @Override - public HardDoorManagerVo getByHardId(Long hardId) { - return baseMapper.pageJoin(hardId); + public HardDoorManagerVo getByHardDoorId(Long hardId) { + HardDoorManagerVo hardDoor = baseMapper.pageJoin(hardId); + if (ObjectUtil.isNotEmpty(hardDoor)) { + List cabinetList = hardDoorCabinetService.getListByHardDoorId(hardDoor.getId()); + if (ObjectUtil.isNotEmpty(cabinetList)) { + hardDoor.setCabinetList(cabinetList); + } + } + return hardDoor; + } + + @Override + public HardDoorManagerVo getByDeviceCode(String deviceCode) { + HardDoorManagerEntity hardDoor = baseMapper.selectOne(new LambdaQueryWrapper() + .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; } /** * 绑定设备 */ @Override + @Transactional(rollbackFor = Exception.class) public void bind(HardDoorManagerEntity dto) { // 查询设备 - HardDoorManagerVo hardDoorDetail = getByHardId(dto.getHardId()); + HardDoorManagerVo hardDoorDetail = getByHardDoorId(dto.getHardId()); if (ObjectUtil.isEmpty(hardDoorDetail)) { HardDoorManagerEntity saveOrUpdate = new HardDoorManagerEntity(); saveOrUpdate.setHardId(dto.getHardId()); saveOrUpdate.setImei(dto.getImei()); saveOrUpdate.setDeviceCode(dto.getDeviceCode()); + saveOrUpdate.setDoorCount(dto.getDoorCount()); baseMapper.insert(saveOrUpdate); + dto.setId(saveOrUpdate.getId()); } else { HardDoorManagerEntity saveOrUpdate = new HardDoorManagerEntity(); saveOrUpdate.setId(hardDoorDetail.getId()); saveOrUpdate.setHardId(dto.getHardId()); saveOrUpdate.setImei(dto.getImei()); saveOrUpdate.setDeviceCode(dto.getDeviceCode()); + saveOrUpdate.setDoorCount(dto.getDoorCount()); baseMapper.updateById(saveOrUpdate); } - // 设备绑定 - DoorBindDto bindDto = new DoorBindDto(); - bindDto.setImei(dto.getImei()); - bindDto.setDeviceCode(dto.getDeviceCode()); - bindDto.setOutDeviceCode(String.valueOf(dto.getHardId())); - DoorBindVo bindVo = thirdDoorApiService.bind(bindDto).getData(); - if (!bindVo.isSuccess()) { - throw new RuntimeException(bindVo.getMessage()); - } // 设备注册 DoorRegisterDto registerDto = new DoorRegisterDto(); registerDto.setImei(dto.getImei()); @@ -85,6 +119,59 @@ public class HardDoorManagerServiceImpl extends ServiceImpl() + .eq(HardDoorManagerEntity::getDeviceCode, deviceCode) + .orderByDesc(HardDoorManagerEntity::getCreateTime) + .last("limit 1") + ); + if (ObjectUtil.isEmpty(hardDoorDetail)) throw new RuntimeException("刷新失败,设备不存在"); + DoorStatusDto statusDto = new DoorStatusDto(); + statusDto.setDeviceCode(deviceCode); + DoorStatusVo statusVo = thirdDoorApiService.status(statusDto).getData(); + if (!statusVo.isSuccess()) { + throw new RuntimeException(statusVo.getMessage()); + } + HardDoorManagerEntity updateObj = new HardDoorManagerEntity(); + updateObj.setId(hardDoorDetail.getId()); + updateObj.setPowerStatus(statusVo.getPowerStatus()); + updateObj.setNetStatus(statusVo.getNetStatus()); + updateObj.setNetStatus(statusVo.getSaleStatus()); + updateObj.setSaleStatus(statusVo.getSaleStatus()); + updateObj.setSimSn(statusVo.getSimSn()); + updateObj.setSignalIntensity(statusVo.getSignalIntensity()); + updateObj.setSignalRatio(statusVo.getSignalRatio()); + updateObj.setSignalTime(statusVo.getSignalTime()); + if (ObjectUtil.isNotEmpty(statusVo.getCabinetStatusList())) { + hardDoorCabinetService.saveOrUpdate(hardDoorDetail.getId(), statusVo.getCabinetStatusList()); + } + baseMapper.updateById(updateObj); + return updateObj; } /** @@ -93,7 +180,7 @@ public class HardDoorManagerServiceImpl extends ServiceImpl cabinetList = hardDoorCabinetService.getListByHardDoorId(hardDoorId); + if (ObjectUtil.isEmpty(cabinetList)) throw new RuntimeException("货柜不存在"); + if (ObjectUtil.isEmpty(cabinetList.stream().filter(i -> ObjectUtil.equals(i.getCabinetNo(), cabinetNo)).findFirst().orElse(null))) { + throw new RuntimeException("货柜不存在"); + } + HardDoorManagerVo doorVo = BeanUtil.toBean(doorDetail, HardDoorManagerVo.class); + doorVo.setCabinetList(cabinetList); + return doorVo; + } + + private void disposeList(List list, HardDoorManagerDto dto) { + if (ObjectUtil.isEmpty(list)) return; + // 设备 + List hardIds = list.stream().map(HardDoorManagerVo::getHardId).filter(ObjectUtil::isNotEmpty).distinct().toList(); + if (ObjectUtil.isNotEmpty(hardIds)) { + HardManagerDto hardManagerDto = new HardManagerDto(); + hardManagerDto.setIds(hardIds); + List hardList = hardManagerMapper.list(hardManagerDto); + if (ObjectUtil.isNotEmpty(hardList)) { + HardUtil.convertHardList(list, CollectionUtils.convertMap(hardList, HardManagerEntity::getId)); + } + } } } \ No newline at end of file diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardCarServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardCarServiceImpl.java index d47bec2d5..646cc5511 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardCarServiceImpl.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardCarServiceImpl.java @@ -20,11 +20,13 @@ import com.bsd.pjcloud.hard.api.dto.order.HardCreateCarDto; import com.bsd.pjcloud.hard.api.entity.order.HardCarEntity; import com.bsd.pjcloud.hard.api.entity.order.HardParentCarEntity; import com.bsd.pjcloud.hard.api.entity.order.HardOrderEntity; +import com.bsd.pjcloud.hard.api.entity.spu.HardSpuEntity; import com.bsd.pjcloud.hard.api.vo.order.HardCarVo; import com.bsd.pjcloud.hard.mapper.order.HardCarMapper; import com.bsd.pjcloud.hard.mapper.order.HardOrderMapper; import com.bsd.pjcloud.hard.mapper.order.HardParentCarMapper; import com.bsd.pjcloud.hard.service.HardCarService; +import com.bsd.pjcloud.hard.service.HardSpuService; import com.bsd.pjcloud.supermarket.api.feign.RemoteSupermarketUnitSkuService; import com.bsd.pjcloud.supermarket.vo.erp.SmErpUnitWithSpuVo; import lombok.RequiredArgsConstructor; @@ -53,6 +55,7 @@ public class HardCarServiceImpl extends ServiceImpl { + AtomicInteger doorTotalPrice = new AtomicInteger(); + // 查询智能柜 + List supList = hardSpuService.getByIds(productIds); + for (HardCreateCarDto v : list) { + supList.stream().filter(i -> ObjectUtil.equals(i.getId(), v.getProductId())).findFirst().ifPresent(spu -> { + Integer price = spu.getPrice(); + if (ObjectUtil.isNotEmpty(v.getProductCount()) && !ObjectUtil.equals(v.getProductCount(), 0)) { + // 按数量 + int itemTotalPrice = v.getProductCount() * price; + doorTotalPrice.addAndGet(itemTotalPrice); + } else if (ObjectUtil.isNotEmpty(v.getProductWeight()) && v.getProductWeight().compareTo(BigDecimal.valueOf(0)) != 0) { + // 按重量 + // 向上取整 + int itemTotalPrice = v.getProductWeight().multiply(BigDecimal.valueOf(price)).setScale(0, RoundingMode.CEILING).intValue(); + doorTotalPrice.addAndGet(itemTotalPrice); + } + }); + } + yield doorTotalPrice.get(); + } default -> null; }; } @@ -272,6 +296,37 @@ public class HardCarServiceImpl extends ServiceImpl carObjectList = new ArrayList<>(); + List supList = hardSpuService.getByIds(productIds); + for (HardCreateCarDto v : productList) { + HardCarEntity item = HardCarEntity.builder().parentCarId(parentCarId).build(); + supList.stream().filter(i -> ObjectUtil.equals(i.getId(), v.getProductId())).findFirst().ifPresent(spu -> { + Integer price = spu.getPrice(); + int totalPrice = 0; + // 按重量 + if (ObjectUtil.isNotEmpty(v.getProductCount()) && !ObjectUtil.equals(v.getProductCount(), 0)) { + // 按数量 + totalPrice = v.getProductCount() * price; + } else if (ObjectUtil.isNotEmpty(v.getProductWeight()) && v.getProductWeight().compareTo(BigDecimal.valueOf(0)) != 0) { + // 按重量 + totalPrice = v.getProductWeight().multiply(BigDecimal.valueOf(price)).setScale(0, RoundingMode.CEILING).intValue(); + } + item.setProductId(spu.getId()); + item.setProductName(spu.getName()); + item.setProductPrice(price); + item.setProductPic(spu.getCover()); + item.setTotalPrice((long) totalPrice); + // item.setProductNature(v.getProductNature().getType()); + item.setProductCount(v.getProductCount()); + item.setProductWeight(v.getProductWeight()); + carObjectList.add(item); + }); + } + baseMapper.insert(carObjectList); + return; + } } @Override @@ -308,6 +363,15 @@ public class HardCarServiceImpl extends ServiceImpl supList = hardSpuService.getByIds(productIds); + for (HardCreateCarDto v : list) { + supList.stream().filter(i -> ObjectUtil.equals(i.getId(), v.getProductId())).findFirst().ifPresent(spu -> { + str.append(spu.getName()).append("x").append(v.getProductCount()).append(";"); + }); + } + } return str.toString(); } diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderServiceImpl.java index 972adf779..815986eb0 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderServiceImpl.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderServiceImpl.java @@ -2,6 +2,7 @@ package com.bsd.pjcloud.hard.service.impl.order; import cn.hutool.core.util.ObjectUtil; import cn.hutool.extra.spring.SpringUtil; +import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -19,6 +20,7 @@ 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.common.security.service.PjcloudUser; +import com.bsd.pjcloud.hard.api.constant.HardProductNatureEnum; import com.bsd.pjcloud.hard.api.constant.HardTypeEnum; import com.bsd.pjcloud.hard.api.constant.order.HardOrderStatusEnum; import com.bsd.pjcloud.hard.api.constant.order.HardOrderTypeEnum; @@ -29,21 +31,22 @@ import com.bsd.pjcloud.hard.api.dto.hard.HardCreateOrderDto; import com.bsd.pjcloud.hard.api.dto.order.HardCreateCarDto; import com.bsd.pjcloud.hard.api.dto.order.HardOrderDto; import com.bsd.pjcloud.hard.api.dto.order.app.HardAppCreateOrderDto; +import com.bsd.pjcloud.hard.api.dto.spu.DeductionSpuStockDto; import com.bsd.pjcloud.hard.api.entity.manager.HardManagerEntity; import com.bsd.pjcloud.hard.api.entity.order.HardCarEntity; import com.bsd.pjcloud.hard.api.entity.order.HardOrderEntity; import com.bsd.pjcloud.hard.api.entity.order.HardParentCarEntity; +import com.bsd.pjcloud.hard.api.entity.spu.HardSpuEntity; import com.bsd.pjcloud.hard.api.utils.HardUtil; +import com.bsd.pjcloud.hard.api.vo.manager.HardManagerVo; import com.bsd.pjcloud.hard.api.vo.order.HardCarVo; import com.bsd.pjcloud.hard.api.vo.order.HardOrderVo; import com.bsd.pjcloud.hard.mapper.manager.HardManagerMapper; import com.bsd.pjcloud.hard.mapper.order.HardOrderMapper; -import com.bsd.pjcloud.hard.service.HardCarService; -import com.bsd.pjcloud.hard.service.HardInvoiceService; -import com.bsd.pjcloud.hard.service.HardManagerService; -import com.bsd.pjcloud.hard.service.HardOrderService; +import com.bsd.pjcloud.hard.service.*; import com.bsd.pjcloud.supermarket.api.feign.RemoteSupermarketSpuService; import com.bsd.pjcloud.supermarket.dto.SupermarketSpuUpdateStockReqDTO; +import com.bsd.pjcloud.thirdparty.dto.ks.KsRecognitionCallbackDto; import com.bsd.pjcloud.wallet.api.constant.WalletBizEnum; import com.bsd.pjcloud.wallet.api.constant.WalletCodeBizEnum; import com.bsd.pjcloud.wallet.api.constant.WalletTypeEnum; @@ -90,6 +93,8 @@ public class HardOrderServiceImpl extends ServiceImpl carList = hardCarService.getByParentCarId(dto.getCarParentId()); @@ -345,6 +350,8 @@ public class HardOrderServiceImpl extends ServiceImpl ksSpuList) { + if (ObjectUtil.isEmpty(dto) || ObjectUtil.isEmpty(ksSpuList)) return null; + // 创建购物车 + List ksSpuIds = ksSpuList.stream().map(KsRecognitionCallbackDto.ResultSku::getKs_sku_id).toList(); + List hardSpuList = hardSpuService.get(ksSpuIds); + if (ObjectUtil.isEmpty(hardSpuList)) { + log.error("|{}|智能柜订单结算,商品不存在dto|{}|ksSpuList|{}|", TAG, JSONUtil.toJsonStr(dto), JSONUtil.toJsonStr(ksSpuList)); + return null; + } + List carListDto = new ArrayList<>(); + for (KsRecognitionCallbackDto.ResultSku v : ksSpuList) { + hardSpuList.stream().filter(i -> ObjectUtil.equals(i.getKsSkuId(), v.getKs_sku_id())).findFirst().ifPresent(hardSpu -> { + HardCreateCarDto entity = new HardCreateCarDto(); + entity.setProductId(hardSpu.getId()); + entity.setProductNature(HardProductNatureEnum.DEFAULT); + entity.setProductCount(Integer.parseInt(v.getSku_num())); + carListDto.add(entity); + }); + } + HardTypeEnum sysType = HardTypeEnum.valueOfByType(dto.getSysType()); + HardOrderTypeEnum orderType = HardOrderTypeEnum.valueOfByType(dto.getOrderType()); + // 获取商品价格 + Integer totalPrice = hardCarService.computerCarTotalPrice(sysType, orderType, carListDto); + // 添加购物车 + Long parentCarId = hardCarService.createCard(dto.getUserId(), dto.getMerchantId(), sysType, orderType, carListDto); + // 获取商品描述 + String subject = hardCarService.computerCarSubject(sysType, orderType, carListDto); + // 更新订单信息 + HardOrderEntity updateObj = HardOrderEntity.builder() + .id(dto.getId()) + .parentCarId(parentCarId) + .totalPrice(totalPrice) + .payPrice(totalPrice) + .extraPrice(0) + .productDesc(subject) + .build(); + baseMapper.updateById(updateObj); + HardOrderEntity orderObj = baseMapper.selectById(updateObj.getId()); + // 扣减库存 + getSelf().fastenerInventory(orderObj, YesNoEnum.YES); + // 钱包扣款 + getSelf().fastReduceBalance(orderObj); + return orderObj.getId(); + } + + /** + * 智能柜取消订单 + */ + @Override + public Long cancelHardDoorOrder(Long orderId) { + // 查询订单 + HardOrderEntity order = baseMapper.selectById(orderId); + if (ObjectUtil.isEmpty(order)) { + log.error("|{}|智能柜订单取消失败,订单不存在|{}|", TAG, orderId); + return null; + } + if (ObjectUtil.isNotEmpty(order.getPayPrice()) && order.getPayPrice() > 0) { + log.error("|{}|智能柜订单取消失败,订单价格大于0|{}|", TAG, orderId); + return null; + } + if (ObjectUtil.isNotEmpty(order.getOrderStatus()) && ObjectUtil.equals(order.getOrderStatus(), HardOrderStatusEnum.UNFOLLOW.getType())) { + log.error("|{}|智能柜订单取消失败,订单已核销|{}|", TAG, orderId); + return null; + } + HardOrderEntity updateObj = HardOrderEntity.builder() + .id(order.getId()) + .orderStatus(HardOrderStatusEnum.UNFOLLOW.getType()) + .unfollowTime(LocalDateTime.now()) + .build(); + baseMapper.updateById(updateObj); + return updateObj.getId(); + } + @Override @Transactional(rollbackFor = Exception.class) public void fastReduceBalance(HardOrderEntity order) { @@ -513,7 +637,7 @@ public class HardOrderServiceImpl extends ServiceImpl carList = hardCarService.getByParentCarId(order.getParentCarId()); @@ -534,7 +658,7 @@ public class HardOrderServiceImpl extends ServiceImpl carList = hardCarService.getByParentCarId(order.getParentCarId()); @@ -563,6 +687,25 @@ public class HardOrderServiceImpl extends ServiceImpl carList = hardCarService.getByParentCarId(order.getParentCarId()); + if (ObjectUtil.isEmpty(carList)) throw new RuntimeException("扣减库存错误,购物车不存在"); + List list = carList.stream().map(v -> { + DeductionSpuStockDto entity = new DeductionSpuStockDto(); + entity.setHardSpuId(v.getProductId()); + entity.setIncrCount(v.getProductCount()); + return entity; + }).toList(); + Boolean isDeduction = hardSpuService.deductionSpuStock(list); + if (!isDeduction) { + log.info("|{}|{},失败,order:|{}|,isReduce:|{}|,params:|{}|", TAG, CarErrorMsg, JSON.toJSON(order), isReduce, JSON.toJSON(list)); + throw new RuntimeException("扣减智能柜库存" + CarErrorMsg + "错误"); + } + log.info("扣减智能柜库存成功|{}|{},成功,order:|{}|,isReduce:|{}|,params:|{}|", TAG, CarErrorMsg, JSON.toJSON(order), isReduce, JSON.toJSON(list)); + return; + } } // 发送mq消息 @@ -587,8 +730,20 @@ public class HardOrderServiceImpl extends ServiceImpl { + HardOrderTypeEnum hardOrderType = HardOrderTypeEnum.valueOfByType(orderdetail.getOrderType()); + if (ObjectUtil.isEmpty(hardTypeEnum)) { + log.error("|{}|发送mq消息失败,订餐类型错误hardType不存在hardType|{}|", TAG, orderdetail.getOrderType()); + return; + } + // 发送订餐mq + if (ObjectUtil.equals(hardOrderType, HardOrderTypeEnum.RESERVE)) { + hardBroadcastService.addReserveOrderTask(orderdetail); + } + } } } catch (Exception e) { + // 不返回错误 log.info("|{}|发送mq消息成功,意外的错误error|{}|", TAG, e.getMessage()); } } 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 150416d7e..0363fc7cc 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 @@ -17,6 +17,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; +import java.util.ArrayList; import java.util.List; /** @@ -33,20 +34,34 @@ 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) + .orderByAsc(HardSpuJoinEntity::getHardDoorNumber) + .orderByDesc(HardSpuJoinEntity::getSpuId) ); - if (ObjectUtil.isEmpty(list)) return List.of(); + if (ObjectUtil.isEmpty(list)) return new ArrayList<>(); List joinList = BeanUtils.toBean(list, HardSpuJoinVo.class); List spuIds = joinList.stream().map(HardSpuJoinVo::getSpuId).toList(); // 查询商品 if (ObjectUtil.isNotEmpty(spuIds)) { - List spuList = hardSpuMapper.scopPageList(HardSpuDto.builder().build(), null); + HardSpuDto spuDto = new HardSpuDto(); + spuDto.setSpuIdList(spuIds); + List spuList = hardSpuMapper.scopPageList(spuDto, null); for (HardSpuJoinVo v : joinList) { spuList.stream().filter(i -> ObjectUtil.equals(i.getId(), v.getSpuId())).findFirst().ifPresent(v::setSpuDetail); } } - return List.of(); + return joinList; + } + + @Override + public List getSpuList(Long hardDoorId, Integer cabinetNo) { + HardSpuJoinDto queryDto = new HardSpuJoinDto(); + queryDto.setHardDoorId(hardDoorId); + queryDto.setCabinetNo(String.valueOf(cabinetNo)); + queryDto.setIsSpu(true); + return scopeList(queryDto); } } \ No newline at end of file diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/spu/HardSpuRepertoryServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/spu/HardSpuRepertoryServiceImpl.java index 3728114e4..f6cf85752 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/spu/HardSpuRepertoryServiceImpl.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/spu/HardSpuRepertoryServiceImpl.java @@ -12,15 +12,15 @@ import com.bsd.pjcloud.common.core.util.R; import com.bsd.pjcloud.common.data.datascope.DataScope; import com.bsd.pjcloud.common.security.service.PjcloudUser; import com.bsd.pjcloud.hard.api.constant.spu.HardSpuRepertoryTypeEnum; -import com.bsd.pjcloud.hard.api.dto.manager.HardManagerDto; +import com.bsd.pjcloud.hard.api.dto.spu.DeductionSpuRepertoryDto; import com.bsd.pjcloud.hard.api.dto.spu.HardSpuRepertoryDto; -import com.bsd.pjcloud.hard.api.entity.manager.HardManagerEntity; +import com.bsd.pjcloud.hard.api.entity.HardDoorFlowEntity; import com.bsd.pjcloud.hard.api.entity.spu.HardSpuEntity; import com.bsd.pjcloud.hard.api.entity.spu.HardSpuRepertoryEntity; -import com.bsd.pjcloud.hard.api.utils.HardUtil; import com.bsd.pjcloud.hard.api.vo.spu.HardSpuRepertoryVo; import com.bsd.pjcloud.hard.mapper.manager.HardManagerMapper; import com.bsd.pjcloud.hard.mapper.spu.HardSpuRepertoryMapper; +import com.bsd.pjcloud.hard.service.HardDoorFlowService; import com.bsd.pjcloud.hard.service.HardSpuRepertoryService; import com.bsd.pjcloud.hard.service.HardSpuService; import com.bsd.pjcloud.wallet.api.feign.RemoteMchService; @@ -45,12 +45,11 @@ import java.util.List; public class HardSpuRepertoryServiceImpl extends ServiceImpl implements HardSpuRepertoryService { private final HardSpuService hardSpuService; + private final HardDoorFlowService hardDoorFlowService; private final RemoteMchService remoteMchService; private final RemoteUserService remoteUserService; - private final HardManagerMapper hardManagerMapper; - @Override public Page scopePageJoin(Page page, HardSpuRepertoryDto dto, DataScope dataScope) { Page pageList = baseMapper.scopePageJoin(page, dto, dataScope); @@ -69,13 +68,18 @@ public class HardSpuRepertoryServiceImpl extends ServiceImpl().eq(HardSpuRepertoryEntity::getBizId, body.getFlowId())); + if (count > 0) { + throw new RuntimeException("改上架已结束"); + } + List list = body.getList().stream().filter(v -> v.getPlusCount() > 0).toList(); + if (ObjectUtil.isEmpty(list)) { + throw new RuntimeException("上架商品不能为空"); + } + // 查询商品列表 + List spuIds = list.stream().map(DeductionSpuRepertoryDto.Item::getHardSpuId).toList(); + List spuList = hardSpuService.listByIds(spuIds); + // 更新上架记录 + List spuRepertoryList = new ArrayList<>(); + List spuUpdateList = new ArrayList<>(); + for (DeductionSpuRepertoryDto.Item i : list) { + spuList.stream().filter(v -> v.getId().equals(i.getHardSpuId())).findFirst().ifPresent(spu -> { + HardSpuRepertoryEntity entity = new HardSpuRepertoryEntity(); + Integer beforeCount = 0; + if (ObjectUtil.isNotEmpty(spu.getRepertoryCount())) { + beforeCount = spu.getRepertoryCount(); + } + entity.setSpuId(spu.getId()); + entity.setUserId(userId); + entity.setBeforeCount(beforeCount); + entity.setCount(i.getPlusCount() + beforeCount); + entity.setBizId(body.getFlowId()); + entity.setBizType(HardSpuRepertoryTypeEnum.PERSION.getType()); + spuRepertoryList.add(entity); + + HardSpuEntity spuEntity = new HardSpuEntity(); + spuEntity.setId(spu.getId()); + spuEntity.setRepertoryCount(entity.getCount()); + spuUpdateList.add(spuEntity); + }); + } + // 添加上架记录 + baseMapper.insert(spuRepertoryList); + // 更新商品库存 + hardSpuService.updateBatchById(spuUpdateList); + return false; + } + private void disposeList(List list, HardSpuRepertoryDto dto) { if (ObjectUtil.isEmpty(list)) return; // 商户 @@ -154,16 +211,6 @@ public class HardSpuRepertoryServiceImpl extends ServiceImpl hardIds = list.stream().map(HardSpuRepertoryVo::getHardId).filter(ObjectUtil::isNotEmpty).distinct().toList(); - if (ObjectUtil.isNotEmpty(hardIds)) { - HardManagerDto hardManagerDto = new HardManagerDto(); - hardManagerDto.setIds(hardIds); - List hardList = hardManagerMapper.list(hardManagerDto); - if (ObjectUtil.isNotEmpty(hardList)) { - HardUtil.convertHardList(list, CollectionUtils.convertMap(hardList, HardManagerEntity::getId)); - } - } // 用户 List userIds = list.stream().map(HardSpuRepertoryVo::getUserId).distinct().toList(); R> userList = remoteUserService.getUserById(new ArrayList<>(userIds)); diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/spu/HardSpuServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/spu/HardSpuServiceImpl.java index f958f7184..e82b5761b 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/spu/HardSpuServiceImpl.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/spu/HardSpuServiceImpl.java @@ -1,14 +1,22 @@ package com.bsd.pjcloud.hard.service.impl.spu; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.bsd.pjcloud.common.core.constant.enums.YesNoEnum; import com.bsd.pjcloud.common.data.datascope.DataScope; +import com.bsd.pjcloud.hard.api.constant.spu.HardKsCheckStatusEnum; import com.bsd.pjcloud.hard.api.constant.spu.HardKsSkuTypeEnum; +import com.bsd.pjcloud.hard.api.dto.spu.DeductionSpuStockDto; +import com.bsd.pjcloud.hard.api.dto.spu.HardPutawayDto; import com.bsd.pjcloud.hard.api.dto.spu.HardSpuDto; import com.bsd.pjcloud.hard.api.dto.spu.HardSpuJoinDto; import com.bsd.pjcloud.hard.api.entity.spu.HardSpuEntity; +import com.bsd.pjcloud.hard.api.entity.spu.HardSpuJoinEntity; import com.bsd.pjcloud.hard.api.vo.manager.HardDoorManagerVo; import com.bsd.pjcloud.hard.api.vo.spu.HardSpuJoinVo; import com.bsd.pjcloud.hard.api.vo.spu.HardSpuVo; @@ -20,10 +28,12 @@ import com.bsd.pjcloud.hard.service.HardSpuService; import com.bsd.pjcloud.thirdparty.api.feign.RemoterThirdKsService; import com.bsd.pjcloud.thirdparty.dto.ks.KsBarcodeLikeDto; import com.bsd.pjcloud.thirdparty.vo.ks.KsBarcodeLikeVo; +import com.bsd.pjcloud.thirdparty.vo.ks.KsSpuVo; import com.bsd.pjcloud.wallet.api.feign.RemoteMchService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; import java.util.*; @@ -37,6 +47,8 @@ import java.util.*; @Service public class HardSpuServiceImpl extends ServiceImpl implements HardSpuService { + private static final String TAG = "硬件商品"; + private final HardManagerService hardManagerService; private final HardDoorManagerService hardDoorManagerService; private final HardSpuJoinService hardSpuJoinService; @@ -55,14 +67,24 @@ public class HardSpuServiceImpl extends ServiceImpl get(List ksSpuIds) { + return baseMapper.selectList(new LambdaQueryWrapper().in(HardSpuEntity::getKsSkuId, ksSpuIds)); + } + + @Override + public List getByIds(List spuIds) { + return baseMapper.selectList(new LambdaQueryWrapper().in(HardSpuEntity::getId, spuIds)); + } + /** * 新增 */ @Override public Long create(HardSpuEntity entity) { - if (existName(entity)) { - throw new RuntimeException("商品名不能重复"); - } + // if (existName(entity)) { + // throw new RuntimeException("商品名不能重复"); + // } entity.setSkuType(HardKsSkuTypeEnum.SELF.getType()); baseMapper.insert(entity); // 发起审核 @@ -75,9 +97,9 @@ public class HardSpuServiceImpl extends ServiceImpl>> getByCabinetNo(Long hardId, String cabinetNo) { List>> result = new LinkedList<>(); // 查询设备 - HardDoorManagerVo doorManagerVo = hardDoorManagerService.getByHardId(hardId); + HardDoorManagerVo doorManagerVo = hardDoorManagerService.getByHardDoorId(hardId); if (ObjectUtil.isEmpty(doorManagerVo)) return result; int doorCount = 6; int storeySpuMaxCount = 10; @@ -108,22 +131,84 @@ public class HardSpuServiceImpl extends ServiceImpl storeySpu = hardSpuJoinService.scopeList(spuJoinDto); int storeySpuSize = storeySpu.size(); int emptyStoreySpuSize = storeySpuMaxCount - storeySpuSize; for (int j = 0; j < emptyStoreySpuSize; j++) { - HardSpuJoinVo hardSpuJoinEntity = new HardSpuJoinVo(); - hardSpuJoinEntity.setHardDoorId(hardId); + HardSpuJoinEntity hardSpuJoinEntity = new HardSpuJoinEntity(); + hardSpuJoinEntity.setCabinetNo(cabinetNo); + hardSpuJoinEntity.setHardDoorId(doorManagerVo.getId()); hardSpuJoinEntity.setHardDoorNumber(i); - storeySpu.add(hardSpuJoinEntity); + hardSpuJoinService.save(hardSpuJoinEntity); + HardSpuJoinVo hardSpuJoinVo = new HardSpuJoinVo(); + hardSpuJoinVo.setId(hardSpuJoinEntity.getId()); + hardSpuJoinVo.setCabinetNo(hardSpuJoinEntity.getCabinetNo()); + hardSpuJoinVo.setHardDoorId(hardSpuJoinEntity.getHardDoorId()); + hardSpuJoinVo.setHardDoorNumber(hardSpuJoinEntity.getHardDoorNumber()); + if (ObjectUtil.isNotEmpty(hardSpuJoinVo)) { + storeySpu.add(hardSpuJoinVo); + } } Map> addMap = new HashMap<>(); addMap.put(i, storeySpu); result.add(addMap); } - return List.of(); + return result; + } + + /** + * 查询货柜补货商品列表 + */ + @Override + public List appCabinetPutawayList(Long hardDoorId, String cabinetNo) { + HardSpuJoinDto spuJoinDto = new HardSpuJoinDto(); + spuJoinDto.setHardDoorId(hardDoorId); + spuJoinDto.setCabinetNo(cabinetNo); + spuJoinDto.setIsSpu(true); + return hardSpuJoinService.scopeList(spuJoinDto); + } + + /** + * 上架id + */ + @Override + public void putaway(HardPutawayDto dto) { + // 查询有没有货柜 + HardSpuJoinEntity spuJoinDetail = hardSpuJoinService.getOne(new LambdaQueryWrapper() + .eq(HardSpuJoinEntity::getId, dto.getId()) + ); + if (ObjectUtil.isEmpty(spuJoinDetail)) throw new RuntimeException("货柜不存在"); + // 校验商品 + HardSpuEntity spuDetail = validateSpu(dto.getHardSpuId()); + // 判断这一层是否重复 + long doorCount = hardSpuJoinService.count(new LambdaUpdateWrapper() + .eq(HardSpuJoinEntity::getHardDoorNumber, spuJoinDetail.getHardDoorNumber()) + .eq(HardSpuJoinEntity::getSpuId, spuDetail.getId()) + ); + if (doorCount > 0) throw new RuntimeException("该层已有相同商品"); + LambdaUpdateWrapper updateObj = new LambdaUpdateWrapper() + .set(HardSpuJoinEntity::getSpuId, spuDetail.getId()) + .eq(HardSpuJoinEntity::getId, dto.getId()); + hardSpuJoinService.update(updateObj); + } + + /** + * 下架 + */ + @Override + public void unPutaway(HardPutawayDto dto) { + // 查询有没有商品 + HardSpuJoinEntity hardSpuJoinDetail = hardSpuJoinService.getOne(new LambdaQueryWrapper() + .eq(HardSpuJoinEntity::getSpuId, dto.getHardSpuId()) + .eq(HardSpuJoinEntity::getId, dto.getId()) + ); + if (ObjectUtil.isEmpty(hardSpuJoinDetail)) throw new RuntimeException("该商品不存在"); + LambdaUpdateWrapper updateObj = new LambdaUpdateWrapper() + .set(HardSpuJoinEntity::getSpuId, null) + .eq(HardSpuJoinEntity::getId, dto.getId()); + hardSpuJoinService.update(updateObj); } /** @@ -135,16 +220,149 @@ public class HardSpuServiceImpl extends ServiceImpl list) { + if (ObjectUtil.isEmpty(list)) { + log.error("|{}|扣减商品库存失败list为空", TAG); + return false; + } + List hardSpuIdes = list.stream().map(DeductionSpuStockDto::getHardSpuId).toList(); + List hardSpuList = getByIds(hardSpuIdes); + if (ObjectUtil.isEmpty(hardSpuList)) { + log.error("|{}|扣减商品库存失败查询到的智能柜商品为空dto|{}|", TAG, JSONUtil.toJsonStr(list)); + return false; + } + for (HardSpuEntity i : hardSpuList) { + list.stream().filter(j -> ObjectUtil.equals(i.getId(), j.getHardSpuId())).findFirst().ifPresent(hardSpu -> { + if (ObjectUtil.isNotEmpty(hardSpu.getIncrCount())) { + HardSpuEntity entity = new HardSpuEntity(); + entity.setId(hardSpu.getHardSpuId()); + entity.setSalesCount(i.getSalesCount() + hardSpu.getIncrCount()); + entity.setRepertoryCount(i.getRepertoryCount() - hardSpu.getIncrCount()); + // 乐观锁循环扣减库存 + baseMapper.updateById(entity); + } + }); + } + return true; + } + + public boolean asyncAllGroup(KsBarcodeLikeDto likeDto) { + KsBarcodeLikeVo data = remoterThirdKsService.barcodeSkuLike(likeDto).getData(); + if (ObjectUtil.isEmpty(data) || !data.isSuccess() || ObjectUtil.isEmpty(data.getResultList())) return false; + List spuList = new ArrayList<>(); + for (KsSpuVo i : data.getResultList()) { + try { + HardSpuEntity entity = HardSpuEntity + .builder() + .spuCategoryId(null) + .name(i.getSku_name()) + .cover(i.getCover()) + .skuType(i.getSku_type()) + .ksSkuId(i.getKs_sku_id()) + .ksResSkuId(i.getSku_id()) + .ksBarcode(i.getBarcode()) + .ksHasSubSku(i.getHas_sub_sku()) + .build(); + // 图片 + if (ObjectUtil.isNotEmpty(i.getImg_urls())) { + entity.setPic(String.join(",", i.getImg_urls())); + } + // 审核状态 + entity.setKsStatus(HardKsCheckStatusEnum.CHECK_DONE.getType()); + entity.setKsStatusTitle(HardKsCheckStatusEnum.CHECK_DONE.getDescription()); + entity.setKsComments("API同步"); + // 处理规格 + KsSpuVo.KsSpuSpecsVo specs = i.getSpecs(); + if (ObjectUtil.isNotEmpty(specs)) { + if (ObjectUtil.isNotEmpty(specs.getTaste())) entity.setSpecsTaste(specs.getTaste()); + if (ObjectUtil.isNotEmpty(specs.getCapacity())) entity.setSpecsCapacity(specs.getCapacity()); + if (ObjectUtil.isNotEmpty(specs.getWeight())) entity.setSpecsWeight(specs.getWeight()); + } + // 处理集合SKU的子SKU信息 + if (ObjectUtil.isEmpty(i.getSub_sku())) { + entity.setKsSubSkuJson(""); + spuList.add(entity); + } else { + HardSpuEntity entityCopy = BeanUtil.toBean(entity, HardSpuEntity.class); + for (KsSpuVo j : i.getSub_sku()) { + entityCopy.setKsSkuId(j.getKs_sku_id()); + entityCopy.setKsResSkuId(j.getSku_id()); + entityCopy.setKsBarcode(j.getBarcode()); + entityCopy.setName(j.getSku_name()); + entityCopy.setSkuType(j.getSku_type()); + entityCopy.setCover(i.getCover()); + entityCopy.setKsSubSkuJson(JSONUtil.toJsonStr(j.getSub_sku())); + // 图片 + if (ObjectUtil.isNotEmpty(j.getImg_urls())) { + entityCopy.setPic(String.join(",", j.getImg_urls())); + } + spuList.add(entityCopy); + } + } + } catch (Exception e) { + log.error("|{}|添加旷世商品错误|{}|", TAG, e.getMessage()); + } + } + if (ObjectUtil.isNotEmpty(spuList)) { + List insertList = new ArrayList<>(); + List updateList = new ArrayList<>(); + for (HardSpuEntity i : spuList) { + HardSpuEntity entity = baseMapper.selectOne(new LambdaQueryWrapper() + .eq(HardSpuEntity::getKsResSkuId, i.getKsResSkuId()) + .eq(HardSpuEntity::getKsSkuId, i.getKsSkuId()) + ); + if (ObjectUtil.isEmpty(entity)) { + i.setPrice(0); + i.setSalesCount(0); + i.setRepertoryCount(0); + i.setSort(0); + i.setIsDefault(YesNoEnum.YES.getCode()); + i.setStatus(YesNoEnum.YES.getCode()); + insertList.add(i); + } else { + i.setId(entity.getId()); + updateList.add(i); + } + } + if (ObjectUtil.isNotEmpty(insertList)) { + baseMapper.insert(insertList); + } + if (ObjectUtil.isNotEmpty(updateList)) { + baseMapper.updateById(updateList); + } + } + return true; } /** diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/HardAuthMapper.xml b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/HardAuthMapper.xml index 8421a5a8d..6a2633937 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/HardAuthMapper.xml +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/HardAuthMapper.xml @@ -39,10 +39,13 @@ a.del_flag = '0' - and a.userId = #{dto.userId} + and a.user_id = #{dto.userId} + + + and a.hard_id = #{dto.hardId} - and a.authStatus = #{dto.auth_status} + and a.auth_status = #{dto.authStatus} and a.is_done = #{dto.isDone} @@ -65,5 +68,6 @@ + order by a.create_time desc , a.id desc \ No newline at end of file diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/HardBroadcastMapper.xml b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/HardBroadcastMapper.xml index af902b355..ff348dcc2 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/HardBroadcastMapper.xml +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/HardBroadcastMapper.xml @@ -7,6 +7,7 @@ + @@ -28,6 +29,7 @@ a.user_id, a.hard_id, a.topic, + a.biz_type, a.biz_id, a.title, a.content, @@ -52,6 +54,9 @@ and a.hard_id = #{dto.hardId} + + and a.biz_type = #{dto.bizType} + and a.biz_id = #{dto.bizId} @@ -77,5 +82,4 @@ - \ No newline at end of file diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/HardDoorFlowMapper.xml b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/HardDoorFlowMapper.xml new file mode 100644 index 000000000..a75e914ca --- /dev/null +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/HardDoorFlowMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/manager/HardDoorCabinetMapper.xml b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/manager/HardDoorCabinetMapper.xml new file mode 100644 index 000000000..3f85f0c40 --- /dev/null +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/manager/HardDoorCabinetMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/manager/HardDoorManagerMapper.xml b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/manager/HardDoorManagerMapper.xml index 5b66bd7e2..45745f450 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/manager/HardDoorManagerMapper.xml +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/manager/HardDoorManagerMapper.xml @@ -14,11 +14,13 @@ + - + + @@ -39,11 +41,13 @@ a.power_status, a.net_status, a.sale_status, + a.sim_sn, a.signal_intensity, a.signal_ratio, a.signal_time, - a.cabinet_list, a.restart_time, + a.system_volume, + a.media_volume, a.create_by, a.create_time, a.update_by, diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/spu/HardSpuMapper.xml b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/spu/HardSpuMapper.xml index 0fe7da6d4..71329ef84 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/spu/HardSpuMapper.xml +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/spu/HardSpuMapper.xml @@ -6,6 +6,7 @@ + @@ -17,9 +18,11 @@ + + - + @@ -35,6 +38,7 @@ select a.id, a.spu_category_id, a.name, + a.cover, a.pic, a.price, a.sales_count, @@ -46,9 +50,11 @@ a.specs_capacity, a.specs_weight, a.sku_type, + a.ks_res_sku_id, + a.ks_sku_id, a.ks_barcode, a.ks_has_sub_sku, - a.ks_sub_sku, + a.ks_sub_sku_json, a.ks_status, a.ks_status_title, a.ks_comments, @@ -106,7 +112,7 @@