小程序修改

ruoyi-system/src/main/java/com/ruoyi/system/domain/UsageRecord.java

@@ -71,6 +71,9 @@ public class UsageRecord extends BaseEntity
     /** 使用人手机号 */
     @Excel(name = "使用人手机号")
     private String creditPhone;
+
+    /** 使用人身份证号 */
+    private String idCard;
     /**
      * 子菜单
      */
@@ -209,6 +212,14 @@ public class UsageRecord extends BaseEntity
         this.creditName = creditName;
     }
 
+    public String getIdCard() {
+        return idCard;
+    }
+
+    public void setIdCard(String idCard) {
+        this.idCard = idCard;
+    }
+
     @Override
     public String toString() {
         return "UsageRecord{" +
@@ -226,6 +237,7 @@ public class UsageRecord extends BaseEntity
                 ", creditName='" + creditName + '\'' +
                 ", surplusNum='" + surplusNum + '\'' +
                 ", creditPhone='" + creditPhone + '\'' +
+                ", idCard='" + idCard + '\'' +
                 ", children=" + children +
                 '}';
     }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/PolicyMenuServiceImpl.java

@@ -59,6 +59,7 @@ public class PolicyMenuServiceImpl implements IPolicyMenuService {
      */
     @Override
     public List<PolicyMenu> selectPolicyMenuList(PolicyMenu policyMenu) {
+        policyMenu.setParentId(0L);
         return policyMenuMapper.selectPolicyMenuList(policyMenu);
     }
 

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UsageRecordServiceImpl.java

@@ -76,9 +76,13 @@ public class UsageRecordServiceImpl implements IUsageRecordService
         //根据手机号查询使用人员信息
         CreditUser creditUser = new CreditUser();
         creditUser.setPhoneNum(usageRecord.getCreditPhone());
+        creditUser.setIdCard(usageRecord.getIdCard());
         creditUser = creditUserMapper.selectCreditUser(creditUser);
         //根据商家ID和分类id查询权益id
         InterestsTable tnterestsTable = interestsTableMapper.selectInterestsTable(usageRecord.getBusinessId(),usageRecord.getPolicyId());
+        if(tnterestsTable == null){
+            return AjaxResult.error("核销失败,权益与商家不匹配。");
+        }
         usageRecord.setInterestsId(tnterestsTable.getId());
         //查询用户权益等级对应的商家权益次数
         InterestsNumberTable interestsNumberTable = new InterestsNumberTable();

ruoyi-system/src/main/resources/mapper/system/PolicyMenuMapper.xml

@@ -31,6 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             status = '0'
             and visible = '0'
             <if test="menuName != null  and menuName != ''"> and menu_name like concat(#{menuName}, '%')</if>
+            <if test="parentId != null"> and parent_id = #{parentId}</if>
         </where>
         order by parent_id,order_num
     </select>