renfan
/
charging_pile
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

【admin】新增&优化# 1.优化服务报价 2.新增客户确认服务报价 3.优化后台编辑用户登录问题

dev
dabin 2024-08-25 20:03:53 +08:00
parent 52a7927632
commit 6a5ee530e6
47 changed files with 263 additions and 2452 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.idea/dataSources.xml
View File

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="DataSourceManagerImpl" format="xml" multifile-model="true">
<data-source source="LOCAL" name="yuehao_test@114.132.227.196" uuid="ec39e546-443a-4baa-bcd8-87392c248a4d">
<driver-ref>mysql.8</driver-ref>
<synchronize>true</synchronize>
<jdbc-driver>com.mysql.cj.jdbc.Driver</jdbc-driver>
<jdbc-url>jdbc:mysql://114.132.227.196:3306/yuehao_test?useUnicode=true&amp;characterEncoding=UTF-8&amp;autoReconnect=true&amp;useSSL=false</jdbc-url>
<working-dir>$ProjectFileDir$</working-dir>
</data-source>
</component>
</project>

1
admin/src/main/java/com/hcy/admin/service/client/impl/ClientContactsServiceImpl.java
View File

@ -185,6 +185,7 @@ public class ClientContactsServiceImpl implements IClientContactsService {
user.setCreateTime(System.currentTimeMillis() / 1000); user.setCreateTime(System.currentTimeMillis() / 1000);
user.setMobile(clientContactsParam.getPhone()); user.setMobile(clientContactsParam.getPhone());
userMapper.insert(user); userMapper.insert(user);
admin.setUserId(Long.valueOf(user.getId()));
model.setUserId(user.getId().longValue()); model.setUserId(user.getId().longValue());
} }

28
admin/src/main/java/com/hcy/admin/service/system/impl/SystemAuthAdminServiceImpl.java
View File

@ -21,6 +21,7 @@ import com.hcy.admin.vo.system.SystemAuthAdminVo;
import com.hcy.admin.vo.system.SystemAuthRoleVo; import com.hcy.admin.vo.system.SystemAuthRoleVo;
import com.hcy.admin.vo.system.SystemAuthSelfVo; import com.hcy.admin.vo.system.SystemAuthSelfVo;
import com.hcy.common.config.GlobalConfig; import com.hcy.common.config.GlobalConfig;
import com.hcy.common.constant.GlobalConstant;
import com.hcy.common.core.PageResult; import com.hcy.common.core.PageResult;
import com.hcy.common.dto.SystemAuthAdminDto; import com.hcy.common.dto.SystemAuthAdminDto;
import com.hcy.common.entity.plant.Plant; import com.hcy.common.entity.plant.Plant;
@ -541,7 +542,6 @@ public class SystemAuthAdminServiceImpl implements ISystemAuthAdminService {
@Override @Override
public void upInfo(SystemAuthAdminParam systemAuthAdminParam, Integer adminId) { public void upInfo(SystemAuthAdminParam systemAuthAdminParam, Integer adminId) {
SystemAuthAdmin model = systemAuthAdminMapper.selectOne(new QueryWrapper<SystemAuthAdmin>() SystemAuthAdmin model = systemAuthAdminMapper.selectOne(new QueryWrapper<SystemAuthAdmin>()
.select("id,username,nickname,password,salt")
.eq("id", adminId) .eq("id", adminId)
.eq("is_delete", 0) .eq("is_delete", 0)
.last("limit 1")); .last("limit 1"));
@ -597,24 +597,28 @@ public class SystemAuthAdminServiceImpl implements ISystemAuthAdminService {
* @author fzr * @author fzr
*/ */
@Override @Override
@Transactional
public void del(Integer id) { public void del(Integer id) {
String[] field = {"id", "username", "nickname"}; SystemAuthAdmin systemAuthAdmin = systemAuthAdminMapper.selectOne(new QueryWrapper<SystemAuthAdmin>()
Assert.notNull(systemAuthAdminMapper.selectOne(new QueryWrapper<SystemAuthAdmin>()
.select(field)
.eq("id", id) .eq("id", id)
.eq("is_delete", 0) .eq("is_delete", 0)
.last("limit 1")), "账号已不存在!"); .last("limit 1"));
Assert.notNull(systemAuthAdmin, "账号已不存在!");
Assert.isFalse(id == 1, "系统管理员不允许删除!"); Assert.isFalse(id == 1, "系统管理员不允许删除!");
int adminId = Integer.parseInt(AdminThreadLocal.getAdminId().toString()); int adminId = Integer.parseInt(AdminThreadLocal.getAdminId().toString());
Assert.isFalse(id == adminId, "不能删除自己!"); Assert.isFalse(id == adminId, "不能删除自己!");
SystemAuthAdmin model = new SystemAuthAdmin(); systemAuthAdmin.setIsDelete(GlobalConstant.DELETE);
model.setId(id); systemAuthAdmin.setDeleteTime(System.currentTimeMillis() / 1000);
model.setIsDelete(1); systemAuthAdminMapper.updateById(systemAuthAdmin);
model.setDeleteTime(System.currentTimeMillis() / 1000);
systemAuthAdminMapper.updateById(model); if(systemAuthAdmin.getUserId() != null){
userMapper.deleteById(systemAuthAdmin.getUserId());
userAuthMapper.delete(new LambdaQueryWrapper<UserAuth>().eq(UserAuth::getUserId, systemAuthAdmin.getUserId()));
}
this.cacheAdminUserByUid(id); this.cacheAdminUserByUid(id);
} }
@ -626,11 +630,9 @@ public class SystemAuthAdminServiceImpl implements ISystemAuthAdminService {
*/ */
@Override @Override
public void disable(Integer id) { public void disable(Integer id) {
String[] field = {"id", "username", "nickname", "is_disable"};
SystemAuthAdmin systemAuthAdmin = systemAuthAdminMapper.selectOne(new QueryWrapper<SystemAuthAdmin>() SystemAuthAdmin systemAuthAdmin = systemAuthAdminMapper.selectOne(new QueryWrapper<SystemAuthAdmin>()
.select(field)
.eq("id", id) .eq("id", id)
.eq("is_delete", 0) .eq("is_delete", GlobalConstant.NOT_DELETE)
.last("limit 1")); .last("limit 1"));
Assert.notNull(systemAuthAdmin, "账号已不存在!"); Assert.notNull(systemAuthAdmin, "账号已不存在!");

1
common/src/main/java/com/hcy/common/dto/SparePartDto.java
View File

@ -30,4 +30,5 @@ public class SparePartDto implements Serializable {
private Long deleteTime; // 删除时间 private Long deleteTime; // 删除时间
private String keywords; // 关键字 private String keywords; // 关键字
private String warehouseIds; //仓库ids
} }

6
common/src/main/java/com/hcy/common/dto/order/OrderSparePart.java
View File

@ -21,11 +21,11 @@ public class OrderSparePart implements Serializable {
private Long sparePartsId; // 备件id private Long sparePartsId; // 备件id
private String sparePartsCode; // 备件编码 private String sparePartsCode; // 备件编码
private String sparePartsName; // 备件名称 private String sparePartsName; // 备件名称
private String warehouseName; // 所属仓库名称 private Long warehouseId; // 所属仓库名称
private String specificationsModel; // 规格型号 private String specificationsModel; // 规格型号
private String unit; // 单位 private String unit; // 单位
private BigDecimal price; // 价格 private BigDecimal unitPrice; // 价格
private Long quantity; // 数量 private Integer quantity; // 数量
private BigDecimal totalPrice; // 总价 private BigDecimal totalPrice; // 总价
private Integer isDelete; // 是否删除 0-未删除 1-删除 private Integer isDelete; // 是否删除 0-未删除 1-删除

3
common/src/main/java/com/hcy/common/entity/order/MaintenanceOrder.java
View File

@ -39,6 +39,7 @@ public class MaintenanceOrder implements Serializable {
private Long receiverId; // 接单人id private Long receiverId; // 接单人id
private Long repairId; // 返修id private Long repairId; // 返修id
private Date receiverTime; // 接单时间 private Date receiverTime; // 接单时间
private Date quotationTime; //报价时间
private Date cancelOrderTime; // 取消订单时间 private Date cancelOrderTime; // 取消订单时间
private String cancelCause; // 取消原因 private String cancelCause; // 取消原因
private String refuseMaintenanceCause; // 拒绝维修原因 private String refuseMaintenanceCause; // 拒绝维修原因
@ -51,4 +52,6 @@ public class MaintenanceOrder implements Serializable {
private Date updateTime; // 更新时间 private Date updateTime; // 更新时间
private Integer isDelete; // 是否删除 0-未删除 1-删除 private Integer isDelete; // 是否删除 0-未删除 1-删除
private Integer repairWorkOrderFlow; //工单去向 0=工单池 1=检修员 private Integer repairWorkOrderFlow; //工单去向 0=工单池 1=检修员
private Integer isMaintain; //是否维修 0-维修 1-不维修
private Integer warehouseType; //仓库类型 0-我的仓库 1-公共仓库
} }

57
common/src/main/java/com/hcy/common/enums/ClientStatusEnum.java 100644
View File

@ -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;
}
}

12
common/src/main/java/com/hcy/common/enums/order/MaintenanceOrderStatusEnum.java
View File

@ -21,9 +21,17 @@ public enum MaintenanceOrderStatusEnum {
CHARGEBACK(7,"已退单"), CHARGEBACK(7,"已退单"),
CLOSED(8,"已关闭"), CLOSED(8,"已关闭"),
NEAREST_TO_ME(0,"离我最近"), 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 int status;
private final String desc; private final String desc;

11
common/src/main/java/com/hcy/common/mapper/warehouse/WarehouseMapper.java
View File

@ -4,8 +4,11 @@ package com.hcy.common.mapper.warehouse;
import com.hcy.common.core.basics.IBaseMapper; import com.hcy.common.core.basics.IBaseMapper;
import com.hcy.common.entity.warehouse.Warehouse; import com.hcy.common.entity.warehouse.Warehouse;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Select;
import java.util.List;
/** /**
* 仓库管理Mapper * 仓库管理Mapper
*/ */
@ -14,4 +17,12 @@ public interface WarehouseMapper extends IBaseMapper<Warehouse> {
@Select("select * from la_warehouse where is_delete = 0 and id = #{id}") @Select("select * from la_warehouse where is_delete = 0 and id = #{id}")
Warehouse findWarehouseById(Long id); Warehouse findWarehouseById(Long id);
/**
* 获取公共仓库和指定仓库列表
* @param id 指定仓库id
* @return List<Warehouse>
*/
@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<Warehouse> findPublicWarehouseList(@Param("id") Long id);
} }

7
common/src/main/resources/mapper/MaintenanceOrderMapper.xml
View File

@ -47,14 +47,17 @@
<if test="param.receiverId != null"> <if test="param.receiverId != null">
and lmo.receiver_id = #{param.receiverId} and lmo.receiver_id = #{param.receiverId}
</if> </if>
<if test="param.clientId != null">
and lmo.client_id = #{param.clientId}
</if>
<if test="param.orderStatusIds != null and param.orderStatusIds != ''"> <if test="param.orderStatusIds != null and param.orderStatusIds != ''">
and find_in_set(lmo.order_status,#{param.orderStatusIds}) and find_in_set(lmo.order_status,#{param.orderStatusIds})
</if> </if>
<if test="param.likeWork != null and param.likeWork != ''"> <if test="param.likeWork != null and param.likeWork != ''">
and (le.number like concat('%',#{param.likeWork},'%') and (le.number like concat('%',#{param.likeWork},'%')
or lmo.order_no 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},'%'))
</if> </if>
</where> </where>
order by create_time desc order by create_time desc

3
common/src/main/resources/mapper/SparePartrMapper.xml
View File

@ -16,6 +16,9 @@
lsp.spare_parts_name like concat('%',#{param.keywords},'%') or lsp.spare_parts_name like concat('%',#{param.keywords},'%') or
lw.warehouse_name like concat('%',#{param.keywords},'%')) lw.warehouse_name like concat('%',#{param.keywords},'%'))
</if> </if>
<if test="param.warehouseIds != null and param.warehouseIds != ''">
and find_in_set(lw.id,#{param.warehouseIds})
</if>
</where> </where>
</select> </select>

25
common/target/classes/mapper/ClientMapper.xml
View File

@ -1,25 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hcy.common.mapper.client.ClientMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.hcy.common.entity.client.Client">
</resultMap>
<select id="clientEquipmentList" resultType="com.hcy.common.dto.largeDataDto.ClientLargeDataDto">
SELECT
c.client_no,c.client_name,COUNT(e.client_id) AS equipmentCount,
SUM(CASE WHEN e.device_status = 1 THEN 1 ELSE 0 END) AS normalCount,
SUM(CASE WHEN e.device_status = 2 THEN 1 ELSE 0 END) AS underOverhaulCount,
SUM(CASE WHEN e.device_status = 3 THEN 1 ELSE 0 END) AS underWarrantyCount
FROM
la_client as c
JOIN
la_equipment as e ON e.client_id = c.id
where c.is_delete = 0 and e.is_delete = 0
GROUP BY
c.id
ORDER BY
equipmentCount DESC
LIMIT 5;
</select>
</mapper>

32
common/target/classes/mapper/CouponMapper.xml
View File

@ -1,32 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hcy.common.mapper.coupon.CouponMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.hcy.common.entity.coupon.Coupon">
</resultMap>
<select id="getCouponByUserCoupon" resultType="com.hcy.common.entity.coupon.Coupon">
SELECT
c.*
FROM
la_coupon AS c
RIGHT JOIN la_user_coupon AS uc ON uc.coupon_id = c.id
WHERE
uc.is_delete = 0
AND c.is_delete = 0
AND uc.use_status = 1
AND uc.coupon_id = #{couponId}
AND uc.user_id = #{userId}
limit 1
</select>
<select id="getCouponByUserCouponId" resultType="com.hcy.common.entity.coupon.Coupon">
SELECT
c.*
FROM
la_coupon AS c
RIGHT JOIN la_user_coupon AS uc ON uc.coupon_id = c.id
WHERE
uc.id = #{userCouponId}
</select>
</mapper>

43
common/target/classes/mapper/DevRegionMapper.xml
View File

@ -1,43 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hcy.common.mapper.region.DevRegionMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.hcy.common.entity.region.DevRegion">
<!-- <id column="id" property="id"/>
<result column="create_id" property="createId"/>
<result column="create_time" property="createTime"/>
<result column="update_id" property="updateId"/>
<result column="update_time" property="updateTime"/>
<result column="company_id" property="companyId"/>
<result column="account_id" property="accountId"/>
<result column="account_chart_id" property="accountChartId"/>
<result column="is_add_next_level" property="isAddNextLevel"/>
<result column="is_reallocate" property="isReallocate"/>
<result column="tenant_id" property="tenantId"/>-->
</resultMap>
<select id="list" resultType="com.hcy.common.dto.result.RegionResultDto">
select id,
parent_id as parentId,
level,
name,
short as shortName,
city_code as cityCode,
zip_code as zipCode,
gcj02_lng as gcj02Lng,
gcj02_lat as gcj02Lat,
db09_lng as db09Lng,
db09_lat as db09Lat,
remark1,
remark2
from la_dev_region
<where>
<if test="form.level != null">
and level = #{form.level}
</if>
<if test="form.parentId != null">
and parent_id = #{form.parentId}
</if>
</where>
</select>
</mapper>

22
common/target/classes/mapper/DistributorCommissionMapper.xml
View File

@ -1,22 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hcy.common.mapper.distribution.DistributorCommissionMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.hcy.common.entity.distribution.DistributorCommission">
</resultMap>
<select id="getDistributorCommissionByDate" resultType="com.hcy.common.entity.distribution.DistributorCommission">
SELECT
dc.*
FROM
la_distributor_commission AS dc
LEFT JOIN la_order_goods AS og ON og.order_id = dc.order_id
WHERE
dc.is_delete = 0
AND dc.distributor_id = #{distributorId}
AND DATE_FORMAT( dc.create_time, '%Y-%m' ) = #{date}
AND dc.commission > 0
ORDER BY
create_time desc
</select>
</mapper>

27
common/target/classes/mapper/EquipmentMapper.xml
View File

@ -1,27 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hcy.common.mapper.client.EquipmentMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.hcy.common.entity.client.Equipment">
</resultMap>
<select id="provinceEquipment" resultType="com.hcy.common.dto.largeDataDto.ClientLargeDataDto">
SELECT
dr.name as province,
COUNT( e.province_id ) AS equipmentCount,
SUM( CASE WHEN e.device_status = 1 THEN 1 ELSE 0 END ) AS normalCount,
SUM( CASE WHEN e.device_status = 2 THEN 1 ELSE 0 END ) AS underOverhaulCount,
SUM( CASE WHEN e.device_status = 3 THEN 1 ELSE 0 END ) AS underWarrantyCount
FROM
la_equipment AS e
JOIN la_dev_region as dr on e.province_id = dr.id
where
e.is_delete = 0
GROUP BY
e.province_id
ORDER BY
equipmentCount DESC
LIMIT 5;
</select>
</mapper>

62
common/target/classes/mapper/GoodsCategoryMapper.xml
View File

@ -1,62 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hcy.common.mapper.category.GoodsCategoryMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.hcy.common.entity.category.GoodsCategory">
<!-- <id column="id" property="id"/>
<result column="create_id" property="createId"/>
<result column="create_time" property="createTime"/>
<result column="update_id" property="updateId"/>
<result column="update_time" property="updateTime"/>
<result column="company_id" property="companyId"/>
<result column="account_id" property="accountId"/>
<result column="account_chart_id" property="accountChartId"/>
<result column="is_add_next_level" property="isAddNextLevel"/>
<result column="is_reallocate" property="isReallocate"/>
<result column="tenant_id" property="tenantId"/>-->
</resultMap>
<select id="listByIds" resultType="com.hcy.common.entity.category.GoodsCategory">
select id,
name,
pid,
level,
image,
sort,
is_show as isShow,
is_recommend as isRecommed,
create_time as createTime,
update_time as updateTime,
delete_time as deleteTime,
is_delete as isDelete
from la_goods_category
<where>
<if test="ids != null and ids.size() != 0">
id in
<foreach collection="ids" item="id" open="(" close=")" separator=",">
#{id}
</foreach>
</if>
</where>
</select>
<select id="getCouponCorrelationGoodsCategory" resultType="com.hcy.common.entity.category.GoodsCategory">
SELECT
*
FROM
la_goods_category
WHERE
is_delete = 0
AND is_show = 1
AND id IN (
SELECT
goods_cat_id
FROM
la_goods_category_coupon
WHERE
is_delete = 0
AND coupon_id = #{couponId})
</select>
</mapper>

102
common/target/classes/mapper/GoodsCommentMapper.xml
View File

@ -1,102 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hcy.common.mapper.comment.GoodsCommentMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.hcy.common.entity.comment.GoodsComment">
<!-- <id column="id" property="id"/>
<result column="create_id" property="createId"/>
<result column="create_time" property="createTime"/>
<result column="update_id" property="updateId"/>
<result column="update_time" property="updateTime"/>
<result column="company_id" property="companyId"/>
<result column="account_id" property="accountId"/>
<result column="account_chart_id" property="accountChartId"/>
<result column="is_add_next_level" property="isAddNextLevel"/>
<result column="is_reallocate" property="isReallocate"/>
<result column="tenant_id" property="tenantId"/>-->
</resultMap>
<sql id="base_sql">
id,
goods_id,
user_id,
order_goods_id,
service_comment,
comment,
reply,
status,
create_time,
update_time,
delete_time,
comment_level
</sql>
<select id="pageResult" resultType="com.hcy.common.dto.result.GoodsCommentPageResultDto">
select a.id,
a.goods_id as goodsId,
a.user_id as userId,
a.order_goods_id as orderGoodsId,
a.service_comment as serviceComment,
a.comment,
a.reply,
a.status,
a.create_time as createTime,
a.update_time as updateTime,
a.comment_level as commentLevel,
a.staff_id as staffId,
a.customer_service_appraise as customerServiceAppraise,
c.avatar as avatarUri,
c.nickname,
c.username,
c.sn,
c.mobile as userMobile,
d.image as goodsImageUri,
d.name as goodsName,
d.price,
e.name as unitName,
s.sn as staffSn,
s.name as staffName
from la_goods_comment a
left join la_user c on a.user_id = c.id
left join la_goods d on a.goods_id = d.id
left join la_goods_unit e on d.unit_id = e.id
left join la_staff as s on s.id = a.staff_id
<where>
a.is_delete = 0
<if test="form.flag != null and form.flag == 1">
and a.service_comment is not null
</if>
<if test="form.goodsId != null">
and a.goods_id = #{form.goodsId}
</if>
<if test="form.commentLevel != null and form.commentLevel != 0 and form.commentLevel != 4">
and a.comment_level = #{form.commentLevel}
</if>
<if test="form.userId != null">
and a.user_id = #{form.userId}
</if>
<if test="form.goodsInfo != null and form.goodsInfo != ''">
and d.name like concat('%', #{form.goodsInfo}, '%')
</if>
<if test="form.status != null">
and a.status = #{form.status}
</if>
<if test="form.userInfo != null and form.userInfo != ''">
and (c.nickname like concat('%', #{form.userInfo}, '%') or
c.mobile like concat('%', #{form.userInfo}, '%'))
</if>
<if test="form.startTime != null">
and a.create_time &gt;= #{form.startTime}
</if>
<if test="form.endTime != null">
and a.create_time &lt;= #{form.endTime}
</if>
<if test="form.staffInfo != null and form.staffInfo != ''">
and s.sn like concat('%', #{form.staffInfo}, '%') or
s.name like concat('%', #{form.staffInfo}, '%') or
s.mobile like concat('%', #{form.staffInfo}, '%')
</if>
</where>
order by a.create_time desc
</select>
</mapper>

56
common/target/classes/mapper/GoodsMapper.xml
View File

@ -1,56 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hcy.common.mapper.goods.GoodsMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.hcy.common.dto.goods.GoodsDto">
</resultMap>
<select id="getCouponCorrelationGoods" resultType="com.hcy.common.dto.goods.GoodsDto">
SELECT
*,
gc.`name` AS categoryName
FROM
la_goods AS g
LEFT JOIN la_goods_category AS gc ON gc.id = g.category_id
WHERE
g.is_delete = 0
AND g.id IN (
SELECT
goods_id
FROM
la_goods_coupon
WHERE
is_delete = 0
AND status = 1
AND coupon_id = #{couponId})
</select>
<select id="getGoodsCancelOrderList" resultType="com.hcy.common.dto.goods.GoodsDto">
SELECT
g.*,
coc.id AS cancelOrderId
FROM
la_goods AS g
LEFT JOIN ( SELECT GROUP_CONCAT( DISTINCT goods_id ) AS goods_id, id FROM la_cancel_order_config GROUP BY goods_id) AS coc ON coc.goods_id = g.id
<where>
g.is_delete = 0
AND g.status = 1
<if test="param.name != null and param.name != ''">
AND g.name like concat('%', #{param.name}, '%')
</if>
<if test="param.categoryId != null">
AND g.category_id = #{param.categoryId}
</if>
<if test="param.isSetRefund != null">
<choose>
<when test="param.isSetRefund == 0">
AND coc.id is null
</when>
<otherwise>
AND coc.id is not null
</otherwise>
</choose>
</if>
</where>
</select>
</mapper>

31
common/target/classes/mapper/GoodsUnitMapper.xml
View File

@ -1,31 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hcy.common.mapper.unit.GoodsUnitMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.hcy.common.entity.unit.GoodsUnit">
<!-- <id column="id" property="id"/>
<result column="create_id" property="createId"/>
<result column="create_time" property="createTime"/>
<result column="update_id" property="updateId"/>
<result column="update_time" property="updateTime"/>
<result column="company_id" property="companyId"/>
<result column="account_id" property="accountId"/>
<result column="account_chart_id" property="accountChartId"/>
<result column="is_add_next_level" property="isAddNextLevel"/>
<result column="is_reallocate" property="isReallocate"/>
<result column="tenant_id" property="tenantId"/>-->
</resultMap>
<select id="listByIds" resultType="com.hcy.common.entity.unit.GoodsUnit">
select id, name, sort, create_time as createTime, update_time as updateTime, delete_time as deleteTime, is_delete as isDelete
from la_goods_unit
<where>
<if test="ids != null and ids.size() != 0">
id in
<foreach collection="ids" open="(" close=")" separator="," item="id">
#{id}
</foreach>
</if>
</where>
</select>
</mapper>

13
common/target/classes/mapper/IndexVisitMapper.xml
View File

@ -1,13 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hcy.common.mapper.visit.IndexVisitMapper">
<select id="groupVisit" resultType="com.hcy.common.dto.result.VisitGroupResultDto">
select from_unixtime(create_time, '%Y-%m-%d') as time, sum(visit) as visitCount
from la_index_visit
where create_time &lt;= #{form.endTime}
and create_time &gt;= #{form.startTime}
group by from_unixtime(create_time, '%Y-%m-%d')
order by from_unixtime(create_time, '%Y-%m-%d') asc
</select>
</mapper>

62
common/target/classes/mapper/MaintenanceOrderMapper.xml
View File

@ -1,62 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hcy.common.mapper.order.MaintenanceOrderMapper">
<select id="list" resultType="com.hcy.common.dto.order.MaintenanceOrderDto">
SELECT
lmo.*,
lf.`name` as faultName,
lc.client_name as clientName,
le.number as equipmentNo,
le.name as equipmentName,
le.detailed_address as detailedAddress,
lsaa.nickname as creatorName,
lu.username as receiverName,
le.province_id as equipmentProvinceId,
le.district_id as equipmentDistrictId,
le.city_id as equipmentCityId,
le.longitude,
le.latitude
FROM
la_maintenance_order AS lmo
LEFT JOIN la_client AS lc ON lc.id = lmo.client_id
LEFT JOIN la_equipment AS le ON le.id = lmo.equipment_id
LEFT JOIN la_fault AS lf On lf.id = lmo.fault_id
LEFT JOIN la_system_auth_admin AS lsaa ON lsaa.id = lmo.creator_id
LEFT JOIN la_user AS lu ON lu.id = lmo.receiver_id
<where>
lmo.is_delete = 0
<if test="param.orderNo != null and param.orderNo != ''">
and lmo.order_no like concat('%',#{param.orderNo},'%')
</if>
<if test="param.orderSource != null">
and lmo.order_source = #{param.orderSource}
</if>
<if test="param.clientName != null and param.clientName != ''">
and lc.client_name like concat('%',#{param.clientName},'%')
</if>
<if test="param.creatorName != null and param.creatorName != ''">
and lsaa.username like concat('%',#{param.creatorName},'%')
</if>
<if test="param.receiverName != null and param.receiverName != ''">
and lu.username like concat('%',#{param.receiverName},'%')
</if>
<if test="param.orderStatus != null">
and find_in_set(lmo.order_status,#{param.orderStatus})
</if>
<if test="param.receiverId != null">
and lmo.receiver_id = #{param.receiverId}
</if>
<if test="param.orderStatusIds != null and param.orderStatusIds != ''">
and find_in_set(lmo.order_status,#{param.orderStatusIds})
</if>
<if test="param.likeWork != null and param.likeWork != ''">
and (le.number like concat('%',#{param.likeWork},'%')
or lmo.order_no like concat('%',#{param.likeWork},'%')
or lc.client_name like concat('%',#{param.likeWork},'%'))
</if>
</where>
order by create_time desc
</select>
</mapper>

455
common/target/classes/mapper/OrderMapper.xml
View File

@ -1,455 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hcy.common.mapper.order.OrderMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.hcy.common.entity.order.Order">
<!-- <id column="id" property="id"/>
<result column="create_id" property="createId"/>
<result column="create_time" property="createTime"/>
<result column="update_id" property="updateId"/>
<result column="update_time" property="updateTime"/>
<result column="company_id" property="companyId"/>
<result column="account_id" property="accountId"/>
<result column="account_chart_id" property="accountChartId"/>
<result column="is_add_next_level" property="isAddNextLevel"/>
<result column="is_reallocate" property="isReallocate"/>
<result column="tenant_id" property="tenantId"/>-->
</resultMap>
<sql id="base_sql">
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
</sql>
<select id="page" resultType="com.hcy.common.dto.result.OrderPageResultDto">
select a.id,
a.sn,
a.user_id as userId,
a.transaction_id as transactionId,
a.staff_id as staffId,
a.order_type as orderType,
a.order_terminal as orderTerminal,
a.order_status as orderStatus,
a.pay_status as payStatus,
a.pay_way as payWay,
a.goods_price as goodsPrice,
a.order_amount as orderAmount,
a.total_amount as totalAmount,
a.total_num as totalNum,
a.user_remark as userRemark,
a.order_remarks as orderRemarks,
a.verification_code as verificationCode,
a.verification_status as verificationStatus,
a.contact,
a.mobile,
a.province_id as provinceId,
a.city_id as cityId,
a.district_id as districtId,
a.address,
a.is_dispatch as isDispatch,
a.create_time as createTime,
a.update_time as updateTime,
a.pay_time as payTime,
a.delete_time as deleteTime,
a.cancel_time as cancelTime,
a.appoint_time_start as appointTimeStart,
a.appoint_time_end as appointTimeEnd,
a.finish_time as finishTime,
b.sn as userSn,
b.avatar,
b.nickname,
b.username,
c.goods_id as goodsId,
c.goods_name as goodsName,
c.unit_name as unitName,
d.image as goodsImage,
e.name as staffName
from la_order a
left join la_order_goods c on a.id = c.order_id
left join la_user b on a.user_id = b.id
left join la_goods d on c.goods_id = d.id
left join la_staff e on a.staff_id = e.id
<where>
a.is_delete = 0
<if test="form.orderStatus != null and form.orderStatus == 4">
and a.order_status in (4, 5)
</if>
<if test="form.orderStatus != null and form.orderStatus != 4">
and a.order_status= #{form.orderStatus}
</if>
<if test="form.sn != null and form.sn != ''">
and a.sn like concat('%', #{form.sn}, '%')
</if>
<if test="form.goodsName != null and form.goodsName != ''">
and c.goods_name like concat('%', #{form.goodsName}, '%')
</if>
<if test="form.payStatus != null">
and a.pay_status = #{form.payStatus}
</if>
<if test="form.isDispatch != null">
and a.is_dispatch = #{form.isDispatch}
</if>
<if test="form.userInfo != null and form.userInfo != ''">
and (b.nickname like concat('%', #{form.userInfo}, '%') or
b.sn like concat('%', #{form.userInfo}, '%'))
</if>
<if test="form.orderTimeStart != null">
and a.create_time &gt;= #{form.orderTimeStart}
</if>
<if test="form.orderTimeEnd != null">
and a.create_time &lt;= #{form.orderTimeEnd}
</if>
<if test="form.staffInfo != null and form.staffInfo != ''">
and e.name like concat('%', #{form.staffInfo}, '%') or
e.sn like concat('%', #{form.staffInfo}, '%')
</if>
</where>
order by a.id desc
</select>
<select id="listWaitComment" resultType="com.hcy.common.dto.result.OrderPageResultDto">
select a.id,
a.sn,
a.user_id as userId,
a.transaction_id as transactionId,
a.staff_id as staffId,
a.order_type as orderType,
a.order_terminal as orderTerminal,
a.order_status as orderStatus,
a.pay_status as payStatus,
a.pay_way as payWay,
a.goods_price as goodsPrice,
a.order_amount as orderAmount,
a.total_amount as totalAmount,
a.total_num as totalNum,
a.user_remark as userRemark,
a.order_remarks as orderRemarks,
a.verification_code as verificationCode,
a.verification_status as verificationStatus,
a.contact,
a.mobile,
a.province_id as provinceId,
a.city_id as cityId,
a.district_id as districtId,
a.address,
a.is_dispatch as isDispatch,
a.create_time as createTime,
a.update_time as updateTime,
a.pay_time as payTime,
a.delete_time as deleteTime,
a.cancel_time as cancelTime,
a.appoint_time_start as appointTimeStart,
a.appoint_time_end as appointTimeEnd,
a.finish_time as finishTime,
c.goods_id as goodsId,
c.goods_name as goodsName,
c.unit_name as unitName,
d.image as goodsImage
from la_order a
left join la_order_goods c on a.id = c.order_id
left join la_goods d on c.goods_id = d.id
where a.is_delete = 0
and c.is_comment = 0
and a.user_id = #{form.userId}
and a.order_status = #{form.orderStatus}
order by a.id desc
</select>
<select id="groupSalesAmount" resultType="com.hcy.common.dto.result.OrderGroupResultDto">
select from_unixtime(create_time, '%Y-%m-%d') as orderTime, sum(total_amount) as totalAmount
from la_order
where pay_status = #{form.payStatus}
and create_time &lt;= #{form.endTime}
and create_time &gt;= #{form.startTime}
group by from_unixtime(create_time, '%Y-%m-%d')
order by from_unixtime(create_time, '%Y-%m-%d') asc
</select>
<select id="listFinishOrder" resultType="com.hcy.common.dto.result.OrderPageResultDto">
select a.id,
a.sn,
a.user_id as userId,
a.transaction_id as transactionId,
a.staff_id as staffId,
a.order_type as orderType,
a.order_terminal as orderTerminal,
a.order_status as orderStatus,
a.pay_status as payStatus,
a.pay_way as payWay,
a.goods_price as goodsPrice,
a.order_amount as orderAmount,
a.total_amount as totalAmount,
a.total_num as totalNum,
a.user_remark as userRemark,
a.order_remarks as orderRemarks,
a.verification_code as verificationCode,
a.verification_status as verificationStatus,
a.contact,
a.mobile,
a.province_id as provinceId,
a.city_id as cityId,
a.district_id as districtId,
a.address,
a.is_dispatch as isDispatch,
a.create_time as createTime,
a.update_time as updateTime,
a.pay_time as payTime,
a.delete_time as deleteTime,
a.cancel_time as cancelTime,
a.appoint_time_start as appointTimeStart,
a.appoint_time_end as appointTimeEnd,
a.finish_time as finishTime,
c.is_comment as isComment
from la_order a
left join la_order_goods c on a.id = c.order_id
where a.is_delete = 0
and a.user_id = #{userId}
and a.order_status = 3
</select>
<select id="pageDistributionOrder" resultType="com.hcy.common.dto.result.OrderDistributionResultDto">
select
a.sn,
a.total_amount as totalAmount,
a.order_amount as orderAmount,
a.total_num as totalNum,
a.finish_time as finishTime,
c.name as goodsName,
d.name as categoryName,
e.name as distributorName,
e.dist_num as distNum,
e.group_id as groupId,
dc.goods_commission_rate as goodsCommissionRate,
dc.distributor_commission_rate as distributorCommissionRate,
dc.commission as commission
from la_order a
left join la_order_goods b on a.id = b.order_id
left join la_goods c on b.goods_id = c.id
left join la_goods_category d on c.category_id = d.id
left join la_distributor e on a.distributor_id = e.id
left join la_distributor_commission dc on dc.order_id = a.id and e.id = dc.distributor_id
<where>
a.is_delete = 0
and a.order_status IN ( 1, 2, 3)
and a.distributor_id != 0
<if test="form.distributorName != null and form.distributorName != ''">
and e.name like concat('%', #{form.distributorName}, '%')
</if>
<if test="form.distNum != null and form.distNum != ''">
and e.dist_num like concat('%', #{form.distNum}, '%')
</if>
<if test="form.groupId != null and form.groupId != ''">
and e.group_id = #{form.groupId}
</if>
<if test="form.categoryId != null">
and d.id = #{form.categoryId}
</if>
<if test="form.finishStartTime != null">
and a.finish_time &gt;= #{form.finishStartTime}
</if>
<if test="form.finishEndTime != null">
and a.finish_time &lt;= #{form.finishEndTime}
</if>
</where>
order by a.id desc
</select>
<select id="listDistributionOrder" resultType="com.hcy.common.dto.result.OrderDistributionResultDto">
select
a.sn,
a.order_amount as orderAmount,
a.total_num as totalNum,
a.finish_time as finishTime,
c.name as goodsName,
d.name as categoryName,
e.name as distributorName,
e.dist_num as distNum,
e.group_id as groupId,
a.total_amount as totalAmount,
dc.goods_commission_rate as goodsCommissionRate,
dc.commission as commission
from la_order a
left join la_order_goods b on a.id = b.order_id
left join la_goods c on b.goods_id = c.id
left join la_goods_category d on c.category_id = d.id
left join la_distributor e on a.distributor_id = e.id
left join la_distributor_commission as dc on dc.order_id = a.id and e.id = dc.distributor_id
<where>
a.is_delete = 0
and a.order_status = 3
and a.distributor_id != 0
<if test="form.distributorName != null and form.distNum != ''">
and e.name like concat('%', #{form.distributorName}, '%')
</if>
<if test="form.distNum != null and form.distNum != ''">
and e.dist_num like concat('%', #{form.distNum}, '%')
</if>
<if test="form.groupId != null and form.groupId != ''">
and e.group_id = #{form.groupId}
</if>
<if test="form.categoryId != null">
and d.id = #{form.categoryId}
</if>
<if test="form.finishStartTime != null">
and a.finish_time &gt;= #{form.finishStartTime}
</if>
<if test="form.finishEndTime != null">
and a.finish_time &lt;= #{form.finishEndTime}
</if>
</where>
order by a.id desc
</select>
<select id="sumAmountByDistribution" resultType="com.hcy.common.dto.OrderDto">
select
sum(a.total_amount ) as totalOrderAmount,
sum(a.order_amount ) as actualPaymentTotal,
sum(dc.commission ) as totalCommissionAmount
from la_order a
left join la_order_goods b on a.id = b.order_id
left join la_goods c on b.goods_id = c.id
left join la_goods_category d on c.category_id = d.id
left join la_distributor e on a.distributor_id = e.id
left join la_distributor_commission dc on a.id = dc.order_id
<where>
a.is_delete = 0
and a.order_status = 3
and a.distributor_id != 0
<if test="form.distributorName != null and form.distributorName != ''">
and e.name like concat('%', #{form.distributorName}, '%')
</if>
<if test="form.distNum != null and form.distNum != ''">
and e.dist_num like concat('%', #{form.distNum}, '%')
</if>
<if test="form.groupId != null and form.groupId != ''">
and e.group_id = #{form.groupId}
</if>
<if test="form.categoryId != null">
and d.id = #{form.categoryId}
</if>
<if test="form.finishStartTime != null">
and a.finish_time &gt;= #{form.finishStartTime}
</if>
<if test="form.finishEndTime != null">
and a.finish_time &lt;= #{form.finishEndTime}
</if>
</where>
</select>
<select id="getGoodsNameAndGoodsCategoryNameByOrderId" resultType="com.hcy.common.dto.OrderDto">
SELECT
og.goods_name as goodsName,gc.`name` as goodsCategoryName
FROM
la_order_goods AS og
LEFT JOIN la_goods AS g ON g.id = og.goods_id
LEFT JOIN la_goods_category AS gc ON gc.id = g.category_id
WHERE
og.order_id = #{orderId}
</select>
<select id="getOrderByStaffId" resultType="com.hcy.common.dto.OrderDto">
SELECT
o.*,og.goods_name as goodsName,og.staff_commission_rate as staffCommissionRate
FROM
la_order AS o
LEFT JOIN la_order_goods AS og ON o.id = og.order_id
LEFT JOIN la_goods AS g ON g.id = og.goods_id
AND g.is_delete = 0
WHERE
o.order_status = 1
AND o.is_delete = 0
AND o.staff_id IS NULL
<if test="cityId != null">
AND o.city_id = #{cityId}
</if>
AND FIND_IN_SET(g.id,(SELECT goods_ids FROM la_staff WHERE id = #{staffId} AND is_delete = 0))
</select>
<select id="getAllOrder" resultType="com.hcy.common.dto.OrderDto">
SELECT
o.*,og.goods_name as goodsName,og.staff_commission_rate as staffCommissionRate
FROM
la_order AS o
LEFT JOIN la_order_goods AS og ON o.id = og.order_id
WHERE
o.order_status = 1
AND o.is_delete = 0
AND o.staff_id IS NULL
<if test="cityId != null">
AND o.city_id = #{cityId}
</if>
</select>
<select id="getOrderDetailByOrderId" resultType="com.hcy.common.dto.OrderDto">
SELECT
o.*,g.name as goodsName,g.staff_commission_rate as staffCommissionRate,og.id as orderGoodsId
FROM
la_order AS o
LEFT JOIN la_order_goods AS og ON o.id = og.order_id
LEFT JOIN la_goods AS g ON g.id = og.goods_id
AND g.is_delete = 0
WHERE
o.is_delete = 0
AND o.id = #{orderId}
</select>
<select id="getNoCommentOrder" resultType="com.hcy.common.dto.OrderDto">
SELECT
o.*,og.goods_id as goodsId,og.id as orderGoodsId
FROM
la_order AS o
LEFT JOIN la_order_goods AS og ON o.id = og.order_id
LEFT JOIN la_goods_comment AS gc ON og.id = gc.order_goods_id
WHERE
o.is_delete = 0
AND o.order_status = 3
AND gc.id is null
</select>
<select id="getDistributorOrderNoByDate" resultType="com.hcy.common.dto.OrderDto">
SELECT
o.*
FROM
la_order AS o
LEFT JOIN la_order_goods AS og ON og.order_id = o.id
WHERE
o.is_delete = 0
AND order_status IN ( 1, 2, 3, 4)
AND o.distributor_id = #{distributorId}
AND DATE_FORMAT( from_unixtime( o.create_time ), '%Y-%m' ) = #{date}
ORDER BY
from_unixtime( o.create_time ) DESC
</select>
</mapper>

80
common/target/classes/mapper/OrderRefundMapper.xml
View File

@ -1,80 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hcy.common.mapper.refund.OrderRefundMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.hcy.common.entity.refund.OrderRefund">
<!-- <id column="id" property="id"/>
<result column="create_id" property="createId"/>
<result column="create_time" property="createTime"/>
<result column="update_id" property="updateId"/>
<result column="update_time" property="updateTime"/>
<result column="company_id" property="companyId"/>
<result column="account_id" property="accountId"/>
<result column="account_chart_id" property="accountChartId"/>
<result column="is_add_next_level" property="isAddNextLevel"/>
<result column="is_reallocate" property="isReallocate"/>
<result column="tenant_id" property="tenantId"/>-->
</resultMap>
<sql id="base_list">
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
<where>
<if test="form.refundSn != null and form.refundSn != ''">
and a.sn like concat('%', #{form.refundSn}, '%')
</if>
<if test="form.orderSn != null and form.orderSn != ''">
and c.sn like concat('%', #{form.orderSn}, '%')
</if>
<if test="form.type != null">
and a.type = #{form.type}
</if>
<if test="form.userInfo != null and form.userInfo != ''">
and (b.nickname like concat('%', #{form.userInfo}, '%') or
b.sn like concat('%', #{form.userInfo}, '%'))
</if>
<if test="form.orderTimeStart != null">
and a.create_time &gt;= #{form.orderTimeStart}
</if>
<if test="form.orderTimeEnd != null">
and a.create_time &lt;= #{form.orderTimeEnd}
</if>
<if test="form.refundStatus != null">
and a.refund_status = #{form.refundStatus}
</if>
<if test="form.goodsName != null and form.goodsName != ''">
and d.goods_name like concat('%', #{form.goodsName}, '%')
</if>
</where>
order by a.id desc
</sql>
<select id="page" resultType="com.hcy.common.dto.result.OrderRefundPageResultDto">
<include refid="base_list"/>
</select>
<select id="selectListByParams" resultType="com.hcy.common.dto.result.OrderRefundPageResultDto">
<include refid="base_list"/>
</select>
</mapper>

112
common/target/classes/mapper/RoutingInspectionOrderMapper.xml
View File

@ -1,112 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hcy.common.mapper.order.RoutingInspectionOrderMapper">
<!-- 通用查询映射结果 -->
<!--<resultMap id="BaseResultMap" type="com.hcy.common.entity.order.RoutingInspectionOrder">
</resultMap>-->
<select id="pageList" resultType="com.hcy.common.dto.RoutingInspectionOrderDto">
SELECT
i.*,
c.client_name,
e.number as equipmentNo,e.name as equipmentName,e.detailed_address,
a.nickname as creatorName,
f.`name` as familiarFaultName,
u.nickname as receiverName
FROM
la_routing_inspection_order AS i
LEFT JOIN la_client AS c ON i.client_id = c.id
LEFT JOIN la_equipment AS e ON i.equipment_id = e.id
LEFT JOIN la_system_auth_admin AS a ON i.creator_id = a.id
LEFT JOIN la_fault AS f ON i.fault_id = f.id
LEFT JOIN la_user as u on i.receiver_id = u.id
WHERE
i.is_delete = 0
<if test="form.orderNo != null and form.orderNo != ''">
and i.order_no like concat('%', #{form.orderNo}, '%')
</if>
<if test="form.clientName != null and form.clientName != ''">
and c.client_name LIKE concat('%', #{form.clientName}, '%')
</if>
<if test="form.equipmentName != null and form.equipmentName != ''">
and e.`name` LIKE concat('%', #{form.equipmentName}, '%')
</if>
<if test="form.receiverName != null and form.receiverName != ''">
and u.nickname LIKE concat('%', #{form.receiverName}, '%')
</if>
<if test="form.orderSource != null">
and i.order_source = #{form.orderSource}
</if>
<if test="form.orderStatus != null">
and i.order_status = #{form.orderStatus}
</if>
ORDER BY create_time DESC
</select>
<select id="frontPageList" resultType="com.hcy.common.dto.RoutingInspectionOrderDto">
SELECT
i.*,
c.client_name,
e.number as equipmentNo,
e.name as equipmentName,
e.detailed_address,
a.nickname as creatorName,
f.`name` as familiarFaultName,
u.nickname as receiverName,
e.longitude,
e.latitude
FROM
la_routing_inspection_order AS i
LEFT JOIN la_client AS c ON i.client_id = c.id
LEFT JOIN la_equipment AS e ON i.equipment_id = e.id
LEFT JOIN la_system_auth_admin AS a ON i.creator_id = a.id
LEFT JOIN la_fault AS f ON i.fault_id = f.id
LEFT JOIN la_user as u on i.receiver_id = u.id
WHERE
i.is_delete = 0
and i.receiver_id = #{form.receiverId}
<if test="form.likeWork != null and form.likeWork != ''">
and (i.order_no like concat('%', #{form.likeWork}, '%')
</if>
<if test="form.likeWork != null and form.likeWork != ''">
OR c.client_name LIKE concat('%', #{form.likeWork}, '%')
</if>
<if test="form.likeWork != null and form.likeWork != ''">
OR e.number LIKE concat('%', #{form.likeWork}, '%'))
</if>
<if test="form.orderStatus != null">
and i.order_status = #{form.orderStatus}
</if>
<if test="form.orderStatus == null">
and i.order_status in (1,2,5)
</if>
ORDER BY create_time DESC
</select>
<select id="list" resultType="com.hcy.common.dto.RoutingInspectionOrderDto">
SELECT
i.*,
c.client_name,
e.number as equipmentNo,
e.name as equipmentName,
e.detailed_address,
a.nickname as creatorName,
f.`name` as familiarFaultName,
u.nickname as receiverName,
e.longitude,
e.latitude
FROM
la_routing_inspection_order AS i
LEFT JOIN la_client AS c ON i.client_id = c.id
LEFT JOIN la_equipment AS e ON i.equipment_id = e.id
LEFT JOIN la_system_auth_admin AS a ON i.creator_id = a.id
LEFT JOIN la_fault AS f ON i.fault_id = f.id
LEFT JOIN la_user as u on i.receiver_id = u.id
WHERE
i.is_delete = 0
<if test="form.orderStatus != null">
and i.order_status = #{form.orderStatus}
</if>
ORDER BY create_time DESC
</select>
</mapper>

80
common/target/classes/mapper/ServiceAreaMapper.xml
View File

@ -1,80 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hcy.common.mapper.serviceArea.ServiceAreaMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.hcy.common.entity.serviceArea.ServiceArea">
<!-- <id column="id" property="id"/>
<result column="name" property="name"/>
<result column="region_id" property="regionId"/>
<result column="longitude" property="longitude"/>
<result column="latitude" property="latitude"/>
<result column="create_time" property="createTime"/>
<result column="update_time" property="updateTime"/>
<result column="polygongeo" property="polygongeo"/>
<result column="is_delete" property="isDelete"/>-->
</resultMap>
<select id="selectById" resultType="com.hcy.common.dto.result.ServiceAreaResultDto">
select id,
name,
region_id as regionId,
longitude,
latitude,
ST_AsText(polygongeo) as polygongeo
from la_service_area
<where>
id = #{id}
</where>
</select>
<select id="pageByRegionId" resultType="com.hcy.common.dto.result.ServiceAreaResultDto">
select id,
name,
region_id as regionId,
longitude,
latitude,
ST_AsText(polygongeo) as polygongeo
from la_service_area
<where>
is_delete = 0
<if test="form.regionId != null">
and region_id = #{form.regionId}
</if>
</where>
</select>
<insert id="insertArea" useGeneratedKeys="true" keyProperty="id">
insert into la_service_area
(name,
region_id,
longitude,
latitude,
create_time,
update_time,
polygongeo)
values
(#{name},
#{regionId},
#{longitude},
#{latitude},
#{createTime},
#{updateTime},
PolygonFromText(#{polygongeo}))
</insert>
<select id="selectByPoint" resultType="com.hcy.common.dto.result.ServiceAreaResultDto">
select id,
name,
region_id as regionId,
longitude,
latitude,
ST_AsText(polygongeo) as polygongeo
from la_service_area
<where>
is_delete = 0
and region_id = #{regionId}
and st_intersects(ST_GeomFromText(#{point}), polygongeo);
</where>
</select>
</mapper>

46
common/target/classes/mapper/StaffFeedbackMapper.xml
View File

@ -1,46 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hcy.common.mapper.staff.StaffFeedbackMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.hcy.common.entity.staff.StaffFeedback">
<!-- <id column="id" property="id"/>
<result column="create_id" property="createId"/>
<result column="create_time" property="createTime"/>
<result column="update_id" property="updateId"/>
<result column="update_time" property="updateTime"/>
<result column="company_id" property="companyId"/>
<result column="account_id" property="accountId"/>
<result column="account_chart_id" property="accountChartId"/>
<result column="is_add_next_level" property="isAddNextLevel"/>
<result column="is_reallocate" property="isReallocate"/>
<result column="tenant_id" property="tenantId"/>-->
</resultMap>
<select id="list" resultType="com.hcy.common.dto.result.StaffFeedbackResultDto">
SELECT
sf.*,
s.sn as staffSn,
s.`name` as staffName,
s.head_portrait as headPortrait
FROM
la_staff_feedback AS sf
LEFT JOIN la_staff AS s ON s.id = sf.staff_id
<where>
sf.is_delete = 0
<if test="form.status != null">
and sf.status = #{form.status}
</if>
<if test="form.createTimeStart != null">
and sf.create_time &gt;= #{form.createTimeStart}
</if>
<if test="form.createTimeEnd != null">
and sf.create_time &lt;= #{form.createTimeEnd}
</if>
<if test="form.staffInfo != null and form.staffInfo != ''">
and (s.sn like concat('%', #{form.staffInfo}, '%')
or s.name like concat('%', #{form.staffInfo}, '%'))
</if>
</where>
order by sf.create_time desc
</select>
</mapper>

117
common/target/classes/mapper/StaffMapper.xml
View File

@ -1,117 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hcy.common.mapper.staff.StaffMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.hcy.common.entity.staff.Staff">
<!-- <id column="id" property="id"/>
<result column="create_id" property="createId"/>
<result column="create_time" property="createTime"/>
<result column="update_id" property="updateId"/>
<result column="update_time" property="updateTime"/>
<result column="company_id" property="companyId"/>
<result column="account_id" property="accountId"/>
<result column="account_chart_id" property="accountChartId"/>
<result column="is_add_next_level" property="isAddNextLevel"/>
<result column="is_reallocate" property="isReallocate"/>
<result column="tenant_id" property="tenantId"/>-->
</resultMap>
<select id="page" resultType="com.hcy.common.dto.result.StaffResultDto">
select a.*,
b.sn as userSn,
b.avatar as avatarUri,
b.nickname,
b.username,
b.mobile
from la_staff a
left join la_user b on a.user_id = b.id
<where>
a.is_delete = 0
<if test="form.status != null">
and a.status = #{form.status}
</if>
<if test="form.userInfo != null and form.userInfo != ''">
and (b.nickname like concat('%', #{form.userInfo}, '%') or
b.mobile like concat('%', #{form.userInfo}, '%'))
</if>
<if test="form.staffInfo != null and form.staffInfo != ''">
and (a.sn like concat('%', #{form.staffInfo}, '%')
or a.name like concat('%', #{form.staffInfo}, '%')
or a.mobile like concat('%', #{form.staffInfo}, '%'))
</if>
<if test="form.isRecommend != null">
and a.is_recommend = #{form.isRecommend}
</if>
<if test="form.provinceId != null">
and a.province_id = #{form.provinceId}
</if>
<if test="form.cityId != null">
and a.city_id = #{form.cityId }
</if>
<if test="form.districtId != null">
and a.district_id = #{form.districtId}
</if>
<if test="form.userInfo != null and form.userInfo != ''">
and (b.nickname like concat('%', #{form.userInfo}, '%') or
b.mobile like concat('%', #{form.userInfo}, '%'))
</if>
<if test="form.isReceiveOrder != null">
and a.is_receive_order = #{form.isReceiveOrder}
</if>
<if test="form.isOrder != null">
and a.is_order = #{form.isOrder}
</if>
<if test="form.isReceiveOrder != null and form.isOrder != null">
and ((a.id NOT IN (
SELECT DISTINCT
staff_id
FROM
la_order
WHERE
is_delete = 0
AND ( order_status = 1 OR order_status = 2 )
AND is_dispatch = 1
AND ( appoint_time_start &gt; ${form.appointTimeStart} AND appoint_time_end &lt; ${form.appointTimeEnd} )) or a.is_operational = 1)
or a.is_operational = 1)
</if>
</where>
order by a.create_time desc
</select>
<select id="getReceiveOrderStaffByOrderId" resultType="com.hcy.common.entity.staff.Staff">
SELECT
*
FROM
la_staff
WHERE
is_delete = 0
and FIND_IN_SET((
SELECT
gc.id
FROM
la_order AS o
LEFT JOIN la_order_goods AS og ON o.id = og.order_id
LEFT JOIN la_goods AS g ON g.id = og.goods_id
LEFT JOIN la_goods_category AS gc ON gc.id = g.category_id
WHERE
o.id = #{orderId}
),
goods_category_ids)
</select>
<select id="getNotPhysicalExaminationStaff" resultType="com.hcy.common.entity.staff.Staff">
SELECT
s.*
FROM
la_staff AS s
LEFT JOIN la_staff_physical_examination AS spe ON spe.staff_id = s.id
<where>
s.is_delete = 0
AND (s.physical_examination is null or s.physical_examination = '')
AND (spe.`status` != 0 or spe.`status` is null)
<if test="keyword != null and keyword != ''">
AND (s.name like CONCAT('%',#{keyword},'%') or s.sn like CONCAT('%',#{keyword},'%') or s.mobile like CONCAT('%',#{keyword},'%'))
</if>
</where>
</select>
</mapper>

29
common/target/classes/mapper/StaffPhysicalExaminationMapper.xml
View File

@ -1,29 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hcy.common.mapper.staff.StaffPhysicalExaminationMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.hcy.common.entity.staff.StaffPhysicalExamination">
</resultMap>
<select id="list" resultType="com.hcy.common.entity.staff.StaffPhysicalExamination">
SELECT
spe.*
FROM
la_staff_physical_examination AS spe
LEFT JOIN la_staff AS sa ON sa.id = spe.staff_id
<where>
spe.is_delete = 0
<if test="form.status != null and form.status != ''">
AND spe.`status` = #{form.status}
</if>
<if test="form.name != null and form.name != ''">
AND sa.`name` LIKE concat('%',#{form.name},'%')
</if>
<if test="form.createTimeStart != null and form.createTimeStart != ''">
and spe.create_time &gt;= #{form.createTimeStart}
and spe.create_time &lt;= #{form.createTimeEnd}
</if>
</where>
order by spe.id desc
</select>
</mapper>

68
common/target/classes/mapper/StaffReassignmentMapper.xml
View File

@ -1,68 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hcy.common.mapper.staff.StaffReassignmentMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.hcy.common.entity.staff.StaffReassignment">
</resultMap>
<select id="list" resultType="com.hcy.common.dto.result.StaffReassignmentResultDto">
SELECT
sr.*,
o.sn,
og.goods_name as goodsName,
s.sn as staffSn,
s.name as staffName,
s.head_portrait as headPortrait
FROM
la_staff_reassignment AS sr
LEFT JOIN la_order as o ON o.id = sr.order_id
LEFT JOIN la_order_goods AS og ON og.order_id = o.id
LEFT JOIN la_staff AS s ON s.id = sr.staff_id
LEFT JOIN la_user as u ON u.id = sr.user_id
<where>
sr.is_delete = 0
<if test="form.orderSn != null and form.orderSn != ''">
AND o.sn = #{form.orderSn}
</if>
<if test="form.userMobile != null and form.userMobile != ''">
AND u.mobile = #{form.userMobile}
</if>
<if test="form.goodsName != null and form.goodsName != ''">
AND og.goods_name like concat('%', #{form.goodsName}, '%')
</if>
<if test="form.staffInfo != null and form.staffInfo != ''">
AND s.sn like concat('%', #{form.staffInfo}, '%') or s.name like concat('%',#{form.staffInfo},'%')
</if>
<if test="form.createTimeStart != null and form.createTimeStart != ''">
AND sr.create_time &gt;= #{form.createTimeStart}
</if>
<if test="form.createTimeEnd != null and form.createTimeEnd != ''">
AND sr.create_time &lt;= #{form.createTimeEnd}
</if>
<if test="form.status != null">
AND sr.status = #{form.status}
</if>
</where>
order by sr.create_time desc
</select>
<select id="getStaffReassignmentByStaffId" resultType="com.hcy.common.dto.result.StaffReassignmentResultDto">
SELECT
sr.*,
o.sn
FROM
la_staff_reassignment AS sr
LEFT JOIN la_order as o ON o.id = sr.order_id
LEFT JOIN la_staff AS s ON s.id = sr.staff_id
<where>
sr.is_delete = 0
<if test="form.staffId != null">
AND sr.staff_id = ${form.staffId}
</if>
<if test="form.date != null and form.date != ''">
AND DATE_FORMAT( sr.create_time, '%Y-%m' ) = #{form.date}
</if>
</where>
order by sr.status asc,sr.create_time desc
</select>
</mapper>

50
common/target/classes/mapper/SystemAuthAdminMapper.xml
View File

@ -1,50 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hcy.common.mapper.system.SystemAuthAdminMapper">
<select id="list" resultType="com.hcy.common.dto.SystemAuthAdminDto">
SELECT
t.*,
sd.NAME AS dept
FROM
la_system_auth_admin t
LEFT JOIN la_system_auth_role sr ON sr.id = t.role
LEFT JOIN la_system_auth_dept sd ON sd.id = t.dept_id
<where>
t.is_delete = 0
and sr.id NOT IN ( 1, 2, 11 )
<if test="param.role != null and param.role != ''">
and FIND_IN_SET(#{param.role},t.role)
</if>
<if test="param.username != null and param.username != ''">
and t.username like concat('%',#{param.username},'%')
</if>
<if test="param.nickname != null and param.nickname != ''">
and t.nickname like concat('%',#{param.nickname},'%')
</if>
</where>
ORDER BY
t.id DESC,
t.sort DESC
</select>
<select id="personnelStatistics" resultType="com.hcy.common.dto.largeDataDto.AdminLargeDataDto">
SELECT
COUNT( aa.role ) AS maintenanceCount,
SUM( CASE WHEN u.receive_order_status = 0 THEN 1 ELSE 0 END ) AS vacationCount,
SUM( CASE WHEN u.receive_order_status = 1 THEN 1 ELSE 0 END ) AS workingCount,
SUM( CASE WHEN u.receive_order_status = 2 THEN 1 ELSE 0 END ) AS availableCount
FROM
la_system_auth_admin AS aa
JOIN la_system_auth_role AS ar ON aa.role = ar.id
join la_user as u on aa.user_id = u.id
WHERE
aa.is_delete = 0
AND u.is_delete = 0 and aa.role = 6
GROUP BY
aa.role
ORDER BY
maintenanceCount DESC
</select>
</mapper>

35
common/target/classes/mapper/UserCouponMapper.xml
View File

@ -1,35 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hcy.common.mapper.coupon.UserCouponMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.hcy.common.entity.coupon.GoodsCoupon">
<!-- <id column="id" property="id"/>
<result column="create_id" property="createId"/>
<result column="create_time" property="createTime"/>
<result column="update_id" property="updateId"/>
<result column="update_time" property="updateTime"/>
<result column="company_id" property="companyId"/>
<result column="account_id" property="accountId"/>
<result column="account_chart_id" property="accountChartId"/>
<result column="is_add_next_level" property="isAddNextLevel"/>
<result column="is_reallocate" property="isReallocate"/>
<result column="tenant_id" property="tenantId"/>-->
</resultMap>
<select id="queryUserGetRecord" resultType="com.hcy.common.dto.coupon.UserCouponDto">
SELECT
us1.*,
COUNT( us1.user_id ) AS allCouponCount,
us2.useCouponCount
FROM
la_user_coupon AS us1
LEFT JOIN ( SELECT user_id, COUNT( user_id ) AS useCouponCount FROM la_user_coupon WHERE `is_delete` = 0 AND use_status = 2 GROUP BY user_id ) AS us2 ON us1.user_id = us2.user_id
WHERE
us1.`is_delete` = 0
<if test="couponId != null and couponId != 0">
and us1.coupon_id = #{couponId}
</if>
GROUP BY
us1.user_id
</select>
</mapper>

109
common/target/classes/mapper/UserMapper.xml
View File

@ -1,109 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hcy.common.mapper.user.UserMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.hcy.common.entity.user.User">
</resultMap>
<select id="pageSearchByDist" resultType="com.hcy.common.dto.result.UserResultDto">
SELECT
t.id,
t.sn,
t.avatar,
t.real_name,
t.nickname,
t.username,
t.password,
t.mobile,
t.channel,
t.salt,
t.money,
t.sex,
t.is_disable,
t.is_delete,
t.is_new,
t.last_login_ip,
t.last_login_time,
t.create_time,
t.update_time,
t.delete_time,
t.distributor_id,
t.bind_time,
t1.dist_num AS distNum,
t1.group_id AS groupId,
t1.name AS distName
FROM la_user t
LEFT JOIN la_distributor t1
ON (t1.id = t.distributor_id AND t1.is_delete = 0)
<where>
t.is_delete = 0
<if test="form.likeWork != null">
AND (t.username LIKE '%${form.likeWork}%'
OR t.nickname LIKE '%${form.likeWork}%'
OR t.mobile LIKE '%${form.likeWork}%')
</if>
<if test="form.channel != null">
And t.channel = #{form.channel}
</if>
<choose>
<when test="form.flag != null">
AND t.distributor_id != 0
<if test="form.startTime != null and form.endTime != null">
AND (t.bind_time &gt;= #{form.startTime} AND t.bind_time &lt;= #{form.endTime})
</if>
</when>
<otherwise>
<if test="form.startTime != null and form.endTime != null">
AND (t.create_time &gt;= #{form.startTime} AND t.create_time &lt;= #{form.endTime})
</if>
</otherwise>
</choose>
<if test="form.type != null">
AND t.type = #{form.type}
</if>
<if test="form.distNum != null">
AND (t1.dist_num LIKE '%${form.distNum}%')
</if>
<if test="form.distName != null">
AND (t1.name LIKE '%${form.distName}%')
</if>
<if test="form.groupId != null">
And t1.group_id = #{form.groupId}
</if>
</where>
order by t.id desc
</select>
<select id="getNotBindingStaffUser" resultType="com.hcy.common.entity.user.User">
SELECT
us.*
FROM
la_user AS us
LEFT JOIN la_staff AS s ON s.user_id = us.id
AND s.is_delete = 0
<where>
us.is_delete = 0
AND s.id IS NULL
AND us.type = 1
<if test="keyword != null and keyword != ''">
AND ((us.sn LIKE '%${keyword}%') OR (us.mobile LIKE '%${keyword}%') OR (us.nickname LIKE '%${keyword}%'))
</if>
</where>
</select>
<select id="reconditionList" resultType="com.hcy.common.dto.result.UserLargeDataDto">
SELECT
u.* ,aa.technical_grade,aa.province_id,aa.city_id,aa.district_id
FROM
la_user AS u
JOIN la_system_auth_admin AS aa ON aa.user_id = u.id
JOIN la_system_auth_role AS ar ON aa.role = ar.id
WHERE
aa.is_delete = 0
AND u.is_delete = 0
AND aa.role = 6
and u.longitude is not null
and u.latitude is not null
</select>
</mapper>

31
common/target/classes/mapper/WithdrawCommissionMapper.xml
View File

@ -1,31 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hcy.common.mapper.common.WithdrawCommissionMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.hcy.common.dto.WithdrawCommissionDto">
</resultMap>
<select id="page" resultType="com.hcy.common.dto.WithdrawCommissionDto">
select a.id,a.distributor_id,a.withdraw_money,a.create_time,a.update_time,a.`status`,a.is_delete,a.fail_reason,b.`name` as distributorName
from la_withdraw_commission a , la_distributor b
<where>
a.is_delete = 0
and
a.distributor_id = b.id
<if test="form.status != null and form.status != ''">
and a.status= #{form.status}
</if>
<if test="form.distributorName != null and form.distributorName != ''">
and b.name like concat('%', #{form.distributorName}, '%')
</if>
<if test="form.startTime != null and form.startTime != ''">
and a.create_time &gt;= #{form.startTime}
</if>
<if test="form.endTime != null and form.endTime != ''">
and a.create_time &lt;= #{form.endTime}
</if>
</where>
order by a.create_time desc
</select>
</mapper>

5
common/target/maven-archiver/pom.properties
View File

@ -1,5 +0,0 @@
#Generated by Maven
#Wed Aug 14 10:40:41 CST 2024
version=1.0.0
groupId=org.hcy
artifactId=common

373
common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
View File

@ -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

339
common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
View File

@ -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

2
front/src/main/java/com/hcy/front/controller/EquipmentController.java
View File

@ -34,6 +34,4 @@ public class EquipmentController {
EquipmentDetailVo detail = iEquipmentService.detail(number); EquipmentDetailVo detail = iEquipmentService.detail(number);
return AjaxResult.success(detail); return AjaxResult.success(detail);
} }
} }

23
front/src/main/java/com/hcy/front/controller/order/MaintenanceOrderController.java
View File

@ -24,6 +24,18 @@ public class MaintenanceOrderController {
@Resource @Resource
IMaintenanceOrderService iMaintenanceOrderService; 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); iMaintenanceOrderService.serviceOfferPrice(maintenanceOrderParam);
return AjaxResult.success(); return AjaxResult.success();
} }
/**
* 确认服务报价
* @param maintenanceOrderParam 参数
* @return Object
*/
@PostMapping("/confirmServiceOfferPrice")
public Object confirmServiceOfferPrice(@RequestBody MaintenanceOrderParam maintenanceOrderParam) {
iMaintenanceOrderService.confirmServiceOfferPrice(maintenanceOrderParam);
return AjaxResult.success();
}
} }

13
front/src/main/java/com/hcy/front/service/order/IMaintenanceOrderService.java
View File

@ -13,6 +13,13 @@ import java.util.List;
*/ */
public interface IMaintenanceOrderService { public interface IMaintenanceOrderService {
/**
* 检修订单新增
*
* @param maintenanceOrderParam 参数
*/
void add(MaintenanceOrderParam maintenanceOrderParam);
/** /**
* 检修订单列表 * 检修订单列表
* *
@ -52,4 +59,10 @@ public interface IMaintenanceOrderService {
* @param maintenanceOrderParam 参数 * @param maintenanceOrderParam 参数
*/ */
void serviceOfferPrice(MaintenanceOrderParam maintenanceOrderParam); void serviceOfferPrice(MaintenanceOrderParam maintenanceOrderParam);
/**
* 确认报价
* @param maintenanceOrderParam 参数
*/
void confirmServiceOfferPrice(MaintenanceOrderParam maintenanceOrderParam);
} }

92
front/src/main/java/com/hcy/front/service/order/impl/MaintenanceOrderServiceImpl.java
View File

@ -15,6 +15,9 @@ import com.hcy.common.entity.order.MaintenanceOrder;
import com.hcy.common.entity.sparePart.SparePart; import com.hcy.common.entity.sparePart.SparePart;
import com.hcy.common.entity.system.SystemAuthAdmin; import com.hcy.common.entity.system.SystemAuthAdmin;
import com.hcy.common.entity.user.User; 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.MaintenanceOrderStatusEnum;
import com.hcy.common.enums.order.OrderStateEnum; import com.hcy.common.enums.order.OrderStateEnum;
import com.hcy.common.exception.OperateException; 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.client.EquipmentMapper;
import com.hcy.common.mapper.fault.FaultMapper; import com.hcy.common.mapper.fault.FaultMapper;
import com.hcy.common.mapper.order.MaintenanceOrderMapper; 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.sparePart.SparePartMapper;
import com.hcy.common.mapper.system.SystemAuthAdminMapper; import com.hcy.common.mapper.system.SystemAuthAdminMapper;
import com.hcy.common.mapper.user.UserMapper; 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.StringUtil;
import com.hcy.common.utils.ToolsUtil; import com.hcy.common.utils.ToolsUtil;
import com.hcy.front.FrontThreadLocal; 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.validate.warehouse.SparePartParam;
import com.hcy.front.vo.order.MaintenanceOrderDetailVo; import com.hcy.front.vo.order.MaintenanceOrderDetailVo;
import com.hcy.front.vo.order.MaintenanceOrderListVo; import com.hcy.front.vo.order.MaintenanceOrderListVo;
import com.hcy.front.vo.order.OrderSparePartListVo;
import com.hcy.front.vo.order.OrderStaffVo; import com.hcy.front.vo.order.OrderStaffVo;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert; import org.springframework.util.Assert;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.sql.ClientInfoStatus;
import java.text.DecimalFormat; import java.text.DecimalFormat;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.*; import java.util.*;
@ -75,8 +83,19 @@ public class MaintenanceOrderServiceImpl implements IMaintenanceOrderService {
@Resource @Resource
SparePartMapper sparePartMapper; SparePartMapper sparePartMapper;
@Resource
WarehouseMapper warehouseMapper;
@Resource
OrderSparePartMapper orderSparePartMapper;
private final DecimalFormat df = new DecimalFormat ("#.#"); private final DecimalFormat df = new DecimalFormat ("#.#");
@Override
public void add(MaintenanceOrderParam maintenanceOrderParam) {
}
/** /**
* 检修订单列表 * 检修订单列表
* *
@ -154,9 +173,15 @@ public class MaintenanceOrderServiceImpl implements IMaintenanceOrderService {
public PageResult<MaintenanceOrderListVo> pageList(PageParam pageParam, MaintenanceOrderParam maintenanceOrderParam) { public PageResult<MaintenanceOrderListVo> pageList(PageParam pageParam, MaintenanceOrderParam maintenanceOrderParam) {
MaintenanceOrderDto maintenanceOrderDto = new MaintenanceOrderDto(); MaintenanceOrderDto maintenanceOrderDto = new MaintenanceOrderDto();
BeanUtils.copyProperties(maintenanceOrderParam,maintenanceOrderDto); BeanUtils.copyProperties(maintenanceOrderParam,maintenanceOrderDto);
maintenanceOrderDto.setReceiverId(FrontThreadLocal.getUserId().longValue());
if(maintenanceOrderParam.getOrderStatus() == null){ if(maintenanceOrderParam.getIsClient() == MaintenanceOrderStatusEnum.REPAIRER.getStatus()){
maintenanceOrderDto.setOrderStatusIds("1,2,7,8"); maintenanceOrderDto.setReceiverId(FrontThreadLocal.getUserId().longValue());
if(maintenanceOrderParam.getOrderStatus() == null){
maintenanceOrderDto.setOrderStatusIds("1,2,7,8");
}
}else{
maintenanceOrderDto.setClientId(FrontThreadLocal.getUserId().longValue());
} }
List<MaintenanceOrderListVo> returnData = new LinkedList<>(); List<MaintenanceOrderListVo> returnData = new LinkedList<>();
@ -227,8 +252,6 @@ public class MaintenanceOrderServiceImpl implements IMaintenanceOrderService {
} }
} }
@Override @Override
public MaintenanceOrderDetailVo detail(Long id) { public MaintenanceOrderDetailVo detail(Long id) {
MaintenanceOrder maintenanceOrder = maintenanceOrderMapper.findMaintenanceOrderById(id); MaintenanceOrder maintenanceOrder = maintenanceOrderMapper.findMaintenanceOrderById(id);
@ -259,29 +282,86 @@ public class MaintenanceOrderServiceImpl implements IMaintenanceOrderService {
vo.setReceiverName(user.getNickname()); vo.setReceiverName(user.getNickname());
} }
//设置配件清单
List<OrderSparePart> orderSpareParts = orderSparePartMapper.selectList(new LambdaQueryWrapper<OrderSparePart>()
.eq(OrderSparePart::getMaintenanceOrderId, maintenanceOrder.getId()));
List<OrderSparePartListVo> orderSparePartListVos = new ArrayList<>();
for (OrderSparePart item : orderSpareParts) {
OrderSparePartListVo orderSparePartListVo = new OrderSparePartListVo();
BeanUtils.copyProperties(item, orderSparePartListVo);
orderSparePartListVos.add(orderSparePartListVo);
}
vo.setSparePartList(orderSparePartListVos);
return vo; return vo;
} }
@Override @Override
@Transactional
public void serviceOfferPrice(MaintenanceOrderParam maintenanceOrderParam) { public void serviceOfferPrice(MaintenanceOrderParam maintenanceOrderParam) {
MaintenanceOrder maintenanceOrder = maintenanceOrderMapper.findMaintenanceOrderById(maintenanceOrderParam.getId()); MaintenanceOrder maintenanceOrder = maintenanceOrderMapper.findMaintenanceOrderById(maintenanceOrderParam.getId());
Assert.notNull(maintenanceOrder, "数据不存在"); Assert.notNull(maintenanceOrder, "数据不存在");
maintenanceOrder.setFaultDescription(maintenanceOrderParam.getFaultDescription()); maintenanceOrder.setFaultDescription(maintenanceOrderParam.getFaultDescription());
maintenanceOrder.setFaultImg(maintenanceOrderParam.getFaultImg()); maintenanceOrder.setFaultImg(maintenanceOrderParam.getFaultImg());
maintenanceOrder.setWarehouseType(maintenanceOrderParam.getWarehouseType());
maintenanceOrder.setQuotationTime(new Date());
Client client = clientMapper.findClientById(maintenanceOrder.getClientId()); 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()) { for (SparePartParam item : maintenanceOrderParam.getSparePartParams()) {
SparePart sparePart = sparePartMapper.findSparePart(item.getId()); SparePart sparePart = sparePartMapper.findSparePart(item.getId());
OrderSparePart orderSparePart = new OrderSparePart(); OrderSparePart orderSparePart = new OrderSparePart();
BeanUtils.copyProperties(sparePart, orderSparePart); BeanUtils.copyProperties(sparePart, orderSparePart);
orderSparePart.setId(null);
orderSparePart.setMaintenanceOrderId(maintenanceOrder.getId());
orderSparePart.setSparePartsId(item.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); maintenanceOrderMapper.updateById(maintenanceOrder);
} }
} }

8
front/src/main/java/com/hcy/front/service/order/impl/OrderSparePartServiceImpl.java
View File

@ -93,10 +93,10 @@ public class OrderSparePartServiceImpl implements IOrderSparePartService {
model.setSparePartsId(orderSparePartParam.getSparePartsId()); model.setSparePartsId(orderSparePartParam.getSparePartsId());
model.setSparePartsCode(orderSparePartParam.getSparePartsCode()); model.setSparePartsCode(orderSparePartParam.getSparePartsCode());
model.setSparePartsName(orderSparePartParam.getSparePartsName()); model.setSparePartsName(orderSparePartParam.getSparePartsName());
model.setWarehouseName(orderSparePartParam.getWarehouseName()); model.setWarehouseId(orderSparePartParam.getWarehouseId());
model.setSpecificationsModel(orderSparePartParam.getSpecificationsModel()); model.setSpecificationsModel(orderSparePartParam.getSpecificationsModel());
model.setUnit(orderSparePartParam.getUnit()); model.setUnit(orderSparePartParam.getUnit());
model.setPrice(orderSparePartParam.getPrice()); model.setUnitPrice(orderSparePartParam.getPrice());
model.setQuantity(orderSparePartParam.getQuantity()); model.setQuantity(orderSparePartParam.getQuantity());
model.setTotalPrice(orderSparePartParam.getTotalPrice()); model.setTotalPrice(orderSparePartParam.getTotalPrice());
orderSparePartMapper.insert(model); orderSparePartMapper.insert(model);
@ -121,10 +121,10 @@ public class OrderSparePartServiceImpl implements IOrderSparePartService {
model.setSparePartsId(orderSparePartParam.getSparePartsId()); model.setSparePartsId(orderSparePartParam.getSparePartsId());
model.setSparePartsCode(orderSparePartParam.getSparePartsCode()); model.setSparePartsCode(orderSparePartParam.getSparePartsCode());
model.setSparePartsName(orderSparePartParam.getSparePartsName()); model.setSparePartsName(orderSparePartParam.getSparePartsName());
model.setWarehouseName(orderSparePartParam.getWarehouseName()); model.setWarehouseId(orderSparePartParam.getWarehouseId());
model.setSpecificationsModel(orderSparePartParam.getSpecificationsModel()); model.setSpecificationsModel(orderSparePartParam.getSpecificationsModel());
model.setUnit(orderSparePartParam.getUnit()); model.setUnit(orderSparePartParam.getUnit());
model.setPrice(orderSparePartParam.getPrice()); model.setUnitPrice(orderSparePartParam.getPrice());
model.setQuantity(orderSparePartParam.getQuantity()); model.setQuantity(orderSparePartParam.getQuantity());
model.setTotalPrice(orderSparePartParam.getTotalPrice()); model.setTotalPrice(orderSparePartParam.getTotalPrice());
orderSparePartMapper.updateById(model); orderSparePartMapper.updateById(model);

17
front/src/main/java/com/hcy/front/service/warehouse/impl/SparePartServiceImpl.java
View File

@ -10,11 +10,14 @@ import com.hcy.common.dto.SparePartDto;
import com.hcy.common.entity.client.Client; import com.hcy.common.entity.client.Client;
import com.hcy.common.entity.client.ClientContacts; import com.hcy.common.entity.client.ClientContacts;
import com.hcy.common.entity.sparePart.SparePart; 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.entity.warehouse.Warehouse;
import com.hcy.common.enums.order.MaintenanceOrderStatusEnum;
import com.hcy.common.exception.OperateException; import com.hcy.common.exception.OperateException;
import com.hcy.common.mapper.client.ClientContactsMapper; import com.hcy.common.mapper.client.ClientContactsMapper;
import com.hcy.common.mapper.client.ClientMapper; import com.hcy.common.mapper.client.ClientMapper;
import com.hcy.common.mapper.sparePart.SparePartMapper; 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.mapper.warehouse.WarehouseMapper;
import com.hcy.common.utils.StringUtil; import com.hcy.common.utils.StringUtil;
import com.hcy.common.utils.TimeUtil; import com.hcy.common.utils.TimeUtil;
@ -32,6 +35,7 @@ import org.springframework.util.Assert;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.*; import java.util.*;
import java.util.stream.Collectors;
/** /**
* 备件信息实现类 * 备件信息实现类
@ -51,6 +55,9 @@ public class SparePartServiceImpl implements ISparePartService {
@Resource @Resource
ClientContactsMapper clientContactsMapper; ClientContactsMapper clientContactsMapper;
@Resource
UserMapper userMapper;
/** /**
* 备件信息列表 * 备件信息列表
* *
@ -68,6 +75,16 @@ public class SparePartServiceImpl implements ISparePartService {
SparePartDto sparePartDto = new SparePartDto(); SparePartDto sparePartDto = new SparePartDto();
BeanUtils.copyProperties(param,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<Warehouse> 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()); Client client = clientMapper.findClientById(param.getClientId());
Map<Long,String> warehouseMap = new HashMap<>(); Map<Long,String> warehouseMap = new HashMap<>();

3
front/src/main/java/com/hcy/front/validate/order/MaintenanceOrderParam.java
View File

@ -113,4 +113,7 @@ public class MaintenanceOrderParam implements Serializable {
//服务报价列表 //服务报价列表
private List<SparePartParam> sparePartParams; private List<SparePartParam> sparePartParams;
private Integer isClient; //是否客户 0-客户端 1-检修员端
private Integer isMaintain; //是否维修 0-维修 1-不维修
private Integer warehouseType; //仓库类型 0-我的仓库 1-公共仓库
} }

8
front/src/main/java/com/hcy/front/validate/order/OrderSparePartParam.java
View File

@ -37,9 +37,9 @@ public class OrderSparePartParam implements Serializable {
@Length(max = 50, message = "sparePartsName参数不能超出50个字符", groups = {create.class, update.class}) @Length(max = 50, message = "sparePartsName参数不能超出50个字符", groups = {create.class, update.class})
private String sparePartsName; private String sparePartsName;
@NotNull(message = "warehouseName参数缺失", groups = {create.class, update.class}) @NotNull(message = "warehouseId参数缺失", groups = {create.class, update.class})
@Length(max = 100, message = "warehouseName参数不能超出100个字符", groups = {create.class, update.class}) @Length(max = 100, message = "warehouseId参数不能超出100个字符", groups = {create.class, update.class})
private String warehouseName; private Long warehouseId;
@NotNull(message = "specificationsModel参数缺失", groups = {create.class, update.class}) @NotNull(message = "specificationsModel参数缺失", groups = {create.class, update.class})
@Length(max = 50, message = "specificationsModel参数不能超出50个字符", 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}) @NotNull(message = "quantity参数缺失", groups = {create.class, update.class})
@DecimalMin(value = "0", message = "quantity参数值不能少于0", 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}) @NotNull(message = "totalPrice参数缺失", groups = {create.class, update.class})
private BigDecimal totalPrice; private BigDecimal totalPrice;

1
front/src/main/java/com/hcy/front/validate/warehouse/SparePartParam.java
View File

@ -57,4 +57,5 @@ public class SparePartParam implements Serializable {
private String keywords; //关键字 private String keywords; //关键字
private Long clientId; //客户id private Long clientId; //客户id
private Integer warehouseType; //仓库类型 0-我的仓库 1-公共仓库
} }

3
front/src/main/java/com/hcy/front/vo/order/MaintenanceOrderDetailVo.java
View File

@ -6,6 +6,7 @@ import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import java.util.List;
/** /**
* MaintenanceOrderVo * MaintenanceOrderVo
@ -50,4 +51,6 @@ public class MaintenanceOrderDetailVo implements Serializable {
private String faultName; //故障名称 private String faultName; //故障名称
private String creatorName; // 创建人姓名 private String creatorName; // 创建人姓名
private String receiverName; // 接单人姓名 private String receiverName; // 接单人姓名
private List<OrderSparePartListVo> sparePartList; // 备件清单
} }