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

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/AppUserSellingWater.java

@@ -131,14 +131,14 @@ public class AppUserSellingWater implements Serializable {
      */
     @Column(name = "crt_time")
 	@ApiModelProperty(value = "创建时间", hidden = true )
-    private Integer crtTime;
+    private Long crtTime;
 	
 	    /**
      *  更新时间
      */
     @Column(name = "upd_time")
 	@ApiModelProperty(value = "更新时间", hidden = true )
-    private Integer updTime;
+    private Long updTime;
 
 	/**
 	 * 所获佣金

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/vo/SellingWalletPagVo.java

+package com.github.wxiaoqi.security.admin.vo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/7/12 11:02
+ */
+@Data
+public class SellingWalletPagVo {
+    private BigDecimal totalIncome;
+
+    private List<SellingWalletVo> sellingWaters;
+
+    private Integer pageNum;
+
+    private Integer pageSize;
+
+    private Integer totalCount;
+
+    private Integer totalPage;
+}

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/vo/SellingWalletVo.java

+package com.github.wxiaoqi.security.admin.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/7/12 11:02
+ */
+@Data
+public class SellingWalletVo {
+
+    /**
+     * 用户名
+     */
+    private String username;
+
+    /**
+     * 昵称
+     */
+    private String nickName;
+
+    /**
+     * 用户头像
+     */
+    private String headUrl;
+
+
+    @ApiModelProperty(value = "商品数量")
+    private Integer goodNumber;
+
+    @ApiModelProperty(value = "商品标题")
+    private String title;
+
+    @ApiModelProperty(value = "图片")
+    private String img;
+
+    @ApiModelProperty(value = "售价")
+    private BigDecimal price;
+
+    @ApiModelProperty(value = "创建时间", hidden = true )
+    private Long crtTime;
+
+    @ApiModelProperty(value = "更新时间", hidden = true )
+    private Long updTime;
+
+    private Integer waiting;
+
+    private Integer status;
+    /**
+     * 所获佣金
+     */
+    private BigDecimal commission;
+}

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/vo/UserTeamMemberVo.java

@@ -25,7 +25,7 @@ public class UserTeamMemberVo {
 
     private List<UserTeamMemberBo> userTeamMemberBos;
 
-    private Integer pageNo;
+    private Integer pageNum;
 
     private Integer pageSize;
 

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/vo/WalletCathPageVo.java

+package com.github.wxiaoqi.security.admin.vo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/7/12 10:31
+ */
+@Data
+public class WalletCathPageVo {
+
+    private BigDecimal totalWithdraw;
+
+    private List<WalletCathVo> walletCaths;
+
+    private Integer pageNum;
+
+    private Integer pageSize;
+
+    private Integer totalCount;
+
+    private Integer totalPage;
+}

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/vo/WalletCathVo.java

+package com.github.wxiaoqi.security.admin.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/7/12 10:45
+ */
+@Data
+public class WalletCathVo {
+
+    /**
+     *  用户iD
+     */
+    @ApiModelProperty(value = "用户iD")
+    private String userId;
+
+    /**
+     *  提现类别，第三方提现类别(0-微信，1-支付宝，2-银行卡)
+     */
+    @ApiModelProperty(value = "提现类别，第三方提现类别(0-微信，1-支付宝，2-银行卡)")
+    private Integer cathType;
+
+    /**
+     *  商户订单号
+     */
+    @ApiModelProperty(value = "商户订单号")
+    private String orderno;
+
+    /**
+     *  第三方订单号：如微信，支付宝，银行卡等
+     */
+    @ApiModelProperty(value = "第三方订单号：如微信，支付宝，银行卡等")
+    private String cono;
+
+    /**
+     *  提现金额
+     */
+    @ApiModelProperty(value = "提现金额")
+    private BigDecimal amount;
+
+    /**
+     *  订单状态：0-未提现,待审核，1-已审核
+     */
+    @ApiModelProperty(value = "订单状态：0-未提现,待审核，1-已审核")
+    private Integer stauts;
+
+    /**
+     *  提现日期
+     */
+    @ApiModelProperty(value = "提现日期", hidden = true )
+    private Long crtTime;
+
+    /**
+     *  审核日期
+     */
+    @ApiModelProperty(value = "审核日期")
+    private Long finishTime;
+
+}

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

@@ -19,6 +19,6 @@ public class AppUserPositionBiz extends BaseBiz<AppUserPositionMapper,AppUserPos
 
     //获取用户职位的折扣
     public  Integer getExtract(Integer userId){
-         return  getExtract(userId);
+         return  mapper.getExtractByUserId(userId);
     }
 }
\ No newline at end of file

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

@@ -3,25 +3,27 @@ package com.github.wxiaoqi.security.admin.biz;
 import com.github.wxiaoqi.security.admin.bo.UserIncomeBo;
 import com.github.wxiaoqi.security.admin.dto.OrderGoodsDTO;
 import com.github.wxiaoqi.security.admin.dto.OrderWaterDTO;
+import com.github.wxiaoqi.security.admin.entity.*;
 import com.github.wxiaoqi.security.admin.entity.AppUserRelation;
-import com.github.wxiaoqi.security.admin.entity.MyWalletDetail;
-import com.github.wxiaoqi.security.admin.mapper.MyWalletDetailMapper;
 import com.github.wxiaoqi.security.admin.vo.AppUserVo;
+import com.github.wxiaoqi.security.admin.vo.SellingWalletVo;
+import com.github.wxiaoqi.security.admin.vo.SellingWalletPagVo;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.github.wxiaoqi.security.admin.entity.AppUserSellingWater;
 import com.github.wxiaoqi.security.admin.mapper.AppUserSellingWaterMapper;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import tk.mybatis.mapper.entity.Example;
 
 import java.math.BigDecimal;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.function.Supplier;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * 拥金明细表
@@ -47,30 +49,50 @@ public class AppUserSellingWaterBiz extends BaseBiz<AppUserSellingWaterMapper,Ap
     @Autowired
     AppUserDetailBiz  detailBiz;
 
+    @Autowired
+    private AppUserLoginBiz appUserLoginBiz;
+
+    @Autowired
+    private AppUserDetailBiz appUserDetailBiz;
+
     @Autowired
    MyWaterBiz myWaterBiz;
 
 
+    //计算用户拥金
+
+    public  void orderWater(OrderWaterDTO orderWaterDTO){
+        if(orderWaterDTO==null){
+            log.info("计算用户拥金----orderWater----次数不能为空----");
+            return;
+        }
+        //订单状态
+        Integer status=orderWaterDTO.getStatus();
+        if(status==null||status==0){
+            log.info("购买计算用户拥金----payOrderWater----参数不能为空----status==="+status);
+            return;
+        }
+        if(status==1){
+            payOrderWater(orderWaterDTO);
+        }else if(status==2){
+            finishOrderWater(orderWaterDTO);
+        }else {
+            refundOrderWater(orderWaterDTO);
+        }
+    }
 
      //购买计算用户拥金
      public  void payOrderWater(OrderWaterDTO orderWaterDTO){
-
-         if(orderWaterDTO==null){
-             log.info("购买计算用户拥金----payOrderWater----次数不能为空----");
-             return;
-         }
          //订单id
          Integer orderId=orderWaterDTO.getOrderId();
          //订单号
          String orderNo=orderWaterDTO.getOrderNo();
          //用户id
          Integer userId=orderWaterDTO.getUserId();
-         //订单状态
-          Integer status=orderWaterDTO.getStatus();
          List<OrderGoodsDTO> goodsDTOList=orderWaterDTO.getGoodsDTOList();
-       log.info("购买计算用户拥金----payOrderWater----userId===="+userId+"---orderId==="+orderId+"---orderNo==="+orderNo+"--status=="+status);
-       if(orderId==null||orderId==0||userId==null||userId==0||status==null||status==0||CollectionUtils.isEmpty(goodsDTOList)){
-           log.info("购买计算用户拥金----payOrderWater----次数不能为空----orderId==="+orderId);
+       log.info("购买计算用户拥金----payOrderWater----userId===="+userId+"---orderId==="+orderId+"---orderNo==="+orderNo);
+       if(orderId==null||orderId==0||userId==null||userId==0|CollectionUtils.isEmpty(goodsDTOList)){
+           log.info("购买计算用户拥金----payOrderWater----参数不能为空----orderId==="+orderId);
             return;
        }
          AppUserRelation relation=relationBiz.getRelationByUserId(userId);
@@ -120,6 +142,7 @@ public class AppUserSellingWaterBiz extends BaseBiz<AppUserSellingWaterMapper,Ap
               sellingWater.setImg(goodsDto.getImg());
               sellingWater.setPrice(price);
               sellingWater.setExtract(extract);
+              sellingWater.setGoodNumber(goodsDto.getGoodNumber());
               sellingWater.setCommission(commission);
               insertSelective(sellingWater);
               log.info("购买计算用户拥成功----payOrderWater--------userId==="+userId);
@@ -145,7 +168,7 @@ public class AppUserSellingWaterBiz extends BaseBiz<AppUserSellingWaterMapper,Ap
                 updateById(sellingWater);
                 BigDecimal commission=sellingWater.getCommission();
                 log.info("订单完成计算用户拥金----finishOrderWater----id===="+id+"---commission=="+commission);
-                amount.add(commission);
+                amount=amount.add(commission);
             }
         }
         log.info("订单完成计算用户拥金----finishOrderWater----orderId===="+orderId+"---amount=="+amount);
@@ -205,9 +228,67 @@ public class AppUserSellingWaterBiz extends BaseBiz<AppUserSellingWaterMapper,Ap
          Map<Integer,BigDecimal> memberIdAndIncomeMap = new HashMap<>();
          List<UserIncomeBo> userIncomeBos = mapper.accquireIncomeByMemberIds(memberIds);
          if (CollectionUtils.isNotEmpty(userIncomeBos)){
-             memberIdAndIncomeMap = userIncomeBos.stream().collect(Collectors.toMap(UserIncomeBo::getUserId,UserIncomeBo::getIncome));
+             memberIdAndIncomeMap = userIncomeBos.stream().collect(Collectors.toMap(UserIncomeBo::getUserId,userIncomeBo-> userIncomeBo.getIncome()==null?new BigDecimal(0):userIncomeBo.getIncome()));
          }
         return memberIdAndIncomeMap;
     }
 
+    public SellingWalletPagVo findSellingWaterPageByWaiting(Integer waiting, Integer userId, Integer pageNo, Integer pageSize){
+
+        SellingWalletPagVo sellingWalletPagVo = new SellingWalletPagVo();
+        Example example = new Example(AppUserSellingWater.class);
+         Example.Criteria criteria = example.createCriteria();
+        if (waiting!=null){
+            criteria.andEqualTo("waiting",waiting);
+        }
+        criteria.andEqualTo("userId",userId);
+        PageDataVO<AppUserSellingWater>  appUserSellingWaterPageDataVO  = PageDataVO.pageInfo(pageNo,pageSize,()->mapper.selectByExample(example));
+        List<AppUserSellingWater> appUserSellingWaters = appUserSellingWaterPageDataVO.getData();
+        if (CollectionUtils.isEmpty(appUserSellingWaters)){
+            sellingWalletPagVo.setPageNum(pageNo);
+            sellingWalletPagVo.setPageSize(pageSize);
+            sellingWalletPagVo.setTotalCount(0);
+            sellingWalletPagVo.setTotalPage(0);
+            sellingWalletPagVo.setTotalIncome(new BigDecimal(0));
+            sellingWalletPagVo.setSellingWaters(Collections.EMPTY_LIST);
+            return sellingWalletPagVo;
+        }
+
+        List<Integer> memberIds = appUserSellingWaters.stream().map(AppUserSellingWater::getSourceId).collect(Collectors.toList());
+
+        Map<Integer,AppUserLogin> userIdAndAppUserLoginMap = appUserLoginBiz.findUserIdAndUserLoginMapByMemberIds(memberIds);
+        Map<Integer, AppUserDetail> userIdAndAppUserDetailMap  = appUserDetailBiz.findUserIdAndUserDetailMapByMemberIds(memberIds);
+
+         List<SellingWalletVo> sellingWaterVos = new ArrayList<>();
+        SellingWalletVo sellingWaterVo;
+         BigDecimal totalIncome  = new BigDecimal(0);
+        for (AppUserSellingWater appUserSellingWater : appUserSellingWaters) {
+            sellingWaterVo = new SellingWalletVo();
+            BeanUtils.copyProperties(appUserSellingWater,sellingWaterVo);
+
+            sellingWaterVo.setUsername(userIdAndAppUserLoginMap.get(appUserSellingWater.getSourceId()).getUsername());
+            if (userIdAndAppUserDetailMap!=null){
+                AppUserDetail appUserDetail = userIdAndAppUserDetailMap.get(appUserSellingWater.getSourceId());
+                sellingWaterVo.setNickName(appUserDetail==null?"":appUserDetail.getNickname());
+                sellingWaterVo.setHeadUrl(appUserDetail==null?"":appUserDetail.getHeadimgurl());
+            }
+            totalIncome = totalIncome.add(sellingWaterVo.getCommission());
+            sellingWaterVos.add(sellingWaterVo);
+        }
+        if (waiting==null){
+           Supplier<Stream<AppUserSellingWater>> commissionStream  =  ()-> appUserSellingWaters.stream();
+             BigDecimal total = commissionStream.get().filter(x -> x.getStatus() == 0).map(AppUserSellingWater::getCommission).reduce(new BigDecimal(0),(x,y)->x.add(y));
+            BigDecimal refund = commissionStream.get().filter(x -> x.getStatus() == 1).map(AppUserSellingWater::getCommission).reduce(new BigDecimal(0),(x,y)->x.add(y));
+            totalIncome = total.subtract(refund);
+        }
+
+        sellingWalletPagVo.setPageNum(pageNo);
+        sellingWalletPagVo.setPageSize(pageSize);
+        sellingWalletPagVo.setTotalCount(appUserSellingWaterPageDataVO.getTotalCount().intValue());
+        sellingWalletPagVo.setTotalPage(appUserSellingWaterPageDataVO.getTotalPage());
+        sellingWalletPagVo.setTotalIncome(totalIncome);
+        sellingWalletPagVo.setSellingWaters(sellingWaterVos);
+
+        return sellingWalletPagVo;
+    }
 }
\ No newline at end of file

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

@@ -3,7 +3,6 @@ package com.github.wxiaoqi.security.admin.biz;
 import com.github.wxiaoqi.security.admin.entity.MyWallet;
 import com.github.wxiaoqi.security.admin.mapper.MyWalletMapper;
 import com.github.wxiaoqi.security.admin.vo.AppletWalletVo;
-import com.github.wxiaoqi.security.admin.vo.WalletVo;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;

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

+package com.github.wxiaoqi.security.admin.biz;
+
+import com.github.wxiaoqi.security.admin.entity.MyWalletCath;
+import com.github.wxiaoqi.security.admin.mapper.MyWalletCathMapper;
+import com.github.wxiaoqi.security.admin.vo.WalletCathPageVo;
+import com.github.wxiaoqi.security.admin.vo.WalletCathVo;
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import tk.mybatis.mapper.entity.Example;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/7/12 10:21
+ */
+@Transactional
+@Service
+public class MyWalletCathBiz extends BaseBiz<MyWalletCathMapper, MyWalletCath> {
+
+    public WalletCathPageVo findWatchCatchByWithdrawalState(Integer userId,Integer state, Integer pageNo, Integer pageSize){
+
+        WalletCathPageVo walletCathPageVo = new WalletCathPageVo();
+
+        Example example = new Example(MyWalletCath.class);
+        Example.Criteria criteria = example.createCriteria();
+        criteria.andEqualTo("stauts",state);
+        criteria.andEqualTo("userId",userId);
+        PageDataVO<MyWalletCath> walletCathPage = PageDataVO.pageInfo(pageNo, pageSize, () -> mapper.selectByExample(example));
+
+        List<MyWalletCath> walletCaths = walletCathPage.getData();
+        if (CollectionUtils.isEmpty(walletCaths)){
+           return walletCathPageVo;
+        }
+
+        WalletCathVo walletCathVo = null;
+        BigDecimal totalWithdraw = new BigDecimal(0);
+        List<WalletCathVo> walletCatchPageVos = new ArrayList<>();
+        for (MyWalletCath walletCath : walletCaths) {
+            walletCathVo = new WalletCathVo();
+            BeanUtils.copyProperties(walletCath,walletCathVo);
+            totalWithdraw = totalWithdraw.add(walletCathVo.getAmount());
+            walletCatchPageVos.add(walletCathVo);
+        }
+        walletCathPageVo.setPageNum(walletCathPage.getPageNum());
+        walletCathPageVo.setPageSize(walletCathPage.getPageSize());
+        walletCathPageVo.setTotalCount(walletCathPage.getTotalCount().intValue());
+        walletCathPageVo.setTotalPage(walletCathPage.getTotalPage());
+        walletCathPageVo.setTotalWithdraw(totalWithdraw);
+        walletCathPageVo.setWalletCaths(walletCatchPageVos);
+        return walletCathPageVo;
+    }
+
+}

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

+package com.github.wxiaoqi.security.admin.biz;
+
+import com.github.wxiaoqi.security.admin.entity.MyWalletDetail;
+import com.github.wxiaoqi.security.admin.mapper.MyWalletDetailMapper;
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/7/12 9:18
+ */
+@Transactional
+@Service
+public class MyWalletDetailBiz extends BaseBiz<MyWalletDetailMapper, MyWalletDetail> {
+
+
+}

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

@@ -28,7 +28,7 @@ public class MyWaterBiz extends BaseBiz<MyWalletMapper, MyWallet>{
 
 
     @Autowired
-    MyWalletDetailMapper walletDetailMapper;
+    MyWalletDetailBiz walletDetailBiz;
 
 
     //我的钱包入账
@@ -60,7 +60,7 @@ public class MyWaterBiz extends BaseBiz<MyWalletMapper, MyWallet>{
             totalAmount=wallet.getTotalAmount().add(amount);
             Long lastTime=wallet.getLastIntime();
             todayAmount=amount;
-            if (lastTime!=null&&isToday(lastTime)){
+            if (lastTime!=null&&(lastTime==0||isToday(lastTime))){
                 todayAmount=wallet.getTodayAmount().add(amount);
             }
             unbooked=wallet.getUnbooked().subtract(unbooked);
@@ -74,7 +74,7 @@ public class MyWaterBiz extends BaseBiz<MyWalletMapper, MyWallet>{
         walletDetail.setItype(1);
         walletDetail.setAmount(amount);
         walletDetail.setBalance(oldBalance);
-        walletDetailMapper.insertSelective(walletDetail);
+        walletDetailBiz.insertSelective(walletDetail);
         Long time=System.currentTimeMillis();
         wallet.setBalance(balance);
         wallet.setTodayAmount(todayAmount);

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

@@ -57,7 +57,7 @@ public class UserBusinessBiz {
         }
 
         Map<Integer,AppUserLogin> userIdAndAppUserLoginMap = appUserLoginBiz.findUserIdAndUserLoginMapByMemberIds(memberIds);
-        Map<Integer, AppUserDetail> UserIdAndAppUserDetailMap  = appUserDetailBiz.findUserIdAndUserDetailMapByMemberIds(memberIds);
+        Map<Integer, AppUserDetail> userIdAndAppUserDetailMap  = appUserDetailBiz.findUserIdAndUserDetailMapByMemberIds(memberIds);
 
         List<UserTeamMemberBo> userTeamMemberBos = new ArrayList<>();
         UserTeamMemberBo userTeamMemberBo;
@@ -72,8 +72,8 @@ public class UserBusinessBiz {
                 AppUserLogin appUserLogin = userIdAndAppUserLoginMap.get(appUserRelation.getUserId());
                 userTeamMemberBo.setUserName(appUserLogin.getUsername());
             }
-            if (UserIdAndAppUserDetailMap!=null){
-                AppUserDetail appUserDetail = UserIdAndAppUserDetailMap.get(appUserRelation.getUserId());
+            if (userIdAndAppUserDetailMap!=null){
+                AppUserDetail appUserDetail = userIdAndAppUserDetailMap.get(appUserRelation.getUserId());
                 userTeamMemberBo.setHeadUrl(appUserDetail==null?"":appUserDetail.getHeadimgurl());
                 userTeamMemberBo.setNickName(appUserDetail==null?"":appUserDetail.getNickname());
             }
@@ -81,7 +81,7 @@ public class UserBusinessBiz {
             totalIncome = totalIncome.add(userTeamMemberBo.getIncome());
             userTeamMemberBos.add(userTeamMemberBo);
         }
-        userTeamMemberVo.setPageNo(memberPage.getPageNum());
+        userTeamMemberVo.setPageNum(memberPage.getPageNum());
         userTeamMemberVo.setPageSize(memberPage.getPageSize());
         userTeamMemberVo.setTotalCount(memberPage.getTotalCount().intValue());
         userTeamMemberVo.setTotalPage(memberPage.getTotalPage());

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/handler/IntegralMQHandler.java

+package com.github.wxiaoqi.security.admin.handler;
+
+
+import com.alibaba.fastjson.JSONObject;
+import com.github.wxiaoqi.security.admin.biz.AppUserSellingWaterBiz;
+import com.github.wxiaoqi.security.admin.dto.OrderWaterDTO;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+@Slf4j
+public class IntegralMQHandler {
+
+    @Autowired
+    AppUserSellingWaterBiz waterBiz;
+    @RabbitListener(queues = "orderWater_queue")
+    public void integralHandler(String json) {
+        log.info("接收到的消息：json = {}", json);
+        try{
+            OrderWaterDTO orderWaterDTO = JSONObject.parseObject(json, OrderWaterDTO.class);
+            waterBiz.orderWater(orderWaterDTO);
+        }catch (Exception e){
+            log.info("接收到的消息失败");
+            e.printStackTrace();
+        }
+
+    }
+}

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/UserSellingWaterController.java

+package com.github.wxiaoqi.security.admin.rest;
+
+import com.github.wxiaoqi.security.admin.biz.AppUserSellingWaterBiz;
+import com.github.wxiaoqi.security.admin.vo.SellingWalletPagVo;
+import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
+import com.github.wxiaoqi.security.auth.client.jwt.UserAuthUtil;
+import com.github.wxiaoqi.security.auth.common.util.jwt.IJWTInfo;
+import com.github.wxiaoqi.security.common.exception.BaseException;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/7/12 11:35
+ */
+@RestController
+@RequestMapping("/sellingwater")
+public class UserSellingWaterController {
+
+    @Autowired
+    private AppUserSellingWaterBiz appUserSellingWaterBiz;
+
+    @Autowired
+    private UserAuthUtil userAuthUtil;
+
+    @Autowired
+    private UserAuthConfig userAuthConfig;
+
+    @GetMapping("/page")
+    public ObjectRestResponse<SellingWalletPagVo> findSellingWaterPage(@RequestParam(required = false,value = "type") Integer wating,
+                                                                       @RequestParam("pageNo") Integer pageNo,
+                                                                       @RequestParam("pageSize") Integer pageSize,
+                                                                       HttpServletRequest request) {
+        try {
+            IJWTInfo infoFromToken = userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request));
+            SellingWalletPagVo sellingWalletPagVo = appUserSellingWaterBiz.findSellingWaterPageByWaiting(wating, Integer.valueOf(infoFromToken.getId()), pageNo, pageSize);
+            return ObjectRestResponse.succ(sellingWalletPagVo);
+        } catch (Exception e) {
+            throw new BaseException(e);
+        }
+    }
+
+}

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/WalletCathController.java

+package com.github.wxiaoqi.security.admin.rest;
+
+import com.github.wxiaoqi.security.admin.biz.MyWalletCathBiz;
+import com.github.wxiaoqi.security.admin.vo.WalletCathPageVo;
+import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
+import com.github.wxiaoqi.security.auth.client.jwt.UserAuthUtil;
+import com.github.wxiaoqi.security.auth.common.util.jwt.IJWTInfo;
+import com.github.wxiaoqi.security.common.exception.BaseException;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/7/12 14:17
+ */
+@RestController
+@RequestMapping("/walletcath")
+public class WalletCathController {
+
+    @Autowired
+    private MyWalletCathBiz myWalletCathBiz;
+
+    @Autowired
+    private UserAuthUtil userAuthUtil;
+
+    @Autowired
+    private UserAuthConfig userAuthConfig;
+
+    @GetMapping
+    public ObjectRestResponse<WalletCathPageVo> findWatchCatchByWithdrawalState(@RequestParam("state") Integer state,
+                                                                                @RequestParam("pageNo") Integer pageNo,
+                                                                                @RequestParam("pageSize") Integer pageSize,
+                                                                                HttpServletRequest request) {
+        try {
+            IJWTInfo infoFromToken = userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request));
+            WalletCathPageVo catchByWithdrawa = myWalletCathBiz.findWatchCatchByWithdrawalState(Integer.valueOf(infoFromToken.getId()), state, pageNo, pageSize);
+            return ObjectRestResponse.succ(catchByWithdrawa);
+        } catch (Exception e) {
+            throw new BaseException(e);
+        }
+    }
+}

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

@@ -6,37 +6,37 @@
      <update id="updMyWater" parameterType="com.github.wxiaoqi.security.admin.entity.MyWallet">
         update  my_wallet
         <set>
-        <if test="userId!=null AND userId>0">
+        <if test=" userId!=null and userId!=''">
             user_id=#{userId},
         </if>
-            <if test="balance!=null AND balance>0">
+            <if test="balance!=null and balance!='' ">
              balance=#{balance},
          </if>
-         <if test="balance!=null AND balance>0">
+         <if test="balance!=null and balance!='' ">
              withdrawals=#{withdrawals},
          </if>
-         <if test="totalAmount!=null AND totalAmount>0">
+         <if test="totalAmount!=null and totalAmount!='' ">
              total_amount=#{totalAmount},
          </if>
-         <if test="todayAmount!=null AND todayAmount>0">
+         <if test="todayAmount!=null and todayAmount!='' ">
              today_amount=#{todayAmount},
          </if>
-         <if test="unbooked!=null AND unbooked>0">
+         <if test="unbooked!=null and unbooked!='' ">
              unbooked=#{unbooked},
          </if>
-         <if test="isFrozen!=null">
+         <if test="isFrozen!=null and isFrozen!='' ">
              is_frozen=#{isFrozen},
          </if>
-        <if test="lastIntime!=null AND lastIntime>0">
+        <if test="lastIntime!=null and lastIntime!='' ">
             last_intime=#{lastIntime},
         </if>
-        <if test="crtTime!=null AND crtTime>0">
+        <if test="crtTime!=null and crtTime!='' ">
             crt_time=#{crtTime},
         </if>
-        <if test="updTime!=null AND updTime>0">
+        <if test="updTime!=null and updTime!='' ">
             upd_time=#{updTime},
         </if>
-        <if test="version!=null ">
+        <if test="version!=null and version!='' ">
             version=version+1,
         </if>
         </set>