diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml deleted file mode 100644 index fe886e4..0000000 --- a/.idea/dataSources.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - mysql.8 - true - com.mysql.cj.jdbc.Driver - jdbc:mysql://114.132.227.196:3306/yuehao_test?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false - $ProjectFileDir$ - - - \ No newline at end of file diff --git a/admin/src/main/java/com/hcy/admin/service/client/impl/ClientContactsServiceImpl.java b/admin/src/main/java/com/hcy/admin/service/client/impl/ClientContactsServiceImpl.java index 7c97843..6d3aac7 100644 --- a/admin/src/main/java/com/hcy/admin/service/client/impl/ClientContactsServiceImpl.java +++ b/admin/src/main/java/com/hcy/admin/service/client/impl/ClientContactsServiceImpl.java @@ -185,6 +185,7 @@ public class ClientContactsServiceImpl implements IClientContactsService { user.setCreateTime(System.currentTimeMillis() / 1000); user.setMobile(clientContactsParam.getPhone()); userMapper.insert(user); + admin.setUserId(Long.valueOf(user.getId())); model.setUserId(user.getId().longValue()); } diff --git a/admin/src/main/java/com/hcy/admin/service/system/impl/SystemAuthAdminServiceImpl.java b/admin/src/main/java/com/hcy/admin/service/system/impl/SystemAuthAdminServiceImpl.java index 4b22bad..8ecadc6 100644 --- a/admin/src/main/java/com/hcy/admin/service/system/impl/SystemAuthAdminServiceImpl.java +++ b/admin/src/main/java/com/hcy/admin/service/system/impl/SystemAuthAdminServiceImpl.java @@ -21,6 +21,7 @@ import com.hcy.admin.vo.system.SystemAuthAdminVo; import com.hcy.admin.vo.system.SystemAuthRoleVo; import com.hcy.admin.vo.system.SystemAuthSelfVo; import com.hcy.common.config.GlobalConfig; +import com.hcy.common.constant.GlobalConstant; import com.hcy.common.core.PageResult; import com.hcy.common.dto.SystemAuthAdminDto; import com.hcy.common.entity.plant.Plant; @@ -541,7 +542,6 @@ public class SystemAuthAdminServiceImpl implements ISystemAuthAdminService { @Override public void upInfo(SystemAuthAdminParam systemAuthAdminParam, Integer adminId) { SystemAuthAdmin model = systemAuthAdminMapper.selectOne(new QueryWrapper() - .select("id,username,nickname,password,salt") .eq("id", adminId) .eq("is_delete", 0) .last("limit 1")); @@ -597,24 +597,28 @@ public class SystemAuthAdminServiceImpl implements ISystemAuthAdminService { * @author fzr */ @Override + @Transactional public void del(Integer id) { - String[] field = {"id", "username", "nickname"}; - Assert.notNull(systemAuthAdminMapper.selectOne(new QueryWrapper() - .select(field) + SystemAuthAdmin systemAuthAdmin = systemAuthAdminMapper.selectOne(new QueryWrapper() .eq("id", id) .eq("is_delete", 0) - .last("limit 1")), "账号已不存在!"); + .last("limit 1")); + Assert.notNull(systemAuthAdmin, "账号已不存在!"); Assert.isFalse(id == 1, "系统管理员不允许删除!"); int adminId = Integer.parseInt(AdminThreadLocal.getAdminId().toString()); Assert.isFalse(id == adminId, "不能删除自己!"); - SystemAuthAdmin model = new SystemAuthAdmin(); - model.setId(id); - model.setIsDelete(1); - model.setDeleteTime(System.currentTimeMillis() / 1000); - systemAuthAdminMapper.updateById(model); + systemAuthAdmin.setIsDelete(GlobalConstant.DELETE); + systemAuthAdmin.setDeleteTime(System.currentTimeMillis() / 1000); + systemAuthAdminMapper.updateById(systemAuthAdmin); + + if(systemAuthAdmin.getUserId() != null){ + userMapper.deleteById(systemAuthAdmin.getUserId()); + userAuthMapper.delete(new LambdaQueryWrapper().eq(UserAuth::getUserId, systemAuthAdmin.getUserId())); + } + this.cacheAdminUserByUid(id); } @@ -626,11 +630,9 @@ public class SystemAuthAdminServiceImpl implements ISystemAuthAdminService { */ @Override public void disable(Integer id) { - String[] field = {"id", "username", "nickname", "is_disable"}; SystemAuthAdmin systemAuthAdmin = systemAuthAdminMapper.selectOne(new QueryWrapper() - .select(field) .eq("id", id) - .eq("is_delete", 0) + .eq("is_delete", GlobalConstant.NOT_DELETE) .last("limit 1")); Assert.notNull(systemAuthAdmin, "账号已不存在!"); diff --git a/common/src/main/java/com/hcy/common/dto/SparePartDto.java b/common/src/main/java/com/hcy/common/dto/SparePartDto.java index 31d4fea..4860e75 100644 --- a/common/src/main/java/com/hcy/common/dto/SparePartDto.java +++ b/common/src/main/java/com/hcy/common/dto/SparePartDto.java @@ -30,4 +30,5 @@ public class SparePartDto implements Serializable { private Long deleteTime; // 删除时间 private String keywords; // 关键字 + private String warehouseIds; //仓库ids } \ No newline at end of file diff --git a/common/src/main/java/com/hcy/common/dto/order/OrderSparePart.java b/common/src/main/java/com/hcy/common/dto/order/OrderSparePart.java index 0df35e7..a41c7b2 100644 --- a/common/src/main/java/com/hcy/common/dto/order/OrderSparePart.java +++ b/common/src/main/java/com/hcy/common/dto/order/OrderSparePart.java @@ -21,11 +21,11 @@ public class OrderSparePart implements Serializable { private Long sparePartsId; // 备件id private String sparePartsCode; // 备件编码 private String sparePartsName; // 备件名称 - private String warehouseName; // 所属仓库名称 + private Long warehouseId; // 所属仓库名称 private String specificationsModel; // 规格型号 private String unit; // 单位 - private BigDecimal price; // 价格 - private Long quantity; // 数量 + private BigDecimal unitPrice; // 价格 + private Integer quantity; // 数量 private BigDecimal totalPrice; // 总价 private Integer isDelete; // 是否删除 0-未删除 1-删除 diff --git a/common/src/main/java/com/hcy/common/entity/order/MaintenanceOrder.java b/common/src/main/java/com/hcy/common/entity/order/MaintenanceOrder.java index da11a1c..1d3ce77 100644 --- a/common/src/main/java/com/hcy/common/entity/order/MaintenanceOrder.java +++ b/common/src/main/java/com/hcy/common/entity/order/MaintenanceOrder.java @@ -39,6 +39,7 @@ public class MaintenanceOrder implements Serializable { private Long receiverId; // 接单人id private Long repairId; // 返修id private Date receiverTime; // 接单时间 + private Date quotationTime; //报价时间 private Date cancelOrderTime; // 取消订单时间 private String cancelCause; // 取消原因 private String refuseMaintenanceCause; // 拒绝维修原因 @@ -51,4 +52,6 @@ public class MaintenanceOrder implements Serializable { private Date updateTime; // 更新时间 private Integer isDelete; // 是否删除 0-未删除 1-删除 private Integer repairWorkOrderFlow; //工单去向 0=工单池 1=检修员 + private Integer isMaintain; //是否维修 0-维修 1-不维修 + private Integer warehouseType; //仓库类型 0-我的仓库 1-公共仓库 } \ No newline at end of file diff --git a/common/src/main/java/com/hcy/common/enums/ClientStatusEnum.java b/common/src/main/java/com/hcy/common/enums/ClientStatusEnum.java new file mode 100644 index 0000000..773233f --- /dev/null +++ b/common/src/main/java/com/hcy/common/enums/ClientStatusEnum.java @@ -0,0 +1,57 @@ +package com.hcy.common.enums; + +public enum ClientStatusEnum { + + /** + * 桩点维修类型 0-全包 1-半包 + */ + PLIE_POINT_ALL_WRAPPED(0, "桩点全包"), + PLIE_POINT_HALF_BALE(1,"桩点半包"); + + /** + * 构造方法 + */ + private final int status; + private final String msg; + + ClientStatusEnum(int status, String msg) { + this.status = status; + this.msg = msg; + } + + /** + * 获取状态码 + * + * @author fzr + * @return Long + */ + public int getStatus() { + return this.status; + } + + /** + * 获取提示 + * + * @author fzr + * @return String + */ + public String getMsg() { + return this.msg; + } + + /** + * 根据编码获取Msg + * + * @author fzr + * @param code 类型 + * @return String + */ + public static String getMsgByCode(Integer code){ + for(AccountEnum enumItem : AccountEnum.values()) { + if (enumItem.getCode() == code) { + return enumItem.getMsg(); + } + } + return null; + } +} diff --git a/common/src/main/java/com/hcy/common/enums/order/MaintenanceOrderStatusEnum.java b/common/src/main/java/com/hcy/common/enums/order/MaintenanceOrderStatusEnum.java index 44f013a..41f0aaf 100644 --- a/common/src/main/java/com/hcy/common/enums/order/MaintenanceOrderStatusEnum.java +++ b/common/src/main/java/com/hcy/common/enums/order/MaintenanceOrderStatusEnum.java @@ -21,9 +21,17 @@ public enum MaintenanceOrderStatusEnum { CHARGEBACK(7,"已退单"), CLOSED(8,"已关闭"), - NEAREST_TO_ME(0,"离我最近"), - TIME_PRIORITY(1,"时间优先"); + TIME_PRIORITY(1,"时间优先"), + + CLIENT(0,"客户端"), + REPAIRER(1,"检修员"), + + MAINTAIN(0,"维修"), + NOT_MAINTAIN(1,"不维修"), + + MY_WAREHOUSE(0,"我的仓库"), + PUBLIC_WAREHOUSE(1,"全部仓库"),; private final int status; private final String desc; diff --git a/common/src/main/java/com/hcy/common/mapper/warehouse/WarehouseMapper.java b/common/src/main/java/com/hcy/common/mapper/warehouse/WarehouseMapper.java index 1eed64f..d496450 100644 --- a/common/src/main/java/com/hcy/common/mapper/warehouse/WarehouseMapper.java +++ b/common/src/main/java/com/hcy/common/mapper/warehouse/WarehouseMapper.java @@ -4,8 +4,11 @@ package com.hcy.common.mapper.warehouse; import com.hcy.common.core.basics.IBaseMapper; import com.hcy.common.entity.warehouse.Warehouse; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; +import java.util.List; + /** * 仓库管理Mapper */ @@ -14,4 +17,12 @@ public interface WarehouseMapper extends IBaseMapper { @Select("select * from la_warehouse where is_delete = 0 and id = #{id}") Warehouse findWarehouseById(Long id); + + /** + * 获取公共仓库和指定仓库列表 + * @param id 指定仓库id + * @return List + */ + @Select("select * from la_warehouse where is_delete = 0 (pid IN ( SELECT id FROM la_warehouse WHERE warehouse_coding = 'topWarehouse' OR warehouse_coding = 'areaWarehouse' ) or id = #{id})") + List findPublicWarehouseList(@Param("id") Long id); } diff --git a/common/src/main/resources/mapper/MaintenanceOrderMapper.xml b/common/src/main/resources/mapper/MaintenanceOrderMapper.xml index 010e80e..dd577d5 100644 --- a/common/src/main/resources/mapper/MaintenanceOrderMapper.xml +++ b/common/src/main/resources/mapper/MaintenanceOrderMapper.xml @@ -47,14 +47,17 @@ and lmo.receiver_id = #{param.receiverId} + + and lmo.client_id = #{param.clientId} + and find_in_set(lmo.order_status,#{param.orderStatusIds}) and (le.number like concat('%',#{param.likeWork},'%') or lmo.order_no like concat('%',#{param.likeWork},'%') - or lc.client_name like concat('%',#{param.likeWork},'%')) - + or lc.client_name like concat('%',#{param.likeWork},'%') + or le.name like concat('%',#{param.likeWork},'%')) order by create_time desc diff --git a/common/src/main/resources/mapper/SparePartrMapper.xml b/common/src/main/resources/mapper/SparePartrMapper.xml index 5a1a54b..1206f4c 100644 --- a/common/src/main/resources/mapper/SparePartrMapper.xml +++ b/common/src/main/resources/mapper/SparePartrMapper.xml @@ -16,6 +16,9 @@ lsp.spare_parts_name like concat('%',#{param.keywords},'%') or lw.warehouse_name like concat('%',#{param.keywords},'%')) + + and find_in_set(lw.id,#{param.warehouseIds}) + diff --git a/common/target/classes/mapper/ClientMapper.xml b/common/target/classes/mapper/ClientMapper.xml deleted file mode 100644 index 65dff4c..0000000 --- a/common/target/classes/mapper/ClientMapper.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - diff --git a/common/target/classes/mapper/CouponMapper.xml b/common/target/classes/mapper/CouponMapper.xml deleted file mode 100644 index 377749b..0000000 --- a/common/target/classes/mapper/CouponMapper.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - diff --git a/common/target/classes/mapper/DevRegionMapper.xml b/common/target/classes/mapper/DevRegionMapper.xml deleted file mode 100644 index 8f6fedd..0000000 --- a/common/target/classes/mapper/DevRegionMapper.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - diff --git a/common/target/classes/mapper/DistributorCommissionMapper.xml b/common/target/classes/mapper/DistributorCommissionMapper.xml deleted file mode 100644 index 0501294..0000000 --- a/common/target/classes/mapper/DistributorCommissionMapper.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - diff --git a/common/target/classes/mapper/EquipmentMapper.xml b/common/target/classes/mapper/EquipmentMapper.xml deleted file mode 100644 index 3c251ba..0000000 --- a/common/target/classes/mapper/EquipmentMapper.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/common/target/classes/mapper/GoodsCategoryMapper.xml b/common/target/classes/mapper/GoodsCategoryMapper.xml deleted file mode 100644 index 9500980..0000000 --- a/common/target/classes/mapper/GoodsCategoryMapper.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - - - - - - - - diff --git a/common/target/classes/mapper/GoodsCommentMapper.xml b/common/target/classes/mapper/GoodsCommentMapper.xml deleted file mode 100644 index ca12ded..0000000 --- a/common/target/classes/mapper/GoodsCommentMapper.xml +++ /dev/null @@ -1,102 +0,0 @@ - - - - - - - - - - id, - goods_id, - user_id, - order_goods_id, - service_comment, - comment, - reply, - status, - create_time, - update_time, - delete_time, - comment_level - - - - diff --git a/common/target/classes/mapper/GoodsMapper.xml b/common/target/classes/mapper/GoodsMapper.xml deleted file mode 100644 index dc934fa..0000000 --- a/common/target/classes/mapper/GoodsMapper.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - diff --git a/common/target/classes/mapper/GoodsUnitMapper.xml b/common/target/classes/mapper/GoodsUnitMapper.xml deleted file mode 100644 index fb713a5..0000000 --- a/common/target/classes/mapper/GoodsUnitMapper.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - diff --git a/common/target/classes/mapper/IndexVisitMapper.xml b/common/target/classes/mapper/IndexVisitMapper.xml deleted file mode 100644 index 6023234..0000000 --- a/common/target/classes/mapper/IndexVisitMapper.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - diff --git a/common/target/classes/mapper/MaintenanceOrderMapper.xml b/common/target/classes/mapper/MaintenanceOrderMapper.xml deleted file mode 100644 index 010e80e..0000000 --- a/common/target/classes/mapper/MaintenanceOrderMapper.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - diff --git a/common/target/classes/mapper/OrderMapper.xml b/common/target/classes/mapper/OrderMapper.xml deleted file mode 100644 index 6a662c9..0000000 --- a/common/target/classes/mapper/OrderMapper.xml +++ /dev/null @@ -1,455 +0,0 @@ - - - - - - - - - - id, - sn, - user_id, - transaction_id, - staff_id, - order_type, - order_terminal, - order_status, - pay_status, - pay_way, - goods_price, - order_amount, - total_amount, - total_num, - user_remark, - order_remarks, - verification_code, - verification_status, - contact, - mobile, - province_id, - city_id, - district_id, - address, - is_dispatch, - create_time, - update_time, - pay_time, - delete_time, - cancel_time, - appoint_time_start, - appoint_time_end, - finish_time - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/common/target/classes/mapper/OrderRefundMapper.xml b/common/target/classes/mapper/OrderRefundMapper.xml deleted file mode 100644 index a22b727..0000000 --- a/common/target/classes/mapper/OrderRefundMapper.xml +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - select a.id, - a.sn as refundSn, - a.order_id as orderId, - a.user_id as userId, - a.type, - a.order_terminal as orderTerminal, - a.transaction_id as transactionId, - a.order_amount as orderAmount, - a.refund_amount as refundAmount, - a.refund_status as refund_status, - a.create_time as createTime, - a.update_time as updateTime, - a.refund_time as refundTime, - b.sn as userSn, - b.avatar, - b.nickname, - b.username, - c.sn as orderSn, - d.goods_name as goodsName - from la_order_refund a - left join la_user b on a.user_id = b.id - left join la_order c on a.order_id = c.id - left join la_order_goods d on a.order_id = d.order_id - - - and a.sn like concat('%', #{form.refundSn}, '%') - - - and c.sn like concat('%', #{form.orderSn}, '%') - - - and a.type = #{form.type} - - - and (b.nickname like concat('%', #{form.userInfo}, '%') or - b.sn like concat('%', #{form.userInfo}, '%')) - - - and a.create_time >= #{form.orderTimeStart} - - - and a.create_time <= #{form.orderTimeEnd} - - - and a.refund_status = #{form.refundStatus} - - - and d.goods_name like concat('%', #{form.goodsName}, '%') - - - order by a.id desc - - - - - - diff --git a/common/target/classes/mapper/RoutingInspectionOrderMapper.xml b/common/target/classes/mapper/RoutingInspectionOrderMapper.xml deleted file mode 100644 index 084307e..0000000 --- a/common/target/classes/mapper/RoutingInspectionOrderMapper.xml +++ /dev/null @@ -1,112 +0,0 @@ - - - - - - - - - - - - diff --git a/common/target/classes/mapper/ServiceAreaMapper.xml b/common/target/classes/mapper/ServiceAreaMapper.xml deleted file mode 100644 index 1e8cfe5..0000000 --- a/common/target/classes/mapper/ServiceAreaMapper.xml +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - - - - - insert into la_service_area - (name, - region_id, - longitude, - latitude, - create_time, - update_time, - polygongeo) - values - (#{name}, - #{regionId}, - #{longitude}, - #{latitude}, - #{createTime}, - #{updateTime}, - PolygonFromText(#{polygongeo})) - - - - - diff --git a/common/target/classes/mapper/StaffFeedbackMapper.xml b/common/target/classes/mapper/StaffFeedbackMapper.xml deleted file mode 100644 index 64d5aa9..0000000 --- a/common/target/classes/mapper/StaffFeedbackMapper.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - diff --git a/common/target/classes/mapper/StaffMapper.xml b/common/target/classes/mapper/StaffMapper.xml deleted file mode 100644 index 4aba478..0000000 --- a/common/target/classes/mapper/StaffMapper.xml +++ /dev/null @@ -1,117 +0,0 @@ - - - - - - - - - - - - - - diff --git a/common/target/classes/mapper/StaffPhysicalExaminationMapper.xml b/common/target/classes/mapper/StaffPhysicalExaminationMapper.xml deleted file mode 100644 index ccd01d1..0000000 --- a/common/target/classes/mapper/StaffPhysicalExaminationMapper.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - diff --git a/common/target/classes/mapper/StaffReassignmentMapper.xml b/common/target/classes/mapper/StaffReassignmentMapper.xml deleted file mode 100644 index c462d30..0000000 --- a/common/target/classes/mapper/StaffReassignmentMapper.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - diff --git a/common/target/classes/mapper/SystemAuthAdminMapper.xml b/common/target/classes/mapper/SystemAuthAdminMapper.xml deleted file mode 100644 index 778426c..0000000 --- a/common/target/classes/mapper/SystemAuthAdminMapper.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - diff --git a/common/target/classes/mapper/UserCouponMapper.xml b/common/target/classes/mapper/UserCouponMapper.xml deleted file mode 100644 index 321288d..0000000 --- a/common/target/classes/mapper/UserCouponMapper.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - diff --git a/common/target/classes/mapper/UserMapper.xml b/common/target/classes/mapper/UserMapper.xml deleted file mode 100644 index dedc3bd..0000000 --- a/common/target/classes/mapper/UserMapper.xml +++ /dev/null @@ -1,109 +0,0 @@ - - - - - - - - - - - - - - diff --git a/common/target/classes/mapper/WithdrawCommissionMapper.xml b/common/target/classes/mapper/WithdrawCommissionMapper.xml deleted file mode 100644 index b7d3119..0000000 --- a/common/target/classes/mapper/WithdrawCommissionMapper.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/common/target/maven-archiver/pom.properties b/common/target/maven-archiver/pom.properties deleted file mode 100644 index b6da2d2..0000000 --- a/common/target/maven-archiver/pom.properties +++ /dev/null @@ -1,5 +0,0 @@ -#Generated by Maven -#Wed Aug 14 10:40:41 CST 2024 -version=1.0.0 -groupId=org.hcy -artifactId=common diff --git a/common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst deleted file mode 100644 index 7be4939..0000000 --- a/common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ /dev/null @@ -1,373 +0,0 @@ -com\hcy\common\utils\HttpUtils.class -com\hcy\common\plugin\storage\engine\LocalStorage.class -com\hcy\common\enums\CancelOrderConfigTypeEnum.class -com\hcy\common\enums\coupon\ChannelTypeEnum.class -com\hcy\common\enums\wxpay\WxTradeState.class -com\hcy\common\plugin\storage\engine\QiniuStorage.class -com\hcy\common\enums\AccountChangeEnum.class -com\hcy\common\dto\OrderDistributionDto.class -com\hcy\common\entity\plant\Plant.class -com\hcy\common\entity\recharge\Recharge.class -com\hcy\common\entity\setting\DictData.class -com\hcy\common\mapper\log\OrderRefundLogMapper.class -com\hcy\common\utils\ToolsUtil.class -com\hcy\common\constant\GlobalConstant.class -com\hcy\common\entity\wxpay\WxPayOrderNotifyV3Result.class -com\hcy\common\entity\system\SystemLogOperate.class -com\hcy\common\core\basics\IBaseMapper$1.class -com\hcy\common\enums\OrderTypeEnum.class -com\hcy\common\mapper\plant\PlantMapper.class -com\hcy\common\mapper\comment\GoodsCommentMapper.class -com\hcy\common\enums\FaultEnum.class -com\hcy\common\entity\staff\Staff.class -com\hcy\common\mapper\sparePartStockAudit\SparePartStockAuditMapper.class -com\hcy\common\mapper\session\UserSessionMapper.class -com\hcy\common\enums\OrderRefundStatusEnum.class -com\hcy\common\entity\system\SystemAuthPerm.class -com\hcy\common\mapper\address\UserAddressMapper.class -com\hcy\common\entity\goods\OrderGoods.class -com\hcy\common\mapper\coupon\GoodsCouponMapper.class -com\hcy\common\config\QRCodeConfig.class -com\hcy\common\entity\image\GoodsImage.class -com\hcy\common\entity\setting\DictType.class -com\hcy\common\utils\FormulaUtil.class -com\hcy\common\mapper\system\SystemAuthDeptMapper.class -com\hcy\common\entity\wxpay\WxPayOrderNotifyV3Result$Amount.class -com\hcy\common\entity\wxpay\WxPayOrderNotifyV3Result$GoodsDetail.class -com\hcy\common\mapper\decorate\DecoratePageMapper.class -com\hcy\common\mapper\common\WithdrawCommissionMapper.class -com\hcy\common\mapper\log\SmsLogMapper.class -com\hcy\common\plugin\notice\engine\MpNotice.class -com\hcy\common\mapper\group\DistributeGroupMapper.class -com\hcy\common\exception\OperateException.class -com\hcy\common\dto\goods\GoodsDto.class -com\hcy\common\core\ServerResult.class -com\hcy\common\config\map\LikeTenCentClient$2.class -com\hcy\common\mapper\setting\DevNoticeSettingMapper.class -com\hcy\common\utils\SpringUtil.class -com\hcy\common\entity\image\GoodsCommentImage.class -com\hcy\common\config\ResponseControllerAdvice.class -com\hcy\common\utils\WxPayServiceUtils.class -com\hcy\common\mapper\coupon\UserCouponMapper.class -com\hcy\common\dto\OrderDto.class -com\hcy\common\config\map\LikeTenCentClient.class -com\hcy\common\plugin\storage\engine\QcloudStorage.class -com\hcy\common\enums\coupon\CouponTypeEnum.class -com\hcy\common\utils\ArrayUtil.class -com\hcy\common\utils\ExcelUtils.class -com\hcy\common\enums\distributor\DistributorWithdrawStatusEnum.class -com\hcy\common\entity\staff\StaffPhysicalExamination.class -com\hcy\common\enums\RecommendEnum.class -com\hcy\common\mapper\category\GoodsCategoryMapper.class -com\hcy\common\mapper\fault\FaultMapper.class -com\hcy\common\mapper\image\GoodsImageMapper.class -com\hcy\common\enums\OperateEnum.class -com\hcy\common\entity\refund\OrderRefund.class -com\hcy\common\entity\wxpay\WxPayRefundQueryV3Result$From.class -com\hcy\common\entity\system\SystemAuthAdmin.class -com\hcy\common\mapper\album\AlbumMapper.class -com\hcy\common\entity\log\OrderRefundLog.class -com\hcy\common\mapper\setting\DictTypeMapper.class -com\hcy\common\enums\RegionLevelEnum.class -com\hcy\common\entity\log\SmsLog.class -com\hcy\common\entity\sparePartStockAudit\SparePartStockAudit.class -com\hcy\common\entity\coupon\Coupon.class -com\hcy\common\entity\wxpay\WxPayRefundNotifyV3Result.class -com\hcy\common\entity\staff\StaffCommission.class -com\hcy\common\utils\HttpUtil.class -com\hcy\common\mapper\notice\NoticeSettingMapper.class -com\hcy\common\mapper\order\OrderMapper.class -com\hcy\common\entity\album\Album.class -com\hcy\common\entity\setting\DevNoticeSetting.class -com\hcy\common\utils\ArrayUtil$1.class -com\hcy\common\entity\wxpay\WxPayOrderQueryV3Result$Amount.class -com\hcy\common\utils\HttpUtil$1.class -com\hcy\common\entity\address\UserAddress.class -com\hcy\common\plugin\sms\engine\HuaweiSms$1.class -com\hcy\common\entity\server\Cpu.class -com\hcy\common\entity\user\User.class -com\hcy\common\dto\GoodsCommentPageDto.class -com\hcy\common\dto\UserDto.class -com\hcy\common\plugin\notice\NoticeDriver.class -com\hcy\common\mapper\goods\OrderGoodsMapper.class -com\hcy\common\utils\HttpClientUtils.class -com\hcy\common\enums\staff\StaffFeedbackEnum.class -com\hcy\common\mapper\article\ArticleMapper.class -com\hcy\common\mapper\crontab\CrontabMapper.class -com\hcy\common\utils\SnUtils.class -com\hcy\common\enums\wxpay\WxTransferAccountsSceneType.class -com\hcy\common\enums\staff\StaffStatusEnum.class -com\hcy\common\mapper\system\SystemAuthRoleMapper.class -com\hcy\common\mapper\staff\StaffCommissionMapper.class -com\hcy\common\entity\wxpay\WxPayOrderQueryV3Result.class -com\hcy\common\mapper\reply\OfficialAccountReplyMapper.class -com\hcy\common\plugin\storage\StorageDriver.class -com\hcy\common\dto\result\OrderPageResultDto.class -com\hcy\common\utils\ConfigUtil.class -com\hcy\common\utils\HttpUtil$TrustAnyHostnameVerifier.class -com\hcy\common\mapper\applyFor\WithdrawCommissionApplyforMapper.class -com\hcy\common\core\basics\IBaseMapper.class -com\hcy\common\entity\staff\StaffFeedback.class -com\hcy\common\mapper\region\DevRegionMapper.class -com\hcy\common\entity\goods\GoodsTime.class -com\hcy\common\entity\sparePart\SparePart.class -com\hcy\common\utils\RegularExpressionUtil.class -com\hcy\common\entity\coupon\GoodsCategoryCoupon.class -com\hcy\common\entity\user\UserAuth.class -com\hcy\common\core\PageSumResult.class -com\hcy\common\entity\pay\DevPay.class -com\hcy\common\utils\PinyinUtil.class -com\hcy\common\utils\ArrayUtil$6.class -com\hcy\common\enums\HttpEnum.class -com\hcy\common\entity\wxpay\WxPayRefundQueryV3Result$GoodsDetail.class -com\hcy\common\enums\NoticeEnum.class -com\hcy\common\utils\WxGzhTemplateUtil.class -com\hcy\common\entity\system\SystemLogLogin.class -com\hcy\common\entity\fault\Fault.class -com\hcy\common\dto\result\UserResultDto.class -com\hcy\common\validator\StringContainsValidator.class -com\hcy\common\utils\UrlUtil.class -com\hcy\common\mapper\serviceArea\ServiceAreaMapper.class -com\hcy\common\utils\ArrayUtil$7.class -com\hcy\common\entity\visit\IndexVisit.class -com\hcy\common\enums\staff\StaffApplyForStatusEnum.class -com\hcy\common\enums\RefundEnum.class -com\hcy\common\enums\staff\StaffReceiveOrderTypeEnum.class -com\hcy\common\entity\wxpay\WxPayOrderQueryV3Result$SceneInfo.class -com\hcy\common\core\PageResult.class -com\hcy\common\entity\jobs\Jobs.class -com\hcy\common\enums\coupon\UserCouponStatusEnum.class -com\hcy\common\entity\wxpay\WxPayOrderNotifyV3Result$PromotionDetail.class -com\hcy\common\enums\GoodsCategoryStatusEnum.class -com\hcy\common\utils\ToolsUtil$3.class -com\hcy\common\enums\wxpay\WxToUrlEnum.class -com\hcy\common\config\map\MapConfig.class -com\hcy\common\dto\result\GoodsCollectionResultDto.class -com\hcy\common\mapper\crontab\DevCrontabMapper.class -com\hcy\common\utils\RequestUtil.class -com\hcy\common\enums\WithdrawCommissionApplyforEnum.class -com\hcy\common\utils\ArithUtil.class -com\hcy\common\enums\StatusEnum.class -com\hcy\common\utils\RedisUtil.class -com\hcy\common\utils\ArrayUtil$5.class -com\hcy\common\utils\HttpUtil$TrustAnyTrustManager.class -com\hcy\common\plugin\sms\engine\HuaweiSms.class -com\hcy\common\plugin\notice\engine\OaNotice.class -com\hcy\common\entity\wxpay\WxPayRefundV3Result$PromotionDetail.class -com\hcy\common\entity\order\CancelOrderConfig.class -com\hcy\common\mapper\staff\StaffMapper.class -com\hcy\common\utils\ArrayUtil$2.class -com\hcy\common\mapper\user\UserMapper.class -com\hcy\common\utils\ToolsUtil$1.class -com\hcy\common\utils\ArrayUtil$3.class -com\hcy\common\entity\category\GoodsCategory.class -com\hcy\common\mapper\CommonOverhaul\CommonOverhaulMapper.class -com\hcy\common\enums\AlbumEnum.class -com\hcy\common\enums\wxpay\WxRefundStatus.class -com\hcy\common\dto\staff\StaffDto.class -com\hcy\common\utils\AmountUtil.class -com\hcy\common\entity\SparePartAudit\SparePartAudit.class -com\hcy\common\dto\WithdrawCommissionDto.class -com\hcy\common\mapper\article\ArticleCollectMapper.class -com\hcy\common\dto\result\StaffFeedbackResultDto.class -com\hcy\common\entity\wxpay\WxPayRefundQueryV3Result$PromotionDetail.class -com\hcy\common\enums\wxpay\WxNotifyType.class -com\hcy\common\mapper\system\SystemLogSmsMapper.class -com\hcy\common\mapper\way\DevPayWayMapper.class -com\hcy\common\validator\IDMustValidator.class -com\hcy\common\entity\wxpay\WxPayOrderQueryV3Result$GoodsDetail.class -com\hcy\common\mapper\system\SystemConfigMapper.class -com\hcy\common\utils\ArrayUtil$4.class -com\hcy\common\utils\ToolsUtil$2.class -com\hcy\common\enums\distributor\DistributorWithdrawResultEnum.class -com\hcy\common\enums\OrderStatusEnum.class -com\hcy\common\mapper\collect\GoodsCollectMapper.class -com\hcy\common\entity\wxpay\WxPayRefundQueryV3Result.class -com\hcy\common\entity\article\ArticleCategory.class -com\hcy\common\enums\user\UserTypeEnum.class -com\hcy\common\mapper\article\ArticleCategoryMapper.class -com\hcy\common\core\AjaxResult.class -com\hcy\common\mapper\sparePart\SparePartMapper.class -com\hcy\common\entity\wxpay\SystemWxPayConfig.class -com\hcy\common\mapper\coupon\GoodsCategoryCouponMapper.class -com\hcy\common\utils\QRCodeUtil.class -com\hcy\common\entity\collect\GoodsCollect.class -com\hcy\common\validator\annotation\IDMust.class -com\hcy\common\mapper\staff\StaffFeedbackMapper.class -com\hcy\common\dto\staff\StaffReassignmentDto.class -com\hcy\common\entity\serviceArea\ServiceAreaStaff.class -com\hcy\common\enums\OrderDispatchEnum.class -com\hcy\common\entity\group\DistributeGroup.class -com\hcy\common\mapper\setting\HotSearchMapper.class -com\hcy\common\enums\staff\StaffEnum.class -com\hcy\common\entity\reply\OfficialAccountReply.class -com\hcy\common\mapper\time\OrderTimeMapper.class -com\hcy\common\mapper\image\GoodsCommentImageMapper.class -com\hcy\common\utils\IntegerUtil.class -com\hcy\common\entity\wxpay\WxPayRefundV3Result.class -com\hcy\common\mapper\equipment\EquipmentMapper.class -com\hcy\common\mapper\activity\ActivityMapper.class -com\hcy\common\enums\ClientEnum.class -com\hcy\common\enums\AccountEnum.class -com\hcy\common\entity\server\Disk.class -com\hcy\common\mapper\staff\StaffApplyForMapper.class -com\hcy\common\entity\crontab\Crontab.class -com\hcy\common\entity\distribution\Distributor.class -com\hcy\common\entity\notice\NoticeSetting.class -com\hcy\common\entity\warehouse\Warehouse.class -com\hcy\common\entity\coupon\GoodsCoupon.class -com\hcy\common\entity\session\UserSession.class -com\hcy\common\entity\account\AccountLog.class -com\hcy\common\validator\annotation\IntegerContains.class -com\hcy\common\entity\staff\StaffUploadFile.class -com\hcy\common\entity\CommonMaintenance\CommonMaintenance.class -com\hcy\common\validator\annotation\IntArrayEmpty.class -com\hcy\common\mapper\recharge\RechargeOrderMapper.class -com\hcy\common\plugin\notice\engine\SmsNotice.class -com\hcy\common\utils\WeChatUtil.class -com\hcy\common\dto\OrderGroupDto.class -com\hcy\common\dto\result\StaffReassignmentResultDto.class -com\hcy\common\mapper\commonFault\CommonFaultMapper.class -com\hcy\common\enums\goods\GoodsEnum.class -com\hcy\common\mapper\system\SystemAuthPostMapper.class -com\hcy\common\config\map\LikeTenCentClient$1.class -com\hcy\common\enums\wxpay\WxApiType.class -com\hcy\common\config\RedisConfig.class -com\hcy\common\entity\serviceArea\ServiceArea.class -com\hcy\common\entity\wxpay\WxPayRefundV3Result$From.class -com\hcy\common\entity\distribution\DistributorCommission.class -com\hcy\common\enums\GoodsCommentStatusEnum.class -com\hcy\common\validator\annotation\StringContains.class -com\hcy\common\dto\coupon\UserCouponDto.class -com\hcy\common\entity\order\Order.class -com\hcy\common\plugin\sms\engine\AliSms.class -com\hcy\common\entity\OfficialReply.class -com\hcy\common\entity\wxpay\WxPayOrderQueryV3Result$PromotionDetail.class -com\hcy\common\enums\OrderVerificationStatusEnum.class -com\hcy\common\dto\RegionDto.class -com\hcy\common\mapper\staff\StaffPhysicalExaminationMapper.class -com\hcy\common\plugin\sms\SmsDriver.class -com\hcy\common\mapper\album\AlbumCateMapper.class -com\hcy\common\entity\coupon\ChannelCoupon.class -com\hcy\common\mapper\account\AccountLogMapper.class -com\hcy\common\exception\GlobalException.class -com\hcy\common\utils\CodeUtil.class -com\hcy\common\dto\result\VisitGroupResultDto.class -com\hcy\common\mapper\user\UserAuthMapper.class -com\hcy\common\entity\article\ArticleCollect.class -com\hcy\common\entity\equipment\Equipment.class -com\hcy\common\entity\notice\NoticeRecord.class -com\hcy\common\enums\distributor\DistributorCommissionStatusEnum.class -com\hcy\common\enums\PayChannelEnum.class -com\hcy\common\mapper\staff\StaffReassignmentMapper.class -com\hcy\common\mapper\OfficialReplyMapper.class -com\hcy\common\utils\CronUtil.class -com\hcy\common\entity\setting\HotSearch.class -com\hcy\common\mapper\system\SystemAuthAdminMapper.class -com\hcy\common\mapper\unit\GoodsUnitMapper.class -com\hcy\common\enums\commonFault\CommonFaultEnum.class -com\hcy\common\entity\CommonOverhaul\CommonOverhaul.class -com\hcy\common\entity\wxpay\WxPayRefundQueryV3Result$Amount.class -com\hcy\common\dto\result\ServiceAreaResultDto.class -com\hcy\common\entity\wxpay\WxPayRefundNotifyV3Result$Amount.class -com\hcy\common\entity\system\SystemLogSms.class -com\hcy\common\validator\IntArrayEmptyValidator.class -com\hcy\common\mapper\SparePartAudit\SparePartAuditMapper.class -com\hcy\common\mapper\session\AdminSessionMapper.class -com\hcy\common\enums\OrderPayStatusEnum.class -com\hcy\common\mapper\system\SystemLogLoginMapper.class -com\hcy\common\entity\server\Sys.class -com\hcy\common\enums\PaymentEnum.class -com\hcy\common\mapper\coupon\CouponMapper.class -com\hcy\common\entity\coupon\UserCoupon.class -com\hcy\common\mapper\warehouse\WarehouseMapper.class -com\hcy\common\entity\system\SystemConfig.class -com\hcy\common\entity\wxpay\WxPayRefundV3Result$GoodsDetail.class -com\hcy\common\dto\VisitGroupDto.class -com\hcy\common\entity\log\OrderLog.class -com\hcy\common\mapper\setting\DictDataMapper.class -com\hcy\common\config\ThreadPoolConfig.class -com\hcy\common\entity\system\SystemAuthDept.class -com\hcy\common\utils\StringUtil.class -com\hcy\common\dto\OrderRefundDto.class -com\hcy\common\entity\album\AlbumCate.class -com\hcy\common\utils\PolygonUtil.class -com\hcy\common\exception\BaseException.class -com\hcy\common\mapper\order\CancelOrderConfigMapper.class -com\hcy\common\dto\result\RegionResultDto.class -com\hcy\common\entity\wxpay\WxPayOrderNotifyV3Result$SceneInfo.class -com\hcy\common\enums\audit\AuditStateEnum.class -com\hcy\common\enums\ShowEnum.class -com\hcy\common\mapper\system\SystemAuthPermMapper.class -com\hcy\common\dto\ServiceAreaDto.class -com\hcy\common\entity\system\SystemAuthMenu.class -com\hcy\common\utils\YmlUtil.class -com\hcy\common\dto\result\OrderDistributionResultDto.class -com\hcy\common\plugin\sms\engine\TencentSms.class -com\hcy\common\mapper\system\SystemAuthMenuMapper.class -com\hcy\common\utils\IpUtil.class -com\hcy\common\mapper\ScrapType\ScrapTypeMapper.class -com\hcy\common\entity\unit\GoodsUnit.class -com\hcy\common\entity\crontab\DevCrontab.class -com\hcy\common\enums\staff\StaffCommissionStatusEnum.class -com\hcy\common\entity\staff\StaffReassignment.class -com\hcy\common\utils\HttpClientUtils$1.class -com\hcy\common\entity\applyFor\WithdrawCommissionApplyfor.class -com\hcy\common\entity\server\Jvm.class -com\hcy\common\entity\system\SystemAuthRole.class -com\hcy\common\entity\recharge\RechargeOrder.class -com\hcy\common\mapper\log\OrderLogMapper.class -com\hcy\common\entity\way\DevPayWay.class -com\hcy\common\enums\wxpay\WxAddressType.class -com\hcy\common\enums\equipment\EquipmentStateEnum.class -com\hcy\common\entity\server\Mem.class -com\hcy\common\entity\commonFault\CommonFault.class -com\hcy\common\mapper\goods\GoodsMapper.class -com\hcy\common\entity\staff\StaffApplyFor.class -com\hcy\common\exception\LoginException.class -com\hcy\common\entity\wxpay\WxPayOrderQueryV3Result$Payer.class -com\hcy\common\mapper\CommonMaintenance\CommonMaintenanceMapper.class -com\hcy\common\utils\Coordinates.class -com\hcy\common\entity\comment\GoodsComment.class -com\hcy\common\mapper\coupon\ChannelCouponMapper.class -com\hcy\common\dto\result\StaffResultDto.class -com\hcy\common\mapper\jobs\JobsMapper.class -com\hcy\common\dto\result\GoodsCommentPageResultDto.class -com\hcy\common\entity\time\OrderTime.class -com\hcy\common\mapper\visit\IndexVisitMapper.class -com\hcy\common\enums\goods\GoodsTimeStatusEnum.class -com\hcy\common\dto\result\OrderGroupResultDto.class -com\hcy\common\plugin\storage\engine\AliyunStorage.class -com\hcy\common\config\GlobalConfig.class -com\hcy\common\entity\goods\Goods.class -com\hcy\common\dto\staff\StaffPhysicalExaminationDto.class -com\hcy\common\mapper\decorate\DecorateTabbarMapper.class -com\hcy\common\mapper\distribution\DistributorCommissionMapper.class -com\hcy\common\enums\RefundOperateEnum.class -com\hcy\common\enums\wxpay\WxGzhTemplateEnum.class -com\hcy\common\entity\ScrapType\ScrapType.class -com\hcy\common\enums\OrderLogEnum.class -com\hcy\common\mapper\goods\GoodsTimeMapper.class -com\hcy\common\mapper\distribution\DistributorMapper.class -com\hcy\common\mapper\system\SystemLogOperateMapper.class -com\hcy\common\mapper\refund\OrderRefundMapper.class -com\hcy\common\entity\region\DevRegion.class -com\hcy\common\entity\wxpay\WxPayOrderNotifyV3Result$Payer.class -com\hcy\common\entity\session\AdminSession.class -com\hcy\common\dto\GoodsCollectionDto.class -com\hcy\common\entity\decorate\DecorateTabbar.class -com\hcy\common\enums\GoodsCommentLevelEnum.class -com\hcy\common\enums\OrderPlayTypeEnum.class -com\hcy\common\enums\staff\StaffReassignmentEnum.class -com\hcy\common\entity\system\SystemAuthPost.class -com\hcy\common\dto\staff\StaffFeedbackDto.class -com\hcy\common\utils\TimeUtil.class -com\hcy\common\enums\goods\UseGoodsTypeEnum.class -com\hcy\common\mapper\serviceArea\ServiceAreaStaffMapper.class -com\hcy\common\dto\result\OrderRefundPageResultDto.class -com\hcy\common\entity\article\Article.class -com\hcy\common\validator\IntegerContainsValidator.class -com\hcy\common\entity\activity\Activity.class -com\hcy\common\entity\decorate\DecoratePage.class -com\hcy\common\entity\wxpay\WxPayRefundV3Result$Amount.class -com\hcy\common\entity\distribution\WithdrawCommission.class diff --git a/common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst deleted file mode 100644 index 5d623fa..0000000 --- a/common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ /dev/null @@ -1,339 +0,0 @@ -E:\charging_pile\common\src\main\java\com\hcy\common\entity\crontab\Crontab.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\fault\Fault.java -E:\charging_pile\common\src\main\java\com\hcy\common\utils\RedisUtil.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\album\AlbumCate.java -E:\charging_pile\common\src\main\java\com\hcy\common\enums\distributor\DistributorWithdrawStatusEnum.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\CommonOverhaul\CommonOverhaul.java -E:\charging_pile\common\src\main\java\com\hcy\common\validator\annotation\StringContains.java -E:\charging_pile\common\src\main\java\com\hcy\common\dto\VisitGroupDto.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\album\AlbumCateMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\validator\IntegerContainsValidator.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\staff\Staff.java -E:\charging_pile\common\src\main\java\com\hcy\common\enums\staff\StaffReceiveOrderTypeEnum.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\visit\IndexVisitMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\address\UserAddress.java -E:\charging_pile\common\src\main\java\com\hcy\common\plugin\storage\engine\LocalStorage.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\log\OrderRefundLogMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\goods\OrderGoodsMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\staff\StaffFeedbackMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\utils\UrlUtil.java -E:\charging_pile\common\src\main\java\com\hcy\common\enums\OrderPlayTypeEnum.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\coupon\GoodsCouponMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\validator\annotation\IntegerContains.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\staff\StaffCommission.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\ScrapType\ScrapType.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\account\AccountLogMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\enums\wxpay\WxTradeState.java -E:\charging_pile\common\src\main\java\com\hcy\common\plugin\storage\engine\QcloudStorage.java -E:\charging_pile\common\src\main\java\com\hcy\common\enums\coupon\ChannelTypeEnum.java -E:\charging_pile\common\src\main\java\com\hcy\common\validator\StringContainsValidator.java -E:\charging_pile\common\src\main\java\com\hcy\common\enums\goods\UseGoodsTypeEnum.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\jobs\JobsMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\config\WxPayGlobalConfig.java -E:\charging_pile\common\src\main\java\com\hcy\common\dto\result\ServiceAreaResultDto.java -E:\charging_pile\common\src\main\java\com\hcy\common\dto\goods\GoodsDto.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\goods\Goods.java -E:\charging_pile\common\src\main\java\com\hcy\common\dto\result\OrderGroupResultDto.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\server\Disk.java -E:\charging_pile\common\src\main\java\com\hcy\common\enums\FaultEnum.java -E:\charging_pile\common\src\main\java\com\hcy\common\utils\WechatPay2ValidatorForRequest.java -E:\charging_pile\common\src\main\java\com\hcy\common\dto\GoodsCommentPageDto.java -E:\charging_pile\common\src\main\java\com\hcy\common\dto\result\OrderDistributionResultDto.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\image\GoodsImage.java -E:\charging_pile\common\src\main\java\com\hcy\common\utils\TimeUtil.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\article\ArticleCategory.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\collect\GoodsCollect.java -E:\charging_pile\common\src\main\java\com\hcy\common\utils\ArithUtil.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\crontab\DevCrontab.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\article\ArticleCategoryMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\utils\YmlUtil.java -E:\charging_pile\common\src\main\java\com\hcy\common\enums\staff\StaffFeedbackEnum.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\order\Order.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\session\AdminSessionMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\enums\OrderRefundStatusEnum.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\region\DevRegion.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\coupon\ChannelCouponMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\system\SystemLogLogin.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\server\Jvm.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\setting\DevNoticeSettingMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\enums\PayChannelEnum.java -E:\charging_pile\common\src\main\java\com\hcy\common\exception\LoginException.java -E:\charging_pile\common\src\main\java\com\hcy\common\validator\IntArrayEmptyValidator.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\log\OrderLogMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\utils\ConfigUtil.java -E:\charging_pile\common\src\main\java\com\hcy\common\utils\ArrayUtil.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\user\UserMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\distribution\DistributorCommissionMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\order\CancelOrderConfigMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\common\WithdrawCommissionMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\setting\HotSearch.java -E:\charging_pile\common\src\main\java\com\hcy\common\enums\wxpay\WxApiType.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\crontab\DevCrontabMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\enums\RefundEnum.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\staff\StaffReassignmentMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\enums\WithdrawCommissionApplyforEnum.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\staff\StaffPhysicalExamination.java -E:\charging_pile\common\src\main\java\com\hcy\common\enums\commonFault\CommonFaultEnum.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\goods\GoodsTimeMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\enums\user\UserTypeEnum.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\staff\StaffUploadFile.java -E:\charging_pile\common\src\main\java\com\hcy\common\enums\staff\StaffReassignmentEnum.java -E:\charging_pile\common\src\main\java\com\hcy\common\exception\BaseException.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\serviceArea\ServiceAreaMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\enums\AccountEnum.java -E:\charging_pile\common\src\main\java\com\hcy\common\enums\OperateEnum.java -E:\charging_pile\common\src\main\java\com\hcy\common\plugin\storage\StorageDriver.java -E:\charging_pile\common\src\main\java\com\hcy\common\plugin\notice\engine\SmsNotice.java -E:\charging_pile\common\src\main\java\com\hcy\common\plugin\sms\engine\AliSms.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\system\SystemLogOperateMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\enums\OrderPayStatusEnum.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\system\SystemAuthMenu.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\coupon\UserCoupon.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\staff\StaffCommissionMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\enums\RecommendEnum.java -E:\charging_pile\common\src\main\java\com\hcy\common\plugin\sms\engine\HuaweiSms.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\wxpay\WxPayRefundNotifyV3Result.java -E:\charging_pile\common\src\main\java\com\hcy\common\enums\OrderTypeEnum.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\region\DevRegionMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\comment\GoodsCommentMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\plugin\sms\engine\TencentSms.java -E:\charging_pile\common\src\main\java\com\hcy\common\enums\AccountChangeEnum.java -E:\charging_pile\common\src\main\java\com\hcy\common\constant\GlobalConstant.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\comment\GoodsComment.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\warehouse\WarehouseMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\enums\staff\StaffEnum.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\plant\PlantMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\config\map\LikeTenCentClient.java -E:\charging_pile\common\src\main\java\com\hcy\common\enums\OrderVerificationStatusEnum.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\distribution\Distributor.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\wxpay\WxPayRefundQueryV3Result.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\group\DistributeGroup.java -E:\charging_pile\common\src\main\java\com\hcy\common\enums\wxpay\WxToUrlEnum.java -E:\charging_pile\common\src\main\java\com\hcy\common\dto\GoodsCollectionDto.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\serviceArea\ServiceAreaStaff.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\system\SystemAuthRole.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\SparePartAudit\SparePartAudit.java -E:\charging_pile\common\src\main\java\com\hcy\common\utils\QRCodeUtil.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\sparePart\SparePart.java -E:\charging_pile\common\src\main\java\com\hcy\common\dto\staff\StaffFeedbackDto.java -E:\charging_pile\common\src\main\java\com\hcy\common\utils\AmountUtil.java -E:\charging_pile\common\src\main\java\com\hcy\common\utils\ToolsUtil.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\system\SystemAuthPerm.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\time\OrderTime.java -E:\charging_pile\common\src\main\java\com\hcy\common\validator\IDMustValidator.java -E:\charging_pile\common\src\main\java\com\hcy\common\enums\equipment\EquipmentStateEnum.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\session\UserSessionMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\config\WxPayConfigBuilder.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\setting\DevNoticeSetting.java -E:\charging_pile\common\src\main\java\com\hcy\common\config\ResponseControllerAdvice.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\system\SystemConfig.java -E:\charging_pile\common\src\main\java\com\hcy\common\enums\GoodsCommentLevelEnum.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\article\ArticleMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\refund\OrderRefundMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\system\SystemAuthRoleMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\staff\StaffFeedback.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\notice\NoticeRecord.java -E:\charging_pile\common\src\main\java\com\hcy\common\dto\ServiceAreaDto.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\decorate\DecoratePage.java -E:\charging_pile\common\src\main\java\com\hcy\common\dto\OrderGroupDto.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\server\Mem.java -E:\charging_pile\common\src\main\java\com\hcy\common\core\ServerResult.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\recharge\RechargeOrderMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\utils\IpUtil.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\notice\NoticeSettingMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\validator\annotation\IntArrayEmpty.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\image\GoodsCommentImage.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\activity\ActivityMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\config\RedisConfig.java -E:\charging_pile\common\src\main\java\com\hcy\common\utils\CronUtil.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\order\OrderMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\utils\Coordinates.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\system\SystemLogLoginMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\staff\StaffApplyFor.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\category\GoodsCategoryMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\article\Article.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\commonFault\CommonFault.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\setting\DictTypeMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\visit\IndexVisit.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\coupon\GoodsCoupon.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\staff\StaffReassignment.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\staff\StaffPhysicalExaminationMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\plugin\notice\engine\OaNotice.java -E:\charging_pile\common\src\main\java\com\hcy\common\enums\PaymentEnum.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\system\SystemLogSmsMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\log\OrderLog.java -E:\charging_pile\common\src\main\java\com\hcy\common\utils\RegularExpressionUtil.java -E:\charging_pile\common\src\main\java\com\hcy\common\utils\WxPayServiceUtils.java -E:\charging_pile\common\src\main\java\com\hcy\common\config\ThreadPoolConfig.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\decorate\DecorateTabbarMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\utils\StringUtil.java -E:\charging_pile\common\src\main\java\com\hcy\common\dto\RegionDto.java -E:\charging_pile\common\src\main\java\com\hcy\common\dto\result\RegionResultDto.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\address\UserAddressMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\session\AdminSession.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\wxpay\SystemWxPayConfig.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\sparePart\SparePartMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\system\SystemAuthAdminMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\utils\SpringUtil.java -E:\charging_pile\common\src\main\java\com\hcy\common\dto\result\StaffReassignmentResultDto.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\refund\OrderRefund.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\SparePartAudit\SparePartAuditMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\jobs\Jobs.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\goods\OrderGoods.java -E:\charging_pile\common\src\main\java\com\hcy\common\enums\ShowEnum.java -E:\charging_pile\common\src\main\java\com\hcy\common\enums\GoodsCommentStatusEnum.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\article\ArticleCollectMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\coupon\UserCouponMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\system\SystemConfigMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\utils\FormulaUtil.java -E:\charging_pile\common\src\main\java\com\hcy\common\enums\AlbumEnum.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\unit\GoodsUnitMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\system\SystemAuthDeptMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\enums\HttpEnum.java -E:\charging_pile\common\src\main\java\com\hcy\common\enums\wxpay\WxNotifyType.java -E:\charging_pile\common\src\main\java\com\hcy\common\utils\IntegerUtil.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\system\SystemAuthMenuMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\decorate\DecoratePageMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\equipment\EquipmentMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\dto\WithdrawCommissionDto.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\system\SystemLogOperate.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\album\AlbumMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\applyFor\WithdrawCommissionApplyfor.java -E:\charging_pile\common\src\main\java\com\hcy\common\enums\ClientEnum.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\system\SystemAuthAdmin.java -E:\charging_pile\common\src\main\java\com\hcy\common\enums\coupon\CouponTypeEnum.java -E:\charging_pile\common\src\main\java\com\hcy\common\plugin\notice\engine\MpNotice.java -E:\charging_pile\common\src\main\java\com\hcy\common\utils\RequestUtil.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\CommonOverhaul\CommonOverhaulMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\dto\staff\StaffPhysicalExaminationDto.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\log\SmsLog.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\staff\StaffApplyForMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\wxpay\WxPayOrderNotifyV3Result.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\article\ArticleCollect.java -E:\charging_pile\common\src\main\java\com\hcy\common\utils\HttpUtil.java -E:\charging_pile\common\src\main\java\com\hcy\common\utils\ExcelUtils.java -E:\charging_pile\common\src\main\java\com\hcy\common\core\PageSumResult.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\time\OrderTimeMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\enums\wxpay\WxAddressType.java -E:\charging_pile\common\src\main\java\com\hcy\common\plugin\storage\engine\QiniuStorage.java -E:\charging_pile\common\src\main\java\com\hcy\common\dto\result\StaffResultDto.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\log\OrderRefundLog.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\system\SystemAuthPermMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\dto\result\VisitGroupResultDto.java -E:\charging_pile\common\src\main\java\com\hcy\common\enums\staff\StaffStatusEnum.java -E:\charging_pile\common\src\main\java\com\hcy\common\enums\audit\AuditStateEnum.java -E:\charging_pile\common\src\main\java\com\hcy\common\enums\OrderStatusEnum.java -E:\charging_pile\common\src\main\java\com\hcy\common\enums\StatusEnum.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\staff\StaffMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\wxpay\WxPayRefundV3Result.java -E:\charging_pile\common\src\main\java\com\hcy\common\enums\wxpay\WxTransferAccountsSceneType.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\CommonMaintenance\CommonMaintenanceMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\enums\NoticeEnum.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\way\DevPayWayMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\dto\OrderRefundDto.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\collect\GoodsCollectMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\enums\wxpay\WxRefundStatus.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\coupon\CouponMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\wxpay\WxPayOrderQueryV3Result.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\coupon\Coupon.java -E:\charging_pile\common\src\main\java\com\hcy\common\enums\distributor\DistributorWithdrawResultEnum.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\plant\Plant.java -E:\charging_pile\common\src\main\java\com\hcy\common\utils\HttpUtils.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\server\Sys.java -E:\charging_pile\common\src\main\java\com\hcy\common\dto\result\OrderPageResultDto.java -E:\charging_pile\common\src\main\java\com\hcy\common\exception\GlobalException.java -E:\charging_pile\common\src\main\java\com\hcy\common\exception\OperateException.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\setting\DictDataMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\unit\GoodsUnit.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\recharge\RechargeOrder.java -E:\charging_pile\common\src\main\java\com\hcy\common\dto\staff\StaffDto.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\album\Album.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\reply\OfficialAccountReply.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\serviceArea\ServiceArea.java -E:\charging_pile\common\src\main\java\com\hcy\common\enums\wxpay\WxGzhTemplateEnum.java -E:\charging_pile\common\src\main\java\com\hcy\common\utils\HttpClientUtils.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\reply\OfficialAccountReplyMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\config\map\MapConfig.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\sparePartStockAudit\SparePartStockAudit.java -E:\charging_pile\common\src\main\java\com\hcy\common\enums\OrderLogEnum.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\user\UserAuthMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\setting\HotSearchMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\distribution\DistributorMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\image\GoodsCommentImageMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\user\UserAuth.java -E:\charging_pile\common\src\main\java\com\hcy\common\enums\OrderDispatchEnum.java -E:\charging_pile\common\src\main\java\com\hcy\common\utils\PolygonUtil.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\goods\GoodsMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\server\Cpu.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\OfficialReply.java -E:\charging_pile\common\src\main\java\com\hcy\common\utils\SnUtils.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\setting\DictType.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\goods\GoodsTime.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\system\SystemAuthPost.java -E:\charging_pile\common\src\main\java\com\hcy\common\utils\WeChatUtil.java -E:\charging_pile\common\src\main\java\com\hcy\common\dto\coupon\UserCouponDto.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\recharge\Recharge.java -E:\charging_pile\common\src\main\java\com\hcy\common\core\PageResult.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\image\GoodsImageMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\coupon\GoodsCategoryCoupon.java -E:\charging_pile\common\src\main\java\com\hcy\common\dto\result\UserResultDto.java -E:\charging_pile\common\src\main\java\com\hcy\common\enums\staff\StaffCommissionStatusEnum.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\coupon\ChannelCoupon.java -E:\charging_pile\common\src\main\java\com\hcy\common\plugin\notice\NoticeDriver.java -E:\charging_pile\common\src\main\java\com\hcy\common\enums\goods\GoodsEnum.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\order\CancelOrderConfig.java -E:\charging_pile\common\src\main\java\com\hcy\common\dto\result\StaffFeedbackResultDto.java -E:\charging_pile\common\src\main\java\com\hcy\common\enums\goods\GoodsTimeStatusEnum.java -E:\charging_pile\common\src\main\java\com\hcy\common\utils\WxGzhTemplateUtil.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\notice\NoticeSetting.java -E:\charging_pile\common\src\main\java\com\hcy\common\enums\staff\StaffApplyForStatusEnum.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\OfficialReplyMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\warehouse\Warehouse.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\CommonMaintenance\CommonMaintenance.java -E:\charging_pile\common\src\main\java\com\hcy\common\dto\result\GoodsCollectionResultDto.java -E:\charging_pile\common\src\main\java\com\hcy\common\dto\UserDto.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\activity\Activity.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\fault\FaultMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\dto\staff\StaffReassignmentDto.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\way\DevPayWay.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\pay\DevPay.java -E:\charging_pile\common\src\main\java\com\hcy\common\dto\OrderDistributionDto.java -E:\charging_pile\common\src\main\java\com\hcy\common\core\basics\IBaseMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\enums\coupon\UserCouponStatusEnum.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\account\AccountLog.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\setting\DictData.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\distribution\DistributorCommission.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\ScrapType\ScrapTypeMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\enums\GoodsCategoryStatusEnum.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\crontab\CrontabMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\sparePartStockAudit\SparePartStockAuditMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\enums\CancelOrderConfigTypeEnum.java -E:\charging_pile\common\src\main\java\com\hcy\common\enums\RegionLevelEnum.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\distribution\WithdrawCommission.java -E:\charging_pile\common\src\main\java\com\hcy\common\enums\RefundOperateEnum.java -E:\charging_pile\common\src\main\java\com\hcy\common\dto\result\OrderRefundPageResultDto.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\serviceArea\ServiceAreaStaffMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\plugin\sms\SmsDriver.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\category\GoodsCategory.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\user\User.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\commonFault\CommonFaultMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\plugin\storage\engine\AliyunStorage.java -E:\charging_pile\common\src\main\java\com\hcy\common\config\QRCodeConfig.java -E:\charging_pile\common\src\main\java\com\hcy\common\config\GlobalConfig.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\group\DistributeGroupMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\system\SystemLogSms.java -E:\charging_pile\common\src\main\java\com\hcy\common\validator\annotation\IDMust.java -E:\charging_pile\common\src\main\java\com\hcy\common\dto\OrderDto.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\system\SystemAuthDept.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\applyFor\WithdrawCommissionApplyforMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\decorate\DecorateTabbar.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\coupon\GoodsCategoryCouponMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\enums\distributor\DistributorCommissionStatusEnum.java -E:\charging_pile\common\src\main\java\com\hcy\common\dto\result\GoodsCommentPageResultDto.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\log\SmsLogMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\utils\CodeUtil.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\session\UserSession.java -E:\charging_pile\common\src\main\java\com\hcy\common\utils\PinyinUtil.java -E:\charging_pile\common\src\main\java\com\hcy\common\mapper\system\SystemAuthPostMapper.java -E:\charging_pile\common\src\main\java\com\hcy\common\entity\equipment\Equipment.java -E:\charging_pile\common\src\main\java\com\hcy\common\core\AjaxResult.java diff --git a/front/src/main/java/com/hcy/front/controller/EquipmentController.java b/front/src/main/java/com/hcy/front/controller/EquipmentController.java index 3a3ce1a..2bf0e4a 100644 --- a/front/src/main/java/com/hcy/front/controller/EquipmentController.java +++ b/front/src/main/java/com/hcy/front/controller/EquipmentController.java @@ -34,6 +34,4 @@ public class EquipmentController { EquipmentDetailVo detail = iEquipmentService.detail(number); return AjaxResult.success(detail); } - - } diff --git a/front/src/main/java/com/hcy/front/controller/order/MaintenanceOrderController.java b/front/src/main/java/com/hcy/front/controller/order/MaintenanceOrderController.java index c10bdb7..3c941bb 100644 --- a/front/src/main/java/com/hcy/front/controller/order/MaintenanceOrderController.java +++ b/front/src/main/java/com/hcy/front/controller/order/MaintenanceOrderController.java @@ -24,6 +24,18 @@ public class MaintenanceOrderController { @Resource IMaintenanceOrderService iMaintenanceOrderService; + /** + * 检修订单新增 + * + * @param maintenanceOrderParam 参数 + * @return Object + */ + @PostMapping("/add") + public Object add(@Validated(value = MaintenanceOrderParam.create.class) @RequestBody MaintenanceOrderParam maintenanceOrderParam) { + iMaintenanceOrderService.add(maintenanceOrderParam); + return AjaxResult.success(); + } + /** * 检修订单列表 * @@ -93,4 +105,15 @@ public class MaintenanceOrderController { iMaintenanceOrderService.serviceOfferPrice(maintenanceOrderParam); return AjaxResult.success(); } + + /** + * 确认服务报价 + * @param maintenanceOrderParam 参数 + * @return Object + */ + @PostMapping("/confirmServiceOfferPrice") + public Object confirmServiceOfferPrice(@RequestBody MaintenanceOrderParam maintenanceOrderParam) { + iMaintenanceOrderService.confirmServiceOfferPrice(maintenanceOrderParam); + return AjaxResult.success(); + } } diff --git a/front/src/main/java/com/hcy/front/service/order/IMaintenanceOrderService.java b/front/src/main/java/com/hcy/front/service/order/IMaintenanceOrderService.java index f107d59..f244572 100644 --- a/front/src/main/java/com/hcy/front/service/order/IMaintenanceOrderService.java +++ b/front/src/main/java/com/hcy/front/service/order/IMaintenanceOrderService.java @@ -13,6 +13,13 @@ import java.util.List; */ public interface IMaintenanceOrderService { + /** + * 检修订单新增 + * + * @param maintenanceOrderParam 参数 + */ + void add(MaintenanceOrderParam maintenanceOrderParam); + /** * 检修订单列表 * @@ -52,4 +59,10 @@ public interface IMaintenanceOrderService { * @param maintenanceOrderParam 参数 */ void serviceOfferPrice(MaintenanceOrderParam maintenanceOrderParam); + + /** + * 确认报价 + * @param maintenanceOrderParam 参数 + */ + void confirmServiceOfferPrice(MaintenanceOrderParam maintenanceOrderParam); } diff --git a/front/src/main/java/com/hcy/front/service/order/impl/MaintenanceOrderServiceImpl.java b/front/src/main/java/com/hcy/front/service/order/impl/MaintenanceOrderServiceImpl.java index a0f5e67..eaa7180 100644 --- a/front/src/main/java/com/hcy/front/service/order/impl/MaintenanceOrderServiceImpl.java +++ b/front/src/main/java/com/hcy/front/service/order/impl/MaintenanceOrderServiceImpl.java @@ -15,6 +15,9 @@ import com.hcy.common.entity.order.MaintenanceOrder; import com.hcy.common.entity.sparePart.SparePart; import com.hcy.common.entity.system.SystemAuthAdmin; import com.hcy.common.entity.user.User; +import com.hcy.common.entity.warehouse.Warehouse; +import com.hcy.common.enums.ClientEnum; +import com.hcy.common.enums.ClientStatusEnum; import com.hcy.common.enums.order.MaintenanceOrderStatusEnum; import com.hcy.common.enums.order.OrderStateEnum; import com.hcy.common.exception.OperateException; @@ -22,9 +25,11 @@ import com.hcy.common.mapper.client.ClientMapper; import com.hcy.common.mapper.client.EquipmentMapper; import com.hcy.common.mapper.fault.FaultMapper; import com.hcy.common.mapper.order.MaintenanceOrderMapper; +import com.hcy.common.mapper.order.OrderSparePartMapper; import com.hcy.common.mapper.sparePart.SparePartMapper; import com.hcy.common.mapper.system.SystemAuthAdminMapper; import com.hcy.common.mapper.user.UserMapper; +import com.hcy.common.mapper.warehouse.WarehouseMapper; import com.hcy.common.utils.StringUtil; import com.hcy.common.utils.ToolsUtil; import com.hcy.front.FrontThreadLocal; @@ -35,14 +40,17 @@ import com.hcy.front.validate.order.MaintenanceOrderParam; import com.hcy.front.validate.warehouse.SparePartParam; import com.hcy.front.vo.order.MaintenanceOrderDetailVo; import com.hcy.front.vo.order.MaintenanceOrderListVo; +import com.hcy.front.vo.order.OrderSparePartListVo; import com.hcy.front.vo.order.OrderStaffVo; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.Assert; import org.springframework.util.StringUtils; import javax.annotation.Resource; import java.math.BigDecimal; +import java.sql.ClientInfoStatus; import java.text.DecimalFormat; import java.text.SimpleDateFormat; import java.util.*; @@ -75,8 +83,19 @@ public class MaintenanceOrderServiceImpl implements IMaintenanceOrderService { @Resource SparePartMapper sparePartMapper; + @Resource + WarehouseMapper warehouseMapper; + + @Resource + OrderSparePartMapper orderSparePartMapper; + private final DecimalFormat df = new DecimalFormat ("#.#"); + @Override + public void add(MaintenanceOrderParam maintenanceOrderParam) { + + } + /** * 检修订单列表 * @@ -154,9 +173,15 @@ public class MaintenanceOrderServiceImpl implements IMaintenanceOrderService { public PageResult pageList(PageParam pageParam, MaintenanceOrderParam maintenanceOrderParam) { MaintenanceOrderDto maintenanceOrderDto = new MaintenanceOrderDto(); BeanUtils.copyProperties(maintenanceOrderParam,maintenanceOrderDto); - maintenanceOrderDto.setReceiverId(FrontThreadLocal.getUserId().longValue()); - if(maintenanceOrderParam.getOrderStatus() == null){ - maintenanceOrderDto.setOrderStatusIds("1,2,7,8"); + + if(maintenanceOrderParam.getIsClient() == MaintenanceOrderStatusEnum.REPAIRER.getStatus()){ + maintenanceOrderDto.setReceiverId(FrontThreadLocal.getUserId().longValue()); + + if(maintenanceOrderParam.getOrderStatus() == null){ + maintenanceOrderDto.setOrderStatusIds("1,2,7,8"); + } + }else{ + maintenanceOrderDto.setClientId(FrontThreadLocal.getUserId().longValue()); } List returnData = new LinkedList<>(); @@ -227,8 +252,6 @@ public class MaintenanceOrderServiceImpl implements IMaintenanceOrderService { } } - - @Override public MaintenanceOrderDetailVo detail(Long id) { MaintenanceOrder maintenanceOrder = maintenanceOrderMapper.findMaintenanceOrderById(id); @@ -259,29 +282,86 @@ public class MaintenanceOrderServiceImpl implements IMaintenanceOrderService { vo.setReceiverName(user.getNickname()); } + //设置配件清单 + List orderSpareParts = orderSparePartMapper.selectList(new LambdaQueryWrapper() + .eq(OrderSparePart::getMaintenanceOrderId, maintenanceOrder.getId())); + List orderSparePartListVos = new ArrayList<>(); + for (OrderSparePart item : orderSpareParts) { + OrderSparePartListVo orderSparePartListVo = new OrderSparePartListVo(); + BeanUtils.copyProperties(item, orderSparePartListVo); + orderSparePartListVos.add(orderSparePartListVo); + } + vo.setSparePartList(orderSparePartListVos); + return vo; } @Override + @Transactional public void serviceOfferPrice(MaintenanceOrderParam maintenanceOrderParam) { MaintenanceOrder maintenanceOrder = maintenanceOrderMapper.findMaintenanceOrderById(maintenanceOrderParam.getId()); Assert.notNull(maintenanceOrder, "数据不存在"); maintenanceOrder.setFaultDescription(maintenanceOrderParam.getFaultDescription()); maintenanceOrder.setFaultImg(maintenanceOrderParam.getFaultImg()); + maintenanceOrder.setWarehouseType(maintenanceOrderParam.getWarehouseType()); + maintenanceOrder.setQuotationTime(new Date()); Client client = clientMapper.findClientById(maintenanceOrder.getClientId()); + //判断当前客户是全包还是半包 + if(client.getClientType() == ClientStatusEnum.PLIE_POINT_ALL_WRAPPED.getStatus()){ + maintenanceOrder.setOrderStatus(MaintenanceOrderStatusEnum.MAINTENANCE_ING.getStatus()); + }else{ + maintenanceOrder.setOrderStatus(MaintenanceOrderStatusEnum.WAIT_CONFIRMATION.getStatus()); + } + + BigDecimal actualAmount = new BigDecimal("0"); + for (SparePartParam item : maintenanceOrderParam.getSparePartParams()) { SparePart sparePart = sparePartMapper.findSparePart(item.getId()); OrderSparePart orderSparePart = new OrderSparePart(); BeanUtils.copyProperties(sparePart, orderSparePart); + orderSparePart.setId(null); + orderSparePart.setMaintenanceOrderId(maintenanceOrder.getId()); orderSparePart.setSparePartsId(item.getId()); + orderSparePart.setWarehouseId(sparePart.getWarehouseId()); + orderSparePart.setQuantity(item.getQuantity()); + //设置订单实际价格 + BigDecimal practicalPrice = sparePart.getUnitPrice().multiply(client.getPurchaseDivisor()); + orderSparePart.setUnitPrice(practicalPrice); + BigDecimal totalPrice = practicalPrice.multiply(BigDecimal.valueOf(item.getQuantity())); + actualAmount = actualAmount.add(totalPrice); + + orderSparePart.setTotalPrice(totalPrice); + + orderSparePartMapper.insert(orderSparePart); + } + + maintenanceOrder.setTotalAmount(actualAmount); + maintenanceOrder.setActualAmount(actualAmount); + + maintenanceOrderMapper.updateById(maintenanceOrder); + } + + @Override + public void confirmServiceOfferPrice(MaintenanceOrderParam maintenanceOrderParam) { + MaintenanceOrder maintenanceOrder = maintenanceOrderMapper.findMaintenanceOrderById(maintenanceOrderParam.getId()); + Assert.notNull(maintenanceOrder, "数据不存在"); + Assert.isTrue(maintenanceOrder.getOrderStatus() != MaintenanceOrderStatusEnum.WAIT_CONFIRMATION.getStatus(), "订单状态错误"); + + if(maintenanceOrderParam.getIsMaintain() == MaintenanceOrderStatusEnum.MAINTAIN.getStatus()){ + maintenanceOrder.setIsMaintain(MaintenanceOrderStatusEnum.MAINTAIN.getStatus()); + maintenanceOrder.setOrderStatus(MaintenanceOrderStatusEnum.MAINTENANCE_ING.getStatus()); + }else{ + maintenanceOrder.setIsMaintain(MaintenanceOrderStatusEnum.NOT_MAINTAIN.getStatus()); + maintenanceOrder.setRefuseMaintenanceCause(maintenanceOrderParam.getRefuseMaintenanceCause()); + maintenanceOrder.setOrderStatus(MaintenanceOrderStatusEnum.FINISHED.getStatus()); + maintenanceOrder.setOrderAccomplishTime(new Date()); } maintenanceOrderMapper.updateById(maintenanceOrder); - } } diff --git a/front/src/main/java/com/hcy/front/service/order/impl/OrderSparePartServiceImpl.java b/front/src/main/java/com/hcy/front/service/order/impl/OrderSparePartServiceImpl.java index f25a910..4af11b0 100644 --- a/front/src/main/java/com/hcy/front/service/order/impl/OrderSparePartServiceImpl.java +++ b/front/src/main/java/com/hcy/front/service/order/impl/OrderSparePartServiceImpl.java @@ -93,10 +93,10 @@ public class OrderSparePartServiceImpl implements IOrderSparePartService { model.setSparePartsId(orderSparePartParam.getSparePartsId()); model.setSparePartsCode(orderSparePartParam.getSparePartsCode()); model.setSparePartsName(orderSparePartParam.getSparePartsName()); - model.setWarehouseName(orderSparePartParam.getWarehouseName()); + model.setWarehouseId(orderSparePartParam.getWarehouseId()); model.setSpecificationsModel(orderSparePartParam.getSpecificationsModel()); model.setUnit(orderSparePartParam.getUnit()); - model.setPrice(orderSparePartParam.getPrice()); + model.setUnitPrice(orderSparePartParam.getPrice()); model.setQuantity(orderSparePartParam.getQuantity()); model.setTotalPrice(orderSparePartParam.getTotalPrice()); orderSparePartMapper.insert(model); @@ -121,10 +121,10 @@ public class OrderSparePartServiceImpl implements IOrderSparePartService { model.setSparePartsId(orderSparePartParam.getSparePartsId()); model.setSparePartsCode(orderSparePartParam.getSparePartsCode()); model.setSparePartsName(orderSparePartParam.getSparePartsName()); - model.setWarehouseName(orderSparePartParam.getWarehouseName()); + model.setWarehouseId(orderSparePartParam.getWarehouseId()); model.setSpecificationsModel(orderSparePartParam.getSpecificationsModel()); model.setUnit(orderSparePartParam.getUnit()); - model.setPrice(orderSparePartParam.getPrice()); + model.setUnitPrice(orderSparePartParam.getPrice()); model.setQuantity(orderSparePartParam.getQuantity()); model.setTotalPrice(orderSparePartParam.getTotalPrice()); orderSparePartMapper.updateById(model); diff --git a/front/src/main/java/com/hcy/front/service/warehouse/impl/SparePartServiceImpl.java b/front/src/main/java/com/hcy/front/service/warehouse/impl/SparePartServiceImpl.java index 7681807..bba7f32 100644 --- a/front/src/main/java/com/hcy/front/service/warehouse/impl/SparePartServiceImpl.java +++ b/front/src/main/java/com/hcy/front/service/warehouse/impl/SparePartServiceImpl.java @@ -10,11 +10,14 @@ import com.hcy.common.dto.SparePartDto; import com.hcy.common.entity.client.Client; import com.hcy.common.entity.client.ClientContacts; import com.hcy.common.entity.sparePart.SparePart; +import com.hcy.common.entity.user.User; import com.hcy.common.entity.warehouse.Warehouse; +import com.hcy.common.enums.order.MaintenanceOrderStatusEnum; import com.hcy.common.exception.OperateException; import com.hcy.common.mapper.client.ClientContactsMapper; import com.hcy.common.mapper.client.ClientMapper; import com.hcy.common.mapper.sparePart.SparePartMapper; +import com.hcy.common.mapper.user.UserMapper; import com.hcy.common.mapper.warehouse.WarehouseMapper; import com.hcy.common.utils.StringUtil; import com.hcy.common.utils.TimeUtil; @@ -32,6 +35,7 @@ import org.springframework.util.Assert; import javax.annotation.Resource; import java.math.BigDecimal; import java.util.*; +import java.util.stream.Collectors; /** * 备件信息实现类 @@ -51,6 +55,9 @@ public class SparePartServiceImpl implements ISparePartService { @Resource ClientContactsMapper clientContactsMapper; + @Resource + UserMapper userMapper; + /** * 备件信息列表 * @@ -68,6 +75,16 @@ public class SparePartServiceImpl implements ISparePartService { SparePartDto sparePartDto = new SparePartDto(); BeanUtils.copyProperties(param,sparePartDto); + //判断仓库类型 + User user = userMapper.selectById(FrontThreadLocal.getUserId().longValue()); + if(param.getWarehouseType() == MaintenanceOrderStatusEnum.MY_WAREHOUSE.getStatus()){ + sparePartDto.setWarehouseIds(user.getWarehouseId().toString()); + }else{ + List warehouseList = warehouseMapper.findPublicWarehouseList(user.getWarehouseId()); + String warehouseIds = warehouseList.stream().map(Warehouse::getId).map(String::valueOf).collect(Collectors.joining(",")); + sparePartDto.setWarehouseIds(warehouseIds); + } + Client client = clientMapper.findClientById(param.getClientId()); Map warehouseMap = new HashMap<>(); diff --git a/front/src/main/java/com/hcy/front/validate/order/MaintenanceOrderParam.java b/front/src/main/java/com/hcy/front/validate/order/MaintenanceOrderParam.java index 7956ef3..4d33197 100644 --- a/front/src/main/java/com/hcy/front/validate/order/MaintenanceOrderParam.java +++ b/front/src/main/java/com/hcy/front/validate/order/MaintenanceOrderParam.java @@ -113,4 +113,7 @@ public class MaintenanceOrderParam implements Serializable { //服务报价列表 private List sparePartParams; + private Integer isClient; //是否客户 0-客户端 1-检修员端 + private Integer isMaintain; //是否维修 0-维修 1-不维修 + private Integer warehouseType; //仓库类型 0-我的仓库 1-公共仓库 } diff --git a/front/src/main/java/com/hcy/front/validate/order/OrderSparePartParam.java b/front/src/main/java/com/hcy/front/validate/order/OrderSparePartParam.java index f90e7d9..47e9a53 100644 --- a/front/src/main/java/com/hcy/front/validate/order/OrderSparePartParam.java +++ b/front/src/main/java/com/hcy/front/validate/order/OrderSparePartParam.java @@ -37,9 +37,9 @@ public class OrderSparePartParam implements Serializable { @Length(max = 50, message = "sparePartsName参数不能超出50个字符", groups = {create.class, update.class}) private String sparePartsName; - @NotNull(message = "warehouseName参数缺失", groups = {create.class, update.class}) - @Length(max = 100, message = "warehouseName参数不能超出100个字符", groups = {create.class, update.class}) - private String warehouseName; + @NotNull(message = "warehouseId参数缺失", groups = {create.class, update.class}) + @Length(max = 100, message = "warehouseId参数不能超出100个字符", groups = {create.class, update.class}) + private Long warehouseId; @NotNull(message = "specificationsModel参数缺失", groups = {create.class, update.class}) @Length(max = 50, message = "specificationsModel参数不能超出50个字符", groups = {create.class, update.class}) @@ -54,7 +54,7 @@ public class OrderSparePartParam implements Serializable { @NotNull(message = "quantity参数缺失", groups = {create.class, update.class}) @DecimalMin(value = "0", message = "quantity参数值不能少于0", groups = {create.class, update.class}) - private Long quantity; + private Integer quantity; @NotNull(message = "totalPrice参数缺失", groups = {create.class, update.class}) private BigDecimal totalPrice; diff --git a/front/src/main/java/com/hcy/front/validate/warehouse/SparePartParam.java b/front/src/main/java/com/hcy/front/validate/warehouse/SparePartParam.java index cfff11e..cd66729 100644 --- a/front/src/main/java/com/hcy/front/validate/warehouse/SparePartParam.java +++ b/front/src/main/java/com/hcy/front/validate/warehouse/SparePartParam.java @@ -57,4 +57,5 @@ public class SparePartParam implements Serializable { private String keywords; //关键字 private Long clientId; //客户id + private Integer warehouseType; //仓库类型 0-我的仓库 1-公共仓库 } diff --git a/front/src/main/java/com/hcy/front/vo/order/MaintenanceOrderDetailVo.java b/front/src/main/java/com/hcy/front/vo/order/MaintenanceOrderDetailVo.java index 4384b93..cbf6f01 100644 --- a/front/src/main/java/com/hcy/front/vo/order/MaintenanceOrderDetailVo.java +++ b/front/src/main/java/com/hcy/front/vo/order/MaintenanceOrderDetailVo.java @@ -6,6 +6,7 @@ import lombok.Data; import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; +import java.util.List; /** * MaintenanceOrderVo @@ -50,4 +51,6 @@ public class MaintenanceOrderDetailVo implements Serializable { private String faultName; //故障名称 private String creatorName; // 创建人姓名 private String receiverName; // 接单人姓名 + + private List sparePartList; // 备件清单 }