Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/CashAccountDetail.java

@@ -9,6 +9,9 @@ public class CashAccountDetail extends QueryInfo {
     @ApiModelProperty(value = "交易类型", required = true)
     private String type;
 
+    @ApiModelProperty(value = "支付渠道", required = true)
+    private String channel;
+
     public Integer getUserId() {
         return userId;
     }
@@ -24,4 +27,12 @@ public class CashAccountDetail extends QueryInfo {
     public void setType(String type) {
         this.type = type;
     }
+
+    public String getChannel() {
+        return channel;
+    }
+
+    public void setChannel(String channel) {
+        this.channel = channel;
+    }
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/page/StudentPaymentOrderQueryInfo.java

@@ -26,6 +26,9 @@ public class StudentPaymentOrderQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "分部编号",required = false)
     private String organId;
 
+    @ApiModelProperty(value = "支付方式",required = false)
+    private String paymentChannel;
+
     public String getOrganId() {
         return organId;
     }
@@ -81,4 +84,12 @@ public class StudentPaymentOrderQueryInfo extends QueryInfo {
     public void setPaymentStatus(String paymentStatus) {
         this.paymentStatus = paymentStatus;
     }
+
+    public String getPaymentChannel() {
+        return paymentChannel;
+    }
+
+    public void setPaymentChannel(String paymentChannel) {
+        this.paymentChannel = paymentChannel;
+    }
 }

mec-biz/src/main/resources/config/mybatis/StudentPaymentOrderMapper.xml

@@ -177,6 +177,9 @@
             <if test="paymentStatus != null">
                 AND spo.status_ = #{paymentStatus}
             </if>
+            <if test="paymentChannel != null">
+                AND spo.payment_channel_ NOT IN (#{paymentChannel})
+            </if>
         </where>
     </sql>
 

mec-biz/src/main/resources/config/mybatis/SysUserCashAccountDetailMapper.xml

@@ -26,31 +26,61 @@
 
     <!-- 根据主键查询一条记录 -->
     <select id="get" resultMap="SysUserCashAccountDetail">
-		SELECT * FROM sys_user_cash_account_detail WHERE id_ = #{id}
-	</select>
+        SELECT * FROM sys_user_cash_account_detail WHERE id_ = #{id}
+    </select>
 
     <!-- 全查询 -->
     <select id="findAll" resultMap="SysUserCashAccountDetail">
-		SELECT * FROM sys_user_cash_account_detail ORDER BY id_
-	</select>
+        SELECT *
+        FROM sys_user_cash_account_detail
+        ORDER BY id_
+    </select>
 
     <!-- 向数据库增加一条记录 -->
     <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.SysUserCashAccountDetail" useGeneratedKeys="true"
             keyColumn="id" keyProperty="id">
-        <!--
-        <selectKey resultClass="int" keyProperty="id" >
-        SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
-        </selectKey>
-        -->
         INSERT INTO sys_user_cash_account_detail
-        (user_id_,trans_no_,type_,trans_type_,status_,amount_,balance_,description_,comment_,create_time_,update_time_,attribute1_,channel_,platform_account_no_)
-        VALUES(#{userId},#{transNo},#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{transType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{amount},#{balance},#{description},#{comment},now(),now(),#{attribute},#{channel},#{platformAccountNo})
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id!=null">id_,</if>
+            <if test="userId!=null">user_id_,</if>
+            <if test="transNo!=null">trans_no_,</if>
+            <if test="type!=null">type_,</if>
+            <if test="transType!=null">trans_type_,</if>
+            <if test="status!=null">status_,</if>
+            <if test="amount!=null">amount_,</if>
+            <if test="balance!=null">balance_,</if>
+            <if test="description!=null">description_,</if>
+            <if test="comment!=null">comment_,</if>
+            <if test="createTime!=null">create_time_,</if>
+            <if test="updateTime!=null">update_time_,</if>
+            <if test="attribute!=null">attribute_,</if>
+            <if test="channel!=null">channel_,</if>
+            <if test="platformAccountNo!=null">platform_account_no_,</if>
+        </trim>
+        VALUES
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id!=null">#{id},</if>
+            <if test="userId!=null">#{userId},</if>
+            <if test="transNo!=null">#{transNo},</if>
+            <if test="type!=null">#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},</if>
+            <if test="transType!=null">#{transType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},</if>
+            <if test="status!=null">#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},</if>
+            <if test="amount!=null">#{amount},</if>
+            <if test="balance!=null">#{balance},</if>
+            <if test="description!=null">#{description},</if>
+            <if test="comment!=null">#{comment},</if>
+            <if test="createTime!=null">NOW(),</if>
+            <if test="updateTime!=null">NOW(),</if>
+            <if test="attribute!=null">#{attribute},</if>
+            <if test="channel!=null">#{channel},</if>
+            <if test="platformAccountNo!=null">#{platformAccountNo},</if>
+        </trim>
     </insert>
 
     <insert id="batchInsert" parameterType="com.ym.mec.biz.dal.entity.SysUserCashAccountDetail" useGeneratedKeys="true"
             keyColumn="id" keyProperty="id">
         INSERT INTO sys_user_cash_account_detail
-        (user_id_,trans_no_,type_,trans_type_,status_,amount_,balance_,description_,comment_,create_time_,update_time_,attribute1_,channel_,platform_account_no_)
+        (user_id_,trans_no_,type_,trans_type_,status_,amount_,balance_,description_,comment_,create_time_,update_time_,attribute_,channel_,platform_account_no_)
         VALUE
         <foreach collection="sysUserCashAccountDetails" item="sysUserCashAccountDetail" separator=",">
             (#{sysUserCashAccountDetail.userId},#{sysUserCashAccountDetail.transNo},#{sysUserCashAccountDetail.type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{sysUserCashAccountDetail.transType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{sysUserCashAccountDetail.status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{sysUserCashAccountDetail.amount},#{sysUserCashAccountDetail.balance},#{sysUserCashAccountDetail.description},#{sysUserCashAccountDetail.comment},now(),now(),#{sysUserCashAccountDetail.attribute},#{sysUserCashAccountDetail.channel},#{sysUserCashAccountDetail.platformAccountNo})
@@ -91,8 +121,8 @@
             <if test="transType != null">
                 trans_type_ = #{transType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>
-            <if test="attribu != null">
-                attribu1_ = #{attribu},
+            <if test="attribute != null">
+                attribute_ = #{attribute},
             </if>
             <if test="channel != null">
                 channel_ = #{channel},
@@ -106,39 +136,57 @@
 
     <!-- 根据主键删除一条记录 -->
     <delete id="delete">
-		DELETE FROM sys_user_cash_account_detail WHERE id_ = #{id}
-	</delete>
+        DELETE FROM sys_user_cash_account_detail WHERE id_ = #{id}
+    </delete>
 
     <!-- 分页查询 -->
     <select id="queryPage" resultMap="SysUserCashAccountDetail" parameterType="map">
         SELECT * FROM sys_user_cash_account_detail
-        WHERE user_id_ = #{userId}
-        <if test="search != null and search != ''">
-            AND create_time_ LIKE CONCAT(#{search},'%')
-        </if>
+        <where>
+            <if test="userId != null">
+                user_id_ = #{userId}
+            </if>
+            <if test="search != null and search != ''">
+                AND create_time_ LIKE CONCAT(#{search},'%')
+            </if>
+            <if test="channel != null ">
+                AND channel_ NOT IN (#{channel}) OR channel_ IS NULL
+            </if>
+        </where>
         ORDER BY id_
         <include refid="global.limit"/>
     </select>
 
     <!-- 查询当前表的总记录数 -->
     <select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM sys_user_cash_account_detail
-		WHERE user_id_ = #{userId}
-        <if test="search != null and search != ''">
-            AND create_time_ LIKE CONCAT(#{search},'%')
-        </if>
-	</select>
+        SELECT COUNT(*) FROM sys_user_cash_account_detail
+        <where>
+            <if test="userId != null">
+                user_id_ = #{userId}
+            </if>
+            <if test="search != null and search != ''">
+                AND create_time_ LIKE CONCAT(#{search},'%')
+            </if>
+            <if test="channel != null ">
+                AND channel_ NOT IN (#{channel}) OR channel_ IS NULL
+            </if>
+        </where>
+    </select>
 
     <select id="selectDetailByTransNo" resultMap="SysUserCashAccountDetail">
-		SELECT * FROM sys_user_cash_account_detail WHERE  trans_no_ = #{transNo}
-	</select>
-	
-	<select id="queryStatistics" resultType="map">
-		select sum(case when sucad.type_ = 'RECHARGE' then 1 else 0 end) income_num_,sum(case when sucad.type_ = 'RECHARGE' then sucad.amount_ else 0 end) income_total_,sum(case when (sucad.type_ = 'WITHDRAW' or sucad.type_ = 'REWARDS' or sucad.type_ = 'WAGE') then 1 else 0 end) expend_num_,sum(case when (sucad.type_ = 'WITHDRAW' or sucad.type_ = 'REWARDS' or sucad.type_ = 'WAGE') then sucad.amount_ else 0 end) expend_total_ from sys_user_cash_account_detail sucad
-		left join sys_user u on sucad.user_id_ = u.id_
-		where sucad.status_ = 'SUCCESS'
-		<if test="organId != null">
-   			and u.organ_id_ = #{organId}
-   		</if>
-	</select>
+        SELECT * FROM sys_user_cash_account_detail WHERE trans_no_ = #{transNo}
+    </select>
+
+    <select id="queryStatistics" resultType="map">
+        select sum(case when sucad.type_ = 'RECHARGE' then 1 else 0 end) income_num_,sum(case when sucad.type_ =
+        'RECHARGE' then sucad.amount_ else 0 end) income_total_,sum(case when (sucad.type_ = 'WITHDRAW' or sucad.type_ =
+        'REWARDS' or sucad.type_ = 'WAGE') then 1 else 0 end) expend_num_,sum(case when (sucad.type_ = 'WITHDRAW' or
+        sucad.type_ = 'REWARDS' or sucad.type_ = 'WAGE') then sucad.amount_ else 0 end) expend_total_ from
+        sys_user_cash_account_detail sucad
+        left join sys_user u on sucad.user_id_ = u.id_
+        where sucad.status_ = 'SUCCESS'
+        <if test="organId != null">
+            and u.organ_id_ = #{organId}
+        </if>
+    </select>
 </mapper>

mec-web/src/main/java/com/ym/mec/web/controller/StudentPaymentOrderController.java

@@ -14,6 +14,7 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -24,6 +25,12 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 public class StudentPaymentOrderController extends BaseController {
 
+    @Value("${payment.hiddenMode}")
+    private Boolean hiddenMode;
+
+    @Value("${payment.channel}")
+    private String channel;
+
     @Autowired
     private StudentPaymentOrderService studentPaymentOrderService;
     @Autowired
@@ -47,6 +54,9 @@ public class StudentPaymentOrderController extends BaseController {
                 queryInfo.setOrganId(employee.getOrganIdList());
             }
         }
+        if(hiddenMode){
+            queryInfo.setPaymentChannel(channel);
+        }
         return succeed(studentPaymentOrderService.queryPage(queryInfo));
     }
 

mec-web/src/main/java/com/ym/mec/web/controller/SysUserCashAccountDetailController.java

@@ -11,6 +11,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -22,6 +23,13 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 public class SysUserCashAccountDetailController extends BaseController {
 
+    @Value("${payment.hiddenMode}")
+    private Boolean hiddenMode;
+
+    @Value("${payment.channel}")
+    private String channel;
+
+
     @Autowired
     private SysUserCashAccountDetailService sysUserCashAccountDetailService;
     @Autowired
@@ -40,9 +48,12 @@ public class SysUserCashAccountDetailController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('userCashAccountDetail/queryPage')")
     public Object queryPage(CashAccountDetail queryInfo) {
         SysUser user = sysUserFeignService.queryUserInfo();
-        if(user == null && user.getId() != null){
+        if (user == null && user.getId() != null) {
             return failed("请重新登录");
         }
+        if (hiddenMode){
+            queryInfo.setChannel(channel);
+        }
         queryInfo.setUserId(user.getId());
         return succeed(sysUserCashAccountDetailService.queryPage(queryInfo));
     }