ソースを参照

Merge branch 'master' of http://git.dayaedu.com/yonge/mec

zouxuan 5 年 前
コミット
7b1331e9ef

+ 8 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/dao/StudentPaymentOrderDao.java

@@ -256,4 +256,12 @@ public interface StudentPaymentOrderDao extends BaseDAO<Long, StudentPaymentOrde
     StudentPaymentOrder getOrderMoneyAmount(Map<String, Object> params);
 
     List<StudentPaymentOrder> queryPageOrder(Map<String, Object> params);
+
+    /**
+     * 统计收款金额
+     *
+     * @param merNo
+     * @return
+     */
+    BigDecimal sumPerAccountAmount(@Param("merNo") String merNo, @Param("firstDate") Date firstDate);
 }

+ 8 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/dao/SysAccountDao.java

@@ -22,6 +22,7 @@ public interface SysAccountDao extends BaseDAO<Integer, SysAccount> {
 
     /**
      * 获取一个支付
+     *
      * @param company
      * @param channel
      * @param type
@@ -29,4 +30,11 @@ public interface SysAccountDao extends BaseDAO<Integer, SysAccount> {
      * @return
      */
     SysAccount getOneAccount(@Param("company") String company, @Param("channel") String channel, @Param("type") String type, @Param("amount") BigDecimal amount);
+
+    /**
+     * 获取所有私有账户
+     * @param channel
+     * @return
+     */
+    List<SysAccount> getPerAccount(@Param("channel") String channel);
 }

+ 4 - 4
mec-biz/src/main/java/com/ym/mec/biz/dal/entity/SysUserCashAccount.java

@@ -23,19 +23,19 @@ public class SysUserCashAccount {
 	
 	/** 账户可用余额 */
 	@ApiModelProperty(value = "账户可用余额",required = false)
-	private BigDecimal balance;
+	private BigDecimal balance = new BigDecimal(0);
 	
 	/** 冻结金额 */
 	@ApiModelProperty(value = "冻结金额",required = false)
-	private BigDecimal frozenAmount;
+	private BigDecimal frozenAmount = new BigDecimal(0);
 	
 	/** 保证金余额 */
 	@ApiModelProperty(value = "保证金余额",required = false)
-	private BigDecimal marginBalance;
+	private BigDecimal marginBalance = new BigDecimal(0);
 	
 	/** 课程余额余额 */
 	@ApiModelProperty(value = "课程余额",required = false)
-	private BigDecimal courseBalance;
+	private BigDecimal courseBalance = new BigDecimal(0);
 	
 	/** 账户状态(0,冻结,1,正常;-1,注销;) */
 	@ApiModelProperty(value = "账户状态",required = false)

+ 9 - 0
mec-biz/src/main/java/com/ym/mec/biz/service/SysAccountService.java

@@ -3,6 +3,7 @@ package com.ym.mec.biz.service;
 import com.ym.mec.biz.dal.entity.SysAccount;
 import com.ym.mec.biz.dal.entity.SysArea;
 import com.ym.mec.common.service.BaseService;
+import org.apache.ibatis.annotations.Param;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -29,4 +30,12 @@ public interface SysAccountService extends BaseService<Integer, SysAccount> {
      */
     SysAccount getOneAccount(String company, String channel, String type,  BigDecimal amount);
 
+
+    /**
+     * 获取私有账户
+     * @param channel
+     * @return
+     */
+    SysAccount getPerAccount(@Param("channel") String channel,SysAccount account);
+
 }

+ 3 - 7
mec-biz/src/main/java/com/ym/mec/biz/service/impl/MusicGroupServiceImpl.java

@@ -282,11 +282,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         }
 
         OrderTypeEnum type = OrderTypeEnum.SPORADIC;
-        String receiver = null;
-        if (chargeInfo.getChargeType().equals("6")) {
-            type = OrderTypeEnum.LUCK;
-            receiver = "PER";
-        }
+        String receiver = "PER";
 
         Integer userId = sporadicPayDto.getUserId();
         String orderNo = idGeneratorService.generatorId("payment") + "";
@@ -325,7 +321,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 
         studentPaymentOrder.setPaymentChannel("BALANCE");
         studentPaymentOrder.setOrganId(chargeInfo.getOrganId());
-        studentPaymentOrder.setRoutingOrganId(42);
+        studentPaymentOrder.setRoutingOrganId(chargeInfo.getOrganId());
         studentPaymentOrder.setUpdateTime(date);
         studentPaymentOrderService.update(studentPaymentOrder);
         studentPaymentOrder.setVersion(studentPaymentOrder.getVersion() + 1);
@@ -363,7 +359,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 
         Map<String, BigDecimal> routingFee = (Map<String, BigDecimal>) payMap.get("routingFee");
         studentPaymentOrder.setOrganId(chargeInfo.getOrganId());
-        studentPaymentOrder.setRoutingOrganId(42);
+        studentPaymentOrder.setRoutingOrganId(chargeInfo.getOrganId());
         studentPaymentOrder.setComAmount(routingFee.get("COM"));
         studentPaymentOrder.setPerAmount(routingFee.get("PER"));
         studentPaymentOrder.setMerNos((String) payMap.get("routingMerNos"));

+ 16 - 9
mec-biz/src/main/java/com/ym/mec/biz/service/impl/PayServiceImpl.java

@@ -118,7 +118,7 @@ public class PayServiceImpl implements PayService {
                 routingList.put("routingFee", account.getRoutingFee().subtract((account.getRoutingFee().multiply(new BigDecimal("0.28")).divide(new BigDecimal(100))).setScale(2, BigDecimal.ROUND_HALF_UP))); //分佣金额
                 tempRoutingList.add(routingList);
             }
-            if(accounts.size() ==1 && routingAccount.getMerNo().equals(routingAccount.getRoutingMerNo())){
+            if (accounts.size() == 1 && routingAccount.getMerNo().equals(routingAccount.getRoutingMerNo())) {
                 tempRoutingList = null;
             }
 
@@ -134,8 +134,8 @@ public class PayServiceImpl implements PayService {
         unionPay.put("orderNo", orderNo);
         unionPay.put("type", type);
         unionPay.put("payMap", payMap);
-        unionPay.put("routingFee",routingFee);
-        unionPay.put("routingMerNos",routingMerNos);
+        unionPay.put("routingFee", routingFee);
+        unionPay.put("routingMerNos", routingMerNos);
         return unionPay;
     }
 
@@ -151,7 +151,7 @@ public class PayServiceImpl implements PayService {
 
         //支付通道决策
         Map unionPay = new HashMap();
-        Map<String, BigDecimal> routingFee = getRoutingFee(company, amount, fee, organId,receiver);
+        Map<String, BigDecimal> routingFee = getRoutingFee(company, amount, fee, organId, receiver);
         List<SysAccount> accounts = getRoutingAccount(routingFee, company);
         SysAccount routingAccount = accounts.get(0);
 
@@ -165,7 +165,7 @@ public class PayServiceImpl implements PayService {
                 routingList.put("routingFee", account.getRoutingFee().subtract((account.getRoutingFee().multiply(new BigDecimal("0.28")).divide(new BigDecimal(100))).setScale(2, BigDecimal.ROUND_HALF_UP))); //分佣金额
                 tempRoutingList.add(routingList);
             }
-            if(accounts.size() ==1 && routingAccount.getMerNo().equals(routingAccount.getRoutingMerNo())){
+            if (accounts.size() == 1 && routingAccount.getMerNo().equals(routingAccount.getRoutingMerNo())) {
                 tempRoutingList = null;
             }
 
@@ -181,8 +181,8 @@ public class PayServiceImpl implements PayService {
         unionPay.put("orderNo", orderNo);
         unionPay.put("type", type);
         unionPay.put("payMap", payMap);
-        unionPay.put("routingFee",routingFee);
-        unionPay.put("routingMerNos",routingMerNos);
+        unionPay.put("routingFee", routingFee);
+        unionPay.put("routingMerNos", routingMerNos);
         return unionPay;
     }
 
@@ -249,6 +249,13 @@ public class PayServiceImpl implements PayService {
             if (account.getType().equals("COM")) {
                 account.setRoutingFee(routingFee.get("COM"));
             } else {
+                SysAccount perAccount = sysAccountService.getPerAccount(channel, account);
+                if (perAccount != null) {
+                    account.setRoutingMerNo(perAccount.getRoutingMerNo());
+                    if (!account.getCompany().equals("daya")) {
+                        account.setMerNo(perAccount.getRoutingMerNo());
+                    }
+                }
                 account.setRoutingFee(routingFee.get("PER"));
             }
         }
@@ -312,7 +319,7 @@ public class PayServiceImpl implements PayService {
     }
 
 
-    private Map<String, BigDecimal> getRoutingFee(String company, BigDecimal amount, Map<String, BigDecimal> fee, Integer organId,String receiver) {
+    private Map<String, BigDecimal> getRoutingFee(String company, BigDecimal amount, Map<String, BigDecimal> fee, Integer organId, String receiver) {
         Map<String, BigDecimal> routingFee = new HashMap<>(2);
         routingFee.put("COM", BigDecimal.ZERO);
         routingFee.put("PER", BigDecimal.ZERO);
@@ -321,7 +328,7 @@ public class PayServiceImpl implements PayService {
             return routingFee;
         }
 
-        if(receiver != null){
+        if (receiver != null) {
             routingFee.put(receiver, amount);
             return routingFee;
         }

+ 9 - 2
mec-biz/src/main/java/com/ym/mec/biz/service/impl/PracticeGroupServiceImpl.java

@@ -3033,6 +3033,9 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
             if(order.getStatus().equals(DealStatusEnum.FAILED)&&Objects.nonNull(order.getBalancePaymentAmount())&&order.getBalancePaymentAmount().compareTo(BigDecimal.ZERO)>0){
                 sysUserCashAccountService.updateBalance(order.getUserId(), order.getBalancePaymentAmount(), PlatformCashAccountDetailTypeEnum.REFUNDS, "网管课支付失败,退还余额");
             }
+            if(order.getStatus().equals(DealStatusEnum.SUCCESS)){
+                sysUserCashAccountService.updateBalance(order.getUserId(), order.getActualAmount(), PlatformCashAccountDetailTypeEnum.REFUNDS, "重复支付,退还余额");
+            }
             studentPaymentOrderDao.update(order);
             return;
         }
@@ -3083,8 +3086,9 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         sysUserExpendCashAccountDetail.setBalance(sysUserCashAccount.getBalance());
         sysUserExpendCashAccountDetail.setAttribute(order.getTransNo());
         sysUserExpendCashAccountDetail.setChannel(studentPaymentOrder.getPaymentChannel());
+
         if(studentPaymentOrder.getComAmount() != null){
-            sysUserExpendCashAccountDetail.setComAmount(studentPaymentOrder.getComAmount().negate());
+            sysUserIncomeCashAccountDetail.setComAmount(studentPaymentOrder.getComAmount().negate());
         }
         if(studentPaymentOrder.getPerAmount() != null){
             sysUserExpendCashAccountDetail.setPerAmount(studentPaymentOrder.getPerAmount().negate());
@@ -3096,8 +3100,11 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         PracticeGroup practiceGroup = practiceGroupDao.get(Long.valueOf(order.getMusicGroupId()));
         if(practiceGroup.getGroupStatus().equals(GroupStatusEnum.CANCEL)){
             order.setVersion(order.getVersion()+1);
-            order.setMemo("支付成功,在重新支付时,用户选择取消");
+            order.setMemo("支付成功,在重新支付时,用户选择取消,金额进入账户");
             studentPaymentOrderDao.update(order);
+
+            sysUserCashAccountService.updateBalance(order.getUserId(), order.getActualAmount(), PlatformCashAccountDetailTypeEnum.REFUNDS, "支付成功,用户取消,退还余额");
+
             return;
         }
         ClassGroup classGroup = classGroupDao.findByMusicGroupAndType(order.getMusicGroupId(), GroupType.PRACTICE.getCode());

+ 30 - 1
mec-biz/src/main/java/com/ym/mec/biz/service/impl/SysAccountServiceImpl.java

@@ -1,16 +1,19 @@
 package com.ym.mec.biz.service.impl;
 
+import com.ym.mec.biz.dal.dao.StudentPaymentOrderDao;
 import com.ym.mec.biz.dal.dao.SysAccountDao;
 import com.ym.mec.biz.dal.entity.SysAccount;
 import com.ym.mec.biz.dal.entity.SysArea;
 import com.ym.mec.biz.service.SysAccountService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
+import com.ym.mec.util.date.DateUtil;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 
 @Service
@@ -18,6 +21,8 @@ public class SysAccountServiceImpl extends BaseServiceImpl<Integer, SysAccount>
 
     @Autowired
     private SysAccountDao sysAccountDao;
+    @Autowired
+    private StudentPaymentOrderDao studentPaymentOrderDao;
 
     @Override
     public BaseDAO<Integer, SysAccount> getDAO() {
@@ -31,7 +36,31 @@ public class SysAccountServiceImpl extends BaseServiceImpl<Integer, SysAccount>
 
     @Override
     public SysAccount getOneAccount(String company, String channel, String type, BigDecimal amount) {
-        return sysAccountDao.getOneAccount(company,channel,type,amount);
+        return sysAccountDao.getOneAccount(company, channel, type, amount);
+    }
+
+    @Override
+    public SysAccount getPerAccount(String channel, SysAccount account) {
+        BigDecimal maxReceive = new BigDecimal("75000");
+        Date nowDate = new Date();
+        Date firstDayOfMonth = DateUtil.getFirstDayOfMonth(nowDate);
+
+        BigDecimal amount = studentPaymentOrderDao.sumPerAccountAmount(account.getRoutingMerNo(),firstDayOfMonth);
+
+        if (amount == null || amount.compareTo(maxReceive) < 0) {
+            return account;
+        }
+
+        SysAccount newAccount = null;
+        List<SysAccount> perAccounts = sysAccountDao.getPerAccount(channel);
+        for (SysAccount perAccount : perAccounts) {
+            amount = studentPaymentOrderDao.sumPerAccountAmount(perAccount.getRoutingMerNo(),firstDayOfMonth);
+            if (amount == null || amount.compareTo(maxReceive) < 0) {
+                newAccount = perAccount;
+                break;
+            }
+        }
+        return newAccount;
     }
 
 }

+ 6 - 0
mec-biz/src/main/java/com/ym/mec/biz/service/impl/TeacherServiceImpl.java

@@ -19,6 +19,7 @@ import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.im.ImFeignService;
 import com.ym.mec.util.collection.MapUtil;
+import com.ym.mec.util.idcard.IdcardValidator;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -462,6 +463,11 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 				&& StringUtils.isNotBlank(teacher.getIdcardHandImg())) {
 			throw new BizException("已实名认证,不能重复操作");
 		}
+		
+		IdcardValidator validator = new IdcardValidator();
+		if (validator.isValidatedAllIdcard(idcardNo) == false) {
+			throw new BizException("身份证校验失败");
+		}
 
 		Date date = new Date();
 

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

@@ -83,16 +83,19 @@
     <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.StudentPaymentOrder" useGeneratedKeys="true"
             keyColumn="id" keyProperty="id">
         INSERT INTO student_payment_order
-        (id_, group_type_, user_id_,organ_id_,routing_organ_id_, type_, expect_amount_, actual_amount_, com_amount_, per_amount_,
+        (id_, group_type_, user_id_, organ_id_, routing_organ_id_, type_, expect_amount_, actual_amount_, com_amount_,
+         per_amount_,
          balance_payment_amount_, remit_fee_, trans_no_,
          status_, memo_, create_time_, update_time_, payment_channel_, payment_business_channel_,
          payment_account_no_, mer_nos_, order_no_, music_group_id_, class_group_id_)
         VALUES (#{id}, #{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-                #{userId},#{organId},#{routingOrganId}, #{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+                #{userId}, #{organId}, #{routingOrganId},
+                #{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
                 #{expectAmount}, #{actualAmount}, #{comAmount}, #{perAmount}, #{balancePaymentAmount},
                 #{remitFee}, #{transNo},
                 #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}, #{memo}, now(), now(),
-                #{paymentChannel}, #{paymentBusinessChannel}, #{paymentAccountNo}, #{merNos}, #{orderNo}, #{musicGroupId},
+                #{paymentChannel}, #{paymentBusinessChannel}, #{paymentAccountNo}, #{merNos}, #{orderNo},
+                #{musicGroupId},
                 #{classGroupId})
     </insert>
 
@@ -251,15 +254,13 @@
                               #{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler})
     </select>
     <select id="queryByCondition" resultMap="StudentPaymentOrder" parameterType="map">
-        SELECT
-        spo.*
-        FROM
-        student_payment_order spo
-        WHERE spo.user_id_=#{userId}
-        AND spo.music_group_id_=#{musicGroupId}
-        AND spo.status_=#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
-        AND spo.group_type_ = #{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
-        and spo.type_ = #{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+        SELECT spo.*
+        FROM student_payment_order spo
+        WHERE spo.user_id_ = #{userId}
+          AND spo.music_group_id_ = #{musicGroupId}
+          AND spo.status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+          AND spo.group_type_ = #{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+          and spo.type_ = #{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
     </select>
     <select id="findByStudentVipGroup" resultMap="StudentPaymentOrder">
         SELECT
@@ -347,9 +348,11 @@
     </select>
 
     <select id="findOrdersByStatus" resultMap="StudentPaymentOrder">
-        SELECT * FROM student_payment_order
+        SELECT *
+        FROM student_payment_order
         WHERE status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
-        AND payment_channel_ = #{paymentChannel} LIMIT 100
+          AND payment_channel_ = #{paymentChannel}
+        LIMIT 100
     </select>
 
     <!-- 查询支付中超时订单 -->
@@ -382,7 +385,7 @@
         FROM student_payment_order
         WHERE group_type_ = #{groupType}
           AND music_group_id_ = #{musicGroupId}
-          AND status_='SUCCESS'
+          AND status_ = 'SUCCESS'
     </select>
     <select id="findStudentPaymentOrder" resultMap="StudentPaymentOrder">
         SELECT *
@@ -416,7 +419,13 @@
     </select>
 
     <select id="findFixOrder" resultMap="StudentPaymentOrder">
-        SELECT * FROM student_payment_order where status_ ='SUCCESS' AND type_='APPLY' AND actual_amount_> 0 and mer_nos_ IS NULL LIMIT 100
+        SELECT *
+        FROM student_payment_order
+        where status_ = 'SUCCESS'
+          AND type_ = 'APPLY'
+          AND actual_amount_ > 0
+          and mer_nos_ IS NULL
+        LIMIT 100
     </select>
 
 
@@ -439,7 +448,8 @@
 
     <!-- 分页查询 -->
     <select id="ExportQueryPage" resultMap="orderAndDetail" parameterType="map">
-        SELECT spo.*,u.username_,spod.id_ detail_id_,spod.type_ detail_type_,spod.price_ detail_price_,spod.kit_group_purchase_type_ detail_kit_group_purchase_type_,
+        SELECT spo.*,u.username_,spod.id_ detail_id_,spod.type_ detail_type_,spod.price_
+        detail_price_,spod.kit_group_purchase_type_ detail_kit_group_purchase_type_,
         o.name_ organ_name,sci.charge_type_,g.id_ goods_id, g.name_ goods_name FROM student_payment_order spo
         LEFT JOIN sys_user u on spo.user_id_ = u.id_
         LEFT JOIN student_payment_order_detail spod on spo.id_ = spod.payment_order_id_
@@ -500,22 +510,37 @@
         <result property="money" column="money"/>
     </resultMap>
     <select id="getLuckStatis" resultMap="luckStatis">
-        SELECT o.name_ organName, SUM(spo.actual_amount_) money ,COUNT(spo.id_) nums FROM student_payment_order spo LEFT JOIN organization o ON o.id_=spo.organ_id_
-        WHERE spo.type_='LUCK' AND spo.status_='SUCCESS' GROUP BY spo.organ_id_ ORDER BY nums DESC;
+        SELECT o.name_ organName, SUM(spo.actual_amount_) money, COUNT(spo.id_) nums
+        FROM student_payment_order spo
+                 LEFT JOIN organization o ON o.id_ = spo.organ_id_
+        WHERE spo.type_ = 'LUCK'
+          AND spo.status_ = 'SUCCESS'
+        GROUP BY spo.organ_id_
+        ORDER BY nums DESC;
     </select>
-    
+
     <select id="queryIncomeStatisticsWithCurrentMonth" resultType="map">
-    	select count(*) total,sum(actual_amount_) total_num_ from student_payment_order
-    	where actual_amount_ &gt; 0 and DATE_FORMAT(create_time_, '%Y%m' ) = DATE_FORMAT( CURDATE() , '%Y%m' )  AND status_ = 'SUCCESS'
-   		<if test="organId != null">
-   			and FIND_IN_SET(organ_id_,#{organId})
-   		</if>
-  	</select>
+        select count(*) total,sum(actual_amount_) total_num_ from student_payment_order
+        where actual_amount_ &gt; 0 and DATE_FORMAT(create_time_, '%Y%m' ) = DATE_FORMAT( CURDATE() , '%Y%m' ) AND
+        status_ = 'SUCCESS'
+        <if test="organId != null">
+            and FIND_IN_SET(organ_id_,#{organId})
+        </if>
+    </select>
     <select id="countUserBuyVipGroupSuccessOrder" resultType="int">
-      select count(*) from student_payment_order where  user_id_=#{userId} and music_group_id_=#{vipGroupId} and group_type_='VIP' and status_='SUCCESS'
+        select count(*)
+        from student_payment_order
+        where user_id_ = #{userId}
+          and music_group_id_ = #{vipGroupId}
+          and group_type_ = 'VIP'
+          and status_ = 'SUCCESS'
     </select>
     <select id="findUserBuyVipGroupOrder" resultMap="StudentPaymentOrder">
-      select * from student_payment_order where  user_id_=#{userId} and music_group_id_=#{vipGroupId} and group_type_='VIP'
+        select *
+        from student_payment_order
+        where user_id_ = #{userId}
+          and music_group_id_ = #{vipGroupId}
+          and group_type_ = 'VIP'
     </select>
     <select id="findUserGroupOrders" resultMap="StudentPaymentOrder">
         select * from student_payment_order
@@ -543,9 +568,19 @@
     <select id="findOrderByGroup" resultMap="StudentPaymentOrder">
         SELECT * FROM student_payment_order
         WHERE music_group_id_=#{groupId}
-            and group_type_=#{groupType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
-            <if test="status!=null">
-                and status_=#{status, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
-            </if>
+        and group_type_=#{groupType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+        <if test="status!=null">
+            and status_=#{status, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+        </if>
+    </select>
+
+    <select id="sumPerAccountAmount" resultType="java.math.BigDecimal"><![CDATA[
+        SELECT SUM(per_amount_)
+        FROM student_payment_order
+        WHERE FIND_IN_SET(status_, 'SUCCESS,ING')
+          AND create_time_ >= #{firstDate}
+          AND create_time_ <= NOW()
+          AND FIND_IN_SET(#{merNo}, mer_nos_)
+        ]]>
     </select>
 </mapper>

+ 7 - 0
mec-biz/src/main/resources/config/mybatis/SysAccountMapper.xml

@@ -161,4 +161,11 @@
             <![CDATA[AND max_receipt_ < has_receipt_+ #{amount}]]>
         </if>
     </select>
+
+    <select id="getPerAccount" resultMap="SysAccount">
+        SELECT * FROM sys_account WHERE status_=1 AND type_='PER'
+        <if test="channel != null">
+            AND channel_ = #{channel}
+        </if>
+    </select>
 </mapper>

+ 141 - 0
mec-util/src/main/java/com/ym/mec/util/idcard/IdcardInfoExtractor.java

@@ -0,0 +1,141 @@
+package com.ym.mec.util.idcard;
+
+import java.io.IOException;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Properties;
+
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+import com.ym.mec.util.exception.UtilException;
+
+public class IdcardInfoExtractor {
+	// 省份
+	private String province;
+
+	private String provinceCode;
+
+	// 城市
+	private String cityCode;
+
+	private String city;
+
+	// 区县
+	private String regionCode;
+
+	private String region;
+
+	// 性别(1,男 0,女)
+	private int gender;
+
+	// 出生日期
+	private Date birthday;
+
+	private static Properties idCardCodeTable;
+
+	static {
+		if (idCardCodeTable == null) {
+			idCardCodeTable = new Properties();
+		}
+		try {
+			idCardCodeTable.load(IdcardInfoExtractor.class.getClassLoader().getResourceAsStream("idcard/idcardCodeTable.properties"));
+		} catch (IOException e) {
+			throw new UtilException("银行卡信息查询接口异常", e);
+		}
+	}
+
+	private IdcardValidator validator = null;
+
+	/**  
+	 * 通过构造方法初始化各个成员属性  
+	 */
+	public IdcardInfoExtractor(String idcard, boolean isCheck) {
+		validator = new IdcardValidator();
+		if (isCheck) {
+			if (validator.isValidatedAllIdcard(idcard) == false) {
+				return;
+			}
+		}
+		if (idcard.length() == 15) {
+			idcard = validator.convertIdcarBy15bit(idcard);
+		}
+		// 获取省份
+		provinceCode = idcard.substring(0, 2) + "0000";
+		province = idCardCodeTable.getProperty(provinceCode);
+
+		cityCode = idcard.substring(0, 4) + "00";
+		city = idCardCodeTable.getProperty(cityCode);
+
+		regionCode = idcard.substring(0, 6);
+		region = idCardCodeTable.getProperty(regionCode);
+
+		// 获取性别
+		String id17 = idcard.substring(16, 17);
+		if (Integer.parseInt(id17) % 2 == 0) {
+			this.gender = 0;
+		} else {
+			this.gender = 1;
+		}
+
+		// 获取出生日期
+		String birthday = idcard.substring(6, 14);
+		Date birthdate = null;
+		try {
+			birthdate = new SimpleDateFormat("yyyyMMdd").parse(birthday);
+		} catch (ParseException e) {
+			throw new RuntimeException("身份证信息错误");
+		}
+		this.birthday = birthdate;
+
+	}
+
+	/**  
+	 * @return the province  
+	 */
+	public String getProvince() {
+		return province;
+	}
+
+	public String getProvinceCode() {
+		return provinceCode;
+	}
+
+	public String getCityCode() {
+		return cityCode;
+	}
+
+	public String getRegionCode() {
+		return regionCode;
+	}
+
+	public int getGender() {
+		return gender;
+	}
+
+	/**  
+	 * @return the birthday  
+	 */
+	public Date getBirthday() {
+		return birthday;
+	}
+
+	public String getCity() {
+		return city;
+	}
+
+	public String getRegion() {
+		return region;
+	}
+
+	@Override
+	public String toString() {
+		return ToStringBuilder.reflectionToString(this);
+	}
+
+	public static void main(String[] args) {
+		IdcardInfoExtractor extractor = new IdcardInfoExtractor("421125198708123013", true);
+		System.out.println(extractor);
+	}
+
+}

+ 414 - 0
mec-util/src/main/java/com/ym/mec/util/idcard/IdcardValidator.java

@@ -0,0 +1,414 @@
+package com.ym.mec.util.idcard;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.regex.Pattern;
+
+import com.ym.mec.util.exception.UtilException;
+
+public class IdcardValidator {
+	/** 
+	 * 省,直辖市代码表: { 11:"北京",12:"天津",13:"河北",14:"山西",15:"内蒙古", 
+	 * 21:"辽宁",22:"吉林",23:"黑龙江",31:"上海",32:"江苏", 
+	 * 33:"浙江",34:"安徽",35:"福建",36:"江西",37:"山东",41:"河南", 
+	 * 42:"湖北",43:"湖南",44:"广东",45:"广西",46:"海南",50:"重庆", 
+	 * 51:"四川",52:"贵州",53:"云南",54:"西藏",61:"陕西",62:"甘肃", 
+	 * 63:"青海",64:"宁夏",65:"新疆",71:"台湾",81:"香港",82:"澳门",91:"国外"} 
+	 */
+	protected String codeAndCity[][] = { { "11", "北京" }, { "12", "天津" }, { "13", "河北" }, { "14", "山西" }, { "15", "内蒙古" }, { "21", "辽宁" }, { "22", "吉林" },
+			{ "23", "黑龙江" }, { "31", "上海" }, { "32", "江苏" }, { "33", "浙江" }, { "34", "安徽" }, { "35", "福建" }, { "36", "江西" }, { "37", "山东" }, { "41", "河南" },
+			{ "42", "湖北" }, { "43", "湖南" }, { "44", "广东" }, { "45", "广西" }, { "46", "海南" }, { "50", "重庆" }, { "51", "四川" }, { "52", "贵州" }, { "53", "云南" },
+			{ "54", "西藏" }, { "61", "陕西" }, { "62", "甘肃" }, { "63", "青海" }, { "64", "宁夏" }, { "65", "新疆" }, { "71", "台湾" }, { "81", "香港" }, { "82", "澳门" },
+			{ "91", "国外" } };
+
+	private String cityCode[] = { "11", "12", "13", "14", "15", "21", "22", "23", "31", "32", "33", "34", "35", "36", "37", "41", "42", "43", "44", "45", "46",
+			"50", "51", "52", "53", "54", "61", "62", "63", "64", "65", "71", "81", "82", "91" };
+
+	// 每位加权因子
+	private int power[] = { 7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2 };
+
+	/** 
+	 * 验证所有的身份证的合法性 
+	 *  
+	 * @param idcard 
+	 * @return 
+	 */
+	public boolean isValidatedAllIdcard(String idcard) {
+		if (idcard.length() == 15) {
+			idcard = this.convertIdcarBy15bit(idcard);
+		}
+		return this.isValidate18Idcard(idcard);
+	}
+
+	/** 
+	 * <p> 
+	 * 判断18位身份证的合法性 
+	 * </p> 
+	 * 根据〖中华人民共和国国家标准GB11643-1999〗中有关公民身份号码的规定,公民身份号码是特征组合码,由十七位数字本体码和一位数字校验码组成。 
+	 * 排列顺序从左至右依次为:六位数字地址码,八位数字出生日期码,三位数字顺序码和一位数字校验码。 
+	 * <p> 
+	 * 顺序码: 表示在同一地址码所标识的区域范围内,对同年、同月、同 日出生的人编定的顺序号,顺序码的奇数分配给男性,偶数分配 给女性。 
+	 * </p> 
+	 * <p> 
+	 * 1.前1、2位数字表示:所在省份的代码; 2.第3、4位数字表示:所在城市的代码; 3.第5、6位数字表示:所在区县的代码; 
+	 * 4.第7~14位数字表示:出生年、月、日; 5.第15、16位数字表示:所在地的派出所的代码; 
+	 * 6.第17位数字表示性别:奇数表示男性,偶数表示女性; 
+	 * 7.第18位数字是校检码:也有的说是个人信息码,一般是随计算机的随机产生,用来检验身份证的正确性。校检码可以是0~9的数字,有时也用x表示。 
+	 * </p> 
+	 * <p> 
+	 * 第十八位数字(校验码)的计算方法为: 1.将前面的身份证号码17位数分别乘以不同的系数。从第一位到第十七位的系数分别为:7 9 10 5 8 4 
+	 * 2 1 6 3 7 9 10 5 8 4 2 
+	 * </p> 
+	 * <p> 
+	 * 2.将这17位数字和系数相乘的结果相加。 
+	 * </p> 
+	 * <p> 
+	 * 3.用加出来和除以11,看余数是多少? 
+	 * </p> 
+	 * 4.余数只可能有0 1 2 3 4 5 6 7 8 9 10这11个数字。其分别对应的最后一位身份证的号码为1 0 X 9 8 7 6 5 4 3 
+	 * 2。 
+	 * <p> 
+	 * 5.通过上面得知如果余数是2,就会在身份证的第18位数字上出现罗马数字的Ⅹ。如果余数是10,身份证的最后一位号码就是2。 
+	 * </p> 
+	 *  
+	 * @param idcard 
+	 * @return 
+	 */
+	public boolean isValidate18Idcard(String idcard) {
+		// 非18位为假
+		if (idcard.length() != 18) {
+			return false;
+		}
+		// 获取前17位
+		String idcard17 = idcard.substring(0, 17);
+		// 获取第18位
+		String idcard18Code = idcard.substring(17, 18);
+		char c[] = null;
+		String checkCode = "";
+		// 是否都为数字
+		if (isDigital(idcard17)) {
+			c = idcard17.toCharArray();
+		} else {
+			return false;
+		}
+
+		if (null != c) {
+			int bit[] = new int[idcard17.length()];
+
+			bit = converCharToInt(c);
+
+			int sum17 = 0;
+
+			sum17 = getPowerSum(bit);
+
+			// 将和值与11取模得到余数进行校验码判断
+			checkCode = getCheckCodeBySum(sum17);
+			if (null == checkCode) {
+				return false;
+			}
+			// 将身份证的第18位与算出来的校码进行匹配,不相等就为假
+			if (!idcard18Code.equalsIgnoreCase(checkCode)) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+	/** 
+	 * 验证15位身份证的合法性,该方法验证不准确,最好是将15转为18位后再判断,该类中已提供。 
+	 *  
+	 * @param idcard 
+	 * @return 
+	 */
+	public boolean isValidate15Idcard(String idcard) {
+		// 非15位为假
+		if (idcard.length() != 15) {
+			return false;
+		}
+
+		// 是否全都为数字
+		if (isDigital(idcard)) {
+			String provinceid = idcard.substring(0, 2);
+			String birthday = idcard.substring(6, 12);
+			int year = Integer.parseInt(idcard.substring(6, 8));
+			int month = Integer.parseInt(idcard.substring(8, 10));
+			int day = Integer.parseInt(idcard.substring(10, 12));
+
+			// 判断是否为合法的省份
+			boolean flag = false;
+			for (String id : cityCode) {
+				if (id.equals(provinceid)) {
+					flag = true;
+					break;
+				}
+			}
+			if (!flag) {
+				return false;
+			}
+			// 该身份证生出日期在当前日期之后时为假
+			Date birthdate = null;
+			try {
+				birthdate = new SimpleDateFormat("yyMMdd").parse(birthday);
+			} catch (ParseException e) {
+				e.printStackTrace();
+			}
+			if (birthdate == null || new Date().before(birthdate)) {
+				return false;
+			}
+
+			// 判断是否为合法的年份
+			GregorianCalendar curDay = new GregorianCalendar();
+			int curYear = curDay.get(Calendar.YEAR);
+			int year2bit = Integer.parseInt(String.valueOf(curYear).substring(2));
+
+			// 判断该年份的两位表示法,小于50的和大于当前年份的,为假
+			if ((year < 50 && year > year2bit)) {
+				return false;
+			}
+
+			// 判断是否为合法的月份
+			if (month < 1 || month > 12) {
+				return false;
+			}
+
+			// 判断是否为合法的日期
+			boolean mflag = false;
+			curDay.setTime(birthdate); // 将该身份证的出生日期赋于对象curDay
+			switch (month) {
+			case 1:
+			case 3:
+			case 5:
+			case 7:
+			case 8:
+			case 10:
+			case 12:
+				mflag = (day >= 1 && day <= 31);
+				break;
+			case 2: // 公历的2月非闰年有28天,闰年的2月是29天。
+				if (curDay.isLeapYear(curDay.get(Calendar.YEAR))) {
+					mflag = (day >= 1 && day <= 29);
+				} else {
+					mflag = (day >= 1 && day <= 28);
+				}
+				break;
+			case 4:
+			case 6:
+			case 9:
+			case 11:
+				mflag = (day >= 1 && day <= 30);
+				break;
+			}
+			if (!mflag) {
+				return false;
+			}
+		} else {
+			return false;
+		}
+		return true;
+	}
+
+	/** 
+	 * 将15位的身份证转成18位身份证 
+	 *  
+	 * @param idcard 
+	 * @return 
+	 */
+	public String convertIdcarBy15bit(String idcard) {
+		String idcard17 = null;
+		// 非15位身份证
+		if (idcard.length() != 15) {
+			return null;
+		}
+
+		if (isDigital(idcard)) {
+			// 获取出生年月日
+			String birthday = idcard.substring(6, 12);
+			Date birthdate = null;
+			try {
+				birthdate = new SimpleDateFormat("yyMMdd").parse(birthday);
+			} catch (ParseException e) {
+				throw new UtilException("日期转换出错", e);
+			}
+			Calendar cday = Calendar.getInstance();
+			cday.setTime(birthdate);
+			String year = String.valueOf(cday.get(Calendar.YEAR));
+
+			idcard17 = idcard.substring(0, 6) + year + idcard.substring(8);
+
+			char c[] = idcard17.toCharArray();
+			String checkCode = "";
+
+			if (null != c) {
+				int bit[] = new int[idcard17.length()];
+
+				// 将字符数组转为整型数组
+				bit = converCharToInt(c);
+				int sum17 = 0;
+				sum17 = getPowerSum(bit);
+
+				// 获取和值与11取模得到余数进行校验码
+				checkCode = getCheckCodeBySum(sum17);
+				// 获取不到校验位
+				if (null == checkCode) {
+					return null;
+				}
+
+				// 将前17位与第18位校验码拼接
+				idcard17 += checkCode;
+			}
+		} else { // 身份证包含数字
+			return null;
+		}
+		return idcard17;
+	}
+
+	/** 
+	 * 15位和18位身份证号码的基本数字和位数验校 
+	 *  
+	 * @param idcard 
+	 * @return 
+	 */
+	public boolean isIdcard(String idcard) {
+		return idcard == null || "".equals(idcard) ? false : Pattern.matches("(^\\d{15}$)|(\\d{17}(?:\\d|x|X)$)", idcard);
+	}
+
+	/** 
+	 * 15位身份证号码的基本数字和位数验校 
+	 *  
+	 * @param idcard 
+	 * @return 
+	 */
+	public boolean is15Idcard(String idcard) {
+		return idcard == null || "".equals(idcard) ? false : Pattern.matches("^[1-9]\\d{7}((0\\d)|(1[0-2]))(([0|1|2]\\d)|3[0-1])\\d{3}$", idcard);
+	}
+
+	/** 
+	 * 18位身份证号码的基本数字和位数验校 
+	 *  
+	 * @param idcard 
+	 * @return 
+	 */
+	public boolean is18Idcard(String idcard) {
+		return Pattern.matches("^[1-9]\\d{5}[1-9]\\d{3}((0\\d)|(1[0-2]))(([0|1|2]\\d)|3[0-1])\\d{3}([\\d|x|X]{1})$", idcard);
+	}
+
+	/** 
+	 * 数字验证 
+	 *  
+	 * @param str 
+	 * @return 
+	 */
+	public boolean isDigital(String str) {
+		return str == null || "".equals(str) ? false : str.matches("^[0-9]*$");
+	}
+
+	/** 
+	 * 将身份证的每位和对应位的加权因子相乘之后,再得到和值 
+	 *  
+	 * @param bit 
+	 * @return 
+	 */
+	public int getPowerSum(int[] bit) {
+
+		int sum = 0;
+
+		if (power.length != bit.length) {
+			return sum;
+		}
+
+		for (int i = 0; i < bit.length; i++) {
+			for (int j = 0; j < power.length; j++) {
+				if (i == j) {
+					sum = sum + bit[i] * power[j];
+				}
+			}
+		}
+		return sum;
+	}
+
+	/** 
+	 * 将和值与11取模得到余数进行校验码判断 
+	 *  
+	 * @param checkCode 
+	 * @param sum17 
+	 * @return 校验位 
+	 */
+	public String getCheckCodeBySum(int sum17) {
+		String checkCode = null;
+		switch (sum17 % 11) {
+		case 10:
+			checkCode = "2";
+			break;
+		case 9:
+			checkCode = "3";
+			break;
+		case 8:
+			checkCode = "4";
+			break;
+		case 7:
+			checkCode = "5";
+			break;
+		case 6:
+			checkCode = "6";
+			break;
+		case 5:
+			checkCode = "7";
+			break;
+		case 4:
+			checkCode = "8";
+			break;
+		case 3:
+			checkCode = "9";
+			break;
+		case 2:
+			checkCode = "x";
+			break;
+		case 1:
+			checkCode = "0";
+			break;
+		case 0:
+			checkCode = "1";
+			break;
+		}
+		return checkCode;
+	}
+
+	/** 
+	 * 将字符数组转为整型数组 
+	 *  
+	 * @param c 
+	 * @return 
+	 * @throws NumberFormatException 
+	 */
+	public int[] converCharToInt(char[] c) throws NumberFormatException {
+		int[] a = new int[c.length];
+		int k = 0;
+		for (char temp : c) {
+			a[k++] = Integer.parseInt(String.valueOf(temp));
+		}
+		return a;
+	}
+
+	public static void main(String[] args) throws Exception {
+
+		String idcard15 = "";
+		String idcard18 = "";
+		IdcardValidator iv = new IdcardValidator();
+		boolean flag = false;
+		flag = iv.isValidate18Idcard(idcard18);
+		System.out.println(flag);
+
+		flag = iv.isValidate15Idcard(idcard15);
+		System.out.println(flag);
+
+		System.out.println(iv.convertIdcarBy15bit(idcard15));
+		flag = iv.isValidate18Idcard(iv.convertIdcarBy15bit(idcard15));
+		System.out.println(flag);
+
+		System.out.println(iv.isValidatedAllIdcard(idcard18));
+
+	}
+}