~zhangleilei/supipe.git

			@@ -33,6 +33,7 @@
			@Autowired
			private IntegralDetailMapper integralDetailMapper;

			private static final Object Lock= new Object();
			/**
			* 积分超市新增和修改
			* @param integralDetailEntity
			@@ -45,6 +46,7 @@
			String sysUserId = sysUserInfo.getUserId();
			String companyId = sysUserInfo.getCompanyId();
			//扣积分逻辑
			synchronized (Lock){
			IntegralAccountEntity integralAccountEntity = IntegralAccountEntity
			.builder()
			.userId(integralDetailEntity.getUserId())
			@@ -81,6 +83,7 @@
			integralDetailEntity.setIntegralSource("积分超市");
			//添加或修改明细
			integralDetailMapper.insertDetailAndUpdate(integralDetailEntity);
			}
			return BasicResult.success();
			}

			@@ -121,7 +124,7 @@
			Double totalConsumption = queryAccount.getTotalConsumption();//总消耗
			Double accumulateIntegral = queryAccount.getAccumulateIntegral();//累计积分
			Double totalIntegral = queryAccount.getTotalIntegral();//当前余额

			synchronized (Lock){
			IntegralAccountEntity integralAccountEntity = IntegralAccountEntity
			.builder()
			.userId(integralDetailEntity.getUserId())
			@@ -131,6 +134,7 @@
			.build();
			integralDetailMapper.insertAndUpdateAccount(integralAccountEntity);
			integralDetailMapper.delete(id);
			}
			return BasicResult.success();
			}