钱包

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserSellingWaterBiz.java

@@ -271,6 +271,7 @@ public class AppUserSellingWaterBiz extends BaseBiz<AppUserSellingWaterMapper, A
 
         SellingWalletPagVo sellingWalletPagVo = new SellingWalletPagVo();
         Example example = new Example(AppUserSellingWater.class);
+        example.setOrderByClause("crt_time DESC");
         Example.Criteria criteria = example.createCriteria();
         if (waiting != null) {
             criteria.andEqualTo("waiting", waiting);

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/MyWalletBiz.java

@@ -80,7 +80,7 @@ public class MyWalletBiz extends BaseBiz<MyWalletMapper, MyWallet> {
             walletpg.setWithdrawaling(withDrawaling);
             walletpg.setWithdrawals(walletpg.getWithdrawals()==null?new BigDecimal(0):walletpg.getWithdrawals());
             walletpg.setUnbooked(walletpg.getUnbooked()==null?new BigDecimal(0):walletpg.getUnbooked());
-            walletpg.setTotalAmount(walletpg.getTodayAmount()==null?walletpg.getUnbooked():walletpg.getTotalAmount().add(walletpg.getUnbooked()));
+            walletpg.setTotalAmount(walletpg.getTodayAmount()==null?new BigDecimal(0):walletpg.getTotalAmount());
             walletpg.setTotalConsumption(totalConsumpution);
             walletPageVos.add(walletpg);
         }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/MyWalletCathBiz.java

@@ -41,6 +41,7 @@ public class MyWalletCathBiz extends BaseBiz<MyWalletCathMapper, MyWalletCath> {
         Example.Criteria criteria = example.createCriteria();
         criteria.andEqualTo("stauts", state);
         criteria.andEqualTo("userId", userId);
+        example.setOrderByClause("crt_time DESC");
         PageDataVO<MyWalletCath> walletCathPage = PageDataVO.pageInfo(pageNo, pageSize, () -> mapper.selectByExample(example));
 
         List<MyWalletCath> walletCaths = walletCathPage.getData();

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/MyWalletDetailBiz.java

@@ -19,6 +19,7 @@ import tk.mybatis.mapper.entity.Example;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -42,6 +43,7 @@ public class MyWalletDetailBiz extends BaseBiz<MyWalletDetailMapper, MyWalletDet
      Example example = new Example(MyWalletDetail.class);
      Example.Criteria criteria = example.createCriteria();
      criteria.andEqualTo("userId",userId);
+     example.setOrderByClause("crt_time DESC");
 
      PageDataVO<MyWalletDetail> walletDetailPageVoPageDataVO = PageDataVO.pageInfo(pageNo, pageSize, () -> mapper.selectByExample(example));
      List<MyWalletDetail> walletDetails = walletDetailPageVoPageDataVO.getData();
@@ -84,6 +86,7 @@ public class MyWalletDetailBiz extends BaseBiz<MyWalletDetailMapper, MyWalletDet
          walletDetailAdminVos.add(walletDetailAdminVo);
          walletDetailAdminVo.setSourceName(StringUtils.isEmpty(detailListDTO.getTitle())?detailListDTO.getActivityName():detailListDTO.getTitle());
      }
+     walletDetailAdminVos.sort(Comparator.comparing(WalletDetailAdminVo::getCrtTime).reversed());
      pageDataVO.setPageNum(walletDetailFindDTO.getPage());
      pageDataVO.setPageSize(walletDetailFindDTO.getLimit());
      pageDataVO.setTotalCount(walletDetailPage.getTotalCount());

ace-modules/ace-admin/src/main/resources/mapper/AppUserRelationMapper.xml

@@ -4,6 +4,6 @@
 
 
     <select id="selectByLeaderId" resultType="com.github.wxiaoqi.security.admin.entity.AppUserRelation">
-        select `parent_id` as `parentId`,`user_id`as `userId`,`bind_time` as `bindTime` from `app_user_relation` where `parent_id`=#{leaderId} and `is_del`=0
+        select `parent_id` as `parentId`,`user_id`as `userId`,`bind_time` as `bindTime` from `app_user_relation` where `parent_id`=#{leaderId} and `is_del`=0 order by `bind_time` DESC
     </select>
 </mapper>
\ No newline at end of file

ace-modules/ace-admin/src/main/resources/mapper/MyWalletCathMapper.xml

@@ -24,7 +24,7 @@
         INNER JOIN ( SELECT `userid`, `nickname`, `realname` FROM `app_user_detail` <if
             test="userName != null and userName != ''">
         WHERE nickname =#{userName} OR realname =#{userName}
-    </if> ) AS `aud` ON aud.userid = aul.id
+    </if> ) AS `aud` ON aud.userid = aul.id order by wc.crt_time DESC
     </select>
 
     <select id="findUserWithDrawingByUserIds" resultType="com.github.wxiaoqi.security.admin.dto.PersonalConsumptionDTO">

ace-modules/ace-admin/src/main/resources/mapper/MyWalletDetailMapper.xml

@@ -30,6 +30,7 @@ FROM
 		WHERE `nickname`=#{userName} OR `realname`=#{userName}
 	</if>) AS `aud` ON aud.userid = aul.id
 	LEFT JOIN (SELECT DISTINCT order_id,id,price,extract,waiting,title FROM `app_user_selling_water`) AS `ausw` ON ausw.order_id = wd.cono
+		 ORDER	BY wd.crt_time DESC
     </select>
 
 	<select id="findpersonalConsumptionsByUserIds" resultType="com.github.wxiaoqi.security.admin.dto.PersonalConsumptionDTO">

ace-modules/ace-admin/src/main/resources/mapper/MyWaterMapper.xml

@@ -51,7 +51,7 @@
 	w.user_id AS `userId`,
 	w.balance,
 	w.withdrawals,
-	w.total_amount AS `totalAmount`,
+    (w.total_amount+w.unbooked) AS `totalAmount`,
 	w.today_amount AS `todayAmount`,
 	w.unbooked,
 	w.is_frozen AS `isFrozen`,
@@ -65,6 +65,6 @@ FROM
 </if> ) AS `aul` ON aul.id = w.user_id
 	INNER JOIN ( SELECT `userid`, `nickname`, `realname` FROM `app_user_detail` <if test="username != null and username != ''">
     WHERE nickname =#{username}  OR realname =#{username}
-</if> ) AS `aud` ON aud.userid = aul.id
+</if> ) AS `aud` ON aud.userid = aul.id ORDER BY `totalAmount` DESC
 </select>
 </mapper>
\ No newline at end of file