Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

svr/svr-wlyy-health-bank/src/main/java/com/yihu/jw/service/CreditsDetailService.java

@@ -887,7 +887,7 @@ public class CreditsDetailService extends BaseJpaService<CreditsDetailDO,Creditt
                        if (creditsDetailDOS != null && creditsDetailDOS.size() != 0){
                            CreditsDetailDO creditsDetailDO1 = creditsDetailDOS.get(0);
                            if (creditsDetailDO.getStepNumber()>0 && creditsDetailDO.getStepNumber()<=step){
                                creditsDetailDO.setIntegrate(creditsDetailDO.getIntegrate());
                                creditsDetailDO.setIntegrate(integrate);
                                creditsDetailDO.setTradeDirection(1);
                                creditsDetailDO.setUpdateTime(new Date());
                                creditsDetailDO.setCreateTime(new Date());
@@ -907,8 +907,9 @@ public class CreditsDetailService extends BaseJpaService<CreditsDetailDO,Creditt
                        }else {
                            CreditsDetailDO creditsDetailDO1 = new CreditsDetailDO();
                            if (creditsDetailDO.getStepNumber()>0 && creditsDetailDO.getStepNumber()<=step){
                                creditsDetailDO1.setIntegrate(creditsDetailDO.getIntegrate());
                                creditsDetailDO1.setIntegrate(integrate);
                                creditsDetailDO1.setStepNumber(creditsDetailDO.getStepNumber());
                                creditsDetailDO1.setTransactionId(creditsDetailDO.getTransactionId());
                                creditsDetailDO1.setTradeDirection(1);
                                creditsDetailDO1.setSaasId("dev");
                                creditsDetailDO1.setTradeType("ACTIVITY_TASK");