提交设备故障反馈

smart-switch-service/src/main/java/com/ruoyi/dashboard/index/service/DashboardService.java

@@ -160,7 +160,7 @@ public class DashboardService {
 
         // 设备故障
         AbnormalQuery abnormalQuery = new AbnormalQuery();
-        abnormalQuery.setStatus(AbnormalStatus.UNREAD.getStatus());
+        abnormalQuery.setStatus(AbnormalStatus.UNDO.getStatus());
         vo.setAbnormalCount(abnormalService.selectCount(abnormalQuery));
 
         // 投诉意见

smart-switch-service/src/main/java/com/ruoyi/ss/abnormal/domain/Abnormal.java

@@ -32,6 +32,18 @@ public class Abnormal extends BaseEntity
     @ApiModelProperty("设备ID")
     private Long deviceId;
 
+    @ApiModelProperty("设备SN码")
+    private String deviceNo;
+
+    @ApiModelProperty("订单id")
+    private Long orderId;
+
+    @ApiModelProperty("订单编号")
+    private String orderNo;
+
+    @ApiModelProperty("商户id")
+    private Long storeId;
+
     /** 故障描述 */
     @ApiModelProperty("故障描述")
     @Excel(name = "故障描述")
@@ -58,6 +70,7 @@ public class Abnormal extends BaseEntity
     @Size(max = 200, message = "联系地址长度不能超过200个字符")
     private String address;
 
-    @ApiModelProperty("状态：1-未读，2-已读")
+    @ApiModelProperty("状态：1-未处理，2-驳回 3-已处理")
     private String status;
+
 }

smart-switch-service/src/main/java/com/ruoyi/ss/abnormal/domain/AbnormalQuery.java

@@ -13,7 +13,5 @@ public class AbnormalQuery extends Abnormal {
     @ApiModelProperty("关键词，可以是故障描述、故障编号")
     private String keyword;
 
-    @ApiModelProperty("设备编号")
-    private String deviceNo;
 
 }

smart-switch-service/src/main/java/com/ruoyi/ss/abnormal/domain/AbnormalVO.java

@@ -10,9 +10,6 @@ import lombok.Data;
 @Data
 public class AbnormalVO extends Abnormal {
 
-    @ApiModelProperty("设备编号")
-    private String deviceNo;
-
     @ApiModelProperty("用户名称")
     private String userName;
 

smart-switch-service/src/main/java/com/ruoyi/ss/abnormal/domain/enums/AbnormalStatus.java

@@ -11,8 +11,10 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum AbnormalStatus {
 
-    UNREAD("1", "未读"),
+    UNDO("1", "修改状态为未处理"),
-    READ("2", "已读");
+    OVERRULE("2", "修改状态为驳回"),
+    DO("3", "修改状态为已处理");
+
 
     private final String status;
     private final String msg;

smart-switch-service/src/main/java/com/ruoyi/ss/abnormal/mapper/AbnormalMapper.java

@@ -74,4 +74,6 @@ public interface AbnormalMapper
      * 查询数量
      */
     int selectCount(AbnormalQuery query);
+
+    int updateAbnormalByOrderId(String orderId);
 }

smart-switch-service/src/main/java/com/ruoyi/ss/abnormal/mapper/AbnormalMapper.xml

@@ -18,9 +18,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             sa.create_time,
             sa.create_by,
             sa.update_time,
+            sa.device_no,
             sa.update_by,
             sa.deleted,
             sa.user_id,
+            sa.order_no,
+            sa.order_id,
+            sa.store_id,
             su.user_name as user_name,
             sd.device_no as device_no
         from <include refid="searchTables"/>
@@ -45,6 +49,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="status != null  and status != ''"> and sa.`status` = #{status}</if>
             <if test="userId != null"> and sa.`user_id` = #{userId}</if>
             <if test="deleted != null"> and sa.`deleted` = #{deleted}</if>
+            <if test="orderNo != null"> and sa.`order_no` = #{orderNo}</if>
+            <if test="orderNo != null"> and sa.`order_id` = #{orderId}</if>
+            <if test="storeId != null"> and sa.`store_id` = #{storeId}</if>
             <if test="deleted == null"> and sa.deleted = false</if>
             <if test="keyword != null">
                 and (
@@ -73,6 +80,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         insert into ss_abnormal
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="deviceId != null">device_id,</if>
+            <if test="orderNo != null">order_no,</if>
+            <if test="orderId != null">order_id,</if>
+            <if test="storeId != null">store_id,</if>
+            <if test="deviceNo != null">device_no,</if>
             <if test="content != null and content != ''">content,</if>
             <if test="name != null">`name`,</if>
             <if test="mobile != null">mobile,</if>
@@ -87,6 +98,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="deviceId != null">#{deviceId},</if>
+            <if test="orderNo != null">#{orderNo},</if>
+            <if test="orderId != null">#{orderId},</if>
+            <if test="storeId != null">#{storeId},</if>
+            <if test="deviceNo != null">#{deviceNo},</if>
             <if test="content != null and content != ''">#{content},</if>
             <if test="name != null">#{name},</if>
             <if test="mobile != null">#{mobile},</if>
@@ -102,19 +117,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
 
     <update id="updateAbnormal" parameterType="Abnormal">
-        update ss_abnormal
+        update ss_abnormal sa
         <trim prefix="SET" suffixOverrides=",">
-            <if test="deviceId != null">device_no = #{deviceId},</if>
+            <if test="deviceId != null">device_id = #{deviceId},</if>
+            <if test="deviceNo != null">device_no = #{deviceNo},</if>
             <if test="content != null and content != ''">content = #{content},</if>
-            <if test="name != null">`name` = #{name},</if>
+            <if test="name != null">name = #{name},</if>
             <if test="mobile != null">mobile = #{mobile},</if>
             <if test="address != null">address = #{address},</if>
-            <if test="status != null and status != ''">`status` = #{status},</if>
+            <if test="status != null and status != ''">status = #{status},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="userId != null">user_id = #{userId},</if>
+            <if test="userId != null">user_id = #{userId}</if>
         </trim>
-        where abnormal_id = #{abnormalId}
+        where sa.abnormal_id = #{abnormalId}
     </update>
 
     <update id="logicDel">
@@ -126,6 +142,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </update>
 
+    <update id="updateAbnormalByOrderId">
+        update ss_abnormal sa
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="deviceId != null">device_id = #{deviceId},</if>
+            <if test="content != null and content != ''">content = #{content},</if>
+            <if test="name != null"> name = #{name},</if>
+            <if test="mobile != null">mobile = #{mobile},</if>
+            <if test="address != null">address = #{address},</if>
+            <if test="status != null and status != ''">status = #{status},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="userId != null">user_id = #{userId}</if>
+        </trim>
+        where sa.order_no = #{orderNo}
+    </update>
+
     <delete id="deleteAbnormalByAbnormalId" parameterType="Long">
         delete from ss_abnormal where abnormal_id = #{abnormalId}
     </delete>

smart-switch-service/src/main/java/com/ruoyi/ss/abnormal/service/AbnormalService.java

@@ -66,4 +66,6 @@ public interface AbnormalService
      * 查询数量
      */
     int selectCount(AbnormalQuery query);
+
+    int updateAbnormalByOrderId(AbnormalQuery query);
 }

smart-switch-service/src/main/java/com/ruoyi/ss/abnormal/service/impl/AbnormalConverterImpl.java

@@ -7,7 +7,9 @@ import com.ruoyi.ss.abnormal.domain.enums.AbnormalStatus;
 import com.ruoyi.ss.abnormal.service.AbnormalConverter;
 import com.ruoyi.ss.abnormal.service.AbnormalService;
 import com.ruoyi.ss.device.domain.vo.DeviceVO;
+import com.ruoyi.ss.device.mapper.DeviceMapper;
 import com.ruoyi.ss.device.service.DeviceService;
+import com.ruoyi.ss.store.service.StoreService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -24,6 +26,10 @@ public class AbnormalConverterImpl implements AbnormalConverter {
     @Autowired
     private DeviceService deviceService;
 
+    @Autowired
+    private StoreService storeService;
+
+
     @Override
     public Abnormal toPo(AbnormalSubmitDTO dto) {
         if (dto == null) {
@@ -35,11 +41,15 @@ public class AbnormalConverterImpl implements AbnormalConverter {
         Abnormal po = new Abnormal();
         po.setUserId(dto.getUserId());
         po.setDeviceId(device.getDeviceId());
+        po.setOrderNo(dto.getOrderNo());
+        po.setStoreId(dto.getStoreId());
+        po.setDeviceNo(dto.getDeviceNo());
         po.setContent(dto.getContent());
+        po.setOrderId(dto.getOrderId());
         po.setName(dto.getName());
         po.setMobile(dto.getMobile());
         po.setAddress(dto.getAddress());
-        po.setStatus(AbnormalStatus.UNREAD.getStatus());
+        po.setStatus(AbnormalStatus.UNDO.getStatus());
         po.setCreateBy(dto.getCreateBy());
         return po;
     }

smart-switch-service/src/main/java/com/ruoyi/ss/abnormal/service/impl/AbnormalServiceImpl.java

@@ -101,4 +101,9 @@ public class AbnormalServiceImpl implements AbnormalService
     public int selectCount(AbnormalQuery query) {
         return abnormalMapper.selectCount(query);
     }
+
+    @Override
+    public int updateAbnormalByOrderId(AbnormalQuery query) {
+        return abnormalMapper.updateAbnormalByOrderId(query.getOrderNo());
+    }
 }

smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/Device.java

@@ -281,4 +281,7 @@ public class Device extends BaseEntity
 
     @ApiModelProperty("电量系数")
     private BigDecimal wxs;
+
+    @ApiModelProperty("代理商备注")
+    private String agentRemark;
 }

smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/DeviceBO.java

@@ -42,6 +42,7 @@ public class DeviceBO extends Device {
         bo.setAgentServiceRate(getAgentServiceRate());
         bo.setAgentId(getAgentId());
         bo.setMonthFee(getMonthFee());
+        bo.setAgentRemark(getAgentRemark());
         return bo;
     }
 
@@ -73,6 +74,7 @@ public class DeviceBO extends Device {
         bo.setAgentServiceRate(getAgentServiceRate());
         bo.setAgentId(getAgentId());
         bo.setMonthFee(getMonthFee());
+        bo.setAgentRemark(getAgentRemark());
         return bo;
     }
 
@@ -84,6 +86,7 @@ public class DeviceBO extends Device {
         DeviceBO bo = new DeviceBO();
         bo.setDeviceId(getDeviceId());
         bo.setAgentServiceRate(getAgentServiceRate());
+        bo.setAgentRemark(getAgentRemark());
         return bo;
     }
 }

smart-switch-service/src/main/java/com/ruoyi/ss/device/mapper/DeviceMapper.xml

@@ -75,6 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             sd.user_opera_ele,
             sd.imsi,
             sd.wxs,
+            sd.agent_remark,
             sm.model_name as model,
             sm.picture as picture,
             sm.tags as  model_tags,
@@ -142,6 +143,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="query.excludeDeviceId != null"> and sd.device_id != #{query.excludeDeviceId}</if>
         <if test="query.userOperaType != null  and query.userOperaType != ''"> and user_opera_type = #{query.userOperaType}</if>
         <if test="query.imsi != null  and query.imsi != ''"> and sd.imsi like concat('%', #{query.imsi}, '%')</if>
+        <if test="query.agentRemark != null  and query.agentRemark != ''"> and sd.agent_remark like concat('%', #{query.agentRemark}, '%')</if>
         <if test="query.inStaff != null">
             and sd.store_id
             <if test="!query.inStaff">not</if>
@@ -419,6 +421,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="userOperaEle != null">user_opera_ele,</if>
             <if test="imsi != null">imsi,</if>
             <if test="wxs != null">wxs,</if>
+            <if test="agentRemark != null">agent_remark,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="storeId != null">#{storeId},</if>
@@ -479,6 +482,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="userOperaEle != null">#{userOperaEle},</if>
             <if test="imsi != null">#{imsi},</if>
             <if test="wxs != null">#{wxs},</if>
+            <if test="agentRemark != null">#{agentRemark},</if>
          </trim>
     </insert>
 
@@ -572,6 +576,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="userOperaEle != null">user_opera_ele = #{userOperaEle},</if>
             <if test="imsi != null">imsi = #{imsi},</if>
             <if test="wxs != null">wxs = #{wxs},</if>
+            <if test="agentRemark != null">agent_remark = #{agentRemark},</if>
         </trim>
         where device_id = #{deviceId}
     </update>

smart-switch-service/src/main/java/com/ruoyi/ss/device/service/impl/DeviceServiceImpl.java

@@ -13,6 +13,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
+import com.ruoyi.ss.snLog.domain.SnLog;
 import com.ruoyi.ss.transactionBill.service.TransactionAssembler;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -244,10 +245,20 @@ public class DeviceServiceImpl implements DeviceService
         data.setUpdateTime(DateUtils.getNowDate());
 
         Integer result = transactionTemplate.execute(status -> {
+       //     deviceMapper.selectByDeviceId(data.getDeviceNo());
+
+            // 生成SnLog记录
+            SnLog snLog = new SnLog();
+            snLog.setDeviceId(data.getDeviceId());
+            snLog.setUserId(SecurityUtils.getUserId());
+            snLog.setMac(data.getMac());
+
             // 更新主表
             int update = deviceMapper.updateSmDevice(data);
             ServiceUtil.assertion(update != 1, "更新设备失败");
 
+
+
             // 后校验
             DeviceVO vo = this.selectById(data.getDeviceId());
             deviceAssembler.assembleBonusList(vo);

smart-switch-service/src/main/java/com/ruoyi/ss/snLog/domain/SnLog.java

@@ -0,0 +1,43 @@
+package com.ruoyi.ss.snLog.domain;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * Sn码更换日志对象 ss_sn_log
+ *
+ * @author ruoyi
+ * @date 2025-03-31
+ */
+@Data
+public class SnLog extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    private Long id;
+
+    @Excel(name = "设备id")
+    @ApiModelProperty("设备id")
+    private Long deviceId;
+
+    @Excel(name = "操作人id")
+    @ApiModelProperty("操作人id")
+    private Long userId;
+
+    @Excel(name = "设备Mac号")
+    @ApiModelProperty("设备Mac号")
+    private String mac;
+
+    @Excel(name = "原sn")
+    @ApiModelProperty("原sn")
+    private String oldSn;
+
+    @Excel(name = "当前sn")
+    @ApiModelProperty("当前sn")
+    private String newSn;
+
+}

smart-switch-service/src/main/java/com/ruoyi/ss/snLog/domain/SnLogQuery.java

@@ -0,0 +1,7 @@
+package com.ruoyi.ss.snLog.domain;
+
+import lombok.Data;
+
+@Data
+public class SnLogQuery extends SnLog {
+}

smart-switch-service/src/main/java/com/ruoyi/ss/snLog/domain/SnLogVO.java

@@ -0,0 +1,8 @@
+package com.ruoyi.ss.snLog.domain;
+
+import lombok.Data;
+
+@Data
+public class SnLogVO extends SnLog {
+
+}

smart-switch-service/src/main/java/com/ruoyi/ss/snLog/mapper/SnLogMapper.java

@@ -0,0 +1,74 @@
+package com.ruoyi.ss.snLog.mapper;
+
+import java.util.List;
+import com.ruoyi.ss.snLog.domain.SnLog;
+import com.ruoyi.ss.snLog.domain.SnLogVO;
+import com.ruoyi.ss.snLog.domain.SnLogQuery;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * Sn码更换日志Mapper接口
+ *
+ * @author ruoyi
+ * @date 2025-03-31
+ */
+public interface SnLogMapper
+{
+    /**
+     * 查询Sn码更换日志
+     *
+     * @param id Sn码更换日志主键
+     * @return Sn码更换日志
+     */
+    SnLogVO selectSnLogById(Long id);
+
+    /**
+     * 查询Sn码更换日志列表
+     *
+     * @param query Sn码更换日志
+     * @return Sn码更换日志集合
+     */
+    List<SnLogVO> selectSnLogList(@Param("query")SnLogQuery query);
+
+    /**
+     * 新增Sn码更换日志
+     *
+     * @param snLog Sn码更换日志
+     * @return 结果
+     */
+    int insertSnLog(SnLog snLog);
+
+    /**
+     * 批量新增Sn码更换日志
+     */
+    int batchInsert(@Param("list") List<? extends SnLog> list);
+
+    /**
+     * 批量修改Sn码更换日志
+     */
+    int batchUpdate(@Param("list") List<? extends SnLog> list);
+
+    /**
+     * 修改Sn码更换日志
+     *
+     * @param snLog Sn码更换日志
+     * @return 结果
+     */
+    public int updateSnLog(@Param("data") SnLog snLog);
+
+    /**
+     * 删除Sn码更换日志
+     *
+     * @param id Sn码更换日志主键
+     * @return 结果
+     */
+    int deleteSnLogById(Long id);
+
+    /**
+     * 批量删除Sn码更换日志
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSnLogByIds(Long[] ids);
+}

smart-switch-service/src/main/java/com/ruoyi/ss/snLog/service/SnLogService.java

@@ -0,0 +1,63 @@
+package com.ruoyi.ss.snLog.service;
+
+import java.util.List;
+import com.ruoyi.ss.snLog.domain.SnLog;
+import com.ruoyi.ss.snLog.domain.SnLogVO;
+import com.ruoyi.ss.snLog.domain.SnLogQuery;
+
+/**
+ * Sn码更换日志Service接口
+ *
+ * @author ruoyi
+ * @date 2025-03-31
+ */
+public interface SnLogService
+{
+    /**
+     * 查询Sn码更换日志
+     *
+     * @param id Sn码更换日志主键
+     * @return Sn码更换日志
+     */
+    public SnLogVO selectSnLogById(Long id);
+
+    /**
+     * 查询Sn码更换日志列表
+     *
+     * @param snLog Sn码更换日志
+     * @return Sn码更换日志集合
+     */
+    public List<SnLogVO> selectSnLogList(SnLogQuery snLog);
+
+    /**
+     * 新增Sn码更换日志
+     *
+     * @param snLog Sn码更换日志
+     * @return 结果
+     */
+    public int insertSnLog(SnLog snLog);
+
+    /**
+     * 修改Sn码更换日志
+     *
+     * @param snLog Sn码更换日志
+     * @return 结果
+     */
+    public int updateSnLog(SnLog snLog);
+
+    /**
+     * 批量删除Sn码更换日志
+     *
+     * @param ids 需要删除的Sn码更换日志主键集合
+     * @return 结果
+     */
+    public int deleteSnLogByIds(Long[] ids);
+
+    /**
+     * 删除Sn码更换日志信息
+     *
+     * @param id Sn码更换日志主键
+     * @return 结果
+     */
+    public int deleteSnLogById(Long id);
+}

smart-switch-service/src/main/java/com/ruoyi/ss/snLog/service/impl/SnLogServiceImpl.java

@@ -0,0 +1,97 @@
+package com.ruoyi.ss.snLog.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.ss.snLog.mapper.SnLogMapper;
+import com.ruoyi.ss.snLog.domain.SnLog;
+import com.ruoyi.ss.snLog.domain.SnLogVO;
+import com.ruoyi.ss.snLog.domain.SnLogQuery;
+import com.ruoyi.ss.snLog.service.SnLogService;
+
+/**
+ * Sn码更换日志Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2025-03-31
+ */
+@Service
+public class SnLogServiceImpl implements SnLogService
+{
+    @Autowired
+    private SnLogMapper snLogMapper;
+
+    /**
+     * 查询Sn码更换日志
+     *
+     * @param id Sn码更换日志主键
+     * @return Sn码更换日志
+     */
+    @Override
+    public SnLogVO selectSnLogById(Long id)
+    {
+        return snLogMapper.selectSnLogById(id);
+    }
+
+    /**
+     * 查询Sn码更换日志列表
+     *
+     * @param snLog Sn码更换日志
+     * @return Sn码更换日志
+     */
+    @Override
+    public List<SnLogVO> selectSnLogList(SnLogQuery snLog)
+    {
+        return snLogMapper.selectSnLogList(snLog);
+    }
+
+    /**
+     * 新增Sn码更换日志
+     *
+     * @param snLog Sn码更换日志
+     * @return 结果
+     */
+    @Override
+    public int insertSnLog(SnLog snLog)
+    {
+        return snLogMapper.insertSnLog(snLog);
+    }
+
+    /**
+     * 修改Sn码更换日志
+     *
+     * @param snLog Sn码更换日志
+     * @return 结果
+     */
+    @Override
+    public int updateSnLog(SnLog snLog)
+    {
+        snLog.setUpdateTime(DateUtils.getNowDate());
+        return snLogMapper.updateSnLog(snLog);
+    }
+
+    /**
+     * 批量删除Sn码更换日志
+     *
+     * @param ids 需要删除的Sn码更换日志主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSnLogByIds(Long[] ids)
+    {
+        return snLogMapper.deleteSnLogByIds(ids);
+    }
+
+    /**
+     * 删除Sn码更换日志信息
+     *
+     * @param id Sn码更换日志主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSnLogById(Long id)
+    {
+        return snLogMapper.deleteSnLogById(id);
+    }
+}

smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/TransactionBillValidatorImpl.java

@@ -421,6 +421,9 @@ public class TransactionBillValidatorImpl extends BaseValidator implements Trans
 
     @Override
     public boolean canViewOrder(TransactionBillVO bill, Long userId) {
+        if (bill == null) {
+            return false;
+        }
         return this.isMch(bill, userId)
                 || this.isUser(bill, userId)
                 || this.isAgent(bill, userId)

smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppAbnormalController.java

@@ -10,6 +10,14 @@ import com.ruoyi.ss.abnormal.domain.AbnormalQuery;
 import com.ruoyi.ss.abnormal.service.AbnormalConverter;
 import com.ruoyi.ss.abnormal.service.AbnormalValidator;
 import com.ruoyi.ss.abnormal.service.AbnormalService;
+import com.ruoyi.ss.device.domain.vo.DeviceVO;
+import com.ruoyi.ss.device.service.DeviceService;
+import com.ruoyi.ss.payBill.domain.PayBillVO;
+import com.ruoyi.ss.payBill.service.PayBillService;
+import com.ruoyi.ss.transactionBill.domain.TransactionBill;
+import com.ruoyi.ss.transactionBill.domain.vo.TransactionBillVO;
+import com.ruoyi.ss.transactionBill.service.TransactionBillService;
+import com.ruoyi.ss.vipOrder.service.VipOrderService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,11 +42,44 @@ public class AppAbnormalController extends BaseController {
     @Autowired
     private AbnormalConverter abnormalConverter;
 
+    @Autowired
+    private TransactionBillService transactionBillService;
+
+    @Autowired
+    private DeviceService deviceService;
+
     @ApiOperation("提交设备故障反馈")
     @PostMapping("/submit")
     public AjaxResult submit(@RequestBody @Validated(ValidGroup.FrontCreate.class) AbnormalSubmitDTO data) {
         data.setUserId(getUserId());
         data.setCreateBy(getUsername());
+        TransactionBillVO transactionBillVO = transactionBillService.selectSmTransactionBillByBillId(data.getOrderId());
+        DeviceVO deviceVO = deviceService.selectByDeviceNo(data.getDeviceNo());
+        if (data.getOrderId() != null && data.getDeviceNo() != null) {
+            if (transactionBillVO == null) {
+                return AjaxResult.error("当前订单不存在");
+            }
+            if (deviceVO == null) {
+                return AjaxResult.error("当前设备不存在");
+            }
+            if (!transactionBillVO.getDeviceNo().equals(data.getDeviceNo())) {
+                return AjaxResult.error("当前设备与订单无关联");
+            }
+        }
+        // 获取订单商户id
+        if ( data.getOrderId()!= null) {
+            data.setOrderNo(transactionBillVO.getBillNo());
+            if(transactionBillVO.getMchId()!=null){
+                data.setStoreId(transactionBillVO.getMchId());
+            }
+        }
+        // 获取设备商户id
+        if (data.getDeviceNo() != null) {
+            Long storeId = deviceVO.getStoreId();
+            if (storeId != null) {
+                data.setStoreId(storeId);
+            }
+        }
         return success(abnormalService.insertAbnormal(abnormalConverter.toPo(data)));
     }
 

smart-switch-web/src/main/java/com/ruoyi/web/controller/mch/MchAbnormalController.java

@@ -0,0 +1,42 @@
+package com.ruoyi.web.controller.mch;
+
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.ss.abnormal.domain.AbnormalQuery;
+import com.ruoyi.ss.abnormal.service.AbnormalService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/mch/abnormal")
+public class MchAbnormalController extends BaseController {
+
+    @Autowired
+    private AbnormalService abnormalService;
+
+    @ApiOperation("商户处理申诉状态")
+    @PutMapping
+    public AjaxResult updateAbnormalStatus(AbnormalQuery query) {
+        return AjaxResult.success(abnormalService.updateAbnormal(query));
+    }
+
+    @ApiOperation("商户查询用户故障反馈列表")
+    @GetMapping("/list")
+    public TableDataInfo abnormalList(AbnormalQuery query) {
+        startPage();
+        query.setStoreId(getUserId());
+        return getDataTable(abnormalService.selectAbnormalList(query));
+    }
+
+    @ApiOperation("商户查询用户故障反馈详情")
+    @GetMapping("/{id}")
+    public AjaxResult selectAbnormal(Long id) {
+        return AjaxResult.success(abnormalService.selectAbnormalByAbnormalId(id));
+    }
+}

smart-switch-web/src/main/java/com/ruoyi/web/controller/ss/SnLogController.java

@@ -0,0 +1,101 @@
+package com.ruoyi.web.controller.ss;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.ss.snLog.domain.SnLog;
+import com.ruoyi.ss.snLog.domain.SnLogQuery;
+import com.ruoyi.ss.snLog.domain.SnLogVO;
+import com.ruoyi.ss.snLog.service.SnLogService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * Sn码更换日志Controller
+ *
+ * @author ruoyi
+ * @date 2025-03-31
+ */
+@RestController
+@RequestMapping("/ss/snLog")
+public class SnLogController extends BaseController
+{
+    @Autowired
+    private SnLogService snLogService;
+
+    /**
+     * 查询Sn码更换日志列表
+     */
+    @PreAuthorize("@ss.hasPermi('ss:snLog:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SnLogQuery query)
+    {
+        startPage();
+        startOrderBy();
+        List<SnLogVO> list = snLogService.selectSnLogList(query);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出Sn码更换日志列表
+     */
+    @PreAuthorize("@ss.hasPermi('ss:snLog:export')")
+    @Log(title = "Sn码更换日志", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SnLogQuery query)
+    {
+        List<SnLogVO> list = snLogService.selectSnLogList(query);
+        ExcelUtil<SnLogVO> util = new ExcelUtil<SnLogVO>(SnLogVO.class);
+        util.exportExcel(response, list, "Sn码更换日志数据");
+    }
+
+    /**
+     * 获取Sn码更换日志详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('ss:snLog:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(snLogService.selectSnLogById(id));
+    }
+
+    /**
+     * 新增Sn码更换日志
+     */
+    @PreAuthorize("@ss.hasPermi('ss:snLog:add')")
+    @Log(title = "Sn码更换日志", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SnLog snLog)
+    {
+        return toAjax(snLogService.insertSnLog(snLog));
+    }
+
+    /**
+     * 修改Sn码更换日志
+     */
+    @PreAuthorize("@ss.hasPermi('ss:snLog:edit')")
+    @Log(title = "Sn码更换日志", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SnLog snLog)
+    {
+        return toAjax(snLogService.updateSnLog(snLog));
+    }
+
+    /**
+     * 删除Sn码更换日志
+     */
+    @PreAuthorize("@ss.hasPermi('ss:snLog:remove')")
+    @Log(title = "Sn码更换日志", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(snLogService.deleteSnLogByIds(ids));
+    }
+}

smart-switch-web/src/main/resources/application-dev.yml

@@ -27,7 +27,7 @@ wx:
     apiV3Key: 49819e0f0abdb2df3246f7b27f264d75
     # 密钥所在位置
     #    privateKeyPath: H:/project/创特/证书/wxpay-kg/apiclient_key.pem
-    privateKeyPath: D:/project/证书/wxpay-kg/apiclient_key.pem
+    privateKeyPath: D:/Work/SmSwitch/wxpay-kg/apiclient_key.pem
     # 证书序列号
     merchantSerialNumber: 6AD69237C0F22A9AE51A64F1927E3A0962AC1FB0
     # 转账回调地址
@@ -127,11 +127,12 @@ ali:
   # 应用私钥
   privateKey: MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCYZr1VQ3FAD3PwcFMTC0sYWRRrxMu3bweEnXU2uK/o+3wxzrnax5l/SUvQJ3CeWUPC7X0cCNMhCVn0NYL08zIMyI9E5x42ry1qvKBRLhBUkctC9XTnIdTjuMbj5XqWuowLlVTP5EdGt4byyEUIh0wGa6WnS9yGn117jfFBii+E7MP+gDXe0HTmxafh8W+VOnAonaBIOLxV5h+AkkK5XKxn/S9EbiVsy/ce7QPkPLBBd1LvjxdHwJ267G9iH0aBhHIxfMKLcfG547Hug+gTcQRkp5Akk05jPiCPBPHYGETE5fAwSiQHsnCUa9AibqcbD1+9Dw1UkSoudeVqbgnB7KzhAgMBAAECggEAZho28J+9iQCRWV23moOvbQGJN+Zh4WQmckeXlvDHEd0iyK/KPnQJN4jgnPU/cyc0yayYbCbRZEnClWUgdoFUX9IigjQhPtvAHsl+0sR8tlvzBMoz5wH4ghRyU46TwdX7K2uBpcI3qn4ckB1yepNCcO6/zcR6W0r7s2JWZuVwjqmR++ixdV8jqg06kxWu39II68ormgflCvkOlJWhPbEeEDUqgRJUDx2r+iJZORlNIj0cT8BgCo4qfeyQWNpANhTBDpC3zXeBBmg5iG8JQTTokEeqwV8Ph1/JR6dOXT3Fn5Ok0tRndhS++XUB8Zqgc3q6F9Fe/za7225TBhV7TnOvvQKBgQDkMttCWNpZWSyQvjK/KMtd3c80XCC8ch0E3ReA1sZRSnsFfOwHb8+pdHeY54DgBtFohP9bmkb+tRtGwgpgWawSWD1iErX8FD78lqPHzJjUiQ+a1vJIkvfp1fJX4HlDTy3PuVW/OZgDL0udCSeTVmr/zBr1nLRdDkYlj9+Ra3bWAwKBgQCq9+NaX354pc6Qawtst4CNhV4NxSMiqefSXx8XV0hlzPnmb4PoBjj/lzdSKgcc7pxunLMmGK9pxDBDqi6y219ciPf5bZKlxoUo7GGHtt1yiMsRduAEHUaitQjXUAo5QXh0kqF4eu+JrXiGCjnNA6s3aQM2VK5szgicx+bbtpf+SwKBgB2Cgh4rVVk2ke/J2NAlm17xHyl7PHSCIUSOvspXe9/pTM1h4Tf4+pbES+8HCQBvgUcN4+PZqJKpovRchXD+R6U7qfxzxPrrN1X8uQNObvkVHGJ+p2hBMTQZCbTZf3T32UnCgtcuwHyw8gtFsst34nBf2aCneh+KiAG1gEjS59Q3AoGAH3oYL7FZNZlBWLF8nv2B+4xMbriW6XDir4a30LJPL/73G4f4fyV2JQiQNN5sBNWhk3PiP+dXlF98i1iv1FozSnQlQ5T65O6R4aDzq+rtBoNM7+A1Ckzhjl9KS2n/F9+H7953QBlSNMTtZbBISAie40rAPqaEnp+oUkUzqcwKW9UCgYAp+2aBq+lumJWGugoxkm8G3hJPO9B2Q/Ogn0+DrCL8GQFoiSYmF+x1d0K2fGglq8CjIK/HnzP7k3qn5ZQlkyn6UzVD0UbibWU2WSdh3100tJ9vpgngGkPaxx5+ZxDxzH8ljIwJZPWKK+xsbW+kX+DFIGBJ038zXwZ5TWKLPIasrw==
   # 应用公钥证书地址
-  appCertPath: D:\project\证书\alipay\appCertPublicKey_2021004193649611.crt
+#  appCertPath: D:\project\证书\alipay\appCertPublicKey_2021004193649611.crt
+  appCertPath: D:\Work\SmSwitch\alipay\appCertPublicKey_2021004193649611.crt
   # 支付宝公钥证书地址
-  alipayCertPath: D:\project\证书\alipay\alipayCertPublicKey_RSA2.crt
+  alipayCertPath: D:\Work\SmSwitch\alipay\alipayCertPublicKey_RSA2.crt
   # 支付宝根证书地址
-  alipayRootCertPath: D:\project\证书\alipay\alipayRootCert.crt
+  alipayRootCertPath: D:\Work\SmSwitch\alipay\alipayRootCert.crt
   # AES秘钥
   aesPrivateKey: FGhCgOURrXkhGs36PUTHfg==
   # 通知地址