shiyj1101 лет назад: 5
Родитель
Сommit
5dddd9b082

+ 2 - 0
java110-bean/src/main/java/com/java110/po/accountWithdrawalApply/AccountWithdrawalApplyPo.java

@@ -4,6 +4,8 @@ import java.io.Serializable;
 import java.util.Date;
 
 public class AccountWithdrawalApplyPo implements Serializable {
+    public static final String STATE_PASS="587"; //审核不通过
+    public static final String STATE_ERROR_PAYER="687"; //付款失败
 
     private String applyId;
 private String applyUserName;

+ 1 - 1
java110-db/src/main/resources/mapper/acct/AccountWithdrawalApplyServiceDaoImplMapper.xml

@@ -190,7 +190,7 @@ where 1 =1
 
     <!-- 查询账户提现信息 add by wuxw 2018-07-03 -->
     <select id="listStateWithdrawalApplysCount" parameterType="Map" resultType="Map">
-        select  count(*)
+        select  count(1)
         from account_withdrawal_apply t left join t_dict t1 on t.state = t1.status_cd
         where t1.table_name='account_withdrawal_apply'
         and t1.table_columns='state'

+ 1 - 3
service-acct/src/main/java/com/java110/acct/api/AccountWithdrawalApplyApi.java

@@ -55,8 +55,6 @@ public class AccountWithdrawalApplyApi {
     @RequestMapping(value = "/upAccountWithdrawalApply", method = RequestMethod.POST)
     public ResponseEntity<String> updateAccountWithdrawalApply(@RequestBody JSONObject reqJson) {
 
-        Assert.hasKeyAndValue(reqJson, "acctId", "请求报文中未包含acctId");
-        Assert.hasKeyAndValue(reqJson, "amount", "请求报文中未包含amount");
         Assert.hasKeyAndValue(reqJson, "state", "请求报文中未包含state");
         Assert.hasKeyAndValue(reqJson, "applyId", "applyId不能为空");
 
@@ -114,7 +112,7 @@ public class AccountWithdrawalApplyApi {
     @RequestMapping(value = "/listStateWithdrawalApplys", method = RequestMethod.GET)
     public ResponseEntity<String> listStateWithdrawalApplys(@RequestParam(value = "page") int page,
                                                               @RequestParam(value = "row") int row,
-                                                              @RequestParam(value = "state",required = false) String [] state) {
+                                                              @RequestParam(value = "state") String [] state) {
 
         return getAccountWithdrawalApplyBMOImpl.listStateWithdrawalApplys( state, page,row);
     }

+ 1 - 1
service-acct/src/main/java/com/java110/acct/bmo/accountWithdrawalApply/impl/GetAccountWithdrawalApplyBMOImpl.java

@@ -45,7 +45,7 @@ public class GetAccountWithdrawalApplyBMOImpl implements IGetAccountWithdrawalAp
 
     @Override
     public ResponseEntity<String> listStateWithdrawalApplys(String[] states, int page, int row) {
-
+        System.out.println( states.length + "statesstatesstates"+states[0] );
         int count = accountWithdrawalApplyInnerServiceSMOImpl.listStateWithdrawalApplysCount( states);
 
         List<AccountWithdrawalApplyDto> accountWithdrawalApplyDtos = null;

+ 23 - 1
service-acct/src/main/java/com/java110/acct/bmo/accountWithdrawalApply/impl/UpdateAccountWithdrawalApplyBMOImpl.java

@@ -3,20 +3,26 @@ package com.java110.acct.bmo.accountWithdrawalApply.impl;
 import com.java110.acct.bmo.accountWithdrawalApply.IUpdateAccountWithdrawalApplyBMO;
 import com.java110.core.annotation.Java110Transactional;
 
+import com.java110.dto.accountWithdrawalApply.AccountWithdrawalApplyDto;
+import com.java110.intf.acct.IAccountInnerServiceSMO;
 import com.java110.intf.acct.IAccountWithdrawalApplyInnerServiceSMO;
+import com.java110.po.accountDetail.AccountDetailPo;
 import com.java110.po.accountWithdrawalApply.AccountWithdrawalApplyPo;
 import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 
 @Service("updateAccountWithdrawalApplyBMOImpl")
 public class UpdateAccountWithdrawalApplyBMOImpl implements IUpdateAccountWithdrawalApplyBMO {
 
     @Autowired
     private IAccountWithdrawalApplyInnerServiceSMO accountWithdrawalApplyInnerServiceSMOImpl;
-
+    @Autowired
+    private IAccountInnerServiceSMO accountInnerServiceSMOImpl;
     /**
      *
      *
@@ -26,6 +32,22 @@ public class UpdateAccountWithdrawalApplyBMOImpl implements IUpdateAccountWithdr
     @Java110Transactional
     public ResponseEntity<String> update(AccountWithdrawalApplyPo accountWithdrawalApplyPo) {
 
+            if(accountWithdrawalApplyPo.getState().equals( AccountWithdrawalApplyPo.STATE_PASS ) || accountWithdrawalApplyPo.getState().equals( AccountWithdrawalApplyPo.STATE_ERROR_PAYER )){
+                AccountWithdrawalApplyDto accountWithdrawalApplyDto = new AccountWithdrawalApplyDto();
+                accountWithdrawalApplyDto.setApplyId( accountWithdrawalApplyPo.getApplyId() );
+                accountWithdrawalApplyDto.setState( "0" );
+                List<AccountWithdrawalApplyDto> accountWithdrawalApplyDtos = accountWithdrawalApplyInnerServiceSMOImpl.queryAccountWithdrawalApplys( accountWithdrawalApplyDto );
+                if(null != accountWithdrawalApplyDtos && accountWithdrawalApplyDtos.size() > 0){
+                    AccountWithdrawalApplyDto WithdrawalApplyDto = accountWithdrawalApplyDtos.get( 0 );
+                    AccountDetailPo accountDetailPo = new AccountDetailPo();
+                    accountDetailPo.setAcctId( WithdrawalApplyDto.getAcctId() );
+                    accountDetailPo.setAmount( WithdrawalApplyDto.getAmount() );
+                    accountDetailPo.setRemark( accountWithdrawalApplyPo.getContext() );
+                    accountDetailPo.setObjId( accountWithdrawalApplyPo.getApplyId() );
+                    accountInnerServiceSMOImpl.prestoreAccount( accountDetailPo );
+            }
+        }
+
         int flag = accountWithdrawalApplyInnerServiceSMOImpl.updateAccountWithdrawalApply(accountWithdrawalApplyPo);
 
         if (flag > 0) {

+ 1 - 0
service-acct/src/main/java/com/java110/acct/smo/impl/AccountWithdrawalApplyInnerServiceSMOImpl.java

@@ -101,6 +101,7 @@ public class AccountWithdrawalApplyInnerServiceSMOImpl extends BaseServiceSMO im
         Map stateInfo = new HashMap();
         stateInfo.put("statusCd", StatusConstant.STATUS_CD_VALID);
         stateInfo.put("states", states);
+        System.out.println( states.length + "statesstatesstates"+states[0] );
         return accountWithdrawalApplyServiceDaoImpl.listStateWithdrawalApplysCount(stateInfo);    }
 
     public IAccountWithdrawalApplyServiceDao getAccountWithdrawalApplyServiceDaoImpl() {