integralResponses

src/main/java/com/dk/oauth/service/impl/CompanyServiceImpl.java

@@ -26,6 +26,8 @@ import com.dk.oauth.mapper.integral.IntegralTacticMapper;
 import com.dk.oauth.model.pojo.integral.Integral;
 import com.dk.oauth.model.pojo.integral.IntegralItem;
 import com.dk.oauth.model.pojo.integral.IntegralTactic;
+import com.dk.oauth.model.query.integral.IntegralQuery;
+import com.dk.oauth.model.response.integral.IntegralResponse;
 import com.dk.oauth.query.*;
 import com.dk.oauth.response.*;
 import com.dk.oauth.service.ICompanyService;
@@ -274,8 +276,8 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
                 IntegralTactic integralTactic = integralTactics.get(0);
                 // 积分明细 新公司的
                 IntegralItem integralItem = new IntegralItem();
-                integralItem.setIntegralType(Constant.IntegralType.INTEGRAL_TYPE_INVITE.getName());
-                integralItem.setIntegral(integralTactic.getShareRegIntegral());
+                integralItem.setIntegralType(Constant.IntegralType.INTEGRAL_TYPE_REGISTER.getName());
+                integralItem.setIntegral(integralTactic.getRegIntegral());
                 integralItem.setCpId(company.getCpId());
                 integralItem.setCpIdFrom(companyVO.getCpIdFrom());
                 integralItem.setAccDate(LocalDateTime.now());
@@ -287,19 +289,22 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
                 Integral integral = new Integral();
                 integral.setCpId(company.getCpId());
                 integral.setFlgValid(true);
-                List<Integral> integrals = integralMapper.selectByCond(integral);
-                if (integrals != null && integrals.size() > 0) {
-                    integral.setIntegral(integralTactic.getShareRegIntegral() + integrals.get(0).getIntegral());
+                IntegralQuery integralQuery = new IntegralQuery();
+                integralQuery.setCpId(company.getCpId());
+                integralQuery.setFlgValid(true);
+                List<IntegralResponse> integralResponses = integralMapper.selectByCond(integralQuery);
+                if (integralResponses != null && integralResponses.size() > 0) {
+                    integral.setIntegral(integralTactic.getRegIntegral()  );
                     integralMapper.updateById(integral);
                 }else{
-                    integral.setIntegral(integralTactic.getShareRegIntegral());
+                    integral.setIntegral(integralTactic.getRegIntegral());
                     integralMapper.insert(integral);
                 }
 
                 // 积分明细 来源公司公司的
                 integralItem = new IntegralItem();
 //                邀请的注册
-                integralItem.setIntegralType(Constant.IntegralType.INTEGRAL_TYPE_REGISTER.getName());
+                integralItem.setIntegralType(Constant.IntegralType.INTEGRAL_TYPE_INVITE.getName());
                 integralItem.setIntegral(integralTactic.getShareRegIntegral());
                 integralItem.setCpId(companyVO.getCpIdFrom());
                 integralItem.setAccDate(LocalDateTime.now());
@@ -311,9 +316,12 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
                 integral = new Integral();
                 integral.setCpId(companyVO.getCpIdFrom());
                 integral.setFlgValid(true);
-                integrals = integralMapper.selectByCond(integral);
-                if (integrals != null && integrals.size() > 0) {
-                    integral.setIntegral(integralTactic.getShareRegIntegral() + integrals.get(0).getIntegral());
+                integralQuery = new IntegralQuery();
+                integralQuery.setCpId(companyVO.getCpIdFrom());
+                integralQuery.setFlgValid(true);
+                integralResponses = integralMapper.selectByCond(integralQuery);
+                if (integralResponses != null && integralResponses.size() > 0) {
+                    integral.setIntegral(integralTactic.getShareRegIntegral());
                     integralMapper.updateById(integral);
                 }else{
                     integral.setIntegral(integralTactic.getShareRegIntegral());