From 3e49ff6a3db6710bc327d99384d4b8fc6d474da4 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 27 六月 2024 13:44:09 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUser.java | 9
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoCards2.java | 49 ++++
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockCtrl.java | 2
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateCtrl.java | 6
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaPrivilegeMapper.xml | 88 +++++++
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaPrivilegeMapper.java | 45 +++
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRolePrivilegeMapper.xml | 61 +++++
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeClientCardMapper.java | 25 ++
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/clientCard/qo/QoCards2.java | 25 ++
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/client/ClientCardCtrl.java | 49 ++++
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaPrivilege.java | 42 +++
pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml | 80 ++++++
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaRolePrivilegeMapper.java | 47 +++
pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml | 2
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/clientCard/ClientCardCtrl.java | 23 +
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/client/ClientCardSv.java | 32 ++
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voWe/VoCards3.java | 49 ++++
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/clientCard/ClientCardSv.java | 21 +
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRolePrivilege.java | 32 ++
19 files changed, 683 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaPrivilegeMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaPrivilegeMapper.java
new file mode 100644
index 0000000..9c9cca4
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaPrivilegeMapper.java
@@ -0,0 +1,45 @@
+package com.dy.pipIrrGlobal.daoBa;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dy.pipIrrGlobal.pojoBa.BaPrivilege;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface BaPrivilegeMapper extends BaseMapper<BaPrivilege> {
+
+ /**
+ * 鏌ヨ鍏ㄩ儴
+ * @return List<BaPrivilege>
+ */
+ List<BaPrivilege> selectAll() ;
+
+ /**
+ * 鏌ヨ鏌愪釜鐢ㄦ埛鎵�闅跺睘鎵�鏈夎鑹茬殑鎵�鏈夋潈闄�
+ * @param userId 鐢ㄦ埛ID
+ * @return List<Integer>
+ */
+ List<Integer> selectPrivilegeByUserId(@Param("userId") Long userId) ;
+
+ /**
+ * 鏌ヨ鏌愪釜瑙掕壊鎵�闅跺睘浜庤瑙掕壊鐨勬墍鏈夋潈闄�
+ * @param roleId 鐢ㄦ埛ID
+ * @return List<Integer>
+ */
+ List<Integer> selectPrivilegeByRoleId(@Param("roleId") Long roleId) ;
+
+ /**
+ * insert record to table
+ * @param record the record
+ * @return insert count
+ */
+ int putin(BaPrivilege record);
+
+ /**
+ * insert record to table selective
+ * @param record the record
+ * @return insert count
+ */
+ int insertSelective(BaPrivilege record);
+
+}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaRolePrivilegeMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaRolePrivilegeMapper.java
new file mode 100644
index 0000000..ea41c94
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaRolePrivilegeMapper.java
@@ -0,0 +1,47 @@
+package com.dy.pipIrrGlobal.daoBa;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dy.pipIrrGlobal.pojoBa.BaRolePrivilege;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+@Mapper
+public interface BaRolePrivilegeMapper extends BaseMapper<BaRolePrivilege> {
+
+ /**
+ * insert record to table
+ * @param record the record
+ * @return insert count
+ */
+ int putin(BaRolePrivilege record);
+
+ /**
+ * insert record to table selective
+ * @param record the record
+ * @return insert count
+ */
+ int insertSelective(BaRolePrivilege record);
+
+ /**
+ * delete by primary key
+ * @param roleId primaryKey
+ * @param privilegeId primaryKey
+ * @return deleteCount
+ */
+ int deleteByPrimaryKey(@Param("roleId") Long roleId, @Param("privilegeId") Long privilegeId);
+
+ /**
+ * delete by roleId
+ * @param roleId 瑙掕壊ID
+ * @return deleteCount
+ */
+ int deleteByRoleId(@Param("roleId") Long roleId);
+
+ /**
+ * delete by roleId
+ * @param privilegeId 鏉冮檺ID
+ * @return deleteCount
+ */
+ int deleteByPrivilegeId(@Param("privilegeId") Long privilegeId);
+
+}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeClientCardMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeClientCardMapper.java
index a317354..e16cd6b 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeClientCardMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeClientCardMapper.java
@@ -3,7 +3,10 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dy.pipIrrGlobal.pojoSe.SeClientCard;
import com.dy.pipIrrGlobal.voSe.VoCardInfo;
+
import com.dy.pipIrrGlobal.voSe.VoCards;
+import com.dy.pipIrrGlobal.voSe.VoCards2;
+import com.dy.pipIrrGlobal.voWe.VoCards3;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -126,4 +129,26 @@
* @return 绗﹀悎鏉′欢璁板綍鏁帮紝鏈�澶氫竴鏉�
*/
Integer isLostAndUnreplaced(@Param("cardNum") Long cardNum);
+
+ /**
+ * 鏍规嵁鍐滄埛濮撳悕鍜屾墜鏈哄彿鑾峰彇姘村崱鍒楄〃璁板綍鏁帮紝搴旂敤绋嬪簭浣跨敤
+ * @param params
+ * @return
+ */
+ Long getCardsByClientNameAndPhoneCount(Map<?, ?> params);
+
+ /**
+ * 鏍规嵁鍐滄埛濮撳悕鍜屾墜鏈哄彿鑾峰彇姘村崱鍒楄〃锛屽簲鐢ㄧ▼搴忎娇鐢�
+ * @param params
+ * @return
+ */
+ List<VoCards2> getCardsByClientNameAndPhone(Map<?, ?> params);
+
+
+ /**
+ * 鏍规嵁鍐滄埛ID鏌ヨ姝ｅ父鐘舵�佺殑姘村崱鍒楄〃,灏忕▼搴忎娇鐢�
+ * @param clientId
+ * @return
+ */
+ List<VoCards3> getCardsByClientID(String clientId);
}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaPrivilege.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaPrivilege.java
new file mode 100644
index 0000000..bbedf86
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaPrivilege.java
@@ -0,0 +1,42 @@
+package com.dy.pipIrrGlobal.pojoBa;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.dy.common.po.BaseEntity;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+
+/**
+ * 鏉冮檺瀹炰綋
+ */
+@TableName(value="ba_privilege", autoResultMap = true)
+@Data
+@Builder
+@ToString
+@NoArgsConstructor
+@AllArgsConstructor
+@Schema(name = "鏉冮檺瀹炰綋")
+public class BaPrivilege implements BaseEntity {
+
+ public static final long serialVersionUID = 202310211551001L;
+
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ @TableId(type = IdType.INPUT)
+ private Long id;
+ /**
+ * 鏉冮檺缂栧彿
+ */
+ public Integer num;
+ /**
+ * 鏉冮檺鍚嶇О
+ */
+ public String name;
+ /**
+ * 鏉冮檺绫诲埆
+ */
+ public String type;
+
+}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRolePrivilege.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRolePrivilege.java
new file mode 100644
index 0000000..ccf3c1a
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRolePrivilege.java
@@ -0,0 +1,32 @@
+package com.dy.pipIrrGlobal.pojoBa;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.dy.common.po.BaseEntity;
+import lombok.*;
+/**
+ * 瑙掕壊涓庢潈闄愬叧绯诲疄浣�
+ */
+@TableName(value="ba_role_privilege", autoResultMap = true)
+@Data
+@Builder
+@ToString
+@NoArgsConstructor
+@AllArgsConstructor
+public class BaRolePrivilege implements BaseEntity {
+
+ public static final long serialVersionUID = 202311062027001L;
+
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ @TableField(value = "roleId")
+ public Long roleId;
+
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ @TableField(value = "privilegeId")
+ public Long privilegeId;
+
+}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUser.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUser.java
index 7f54c34..92317e8 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUser.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUser.java
@@ -127,6 +127,15 @@
public List<?> roleList ;
/**
+ * 鐢ㄦ埛鎵�鎷ユ湁鐨勬潈闄愶紝閽堝鐧诲綍搴旂敤
+ */
+ @Schema(hidden = true)
+ @TableField(exist = false)
+ @JSONField(serialize = false)
+ public List<Integer> privileges;
+
+
+ /**
* 鎵�灞炵墖鍖哄悕绉�
*/
@Schema(description = "鎵�灞炵墖鍖哄悕绉帮紝鐢ㄤ簬鏄剧ず锛岃〃鍗曚笉鐢ㄥ～鍐�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoCards2.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoCards2.java
new file mode 100644
index 0000000..de9a14f
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoCards2.java
@@ -0,0 +1,49 @@
+package com.dy.pipIrrGlobal.voSe;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * @author :WuZeYu
+ * @Date :2024/6/26 17:14
+ * @LastEditTime :2024/6/26 17:14
+ * @Description
+ */
+@Data
+@Schema(title = "鍐滄埛鍗¤鍥惧璞�")
+public class VoCards2 {
+ private static final long serialVersionUID = 202406261715001L;
+
+ @Schema(title = "姘村崱ID")
+ private String clientCardId;
+
+ @Schema(title = "鍐滄埛ID")
+ private String clientId;
+
+ @Schema(title = "鍐滄埛缂栧彿")
+ private String clientNum;
+
+ @Schema(title = "鍐滄埛濮撳悕")
+ private String clientName;
+
+ @Schema(title = "姘村崱缂栧彿")
+ private String cardNum;
+
+ @Schema(title = "鐢佃瘽鍙风爜")
+ private String phone;
+
+ @Schema(title = "韬唤璇佸彿鐮�")
+ private String idCard;
+
+ @Schema(title = "姘村崱鐘舵��")
+ private Integer cardState;
+
+ @Schema(title = "姘村崱鐘舵�佸悕绉�")
+ private String stateName;
+
+ @Schema(title = "姘村崱绫诲瀷")
+ private String cardType;
+
+ @Schema(title = "浣欓")
+ private String money;
+}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voWe/VoCards3.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voWe/VoCards3.java
new file mode 100644
index 0000000..803ea6c
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voWe/VoCards3.java
@@ -0,0 +1,49 @@
+package com.dy.pipIrrGlobal.voWe;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * @author :WuZeYu
+ * @Date :2024/6/26 17:14
+ * @LastEditTime :2024/6/26 17:14
+ * @Description
+ */
+@Data
+@Schema(title = "鍐滄埛鍗¤鍥惧璞�")
+public class VoCards3 {
+ private static final long serialVersionUID = 202406261715001L;
+
+ @Schema(title = "姘村崱ID")
+ private String clientCardId;
+
+ @Schema(title = "鍐滄埛ID")
+ private String clientId;
+
+ @Schema(title = "鍐滄埛缂栧彿")
+ private String clientNum;
+
+ @Schema(title = "鍐滄埛濮撳悕")
+ private String clientName;
+
+ @Schema(title = "姘村崱缂栧彿")
+ private String cardNum;
+
+ @Schema(title = "鐢佃瘽鍙风爜")
+ private String phone;
+
+ @Schema(title = "韬唤璇佸彿鐮�")
+ private String idCard;
+
+ @Schema(title = "姘村崱鐘舵��")
+ private Integer cardState;
+
+ @Schema(title = "姘村崱鐘舵�佸悕绉�")
+ private String stateName;
+
+ @Schema(title = "姘村崱绫诲瀷")
+ private String cardType;
+
+ @Schema(title = "浣欓")
+ private String money;
+}
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
index 01b83ee..9fd4b6a 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
@@ -72,7 +72,7 @@
pipIrr:
global:
- dev: false #鏄惁寮�鍙戦樁娈碉紝true鎴杅alse
+ dev: true #鏄惁寮�鍙戦樁娈碉紝true鎴杅alse
dsName: ym #寮�鍙戦樁娈碉紝璁剧疆涓存椂鐨勬暟鎹簱鍚嶇О
mw:
webPort: 8070
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaPrivilegeMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaPrivilegeMapper.xml
new file mode 100644
index 0000000..6af6bd3
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaPrivilegeMapper.xml
@@ -0,0 +1,88 @@
+<?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.dy.pipIrrGlobal.daoBa.BaPrivilegeMapper">
+
+ <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoBa.BaPrivilege">
+ <!--@mbg.generated-->
+ <!--@Table ba_privilege-->
+ <result column="id" jdbcType="BIGINT" property="id" />
+ <result column="num" jdbcType="INTEGER" property="num" />
+ <result column="name" jdbcType="VARCHAR" property="name" />
+ <result column="type" jdbcType="VARCHAR" property="type" />
+ </resultMap>
+
+ <sql id="Base_Column_List">
+ <!--@mbg.generated-->
+ id, num, name, type
+ </sql>
+
+ <select id="selectAll" resultMap="BaseResultMap">
+ select
+ <include refid="Base_Column_List" />
+ from ba_privilege
+ </select>
+
+ <select id="selectPrivilegeByUserId" resultType="Integer">
+ select p.num
+ from ba_privilege p
+ inner join ba_role_privilege rp on p.id = rp.privilegeId
+ inner join ba_user_role ur on rp.roleId = ur.roleId
+ inner join ba_role r on ur.roleId = r.id
+ where r.deleted != 1
+ <if test="userId != null">
+ and ur.userId = #{userId, jdbcType=BIGINT}
+ </if>
+ </select>
+
+ <select id="selectPrivilegeByRoleId" resultType="Integer">
+ select p.num
+ from ba_privilege p
+ inner join ba_role_privilege rp on p.id = rp.privilegeId
+ <if test="roleId != null">
+ where rp.roleId = #{roleId, jdbcType=BIGINT}
+ </if>
+ </select>
+
+ <insert id="putin" parameterType="com.dy.pipIrrGlobal.pojoBa.BaPrivilege">
+ <!--@mbg.generated-->
+ insert into ba_privilege (<include refid="Base_Column_List" />)
+ values (#{id,jdbcType=BIGINT},
+ #{num,jdbcType=INTEGER},
+ #{name,jdbcType=VARCHAR},
+ #{type, jdbcType=VARCHAR}
+ )
+ </insert>
+
+ <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoBa.BaPrivilege">
+ <!--@mbg.generated-->
+ insert into ba_privilege
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="id != null">
+ id,
+ </if>
+ <if test="num != null">
+ id,
+ </if>
+ <if test="name != null">
+ name,
+ </if>
+ <if test="type != null">
+ type,
+ </if>
+ </trim>
+ <trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="id != null">
+ #{id,jdbcType=BIGINT},
+ </if>
+ <if test="num != null">
+ #{name,jdbcType=INTEGER},
+ </if>
+ <if test="name != null">
+ #{name,jdbcType=VARCHAR},
+ </if>
+ <if test="type != null">
+ #{type,jdbcType=VARCHAR},
+ </if>
+ </trim>
+ </insert>
+</mapper>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRolePrivilegeMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRolePrivilegeMapper.xml
new file mode 100644
index 0000000..b90a5e9
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRolePrivilegeMapper.xml
@@ -0,0 +1,61 @@
+<?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.dy.pipIrrGlobal.daoBa.BaRolePrivilegeMapper">
+
+ <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoBa.BaRolePrivilege">
+ <!--@mbg.generated-->
+ <!--@Table ba_role_privilege-->
+ <id column="roleId" jdbcType="BIGINT" property="roleId" />
+ <id column="privilegeId" jdbcType="BIGINT" property="privilegeId" />
+ </resultMap>
+
+ <sql id="Base_Column_List">
+ <!--@mbg.generated-->
+ roleId, privilegeId
+ </sql>
+
+ <insert id="putin" parameterType="com.dy.pipIrrGlobal.pojoBa.BaRolePrivilege">
+ <!--@mbg.generated-->
+ insert into ba_role_privilege (roleId, privilegeId)
+ values (#{roleId,jdbcType=BIGINT}, #{privilegeId,jdbcType=BIGINT})
+ </insert>
+
+ <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoBa.BaRolePrivilege">
+ <!--@mbg.generated-->
+ insert into ba_role_privilege
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="roleId != null">
+ roleId,
+ </if>
+ <if test="privilegeId != null">
+ privilegeId,
+ </if>
+ </trim>
+ <trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="roleId != null">
+ #{roleId,jdbcType=BIGINT},
+ </if>
+ <if test="privilegeId != null">
+ #{privilegeId,jdbcType=BIGINT},
+ </if>
+ </trim>
+ </insert>
+
+ <delete id="deleteByPrimaryKey" parameterType="map">
+ <!--@mbg.generated-->
+ delete from ba_role_privilege
+ where roleId = #{roleId,jdbcType=BIGINT}
+ and privilegeId = #{privilegeId,jdbcType=BIGINT}
+ </delete>
+
+ <delete id="deleteByRoleId" parameterType="long">
+ delete from ba_role_privilege
+ where roleId = #{roleId,jdbcType=BIGINT}
+ </delete>
+
+ <delete id="deleteByPrivilegeId" parameterType="long">
+ delete from ba_role_privilege
+ where privilegeId = #{privilegeId,jdbcType=BIGINT}
+ </delete>
+
+</mapper>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml
index 20ef3f8..8a2ea9f 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml
@@ -448,5 +448,85 @@
</if>
</where>
</select>
+ <!--鏍规嵁鍐滄埛濮撳悕鍜屾墜鏈哄彿鑾峰彇姘村崱鍒楄〃璁板綍鏁帮紝搴旂敤绋嬪簭浣跨敤-->
+ <select id="getCardsByClientNameAndPhoneCount" resultType="java.lang.Long">
+ SELECT
+ COUNT(*) AS recordCount
+ FROM se_client_card card
+ INNER JOIN se_client cli ON card.clientId = cli.id
+ <where>
+ card.state = 1
+ <if test = "clientName != null and clientName !=''">
+ AND cli.name like CONCAT('%',#{clientName},'%')
+ </if>
+ <if test = "phone != null and phone !=''">
+ AND cli.phone like CONCAT('%',#{phone},'%')
+ </if>
+ </where>
+ </select>
+ <!--鏍规嵁鍐滄埛濮撳悕鍜屾墜鏈哄彿鑾峰彇姘村崱鍒楄〃锛屽簲鐢ㄧ▼搴忎娇鐢�-->
+ <select id="getCardsByClientNameAndPhone" resultType="com.dy.pipIrrGlobal.voSe.VoCards2">
+ SELECT
+ card.id AS clientCardId,
+ cli.id AS clientId,
+ cli.clientNum,
+ cli.name AS clientName,
+ card.cardNum,
+ cli.phone,
+ cli.idCard,
+ card.state AS cardState,
+ (CASE
+ WHEN card.state = 1 THEN '姝ｅ父'
+ WHEN card.state = 2 THEN '宸叉敞閿�'
+ WHEN card.state = 3 THEN '宸叉寕澶�'
+ End) AS stateName,
+ '鍐滄埛鍗�' AS cardType,
+ FORMAT(card.money, 2) AS money
+ FROM se_client_card card
+ INNER JOIN se_client cli ON card.clientId = cli.id
+ <where>
+ card.state = 1
+ <if test = "clientName != null and clientName !=''">
+ AND cli.name like CONCAT('%',#{clientName},'%')
+ </if>
+
+ <if test = "phone != null and phone !=''">
+ AND cli.phone like CONCAT('%',#{phone},'%')
+ </if>
+ </where>
+ ORDER BY card.id
+ <trim prefix="limit " >
+ <if test="start != null and count != null">
+ #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
+ </if>
+ </trim>
+ </select>
+ <!--鏍规嵁鍐滄埛ID鏌ヨ姝ｅ父鐘舵�佺殑姘村崱鍒楄〃,灏忕▼搴忎娇鐢�-->
+ <select id="getCardsByClientID" resultType="com.dy.pipIrrGlobal.voWe.VoCards3">
+ SELECT
+ card.id AS clientCardId,
+ cli.id AS clientId,
+ cli.clientNum,
+ cli.name AS clientName,
+ card.cardNum,
+ cli.phone,
+ cli.idCard,
+ card.state AS cardState,
+ (CASE
+ WHEN card.state = 1 THEN '姝ｅ父'
+ WHEN card.state = 2 THEN '宸叉敞閿�'
+ WHEN card.state = 3 THEN '宸叉寕澶�'
+ End) AS stateName,
+ '鍐滄埛鍗�' AS cardType,
+ FORMAT(card.money, 2) AS money
+ FROM se_client_card card
+ INNER JOIN se_client cli ON card.clientId = cli.id
+ where
+ card.state = 1
+ AND cli.id like CONCAT('%',#{clientId},'%')
+
+
+ ORDER BY card.id
+ </select>
</mapper>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockCtrl.java
index 0e864db..db4b1fe 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockCtrl.java
@@ -1,6 +1,7 @@
package com.dy.pipIrrBase.block;
import com.dy.common.aop.SsoAop;
+import com.dy.common.mybatis.envm.Deleted;
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.common.webUtil.QueryResultVo;
@@ -127,6 +128,7 @@
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
po.id = null ;
+ po.deleted = Deleted.NO;
int count;
try {
count = this.sv.save(po);
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateCtrl.java
index db6943f..b490bcb 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateCtrl.java
@@ -790,9 +790,9 @@
public BaseResponse<QueryResultVo<List<VoRecharge>>> get(QoRecharge vo){
try {
QueryResultVo<List<VoRecharge>> res = cardOperateSv.getRecharges(vo);
- if(res.itemTotal == 0) {
- return BaseResponseUtils.buildFail(SellResultCode.No_RECHARGES.getMessage());
- }
+ //if(res.itemTotal == 0) {
+ // return BaseResponseUtils.buildFail(SellResultCode.No_RECHARGES.getMessage());
+ //}
return BaseResponseUtils.buildSuccess(res);
} catch (Exception e) {
log.error("鑾峰彇鍏呭�艰褰曞紓甯�", e);
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/clientCard/ClientCardCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/clientCard/ClientCardCtrl.java
index 93901fd..6a3ff0d 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/clientCard/ClientCardCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/clientCard/ClientCardCtrl.java
@@ -8,7 +8,9 @@
import com.dy.pipIrrGlobal.pojoBa.BaClient;
import com.dy.pipIrrGlobal.voSe.VoCardInfo;
import com.dy.pipIrrGlobal.voSe.VoCards;
+import com.dy.pipIrrGlobal.voSe.VoCards2;
import com.dy.pipIrrSell.clientCard.qo.QoCards;
+import com.dy.pipIrrSell.clientCard.qo.QoCards2;
import com.dy.pipIrrSell.result.SellResultCode;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.Content;
@@ -176,4 +178,25 @@
return BaseResponseUtils.buildException(e.getMessage()) ;
}
}
+
+ /**
+ * 鏍规嵁鍐滄埛濮撳悕銆佺數璇濇煡璇㈡甯哥姸鎬佺殑姘村崱鍒楄〃
+ * @param vo
+ * @return
+ */
+ @GetMapping(path = "getCardsByClientNameAndPhone")
+ @SsoAop()
+ public BaseResponse<QueryResultVo<List<VoCards2>>> getCardsByClientNameAndPhone(QoCards2 vo){
+ try {
+ QueryResultVo<List<VoCards2>> res = clientCardSv.getCardsByClientNameAndPhone(vo);
+ if(res.itemTotal != null && res.itemTotal > 0) {
+ return BaseResponseUtils.buildSuccess(res);
+ }else {
+ return BaseResponseUtils.buildFail(SellResultCode.THE_CARD_NOT_EXIST.getMessage());
+ }
+ } catch (Exception e) {
+ log.error("鏌ヨ姘村崱寮傚父", e);
+ return BaseResponseUtils.buildException(e.getMessage()) ;
+ }
+ }
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/clientCard/ClientCardSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/clientCard/ClientCardSv.java
index 1951ae5..41af87c 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/clientCard/ClientCardSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/clientCard/ClientCardSv.java
@@ -5,7 +5,9 @@
import com.dy.pipIrrGlobal.pojoSe.SeClientCard;
import com.dy.pipIrrGlobal.voSe.VoCardInfo;
import com.dy.pipIrrGlobal.voSe.VoCards;
+import com.dy.pipIrrGlobal.voSe.VoCards2;
import com.dy.pipIrrSell.clientCard.qo.QoCards;
+import com.dy.pipIrrSell.clientCard.qo.QoCards2;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.common.utils.PojoUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -149,4 +151,23 @@
return rsVo ;
}
+
+ /**
+ * 鏍规嵁鍐滄埛濮撳悕銆佺數璇濇煡璇㈡甯哥姸鎬佺殑姘村崱鍒楄〃
+ * @param queryVo
+ * @return
+ */
+ public QueryResultVo<List<VoCards2>> getCardsByClientNameAndPhone(QoCards2 queryVo){
+ Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo) ;
+ Long itemTotal = seClientCardMapper.getCardsByClientNameAndPhoneCount(params);
+
+ QueryResultVo<List<VoCards2>> rsVo = new QueryResultVo<>() ;
+ rsVo.pageSize = queryVo.pageSize ;
+ rsVo.pageCurr = queryVo.pageCurr ;
+
+ rsVo.calculateAndSet(itemTotal, params);
+ rsVo.obj = seClientCardMapper.getCardsByClientNameAndPhone(params);
+
+ return rsVo ;
+ }
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/clientCard/qo/QoCards2.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/clientCard/qo/QoCards2.java
new file mode 100644
index 0000000..a24893d
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/clientCard/qo/QoCards2.java
@@ -0,0 +1,25 @@
+package com.dy.pipIrrSell.clientCard.qo;
+
+import com.dy.common.webUtil.QueryConditionVo;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+
+/**
+ * @author wuzeyu
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ToString(callSuper = true)
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@Schema(name = "姘村崱璁板綍鏌ヨ鏉′欢")
+public class QoCards2 extends QueryConditionVo {
+
+ @Schema(description = "鍐滄埛濮撳悕")
+ private String clientName;
+
+ @Schema(description = "鎵嬫満鍙�")
+ private String phone;
+}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/client/ClientCardCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/client/ClientCardCtrl.java
new file mode 100644
index 0000000..a697a95
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/client/ClientCardCtrl.java
@@ -0,0 +1,49 @@
+package com.dy.pipIrrWechat.client;
+
+import com.dy.common.aop.SsoAop;
+import com.dy.common.webUtil.BaseResponse;
+import com.dy.common.webUtil.BaseResponseUtils;
+import com.dy.pipIrrGlobal.voWe.VoCards3;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @author :WuZeYu
+ * @Date :2024/6/26 15:58
+ * @LastEditTime :2024/6/26 15:58
+ * @Description
+ */
+
+@Slf4j
+@Tag(name = "鍐滄埛姘村崱鎿嶄綔", description = "鍐滄埛姘村崱鎿嶄綔")
+@RestController
+@RequestMapping(path="clientCard")
+public class ClientCardCtrl {
+ @Autowired
+ private ClientCardSv clientCardSv;
+
+ /**
+ * 鏍规嵁鍐滄埛ID鏌ヨ姝ｅ父鐘舵�佺殑姘村崱鍒楄〃
+ * @param clientId
+ * @return
+ */
+ @GetMapping(path = "getCardsByClientID")
+ @SsoAop()
+ public BaseResponse<List<VoCards3>> getCardsByClientID(String clientId){
+ try {
+ List<VoCards3> res = clientCardSv.getCardsByClientID(clientId);
+
+ return BaseResponseUtils.buildSuccess(res);
+
+ } catch (Exception e) {
+ log.error("鏌ヨ姘村崱寮傚父", e);
+ return BaseResponseUtils.buildException(e.getMessage()) ;
+ }
+ }
+}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/client/ClientCardSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/client/ClientCardSv.java
new file mode 100644
index 0000000..043abf9
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/client/ClientCardSv.java
@@ -0,0 +1,32 @@
+package com.dy.pipIrrWechat.client;
+
+import com.dy.pipIrrGlobal.daoSe.SeClientCardMapper;
+import com.dy.pipIrrGlobal.voWe.VoCards3;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author :WuZeYu
+ * @Date :2024/6/26 16:05
+ * @LastEditTime :2024/6/26 16:05
+ * @Description
+ */
+@Slf4j
+@Service
+public class ClientCardSv {
+
+ @Autowired
+ private SeClientCardMapper seClientCardMapper;
+ /**
+ * 鏍规嵁鍐滄埛ID鏌ヨ姝ｅ父鐘舵�佺殑姘村崱鍒楄〃
+ * @param clientId
+ * @return
+ */
+ public List<VoCards3> getCardsByClientID(String clientId){
+
+ return seClientCardMapper.getCardsByClientID(clientId);
+ }
+}
--
Gitblit v1.8.0