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

# Conflicts:
#	common/common-entity/src/main/java/com/yihu/jw/entity/specialist/rehabilitation/PatientRehabilitationPlanDO.java

common/common-request-mapping/src/main/java/com/yihu/jw/rm/health/bank/HealthBankMapping.java

@@ -85,5 +85,6 @@ public class HealthBankMapping {
        public static final String selectWeekReward="/selectWeekReward";
        public static final String reduceIntegrate ="/reduceIntegrate";
        public static final String createPlanActivity = "/createPlanActivity";
        public static final String completePlan="/completePlan";
    }
}

svr/svr-wlyy-health-bank/src/main/java/com/yihu/jw/controller/CreditsDetailController.java

@@ -497,4 +497,31 @@ public class CreditsDetailController extends EnvelopRestEndpoint {
    }
    @PostMapping(value = HealthBankMapping.healthBank.completePlan)
    @ApiOperation(value ="完成计划获取积分")
    public MixEnvelop<CreditsDetailDO, CreditsDetailDO> completePlan(@ApiParam(name = "hospital",value = "社区code" )
                                                                        @RequestParam(value = "hospital",required = false)String hospital,
                                                                        @ApiParam(name = "hospitalName",value = "社区名称")
                                                                        @RequestParam(value = "hospitalName",required = false)String hospitalName,
                                                                        @ApiParam(name = "patient",value = "居民code")
                                                                        @RequestParam(value = "patient",required = true)String patient,
                                                                        @ApiParam(name = "planCode",value = "计划code")
                                                                        @RequestParam(value = "planCode",required = true)String planCode,
                                                                        @ApiParam(name = "idcard",value = "身份证")
                                                                            @RequestParam(value = "idcard",required = false)String idcard,
                                                                        @ApiParam(name = "integrate",value = "积分")
                                                                            @RequestParam(value = "integrate",required = true)Integer integrate){
        try {
            CreditsDetailDO creditsDetailDO =service.completePlan(planCode,patient,idcard,integrate,hospital,hospitalName);
            MixEnvelop<CreditsDetailDO,CreditsDetailDO> envelop = new MixEnvelop<>();
            envelop.setObj(creditsDetailDO);
            return envelop;
        }catch (Exception e){
            e.printStackTrace();
            tracer.getCurrentSpan().logEvent(e.getMessage());
            return MixEnvelop.getError(e.getMessage());
        }
    }
}

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

@@ -1685,4 +1685,40 @@ public class CreditsDetailService extends BaseJpaService<CreditsDetailDO,Creditt
        }
    }
    public CreditsDetailDO completePlan(String planCode,String patient,String idcard,Integer integrate,String hospital,String hospitalName) throws Exception {
        ActivityDO activityDO = activityDao.selectByTemplateIdAndType(planCode,"健康计划");
        CreditsDetailDO creditsDetailDO = new CreditsDetailDO();
        if (activityDO!=null){
            List<TaskDO> taskDOS = taskDao.selectByActivityId(activityDO.getId());
            AccountDO accountDO = accountDao.selectByPatientId(patient);
            if (taskDOS!=null&&taskDOS.size()!=0){
                creditsDetailDO.setSaasId("dev");
                creditsDetailDO.setPatientId(patient);
                creditsDetailDO.setIdCard(idcard);
                creditsDetailDO.setIntegrate(integrate);
                creditsDetailDO.setStatus(1);
                creditsDetailDO.setTradeDirection(1);
                creditsDetailDO.setTradeType("ACTIVITY_TASK");
                creditsDetailDO.setAccountId(accountDO.getId());
                creditsDetailDO.setHospital(hospital);
                creditsDetailDO.setHospitalName(hospitalName);
                creditsDetailDO.setTransactionId(taskDOS.get(0).getId());
                creditsDetailDO.setUpdateTime(new Date());
                creditsDetailDO.setCreateTime(new Date());
                credittsLogDetailDao.save(creditsDetailDO);
                TaskPatientDetailDO taskPatientDetailDO = taskPatientDetailDao.selectByTaskIdAndPatientId(taskDOS.get(0).getId(),patient);
                if (taskPatientDetailDO!=null){
                    taskPatientDetailDO.setTotal(taskPatientDetailDO.getTotal()+integrate);
                }
                taskPatientDetailDao.save(taskPatientDetailDO);
                accountDO.setTotal(accountDO.getTotal()+integrate);
                accountDao.save(accountDO);
            }
        }else {
            throw new Exception("暂不能获取积分！");
        }
        return creditsDetailDO;
    }
}