Merge remote-tracking branch 'origin/base-modify' into base-modify

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

@@ -292,6 +292,7 @@ public class AppUserSellingWaterBiz extends BaseBiz<AppUserSellingWaterMapper, A
             totalIncome = total.subtract(refund);
         }
 
+        sellingWaterVos.sort(Comparator.comparing(SellingWalletVo::getCrtTime).reversed());
         sellingWalletPagVo.setPageNum(pageNo);
         sellingWalletPagVo.setPageSize(pageSize);
         sellingWalletPagVo.setTotalCount(appUserSellingWaterPageDataVO.getTotalCount().intValue());

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/config/RabbitAdminConfig.java

@@ -28,7 +28,7 @@ public class RabbitAdminConfig extends RabbitCommonConfig {
     static {
             myQueue = new ArrayList<BindDTO>(){{
             //支付完成后永久绑定关系
-            add(new BindDTO(ORDER_RELATION_QUEUE, ADMIN_TOPIC, KEY_ORDER_PAY));
+            add(new BindDTO(ORDER_RELATION_QUEUE, ORDER_TOPIC, KEY_ORDER_PAY));
             //拥金计算
             add(new BindDTO(ORDER_WATER_QUEUE, ORDER_TOPIC, KEY_ORDER_PAY));
             add(new BindDTO(ORDER_WATER_QUEUE, ORDER_TOPIC, KEY_ORDER_FINLISH));

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/service/AppPermissionService.java

@@ -363,6 +363,7 @@ public class AppPermissionService {
      * 自动登录type;1-app;2-小程序
      */
     public JSONObject autoLogin(Integer userid, String username, String headimgurl, String nickname,String code,String activityCode,Integer type) {
+        log.info("-----------autoLogin----code==="+code+"----activityCode===="+activityCode);
         JSONObject data = new JSONObject();
         AppUserVo userVo = appUserDetailBiz.getUserInfoById(userid);
         if (userVo != null) {
@@ -389,6 +390,7 @@ public class AppPermissionService {
             //更新登录时间 和 ip
             String clientIp = getIp();
             appUserLoginBiz.updateLoginInfo(userid, clientIp);
+            log.info("-----------autoLogin----type==="+type);
             if(type!=null&&type==1){
                 try {
                     Integer parentId=0;
@@ -401,6 +403,7 @@ public class AppPermissionService {
                     }
                     //活动消息
                     Integer state=userVo.getState();
+                    log.info("-----------autoLogin----state==="+state);
                     if(state!=null&&state==1){
                         if(userVo.getInviterAccount()==null||userVo.getInviterAccount()==0){
                             userVo.setInviterAccount(parentId);