Merge remote-tracking branch 'origin/master'

cif-service/src/main/java/com/txz/cif/dao/FlowMapper.java

@@ -2,6 +2,11 @@ package com.txz.cif.dao;
 
 import com.txz.cif.core.Mapper;
 import com.txz.cif.model.Flow;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.HashMap;
 
 public interface FlowMapper extends Mapper<Flow> {
+    @Select("SELECT COUNT(DISTINCT user_id)  c_flow WHERE type = #{type} and create_time > #{startTime} and create_time < #{endTime}")
+    Integer countByUserId(HashMap map);
 }

cif-service/src/main/java/com/txz/cif/dao/RechargeRecordMapper.java

@@ -5,13 +5,17 @@ import com.txz.cif.dao.impl.RechargeRecordMapperImpl;
 import com.txz.cif.model.RechargeRecord;
 import com.txz.cif.web.bo.RechargeRecordBO;
 import com.txz.cif.web.para.RecordParam;
+import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.SelectProvider;
 
+import java.util.HashMap;
 import java.util.List;
 
 public interface RechargeRecordMapper extends Mapper<RechargeRecord> {
     
     @SelectProvider(type = RechargeRecordMapperImpl.class, method = "pageList")
     List<RechargeRecordBO> pageList(RecordParam param);
-    
+
+    @Select("SELECT COUNT(DISTINCT user_id)  c_recharge_record WHERE status = #{status} and create_time > #{startTime} and create_time < #{endTime}")
+    Integer countByUserId(HashMap map);
 }

cif-service/src/main/java/com/txz/cif/service/FlowService.java

@@ -4,6 +4,9 @@ import com.txz.cif.model.Flow;
 import com.txz.cif.core.Service;
 import com.txz.cif.model.RedEnvelope;
 import com.txz.cif.param.*;
+import tk.mybatis.mapper.entity.Condition;
+
+import java.util.HashMap;
 
 /**
  * Created by CodeGenerator on 2022/11/02.
@@ -58,4 +61,5 @@ public interface FlowService extends Service<Flow> {
     Result settle(RedEnvelope redEnvelope);
 
 
+    Integer countByUserId(HashMap map);
 }

cif-service/src/main/java/com/txz/cif/service/RechargeRecordService.java

@@ -5,6 +5,7 @@ import com.txz.cif.core.Service;
 import com.txz.cif.web.bo.RechargeRecordBO;
 import com.txz.cif.web.para.RecordParam;
 
+import java.util.HashMap;
 import java.util.List;
 
 
@@ -20,4 +21,6 @@ public interface RechargeRecordService extends Service<RechargeRecord> {
     void closeRecharge();
     
     List<RechargeRecordBO> pageList(RecordParam param);
+
+    Integer countByUserId(HashMap map);
 }

cif-service/src/main/java/com/txz/cif/service/impl/FlowServiceImpl.java

@@ -20,6 +20,7 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.HashMap;
 
 /**
  * Created by CodeGenerator on 2022/11/02.
@@ -345,5 +346,10 @@ public class FlowServiceImpl extends AbstractService<Flow> implements FlowServic
         return Result.genSuccessResult();
     }
 
+    @Override
+    public Integer countByUserId(HashMap map) {
+        return cFlowMapper.countByUserId(map);
+    }
+
 
 }

cif-service/src/main/java/com/txz/cif/service/impl/RechargeRecordServiceImpl.java

@@ -18,6 +18,7 @@ import tk.mybatis.mapper.entity.Example;
 
 import javax.annotation.Resource;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 
 
@@ -80,9 +81,14 @@ public class RechargeRecordServiceImpl extends AbstractService<RechargeRecord> i
                     .build());
         }
     }
-    
+
     @Override
     public List<RechargeRecordBO> pageList(RecordParam param) {
         return rechargeRecordMapper.pageList(param);
     }
+
+    @Override
+    public Integer countByUserId(HashMap map) {
+        return rechargeRecordMapper.countByUserId(map);
+    }
 }

cif-service/src/main/java/com/txz/cif/web/UserApiController.java

@@ -360,8 +360,10 @@ public class UserApiController extends AbstractApiController {
             criteria.andEqualTo("pid", puser.getId());
             Integer kidsNum = userService.countByCondition(c);
             ConfigMember nextLevel = configMemberService.findBy("level", puser.getVipLevel() + 1);
-            if (nextLevel.getInvitedNo().compareTo(kidsNum+1)>= 0){
-                userService.update(User.builder().id(puser.getId()).vipLevel(nextLevel.getLevel()).build());
+            if (nextLevel != null){
+                if (nextLevel.getInvitedNo().compareTo(kidsNum+1)<= 0){
+                    userService.update(User.builder().id(puser.getId()).vipLevel(nextLevel.getLevel()).build());
+                }
             }
         }
         if (StrUtil.isBlank(user.getHeadPic())) {

cif-service/src/main/java/com/txz/cif/web/bo/UserBo2.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
+import javax.persistence.Column;
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -18,58 +19,63 @@ public class UserBo2 {
     /**
      * 用户id
      */
-    @ApiModelProperty(value="用户id")
+    @ApiModelProperty(value = "用户id")
     private Long id;
-
+    
+    /**
+     * 用户号
+     */
+    private String userNo;
+    
     @ApiModelProperty("名称")
     private String nickname;
-
+    
     @ApiModelProperty("名称")
     private String name;
-
+    
     @ApiModelProperty("头像")
     private String headPic;
-
-    @ApiModelProperty(value="状态  1正常 2禁止提现 3禁止登录 4禁止下单")
+    
+    @ApiModelProperty(value = "状态  1正常 2禁止提现 3禁止登录 4禁止下单")
     private Byte status;
-
+    
     private String phoneNo;
-
+    
     /**
      * token
      */
-    @ApiModelProperty(value="vip")
+    @ApiModelProperty(value = "vip")
     private Integer vipLevel;
-
-    @ApiModelProperty(value="备注")
+    
+    @ApiModelProperty(value = "备注")
     private String memo;
-
-    @ApiModelProperty(value="邀请好友数")
+    
+    @ApiModelProperty(value = "邀请好友数")
     private Integer inviteNum;
-
-    @ApiModelProperty(value="团队人数")
+    
+    @ApiModelProperty(value = "团队人数")
     private Integer teamNum;
-
-
-    @ApiModelProperty(value="成团数")
+    
+    
+    @ApiModelProperty(value = "成团数")
     private Integer successGroupNum;
-
-    @ApiModelProperty(value="钱包余额")
+    
+    @ApiModelProperty(value = "钱包余额")
     private BigDecimal walletBalance;
-
-    @ApiModelProperty(value="收益余额")
+    
+    @ApiModelProperty(value = "收益余额")
     private BigDecimal earningsBalance;
-
-    @ApiModelProperty(value="createTime创建时间")
+    
+    @ApiModelProperty(value = "createTime创建时间")
     private Date createTime;
-
-    @ApiModelProperty(value="是否有提现权限 1是 2否")
+    
+    @ApiModelProperty(value = "是否有提现权限 1是 2否")
     private Integer hasWithdraw;
-
-    @ApiModelProperty(value="是否有登录权限 1是 2否")
+    
+    @ApiModelProperty(value = "是否有登录权限 1是 2否")
     private Integer hasLogin;
-
-    @ApiModelProperty(value="是否有下单权限 1是 2否")
+    
+    @ApiModelProperty(value = "是否有下单权限 1是 2否")
     private Integer hasOrder;
-
+    
 }

cif-service/src/main/java/com/txz/cif/web/mng/GoodsController.java

@@ -5,7 +5,6 @@ import com.txz.cif.core.ResultCode;
 import com.txz.cif.core.ResultGenerator;
 import com.txz.cif.model.Goods;
 import com.txz.cif.model.PaymentMethod;
-import com.txz.cif.model.RechargeRecord;
 import com.txz.cif.service.GoodsService;
 import com.txz.cif.service.PaymentMethodService;
 import com.txz.cif.web.para.GoodsParam;
@@ -99,13 +98,13 @@ public class GoodsController {
         
         PaymentMethod paymentMethod = paymentMethodService.findById(param.getMethodId());
         
-        Condition condition = new Condition(RechargeRecord.class);
+        Condition condition = new Condition(Goods.class);
         Criteria criteria = condition.createCriteria();
         criteria.andEqualTo("methodId", param.getMethodId());
         if (param.getStatus() != null) {
             criteria.andEqualTo("status", param.getStatus());
         }
-        condition.setOrderByClause("create_time desc");
+        condition.setOrderByClause("status DESC, sort_num ASC, amount ASC ,  create_time DESC");
         List<Goods> list = goodsService.findByCondition(condition);
         
         return Result.success(PaymentPriceVO.builder()

cif-service/src/main/java/com/txz/cif/web/mng/RechargeRecordController.java

@@ -210,7 +210,9 @@ public class RechargeRecordController {
         }
         condition.setOrderByClause("create_time desc");
         List<RechargeRecord> list = rechargeRecordService.findByCondition(condition);
-        List<String> rowHead = CollUtil.newArrayList("编号", "订单号", "用户id", "交易金额", "折扣金额", "状态 1处理中 2充值成功 3充值失败 4超时取消", "渠道", "币种", "用户名", "手机号", "交易时间", "交易成功时间", "银行", "银行账户", "银行账户姓名");
+        List<String> rowHead = CollUtil.newArrayList("编号", "订单号", "用户id", "交易金额", "折扣金额",
+                "状态 1处理中 2充值成功 3充值失败 4超时取消", "渠道", "币种", "用户名", "手机号", "交易时间",
+                "交易成功时间", "银行", "银行账户", "银行账户姓名");
         ExcelWriter writer = ExcelUtil.getWriter();
         try {
             writer.writeHeadRow(rowHead);
@@ -220,14 +222,17 @@ public class RechargeRecordController {
                     List<Object> rowA = CollUtil.newArrayList(
                             temp.getId() + "",
                             temp.getOrderNo(),
+                            temp.getUserId(),
                             temp.getAmount() == null ? "0" : temp.getAmount().toPlainString(),
                             temp.getDiscount() == null ? "0" : temp.getDiscount().toPlainString(),
+
                             temp.getStatus() + "",
                             temp.getChannel(),
                             temp.getCurrency(),
                             temp.getUserName(),
                             temp.getUserPhone(),
                             temp.getTransTime() == null ? "" : DateUtil.format(temp.getTransTime(), "yyyy-MM-dd HH:mm:ss"),
+
                             temp.getSuccessTime() == null ? "" : DateUtil.format(temp.getSuccessTime(), "yyyy-MM-dd HH:mm:ss"),
                             temp.getBank(),
                             temp.getBankAccount(),

cif-service/src/main/java/com/txz/cif/web/mng/ReportController.java

@@ -76,14 +76,27 @@ public class ReportController extends AbstractApiController {
             Integer num = userService.countByCondition(c);
             return ResultGenerator.genSuccessResult(num);
         } else if (query.getType() == 4){
-            Condition  c = new Condition(RechargeRecord.class);
-            c.createCriteria().andLessThanOrEqualTo("createTime",query.getDay()+" 23:59:59")
-                    .andGreaterThanOrEqualTo("createTime",query.getDay()+" 00:00:00")
-                    .andEqualTo("status",2);
-            c.setDistinct(true);
-            c.setCountProperty("user_id");
-            Integer num = rechargeRecordService.countByCondition(c);
+            HashMap map = new HashMap();
+            map.put("status",2);
+            map.put("startTime",query.getDay()+" 00:00:00");
+            map.put("endTime",query.getDay()+" 23:59:59");
+//            Condition  c = new Condition(RechargeRecord.class);
+//            c.createCriteria().andEqualTo("status",2).andLessThanOrEqualTo("createTime",query.getDay()+" 23:59:59")
+//                    .andGreaterThanOrEqualTo("createTime",query.getDay()+" 00:00:00");
+            Integer num = rechargeRecordService.countByUserId(map);
             return ResultGenerator.genSuccessResult(num);
+        } else if (query.getType() == 5){
+//            Condition  c = new Condition(Flow.class);
+//            c.createCriteria().andEqualTo("type",6).andLessThanOrEqualTo("createTime",query.getDay()+" 23:59:59")
+//                    .andGreaterThanOrEqualTo("createTime",query.getDay()+" 00:00:00");
+//            c.setDistinct(true);
+//            c.setCountProperty("user_id");
+
+            HashMap map = new HashMap();
+            map.put("type",6);
+            map.put("startTime",query.getDay()+" 00:00:00");
+            map.put("endTime",query.getDay()+" 23:59:59");
+            Integer integer = flowService.countByUserId(map);
         }
         return ResultGenerator.genSuccessResult(BigDecimal.ZERO);
     }

cif-service/src/main/java/com/txz/cif/web/mng/WithdrawRecordController.java

@@ -213,7 +213,9 @@ public class WithdrawRecordController {
         }
         condition.setOrderByClause("create_time desc");
         List<WithdrawRecord> list = withdrawRecordService.findByCondition(condition);
-        List<String> rowHead = CollUtil.newArrayList("编号", "订单号", "用户id", "交易金额", "手续费", "状态 1处理中 2充值成功 3充值失败 4超时取消", "渠道", "币种", "用户名", "手机号", "交易时间", "交易成功时间", "银行", "银行账户", "银行账户姓名");
+        List<String> rowHead = CollUtil.newArrayList("编号", "订单号", "用户id", "交易金额", "手续费",
+                "状态 1处理中 2充值成功 3充值失败 4超时取消", "渠道", "币种", "用户名", "手机号",
+                "交易时间", "交易成功时间", "银行", "银行账户", "银行账户姓名");
         ExcelWriter writer = ExcelUtil.getWriter();
         try {
             writer.writeHeadRow(rowHead);
@@ -223,13 +225,16 @@ public class WithdrawRecordController {
                     List<Object> rowA = CollUtil.newArrayList(
                             temp.getId() + "",
                             temp.getOrderNo(),
+                            temp.getUserId(),
                             temp.getAmount() == null ? "0" : temp.getAmount().toPlainString(),
                             temp.getFee() == null ? "0" : temp.getFee().toPlainString(),
+
                             temp.getStatus() + "",
                             temp.getChannel(),
                             temp.getCurrency(),
                             temp.getUserName(),
                             temp.getUserPhone(),
+
                             temp.getTransTime() == null ? "" : DateUtil.format(temp.getTransTime(), "yyyy-MM-dd HH:mm:ss"),
                             temp.getSuccessTime() == null ? "" : DateUtil.format(temp.getSuccessTime(), "yyyy-MM-dd HH:mm:ss"),
                             temp.getBank(),