代码修复

module-common/src/main/java/org/jeecg/api/controller/AppletIndexController.java

@@ -178,8 +178,8 @@ public class AppletIndexController {
     //商城-加入购物车之后一次下多个订单
     @ApiOperation(value="商城-加入购物车之后一次下多个订单", notes="商城-加入购物车之后一次下多个订单")
     @PostMapping("/createSumOrder")
-    public Result<?> createSumOrder(@RequestHeader("X-Access-Token") String token,String list,String addressId){
-        return apiRiceService.createSumOrder(token,list,addressId);
+    public Result<?> createSumOrder(@RequestHeader("X-Access-Token") String token,String list,String addressId,Integer payType){
+        return apiRiceService.createSumOrder(token,list,addressId,payType);
     }
 
 

module-common/src/main/java/org/jeecg/api/controller/AppletMyInfoController.java

@@ -5,11 +5,14 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.config.shiro.ShiroRealm;
+import org.jeecg.modules.commonMoneyLog.entity.CommonMoneyLog;
+import org.jeecg.modules.commonMoneyLog.service.ICommonMoneyLogService;
 import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
 import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 
 @Api(tags="项目通用-修改个人信息")
 @RestController
@@ -19,6 +22,8 @@ public class AppletMyInfoController {
 
     @Resource
     private IHanHaiMemberService hanHaiMemberService;
+    @Resource
+    private ICommonMoneyLogService commonMoneyLogService;
     //权限验证
     @Resource
     private ShiroRealm shiroRealm;
@@ -42,6 +47,15 @@ public class AppletMyInfoController {
     public Result<?> getInfo(@RequestHeader("X-Access-Token") String token){
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
         HanHaiMember byId = hanHaiMemberService.getById(hanHaiMember.getId());
+        BigDecimal totalMoney = commonMoneyLogService.lambdaQuery()
+                .select(CommonMoneyLog::getMoney)
+                .eq(CommonMoneyLog::getUserId, hanHaiMember.getId())
+                .eq(CommonMoneyLog::getType, 0)
+                .list()
+                .stream()
+                .map(CommonMoneyLog::getMoney)
+                .reduce(BigDecimal.ZERO, BigDecimal::add);
+        byId.setPrice(totalMoney);
         return Result.OK(byId);
     }
 

module-common/src/main/java/org/jeecg/api/service/AppletIndexService.java

@@ -51,7 +51,7 @@ public interface AppletIndexService {
 
 
     //商城-立即购买多少商品
-    Result<?> createSumOrder(String token,String list,String addressId);
+    Result<?> createSumOrder(String token,String list,String addressId,Integer payType);
 
     //商城-加入购物车之后一次下多个订单 - 再次下单
     Result<?> createSumOrderAgain(String token,String orderId);

module-common/src/main/java/org/jeecg/api/service/impl/AppletIndexServiceImpl.java

@@ -9,10 +9,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult;
+import lombok.Synchronized;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.fileupload.FileItem;
 import org.apache.commons.fileupload.disk.DiskFileItemFactory;
+import org.hibernate.validator.internal.constraintvalidators.bv.time.futureorpresent.FutureOrPresentValidatorForReadableInstant;
 import org.jeecg.api.bean.FansPageBean;
 import org.jeecg.api.bean.HttpClientUtil;
 import org.jeecg.api.bean.PageBean;
@@ -166,7 +168,7 @@ public class AppletIndexServiceImpl implements AppletIndexService {
 
     @Autowired
     private RedisUtil redisUtil;
-
+    private FutureOrPresentValidatorForReadableInstant futureOrPresentValidatorForReadableInstant;
 
 
     //获取首页轮播图
@@ -592,9 +594,11 @@ public class AppletIndexServiceImpl implements AppletIndexService {
 
 
     //商城-立即购买多少商品
+    @Synchronized
+    @Transactional
     @Override
-    public Result<?> createSumOrder(String token,String list,String addressId){
-        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+    public Result<?> createSumOrder(String token,String list,String addressId,Integer payType){
+        HanHaiMember member = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
         //用户地址不能为空
         if(StringUtils.isBlank(addressId)){
             return Result.error("请选择收货地址");
@@ -627,7 +631,7 @@ public class AppletIndexServiceImpl implements AppletIndexService {
 
 
                 //获取vip价格
-                if(hanHaiMember.getIsPay() == 1){
+                if(member.getIsPay() == 1){
                     price = commonShop.getVipPrice().multiply(new BigDecimal(sku.getNum()));
                 }
 
@@ -657,7 +661,7 @@ public class AppletIndexServiceImpl implements AppletIndexService {
             //创建主订单
             CommonOrder cityOrder = new CommonOrder();
             cityOrder.setId(orderId);
-            cityOrder.setUserId(hanHaiMember.getId());
+            cityOrder.setUserId(member.getId());
             cityOrder.setShopId(null);
             cityOrder.setNum(totalNum);
             cityOrder.setAddress(commonAddress.getAddress());
@@ -675,20 +679,140 @@ public class AppletIndexServiceImpl implements AppletIndexService {
             cityOrder.setCreateTime(new Date());
 
             commonOrderService.save(cityOrder);
+            if(payType == 0){
+                //吊起微信支付
+                String s = totalPrice.multiply(new BigDecimal(100)).toString();
+                int i1 = Double.valueOf(s).intValue();
+                Object appOrder = mpWxPayService.createOrder(
+                        "购买"+ "组合订单" ,
+                        "127.0.0.1",
+                        orderId,
+                        i1,
+                        orderId,
+                        member.getAppletOpenid(),
+                        cityOrder.toString());
+
+                return Result.OK("支付成功",appOrder);
+            }else{
+                //判断用户零钱不能小于订单价格
+                if(member.getMoney().compareTo(totalPrice) < 0){
+                    return Result.error("零钱不足");
+                }
 
-            //吊起微信支付
-            String s = totalPrice.multiply(new BigDecimal(100)).toString();
-            int i1 = Double.valueOf(s).intValue();
-            Object appOrder = mpWxPayService.createOrder(
-                    "购买"+ "组合订单" ,
-                    "127.0.0.1",
-                    orderId,
-                    i1,
-                    orderId,
-                    hanHaiMember.getAppletOpenid(),
-                    cityOrder.toString());
+                //根据订单中的商品标识查询商品sku
+                List<CommonOrderSku> commonShopSkuList = commonOrderSkuService
+                        .lambdaQuery()
+                        .eq(CommonOrderSku::getOrderId,orderId)
+                        .list();
 
-            return Result.OK("支付成功",appOrder);
+                for (CommonOrderSku commonShopSku : commonShopSkuList){
+                    //1.根据订单中的商品标识查询商品信息
+                    CommonShop shopIng = commonShopService.lambdaQuery()
+                            .eq(CommonShop::getId,commonShopSku.getShopId())
+                            .one();
+
+                    //初始化直接推荐返点金额
+                    BigDecimal directGivePrice = BigDecimal.ZERO;
+                    //初始化间接推荐返点金额
+                    BigDecimal indirectGivePrice = BigDecimal.ZERO;
+
+
+                    //得到直接推荐
+                    //2.根据订单查询用户信息
+                    HanHaiMember hanHaiMember = hanHaiMemberService.getById(cityOrder.getUserId());
+                    //3.查询用户是否存在直接邀请人
+                    HanHaiMember shareMember = hanHaiMemberService.
+                            lambdaQuery()
+                            .eq(HanHaiMember::getId,hanHaiMember.getShareId())
+                            .one();
+                    if(shareMember!=null){
+                        //得到直接邀请人用户角色
+                        Integer shareRole = shareMember.getRole();
+                        //普通角色
+                        if (shareRole==0){
+                            directGivePrice = shopIng.getGivePrice();
+                        }else if (shareRole==1){ //银卡
+                            directGivePrice = shopIng.getSilverGivePrice();
+                        }else if (shareRole==2){ //金卡
+                            directGivePrice = shopIng.getGoldGivePrice();
+                        }else{
+                            directGivePrice = shopIng.getDiamondGivePrice();
+                        }
+                        //增加流水
+                        CommonMoneyLog moneyLog = new CommonMoneyLog();
+                        moneyLog.setId(IdWorker.getIdStr());
+                        moneyLog.setTitle("获得佣金【"+hanHaiMember.getNickName()+"】购买【"+shopIng.getTitle()+"】");
+                        moneyLog.setMoney(directGivePrice);
+                        moneyLog.setOldMoney(shareMember.getPrice());
+                        moneyLog.setType(0);
+                        moneyLog.setState(1);//已到账
+                        moneyLog.setUserId(shareMember.getId());
+                        moneyLog.setCreateTime(new Date());
+                        commonMoneyLogService.save(moneyLog);
+
+
+                        shareMember.setPrice(shareMember.getPrice().add(directGivePrice));
+                        hanHaiMemberService.updateById(shareMember);
+                    }
+
+
+                    //4.查询用户是否存在间接邀请人
+                    HanHaiMember shareMember2 = hanHaiMemberService.
+                            lambdaQuery()
+                            .eq(HanHaiMember::getId,shareMember.getVid())
+                            .one();
+                    if(shareMember2!=null){
+                        //得到间接邀请人用户角色
+                        Integer shareRole2 = shareMember2.getRole();
+                        if (shareRole2==0){
+                            indirectGivePrice = shopIng.getGivePriceTwo();
+                        }else if (shareRole2==1){ //银卡
+                            indirectGivePrice = shopIng.getSilverGivePriceTwo();
+                        }else if (shareRole2==2){ //金卡
+                            indirectGivePrice = shopIng.getGoldGivePriceTwo();
+                        }else{
+                            indirectGivePrice = shopIng.getDiamondGivePriceTwo();
+                        }
+                        //增加流水
+                        CommonMoneyLog moneyLog = new CommonMoneyLog();
+                        moneyLog.setId(IdWorker.getIdStr());
+                        moneyLog.setTitle("获得佣金【"+hanHaiMember.getNickName()+"】购买【"+shopIng.getTitle()+"】");
+                        moneyLog.setMoney(indirectGivePrice);
+                        moneyLog.setOldMoney(shareMember2.getPrice());
+                        moneyLog.setType(0);
+                        moneyLog.setState(1);
+                        moneyLog.setUserId(shareMember2.getId());
+                        moneyLog.setCreateTime(new Date());
+                        commonMoneyLogService.save(moneyLog);
+
+                        shareMember2.setPrice(shareMember2.getPrice().add(indirectGivePrice));
+                        hanHaiMemberService.updateById(shareMember2);
+                    }
+                }
+
+
+
+
+                //零钱支付
+                cityOrder.setState(1);
+                commonOrderService.updateById(cityOrder);
+                //生成用户支付流水记录
+                CommonMoneyLog commonMoneyLog = new CommonMoneyLog();
+                commonMoneyLog.setId(IdWorker.getIdStr());
+                commonMoneyLog.setUserId(member.getId());
+                commonMoneyLog.setTitle("用户余额支付");
+                commonMoneyLog.setMoney(totalPrice);
+                commonMoneyLog.setOldMoney(member.getMoney());
+                commonMoneyLog.setType(1);
+                commonMoneyLog.setState(1);
+                commonMoneyLog.setCreateTime(new Date());
+                commonMoneyLogService.save(commonMoneyLog);
+
+                member.setMoney(member.getMoney().subtract(totalPrice));
+                hanHaiMemberService.updateById(member);
+
+                return Result.OK(orderId);
+            }
         }
         return null;
     }
@@ -698,7 +822,7 @@ public class AppletIndexServiceImpl implements AppletIndexService {
     //商城-加入购物车之后一次下多个订单 - 再次下单
     @Override
     public Result<?> createSumOrderAgain(String token,String order){
-        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        HanHaiMember member = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
         //根据订单标识查询订单是否存在
         CommonOrder oldOrder = commonOrderService.getById(order);
         if (oldOrder==null){
@@ -747,6 +871,7 @@ public class AppletIndexServiceImpl implements AppletIndexService {
         cityOrder.setAddressId(addressId);
         cityOrder.setName(commonAddress.getName());
         cityOrder.setTitle("组合订单");
+        cityOrder.setPayType(oldOrder.getPayType());
 
         cityOrder.setPrice(oldOrder.getPrice());
 
@@ -760,37 +885,36 @@ public class AppletIndexServiceImpl implements AppletIndexService {
         //删除旧订单
         commonOrderService.removeById(order);
 
-        //吊起微信支付
-        String s = oldOrder.getPrice().multiply(new BigDecimal(100)).toString();
-        int i1 = Double.valueOf(s).intValue();
-        Object appOrder = mpWxPayService.createOrder(
-                "购买"+ "组合订单" ,
-                "127.0.0.1",
-                orderId,
-                i1,
-                orderId,
-                hanHaiMember.getAppletOpenid(),
-                cityOrder.toString());
-
-        return Result.OK("支付成功",appOrder);
+        if(cityOrder.getPayType() == 0){
+            //吊起微信支付
+            String s = cityOrder.getPrice().multiply(new BigDecimal(100)).toString();
+            int i1 = Double.valueOf(s).intValue();
+            Object appOrder = mpWxPayService.createOrder(
+                    "购买"+ "组合订单" ,
+                    "127.0.0.1",
+                    orderId,
+                    i1,
+                    orderId,
+                    member.getAppletOpenid(),
+                    cityOrder.toString());
 
-    }
+            return Result.OK("支付成功",appOrder);
+        }else{
+            //判断用户零钱不能小于订单价格
+            if(member.getMoney().compareTo(cityOrder.getPrice()) < 0){
+                return Result.error("零钱不足");
+            }
 
+            //根据订单中的商品标识查询商品sku
+            List<CommonOrderSku> commonShopSkuList = commonOrderSkuService
+                    .lambdaQuery()
+                    .eq(CommonOrderSku::getOrderId,orderId)
+                    .list();
 
-    //商城-支付回调
-    @Override
-    public Result<?> payNotify(String requestBody){
-        WxPayOrderNotifyResult notify = mpWxPayService.notify(requestBody);
-        String outTradeNo = notify.getOutTradeNo();
-        log.info("支付回调订单号码："+outTradeNo);
-        //查询订单信息
-        CommonOrder commonOrder = commonOrderService.getById(outTradeNo);
-        //如果订单存在则修改订单状态
-        if (commonOrder!=null){
-            if(commonOrder.getState()==0){
+            for (CommonOrderSku commonShopSku : commonShopSkuList){
                 //1.根据订单中的商品标识查询商品信息
                 CommonShop shopIng = commonShopService.lambdaQuery()
-                        .eq(CommonShop::getId,commonOrder.getShopId())
+                        .eq(CommonShop::getId,commonShopSku.getShopId())
                         .one();
 
                 //初始化直接推荐返点金额
@@ -801,7 +925,7 @@ public class AppletIndexServiceImpl implements AppletIndexService {
 
                 //得到直接推荐
                 //2.根据订单查询用户信息
-                HanHaiMember hanHaiMember = hanHaiMemberService.getById(commonOrder.getUserId());
+                HanHaiMember hanHaiMember = hanHaiMemberService.getById(cityOrder.getUserId());
                 //3.查询用户是否存在直接邀请人
                 HanHaiMember shareMember = hanHaiMemberService.
                         lambdaQuery()
@@ -823,7 +947,7 @@ public class AppletIndexServiceImpl implements AppletIndexService {
                     //增加流水
                     CommonMoneyLog moneyLog = new CommonMoneyLog();
                     moneyLog.setId(IdWorker.getIdStr());
-                    moneyLog.setTitle("【"+hanHaiMember.getNickName()+"】购买【"+shopIng.getTitle()+"】");
+                    moneyLog.setTitle("获得佣金【"+hanHaiMember.getNickName()+"】购买【"+shopIng.getTitle()+"】");
                     moneyLog.setMoney(directGivePrice);
                     moneyLog.setOldMoney(shareMember.getPrice());
                     moneyLog.setType(0);
@@ -858,7 +982,7 @@ public class AppletIndexServiceImpl implements AppletIndexService {
                     //增加流水
                     CommonMoneyLog moneyLog = new CommonMoneyLog();
                     moneyLog.setId(IdWorker.getIdStr());
-                    moneyLog.setTitle("【"+hanHaiMember.getNickName()+"】购买【"+shopIng.getTitle()+"】");
+                    moneyLog.setTitle("获得佣金【"+hanHaiMember.getNickName()+"】购买【"+shopIng.getTitle()+"】");
                     moneyLog.setMoney(indirectGivePrice);
                     moneyLog.setOldMoney(shareMember2.getPrice());
                     moneyLog.setType(0);
@@ -870,6 +994,154 @@ public class AppletIndexServiceImpl implements AppletIndexService {
                     shareMember2.setPrice(shareMember2.getPrice().add(indirectGivePrice));
                     hanHaiMemberService.updateById(shareMember2);
                 }
+            }
+
+
+
+
+            //零钱支付
+            cityOrder.setState(1);
+            commonOrderService.updateById(cityOrder);
+            //生成用户支付流水记录
+            CommonMoneyLog commonMoneyLog = new CommonMoneyLog();
+            commonMoneyLog.setId(IdWorker.getIdStr());
+            commonMoneyLog.setUserId(member.getId());
+            commonMoneyLog.setTitle("用户余额支付");
+            commonMoneyLog.setMoney(cityOrder.getPrice());
+            commonMoneyLog.setOldMoney(member.getMoney());
+            commonMoneyLog.setType(1);
+            commonMoneyLog.setState(1);
+            commonMoneyLog.setCreateTime(new Date());
+            commonMoneyLogService.save(commonMoneyLog);
+
+            member.setMoney(member.getMoney().subtract(cityOrder.getPrice()));
+            hanHaiMemberService.updateById(member);
+
+            return Result.OK(orderId);
+        }
+
+
+    }
+
+
+    //商城-支付回调
+    @Override
+    public Result<?> payNotify(String requestBody){
+        WxPayOrderNotifyResult notify = mpWxPayService.notify(requestBody);
+        String outTradeNo = notify.getOutTradeNo();
+        log.info("支付回调订单号码："+outTradeNo);
+        //查询订单信息
+        CommonOrder commonOrder = commonOrderService.getById(outTradeNo);
+        //如果订单存在则修改订单状态
+        if (commonOrder!=null){
+            if(commonOrder.getState()==0){
+
+                //根据订单中的商品标识查询商品sku
+                List<CommonOrderSku> commonShopSkuList = commonOrderSkuService
+                        .lambdaQuery()
+                        .eq(CommonOrderSku::getOrderId,outTradeNo)
+                        .list();
+
+                for (CommonOrderSku commonShopSku : commonShopSkuList){
+                    //1.根据订单中的商品标识查询商品信息
+                    CommonShop shopIng = commonShopService.lambdaQuery()
+                            .eq(CommonShop::getId,commonShopSku.getShopId())
+                            .one();
+
+                    //初始化直接推荐返点金额
+                    BigDecimal directGivePrice = BigDecimal.ZERO;
+                    //初始化间接推荐返点金额
+                    BigDecimal indirectGivePrice = BigDecimal.ZERO;
+
+
+                    //得到直接推荐
+                    //2.根据订单查询用户信息
+                    HanHaiMember hanHaiMember = hanHaiMemberService.getById(commonOrder.getUserId());
+                    //3.查询用户是否存在直接邀请人
+                    HanHaiMember shareMember = hanHaiMemberService.
+                            lambdaQuery()
+                            .eq(HanHaiMember::getId,hanHaiMember.getShareId())
+                            .one();
+                    if(shareMember!=null){
+                        //得到直接邀请人用户角色
+                        Integer shareRole = shareMember.getRole();
+                        //普通角色
+                        if (shareRole==0){
+                            directGivePrice = shopIng.getGivePrice();
+                        }else if (shareRole==1){ //银卡
+                            directGivePrice = shopIng.getSilverGivePrice();
+                        }else if (shareRole==2){ //金卡
+                            directGivePrice = shopIng.getGoldGivePrice();
+                        }else{
+                            directGivePrice = shopIng.getDiamondGivePrice();
+                        }
+                        //增加流水
+                        CommonMoneyLog moneyLog = new CommonMoneyLog();
+                        moneyLog.setId(IdWorker.getIdStr());
+                        moneyLog.setTitle("获得佣金【"+hanHaiMember.getNickName()+"】购买【"+shopIng.getTitle()+"】");
+                        moneyLog.setMoney(directGivePrice);
+                        moneyLog.setOldMoney(shareMember.getPrice());
+                        moneyLog.setType(0);
+                        moneyLog.setState(1);//已到账
+                        moneyLog.setUserId(shareMember.getId());
+                        moneyLog.setCreateTime(new Date());
+                        commonMoneyLogService.save(moneyLog);
+
+
+                        shareMember.setPrice(shareMember.getPrice().add(directGivePrice));
+                        hanHaiMemberService.updateById(shareMember);
+                    }
+
+
+                    //4.查询用户是否存在间接邀请人
+                    HanHaiMember shareMember2 = hanHaiMemberService.
+                            lambdaQuery()
+                            .eq(HanHaiMember::getId,shareMember.getVid())
+                            .one();
+                    if(shareMember2!=null){
+                        //得到间接邀请人用户角色
+                        Integer shareRole2 = shareMember2.getRole();
+                        if (shareRole2==0){
+                            indirectGivePrice = shopIng.getGivePriceTwo();
+                        }else if (shareRole2==1){ //银卡
+                            indirectGivePrice = shopIng.getSilverGivePriceTwo();
+                        }else if (shareRole2==2){ //金卡
+                            indirectGivePrice = shopIng.getGoldGivePriceTwo();
+                        }else{
+                            indirectGivePrice = shopIng.getDiamondGivePriceTwo();
+                        }
+                        //增加流水
+                        CommonMoneyLog moneyLog = new CommonMoneyLog();
+                        moneyLog.setId(IdWorker.getIdStr());
+                        moneyLog.setTitle("获得佣金【"+hanHaiMember.getNickName()+"】购买【"+shopIng.getTitle()+"】");
+                        moneyLog.setMoney(indirectGivePrice);
+                        moneyLog.setOldMoney(shareMember2.getPrice());
+                        moneyLog.setType(0);
+                        moneyLog.setState(1);
+                        moneyLog.setUserId(shareMember2.getId());
+                        moneyLog.setCreateTime(new Date());
+                        commonMoneyLogService.save(moneyLog);
+
+                        shareMember2.setPrice(shareMember2.getPrice().add(indirectGivePrice));
+                        hanHaiMemberService.updateById(shareMember2);
+                    }
+                }
+
+                //根据订单用户标识查询用户信息
+                HanHaiMember member = hanHaiMemberService.getById(commonOrder.getUserId());
+
+                //生成用户支付流水记录
+                CommonMoneyLog commonMoneyLog = new CommonMoneyLog();
+                commonMoneyLog.setId(IdWorker.getIdStr());
+                commonMoneyLog.setUserId(member.getId());
+                commonMoneyLog.setTitle("用户微信支付");
+                commonMoneyLog.setMoney(commonOrder.getPrice());
+                commonMoneyLog.setOldMoney(member.getMoney());
+                commonMoneyLog.setType(1);
+                commonMoneyLog.setState(1);
+                commonMoneyLog.setCreateTime(new Date());
+                commonMoneyLogService.save(commonMoneyLog);
+
 
 
                 //修改订单状态
@@ -959,9 +1231,32 @@ public class AppletIndexServiceImpl implements AppletIndexService {
 
         map.put("page",page);
         //总佣金
-        map.put("totalMoney",100);
+        //查询我状态为0的流水的金额统计
+        BigDecimal totalMoney = commonMoneyLogService.lambdaQuery()
+                .select(CommonMoneyLog::getMoney)
+                .eq(CommonMoneyLog::getUserId, hanHaiMember.getId())
+                .eq(CommonMoneyLog::getType, 0)
+                .list()
+                .stream()
+                .map(CommonMoneyLog::getMoney)
+                .reduce(BigDecimal.ZERO, BigDecimal::add);
+
+
+
+
+        map.put("totalMoney",totalMoney);
         //累积提现
-        map.put("totalWithdraw",100);
+
+        BigDecimal totalWithdraw =commonMoneyLogService.lambdaQuery()
+                .select(CommonMoneyLog::getMoney)
+                .eq(CommonMoneyLog::getUserId, hanHaiMember.getId())
+                .eq(CommonMoneyLog::getTitle, "用户提现")
+                .eq(CommonMoneyLog::getState, 1)
+                .list()
+                .stream()
+                .map(CommonMoneyLog::getMoney)
+                .reduce(BigDecimal.ZERO, BigDecimal::add);
+        map.put("totalWithdraw",totalWithdraw);
 
         return Result.OK(map);
     }

module-system/src/main/resources/application-dev.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8001
+  port: 8081
   tomcat:
     max-swallow-size: -1
   error:

module-system/src/main/resources/pay_weixin.properties

@@ -2,9 +2,9 @@ pay.mchId=1702891319
 pay.appId=wx28679cb649907e7e
 pay.mchKey=6b5fbf1439176f7b78209bd237dfdf7e
 pay.keyPath=classpath:apiclient_cert.pem
-pay.notifyUrl=https://jewelry-admin.hhlm1688.com/jewelry-admin/index_common/payNotify
-pay.notifyUrlDev=https://jewelry-admin.hhlm1688.com/jewelry-admin/index_common/payNotify
-pay.notifyOneUrl=https://jewelry-admin.hhlm1688.com/jewelry-admin/index_common/payNotify
-pay.notifyUrlOneDev=https://jewelry-admin.hhlm1688.com/jewelry-admin/index_common/payNotify
+pay.notifyUrl=http://youyi-test.natapp1.cc/jewelry-admin/index_common/payNotify
+pay.notifyUrlDev=http://youyi-test.natapp1.cc/jewelry-admin/index_common/payNotify
+pay.notifyOneUrl=http://youyi-test.natapp1.cc/jewelry-admin/index_common/payNotify
+pay.notifyUrlOneDev=http://youyi-test.natapp1.cc/jewelry-admin/index_common/payNotify