修复bug

ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletAmountLogServiceImpl.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.model.mapper.AppletAmountLogMapper;
@@ -31,7 +32,7 @@ public class AppletAmountLogServiceImpl extends ServiceImpl<AppletAmountLogMappe
     @Override
     public AppletAmountLog selectAppletAmountLogById(Long id)
     {
-        return appletAmountLogMapper.selectAppletAmountLogById(id);
+        return appletAmountLogMapper.selectById(id);
     }
 
     /**
@@ -43,7 +44,32 @@ public class AppletAmountLogServiceImpl extends ServiceImpl<AppletAmountLogMappe
     @Override
     public List<AppletAmountLog> selectAppletAmountLogList(AppletAmountLog appletAmountLog)
     {
-        return appletAmountLogMapper.selectAppletAmountLogList(appletAmountLog);
+
+        /*
+        * <where>
+            <if test="title != null  and title != ''"> and title = #{title}</if>
+            <if test="amount != null "> and amount = #{amount}</if>
+            <if test="type != null "> and type = #{type}</if>
+            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="state != null "> and state = #{state}</if>
+            <if test="moneyType != null "> and money_type = #{moneyType}</if>
+            <if test="nameValue != null  and nameValue != ''"> and name_value like concat('%', #{nameValue}, '%')</if>
+        </where>
+        * */
+
+        if (appletAmountLog == null){
+            return list();
+        }
+
+        return lambdaQuery()
+                .eq(StringUtils.isNotEmpty(appletAmountLog.getTitle()), AppletAmountLog::getTitle, appletAmountLog.getTitle())
+                .eq(appletAmountLog.getAmount() != null, AppletAmountLog::getAmount, appletAmountLog.getAmount())
+                .eq(appletAmountLog.getUserId() != null, AppletAmountLog::getUserId, appletAmountLog.getUserId())
+                .eq(appletAmountLog.getMoneyType() != null, AppletAmountLog::getMoneyType, appletAmountLog.getMoneyType())
+                .eq(appletAmountLog.getNameValue() != null, AppletAmountLog::getNameValue, appletAmountLog.getNameValue())
+                .list();
+
+//        return appletAmountLogMapper.selectAppletAmountLogList(appletAmountLog);
     }
 
     /**
@@ -56,7 +82,7 @@ public class AppletAmountLogServiceImpl extends ServiceImpl<AppletAmountLogMappe
     public int insertAppletAmountLog(AppletAmountLog appletAmountLog)
     {
         appletAmountLog.setCreateTime(DateUtils.getNowDate());
-        return appletAmountLogMapper.insertAppletAmountLog(appletAmountLog);
+        return appletAmountLogMapper.insert(appletAmountLog);
     }
 
     /**
@@ -69,7 +95,7 @@ public class AppletAmountLogServiceImpl extends ServiceImpl<AppletAmountLogMappe
     public int updateAppletAmountLog(AppletAmountLog appletAmountLog)
     {
         appletAmountLog.setUpdateTime(DateUtils.getNowDate());
-        return appletAmountLogMapper.updateAppletAmountLog(appletAmountLog);
+        return appletAmountLogMapper.updateById(appletAmountLog);
     }
 
     /**

ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletConfigServiceImpl.java

@@ -126,7 +126,7 @@ public class AppletConfigServiceImpl extends ServiceImpl<AppletConfigMapper, App
         if (appletConfigs.size() > 0){
             return appletConfigs.get(0);
         }else {
-            throw  new ServiceException("配置缺失=" + code);
+            throw new ServiceException("配置缺失=" + code);
         }
     }
 }

ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletOrderDateFrequencyServiceImpl.java

@@ -1,5 +1,6 @@
 package com.ruoyi.model.service.impl;
 
+import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
@@ -20,15 +21,19 @@ import com.cyl.manager.oms.mapper.OmsOrderServiceMapper;
 import com.cyl.manager.oms.mapper.OrderItemMapper;
 import com.cyl.manager.oms.mapper.OrderMapper;
 import com.cyl.manager.oms.service.OmsOrderServiceService;
+import com.cyl.manager.ums.domain.Member;
 import com.cyl.manager.ums.domain.Pet;
+import com.cyl.manager.ums.mapper.MemberMapper;
 import com.cyl.manager.ums.mapper.PetMapper;
 import com.cyl.manager.ums.service.MemberService;
 import com.cyl.manager.ums.service.PetService;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.model.domain.*;
 import com.ruoyi.model.mapper.AppletOrderItemMapper;
 import com.ruoyi.model.service.*;
+import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.model.mapper.AppletOrderDateFrequencyMapper;
@@ -42,6 +47,7 @@ import static org.apache.ibatis.ognl.OgnlOps.in;
  * @author daixiande
  */
 @Service
+@Log4j2
 public class AppletOrderDateFrequencyServiceImpl extends ServiceImpl<AppletOrderDateFrequencyMapper, AppletOrderDateFrequency> implements IAppletOrderDateFrequencyService {
 
     @Autowired
@@ -73,6 +79,10 @@ public class AppletOrderDateFrequencyServiceImpl extends ServiceImpl<AppletOrder
 
     @Autowired
     private OrderMapper orderMapper;
+    @Autowired
+    private MemberMapper memberMapper;
+    @Autowired
+    private IAppletConfigService appletConfigService;
 
     /**
      * 查询日订单
@@ -341,23 +351,23 @@ public class AppletOrderDateFrequencyServiceImpl extends ServiceImpl<AppletOrder
 
     @Override
     @Transactional
-    public int check(AppletOrderItemDateLog log) {
+    public int check(AppletOrderItemDateLog dateLog) {
 
-        AppletOrderDateFrequency byId = getById(log.getItemDateId());
+        AppletOrderDateFrequency byId = getById(dateLog.getItemDateId());
 
         if(byId == null){
             throw new RuntimeException("无效日订单");
         }
 
-        byId.setStatus(String.valueOf(log.getSubmitFlag()));
+        byId.setStatus(String.valueOf(dateLog.getSubmitFlag()));
 
-        if(log.getSubmitFlag() == 2){
+        if(dateLog.getSubmitFlag() == 2){
             byId.setCompletionTime(new Date());
         }
 
         updateById(byId);
 
-        log.setOrderId(byId.getOrderId());
+        dateLog.setOrderId(byId.getOrderId());
 
         //当所有的日订单完成，就将订单状态修改完成
         Integer count = lambdaQuery()
@@ -405,6 +415,47 @@ public class AppletOrderDateFrequencyServiceImpl extends ServiceImpl<AppletOrder
             appUsersService.updateAppUsers(user);
 
 
+            //分成给合伙人
+            if (omsOrder != null){
+                Member member = memberMapper.selectById(omsOrder.getMemberId());
+
+                if (member != null && StringUtils.isNotEmpty(member.getInviteCode())){
+                    AppUsers users = appUsersService.lambdaQuery()
+                            .eq(AppUsers::getInvitationCode, member.getInviteCode())
+                            .one();
+
+                    //平台预计收益比例
+                    AppletConfig estimated_platform_revenue = appletConfigService.getByCode("estimated_platform_revenue");
+
+                    //合伙人等级
+                    AppletConfig petPaymentHh = appletConfigService.selectAppletConfigByClassAndNum("pet_payment_hh", users.getUserHhRole());
+
+                    if (petPaymentHh != null && estimated_platform_revenue != null){
+                        BigDecimal multiply = omsOrder.getPayAmount().multiply(new BigDecimal(estimated_platform_revenue.getParamValueText()))
+                                .multiply(new BigDecimal(petPaymentHh.getParamValueNum()));
+
+                        log.info("合伙人分销 合伙人等级：{} 平台预计收益比例：{} 分销金额：{}", petPaymentHh, estimated_platform_revenue.getParamValueText(), multiply);
+
+                        AppletAmountLog multiplyLog = new AppletAmountLog();
+                        multiplyLog.setUserId(users.getUserId());
+                        multiplyLog.setTitle("合伙人佣金");
+                        multiplyLog.setAmount(appletOrderItem.getOrderGivePrice());
+                        multiplyLog.setType(0); //收入
+                        multiplyLog.setState(1); //到账
+                        multiplyLog.setCreateTime(LocalDateTime.now());
+                        multiplyLog.setMoneyType(0);//钱包类型
+                        multiplyLog.setFormId(member.getId());//来源用户
+                        multiplyLog.setOrderId(omsOrder.getId());//来源订单
+                        appletAmountLogService.insertAppletAmountLog(moneyLog);
+
+                        users.setMoney(users.getMoney().add(multiply));
+                        appUsersService.updateById(users);
+
+                    }
+
+                }
+            }
+
 
         }else if (appletOrderItem.getOrderStatus() == 0){//修改成订单进行中
             appletOrderItem.setOrderStatus(1);
@@ -413,10 +464,10 @@ public class AppletOrderDateFrequencyServiceImpl extends ServiceImpl<AppletOrder
         }
 
 
-        if(log.getId() == null){
-            return appletOrderItemDateLogService.insertAppletOrderItemDateLog(log);
+        if(dateLog.getId() == null){
+            return appletOrderItemDateLogService.insertAppletOrderItemDateLog(dateLog);
         }else {
-            return appletOrderItemDateLogService.updateAppletOrderItemDateLog(log);
+            return appletOrderItemDateLogService.updateAppletOrderItemDateLog(dateLog);
         }
     }
 }