会所余额修改

src/main/java/com/caimei/modules/user/dao/CmUserBalanceRecordDao.java

@@ -32,4 +32,6 @@ public interface CmUserBalanceRecordDao extends CrudDao<CmUserBalanceRecord> {
     CmUserBalanceRecord findReturnedBalance(String returnedId);
 
     void updateByWithdrawalsId(String withdrawalsId);
+
+    Integer findBalanceWithdrawals(Integer userId);
 }

src/main/java/com/caimei/modules/user/entity/CmUser.java

@@ -106,6 +106,7 @@ public class CmUser extends DataEntity<CmUser> {
     private String city; // 市
     private String province; //省
     private String address;        // 详细地址
+    private boolean pending = false; //是否有待审核提现
 
     public CmUser() {
         super();
@@ -825,4 +826,12 @@ public class CmUser extends DataEntity<CmUser> {
     public void setSource(Integer source) {
         this.source = source;
     }
+
+    public boolean isPending() {
+        return pending;
+    }
+
+    public void setPending(boolean pending) {
+        this.pending = pending;
+    }
 }

src/main/java/com/caimei/modules/user/service/CmUserBalanceRecordService.java

@@ -1,20 +1,19 @@
 package com.caimei.modules.user.service;
 
-import java.util.List;
-
+import com.caimei.modules.user.dao.CmUserBalanceRecordDao;
 import com.caimei.modules.user.entity.CmUser;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
+import com.caimei.modules.user.entity.CmUserBalanceRecord;
 import com.thinkgem.jeesite.common.persistence.Page;
 import com.thinkgem.jeesite.common.service.CrudService;
-import com.caimei.modules.user.entity.CmUserBalanceRecord;
-import com.caimei.modules.user.dao.CmUserBalanceRecordDao;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * 用户余额收支记录Service
+ *
  * @author lijun
  * @version 2019-10-18
  */
@@ -22,61 +21,69 @@ import javax.annotation.Resource;
 @Transactional(readOnly = true)
 public class CmUserBalanceRecordService extends CrudService<CmUserBalanceRecordDao, CmUserBalanceRecord> {
 
-	@Resource
-	private  CmUserBalanceRecordDao cmUserBalanceRecordDao;
-	public CmUserBalanceRecord get(String id) {
-		return super.get(id);
-	}
+    @Resource
+    private CmUserBalanceRecordDao cmUserBalanceRecordDao;
 
-	public List<CmUserBalanceRecord> findList(CmUserBalanceRecord cmUserBalanceRecord) {
-		return super.findList(cmUserBalanceRecord);
-	}
+    public CmUserBalanceRecord get(String id) {
+        return super.get(id);
+    }
+
+    public List<CmUserBalanceRecord> findList(CmUserBalanceRecord cmUserBalanceRecord) {
+        return super.findList(cmUserBalanceRecord);
+    }
 
-	public Page<CmUserBalanceRecord> findPage(Page<CmUserBalanceRecord> page, CmUserBalanceRecord cmUserBalanceRecord) {
-		return super.findPage(page, cmUserBalanceRecord);
-	}
+    public Page<CmUserBalanceRecord> findPage(Page<CmUserBalanceRecord> page, CmUserBalanceRecord cmUserBalanceRecord) {
+        return super.findPage(page, cmUserBalanceRecord);
+    }
 
-	public List<CmUserBalanceRecord> getBalanceRecord(CmUserBalanceRecord cmUserBalanceRecord){
-		return  cmUserBalanceRecordDao.getBalanceRecord(cmUserBalanceRecord);
-	}
+    public List<CmUserBalanceRecord> getBalanceRecord(CmUserBalanceRecord cmUserBalanceRecord) {
+        return cmUserBalanceRecordDao.getBalanceRecord(cmUserBalanceRecord);
+    }
 
-	@Transactional(readOnly = false)
-	public void save(CmUserBalanceRecord cmUserBalanceRecord) {
-		super.save(cmUserBalanceRecord);
-	}
+    @Transactional(readOnly = false)
+    public void save(CmUserBalanceRecord cmUserBalanceRecord) {
+        super.save(cmUserBalanceRecord);
+    }
 
-	@Transactional(readOnly = false)
-	public void delete(CmUserBalanceRecord cmUserBalanceRecord) {
-		super.delete(cmUserBalanceRecord);
-	}
+    @Transactional(readOnly = false)
+    public void delete(CmUserBalanceRecord cmUserBalanceRecord) {
+        super.delete(cmUserBalanceRecord);
+    }
 
 
-	public List<CmUser> findUserBalanceList(CmUser cmuser){
-		return cmUserBalanceRecordDao.findUserBalanceList(cmuser);
-	}
+    public List<CmUser> findUserBalanceList(CmUser cmuser) {
+        List<CmUser> balanceList = cmUserBalanceRecordDao.findUserBalanceList(cmuser);
+        balanceList.forEach(balance -> {
+            Integer id = cmUserBalanceRecordDao.findBalanceWithdrawals(balance.getUserID());
+            if (id != null && id > 0) {
+                balance.setPending(true);
+            }
+        });
+        return balanceList;
+    }
 
-	@Transactional(readOnly = false)
-	 public int insertUserBalanceRecord(CmUserBalanceRecord cmUserBalanceRecord){
-		 return cmUserBalanceRecordDao.insertUserBalanceRecord(cmUserBalanceRecord);
-	 }
+    @Transactional(readOnly = false)
+    public int insertUserBalanceRecord(CmUserBalanceRecord cmUserBalanceRecord) {
+        return cmUserBalanceRecordDao.insertUserBalanceRecord(cmUserBalanceRecord);
+    }
 
-	@Transactional(readOnly = false)
-	 public int updateBalanceRecord(CmUserBalanceRecord cmUserBalanceRecord){
-		 return cmUserBalanceRecordDao.updateBalanceRecord(cmUserBalanceRecord);
-	 }
+    @Transactional(readOnly = false)
+    public int updateBalanceRecord(CmUserBalanceRecord cmUserBalanceRecord) {
+        return cmUserBalanceRecordDao.updateBalanceRecord(cmUserBalanceRecord);
+    }
 
-	@Transactional(readOnly = false)
-	public int updateBalanceRecordBuyReturned(CmUserBalanceRecord cmUserBalanceRecord){
-		return cmUserBalanceRecordDao.updateBalanceRecordBuyReturned(cmUserBalanceRecord);
-	}
+    @Transactional(readOnly = false)
+    public int updateBalanceRecordBuyReturned(CmUserBalanceRecord cmUserBalanceRecord) {
+        return cmUserBalanceRecordDao.updateBalanceRecordBuyReturned(cmUserBalanceRecord);
+    }
 
     @Transactional(readOnly = false)
-    public int updateBalanceRecordBuyReceipt(CmUserBalanceRecord cmUserBalanceRecord){
+    public int updateBalanceRecordBuyReceipt(CmUserBalanceRecord cmUserBalanceRecord) {
         return cmUserBalanceRecordDao.updateBalanceRecordBuyReceipt(cmUserBalanceRecord);
     }
 
-	@Transactional(readOnly = false)
-	public int updateByID(CmUserBalanceRecord cmUserBalanceRecord){
-		return cmUserBalanceRecordDao.updateByID(cmUserBalanceRecord);
-	}
+    @Transactional(readOnly = false)
+    public int updateByID(CmUserBalanceRecord cmUserBalanceRecord) {
+        return cmUserBalanceRecordDao.updateByID(cmUserBalanceRecord);
+    }
 }

src/main/resources/mappings/modules/user/CmUserBalanceRecordMapper.xml

@@ -191,5 +191,9 @@
 	<update id="updateByWithdrawalsId">
 		UPDATE cm_user_balance_record SET delFlag = 1 WHERE withdrawalsId = #{withdrawalsId}
 	</update>
+	
+	<select id="findBalanceWithdrawals" resultType="integer">
+		SELECT id FROM cm_user_balance_withdrawals WHERE status = 0 AND userID = #{userId}	LIMIT 1
+	</select>
 
 </mapper>

src/main/webapp/WEB-INF/views/modules/user/cmUserBalanceList.jsp

@@ -123,7 +123,12 @@
 						</shiro:hasPermission>
 						<shiro:hasPermission name="balance:cmUserBalanceWithdrawals:withdrawalReview">
 							<c:if test="${cmUser.ableUserMoney > 0}">
-								<a href="${ctx}/user/cmUserBalanceRecord/userWithdrawals?userID=${cmUser.userID}" >申请提现</a>
+								<c:if test="${cmUser.pending}">
+									<font color="#666666">申请提现</font>
+								</c:if>
+								<c:if test="${!cmUser.pending}">
+									<a href="${ctx}/user/cmUserBalanceRecord/userWithdrawals?userID=${cmUser.userID}" >申请提现</a>
+								</c:if>
 							</c:if>
 						</shiro:hasPermission>
 					</td>

src/main/webapp/WEB-INF/views/modules/user/cmUserBalanceWithdrawalsList.jsp

@@ -101,7 +101,7 @@
 							<a href="${ctx}/user/cmUserBalanceWithdrawals/withdrawalReview?id=${cmUserBalanceWithdrawals.id}">审核</a><br>
 						</shiro:hasPermission>
 					</c:if>
-					<c:if test="${cmUserBalanceWithdrawals.status eq 1}">
+					<c:if test="${cmUserBalanceWithdrawals.status eq 1 && not empty cmUserBalanceWithdrawals.reviewer}">
 						<shiro:hasPermission name="balance:cmUserBalanceWithdrawals:edit">
 							<a href="${ctx}/user/cmUserBalanceWithdrawals/withdrawalEdit?id=${cmUserBalanceWithdrawals.id}">编辑</a><br>
 						</shiro:hasPermission>