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/health/bank/ActivityDO.java
#	svr/svr-wlyy-health-bank/src/main/java/com/yihu/jw/controller/ActivityController.java
#	svr/svr-wlyy-health-bank/src/main/java/com/yihu/jw/service/ActivityService.java

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

@@ -1007,6 +1007,9 @@ public class CreditsDetailService extends BaseJpaService<CreditsDetailDO,Creditt
           creditsDetailDO.setHospitalName(hospitalName);
           creditsDetailDO.setCreateTime(new Date());
           creditsDetailDO.setUpdateTime(new Date());
           creditsDetailDO.setTransactionId(taskDO.getId());
           creditsDetailDO.setPatientId(patientId);
           creditsDetailDO.setHospitalName(hospitalName);
           credittsLogDetailDao.save(creditsDetailDO);
           accountDO.setTotal(accountDO.getTotal()-integrate);
           accountDao.save(accountDO);

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

@@ -71,9 +71,17 @@ public class ExchangeGoodsService extends BaseJpaService<ExchangeGoodsDO,Exchang
           }
       }
       if (exchangeGoodsDO.getCoupon() == null){
           accountDO.setTotal(accountDO.getTotal()-exchangeGoodsDO.getIntegrate());
           if (accountDO.getTotal() == null ){
               throw new Exception("积分余额不足！");
           }else {
               accountDO.setTotal(accountDO.getTotal()-exchangeGoodsDO.getIntegrate());
           }
       }else if (exchangeGoodsDO.getIntegrate() == null){
           accountDO.setCouponTotal(accountDO.getCouponTotal()-exchangeGoodsDO.getCoupon());
           if (accountDO.getTotal() == null){
               throw new Exception("活动劵余额不足！");
           }else {
               accountDO.setCouponTotal(accountDO.getCouponTotal()-exchangeGoodsDO.getCoupon());
           }
       }
       exchangeGoodsDO.setCreateTime(new Date());
       exchangeGoodsDO.setUpdateTime(new Date());