新增接口

mtp3-century/src/main/java/com/muchinfo/mtp3century/service/impl/WskhUserinfoServiceImpl.java

@@ -156,7 +156,7 @@ public class WskhUserinfoServiceImpl extends ServiceImpl<IWskhUserinfoMapper, Ws
     @Override
     public AjaxResult addAreainfo(WskhUserinfo vo, Systemmanager systemmanager, HttpServletRequest request) {
         // #6597 管理端】不管是后台注册还是客户端注册，身份证号填写的那一栏，如果涉及到输入字母X，需要固定只能输入大写字母
-        if (vo != null && StringUtils.isNotBlank(vo.getCardnum())){
+        if (vo != null && StringUtils.isNotBlank(vo.getCardnum())) {
             vo.setCardnum(vo.getCardnum().toUpperCase());
         }
 
@@ -202,7 +202,7 @@ public class WskhUserinfoServiceImpl extends ServiceImpl<IWskhUserinfoMapper, Ws
     public AjaxResult updateAreainfo(WskhUserinfo vo, Systemmanager systemmanager, HttpServletRequest request) {
 
         // #6597 管理端】不管是后台注册还是客户端注册，身份证号填写的那一栏，如果涉及到输入字母X，需要固定只能输入大写字母
-        if (vo != null && StringUtils.isNotBlank(vo.getCardnum())){
+        if (vo != null && StringUtils.isNotBlank(vo.getCardnum())) {
             vo.setCardnum(vo.getCardnum().toUpperCase());
         }
 
@@ -323,7 +323,7 @@ public class WskhUserinfoServiceImpl extends ServiceImpl<IWskhUserinfoMapper, Ws
             }
         } catch (Exception e) {
             log.error("审核提交失败，失败原因：" + Arrays.toString(e.getStackTrace()));
-            throw new GlobalException(Constants.Error_Code_Design,MessageType.ORGAN_ERROR_CODE_015.getCode(), request.getHeader("Accept-Language"));
+            throw new GlobalException(Constants.Error_Code_Design, MessageType.ORGAN_ERROR_CODE_015.getCode(), request.getHeader("Accept-Language"));
         }
         return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"));
     }
@@ -356,7 +356,7 @@ public class WskhUserinfoServiceImpl extends ServiceImpl<IWskhUserinfoMapper, Ws
     @Override
     public AjaxResult editWskhUserinfo(WskhUserinfo currentVo, Systemmanager systemmanager, HttpServletRequest request) {
         // #6597 管理端】不管是后台注册还是客户端注册，身份证号填写的那一栏，如果涉及到输入字母X，需要固定只能输入大写字母
-        if (currentVo != null && StringUtils.isNotBlank(currentVo.getCardnum())){
+        if (currentVo != null && StringUtils.isNotBlank(currentVo.getCardnum())) {
             currentVo.setCardnum(currentVo.getCardnum().toUpperCase());
         }
 
@@ -399,7 +399,7 @@ public class WskhUserinfoServiceImpl extends ServiceImpl<IWskhUserinfoMapper, Ws
     @Override
     public AjaxResult addWskhUserinfo(WskhUserinfo currentVo, Systemmanager systemmanager, HttpServletRequest request) {
         // #6597 管理端】不管是后台注册还是客户端注册，身份证号填写的那一栏，如果涉及到输入字母X，需要固定只能输入大写字母
-        if (currentVo != null && StringUtils.isNotBlank(currentVo.getCardnum())){
+        if (currentVo != null && StringUtils.isNotBlank(currentVo.getCardnum())) {
             currentVo.setCardnum(currentVo.getCardnum().toUpperCase());
         }
 
@@ -612,7 +612,7 @@ public class WskhUserinfoServiceImpl extends ServiceImpl<IWskhUserinfoMapper, Ws
         //系统默认资金密码
         String zpwd = redisServiceUtil.getCacheMapValue(Constants.REDIS_HEADER_SYSPARAM, "047");
 
-        if (StringUtils.isNotBlank(wui.getLoginpwd())){
+        if (StringUtils.isNotBlank(wui.getLoginpwd())) {
             // 开户信息有密码时w使用其密码
             lpwd = EncryptUtilForSearch.Base64ToString(wui.getLoginpwd());
         }
@@ -626,7 +626,7 @@ public class WskhUserinfoServiceImpl extends ServiceImpl<IWskhUserinfoMapper, Ws
         } else {
             ua.setAccountname(wui.getUsername());
         }
-        if(StringUtils.isNotBlank(wui.getBrokerid())){
+        if (StringUtils.isNotBlank(wui.getBrokerid())) {
             ua.setBroker(Long.valueOf(wui.getBrokerid()));
         }
         ua.setAccountstatus(4);
@@ -789,15 +789,12 @@ public class WskhUserinfoServiceImpl extends ServiceImpl<IWskhUserinfoMapper, Ws
         BankSystemconfig config = iBankSystemconfigMapper.selectOne(new QueryWrapper<BankSystemconfig>().eq("CONFIGID", SysConstants.BANK_CONFIG_ACTIVATION));
 
         List<Taaccount> taaList = new ArrayList<>();
-        for (int i = 0; i < li.size(); i++) {
+        for (Enumdicitem enumdicitem : li) {
             String manageid = redisServiceUtil.getCacheMapValue(Constants.REDIS_HEADER_SYSPARAM, "001");
             Long accountno = Long.valueOf(manageid + CommonUtil.addZero(String.valueOf(idGeneratorUtils.getGeneratorID(Taaccount.class)), 9));
-            Taaccount ac = new Taaccount();
-            ac.setAccountid(accountno);
-            ac.setUserid(ua.getUserid());
-            ac.setPassword(EncryptionUtils.encryptSHA(zpwd));
+            Taaccount ac = new Taaccount(accountno, ua.getUserid(), EncryptionUtils.encryptSHA(zpwd));
             ac.setIsreckonaccount(0);
-            ac.setCurrencyid(li.get(i).getEnumitemname().intValue());
+            ac.setCurrencyid(enumdicitem.getEnumitemname().intValue());
             //资金账号是否需要激活
             if (config != null && config.getValidstatus() == 1 && config.getConfigvalue().equals("1") && ac.getIsmain() == 1) {
                 ac.setTradestatus(SysEnums.TradeStatusEnum.TOBEACTIVATE.getType());
@@ -914,7 +911,7 @@ public class WskhUserinfoServiceImpl extends ServiceImpl<IWskhUserinfoMapper, Ws
             }
         }
         List<Useraccount> organ = iUseraccountMapper.selectList(new QueryWrapper<Useraccount>()
-                .in(CollectionUtils.isNotEmpty(idList),"userid", idList));
+                .in(CollectionUtils.isNotEmpty(idList), "userid", idList));
 
         if (CollectionUtils.isNotEmpty(organ)) {
             for (Useraccount ua : organ) {

mtp3-century/src/main/resources/mapper/TradeOrderdetailMapper.xml

@@ -120,6 +120,9 @@
             <if test="vo.isHis == 1">
                 AND t.ISVALIDDATA = 1
             </if>
+            <if test="vo.orderstatus != null and vo.orderstatus != ''">
+                AND t.orderstatus = #{vo.orderstatus,jdbcType=INTEGER}
+            </if>
             <if test="vo.operateType == 2">
                 and t.operatetype = 2
             </if>

mtp3-century/src/main/resources/mapper/UseraccountMapper.xml

@@ -208,7 +208,14 @@
             </if>
         </where>
         order by o.userid ) aa
-        where 1 = 1  and rownum &lt;= 10
+        <choose>
+            <when test="vo.pageSize == 0">
+                where 1 = 1
+            </when>
+            <otherwise>
+                where 1 = 1  and rownum &lt;= #{vo.pageSize}
+            </otherwise>
+        </choose>
     </select>
 
 

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/entity/Taaccount.java

@@ -277,4 +277,52 @@ public class Taaccount extends Model<Taaccount> {
         return this.accountid;
     }
 
+    public Taaccount(Long accountid, Long userid,String password) {
+        this.accountid = accountid;
+        this.userid = userid;
+        this.password = password;
+        this.currencyid = 1;
+        this.changeflag = 0;
+        this.tradestatus = 1;
+        this.signstatus = 1;
+        this.ismain = 1;
+        this.parentaccountid = accountid;
+        this.fromaccountid = accountid;
+        this.sublevelpath = "," + accountid + ",";
+        this.taaccounttype = 2;
+        this.isreckonaccount = 1;
+        this.ismarketaccount = 0;
+        this.accountflag = 0;
+        this.balance = BigDecimal.ZERO;
+        this.orifreezemargin = BigDecimal.ZERO;
+        this.oriusedmargin = BigDecimal.ZERO;
+        this.oriotherfreezemargin = BigDecimal.ZERO;
+        this.orifreezecharge = BigDecimal.ZERO;
+        this.orimortgagecredit = BigDecimal.ZERO;
+        this.oriothercredit = BigDecimal.ZERO;
+        this.orioutamountfreeze = BigDecimal.ZERO;
+        this.currentbalance = BigDecimal.ZERO;
+        this.freezemargin = BigDecimal.ZERO;
+        this.usedmargin = BigDecimal.ZERO;
+        this.otherfreezemargin = BigDecimal.ZERO;
+        this.freezecharge = BigDecimal.ZERO;
+        this.mortgagecredit = BigDecimal.ZERO;
+        this.othercredit = BigDecimal.ZERO;
+        this.outamountfreeze = BigDecimal.ZERO;
+        this.inamount = BigDecimal.ZERO;
+        this.outamount = BigDecimal.ZERO;
+        this.paycharge = BigDecimal.ZERO;
+        this.closepl = BigDecimal.ZERO;
+        this.creditincrease = BigDecimal.ZERO;
+        this.creditdecrease = BigDecimal.ZERO;
+        this.othercreditincrease = BigDecimal.ZERO;
+        this.othercreditdecrease = BigDecimal.ZERO;
+        this.transferamount = BigDecimal.ZERO;
+        this.otherpay = BigDecimal.ZERO;
+        this.otherincome = BigDecimal.ZERO;
+        this.outthreshold = BigDecimal.ZERO;
+        this.changetime = new Date();
+        this.oridebt = BigDecimal.ZERO;
+        this.curdebt = BigDecimal.ZERO;
+    }
 }

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/common/OrganSelectParam.java

@@ -41,4 +41,5 @@ public class OrganSelectParam {
     private String usertypeIds;
     private String[] usertypeArray;
     private Integer isusertype;    // 是否根据usertype去查 0-否 1-是
+    private Integer pageSize;
 }