Browse Source

bug

feature/dangjian
曲树通 4 years ago
parent
commit
e19718b6ff
  1. 2
      esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/feign/UserPointsFeignClient.java
  2. 2
      esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserPointsFeignClientFallback.java
  3. 5
      esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/AcitveProductInfoServiceImpl.java
  4. 2
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java
  5. 2
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java
  6. 7
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java

2
esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/feign/UserPointsFeignClient.java

@ -30,7 +30,7 @@ public interface UserPointsFeignClient {
* @date 2021/9/27 13:38 * @date 2021/9/27 13:38
*/ */
@PostMapping(value = "/app-user/epdc-app/user/updatePointsUser", consumes = MediaType.APPLICATION_JSON_VALUE) @PostMapping(value = "/app-user/epdc-app/user/updatePointsUser", consumes = MediaType.APPLICATION_JSON_VALUE)
Result updataUserPoint(UserPointsFormDTO formDto); Result<Boolean> updataUserPoint(UserPointsFormDTO formDto);
/*** /***

2
esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserPointsFeignClientFallback.java

@ -21,7 +21,7 @@ public class UserPointsFeignClientFallback implements UserPointsFeignClient {
@Override @Override
public Result updataUserPoint(UserPointsFormDTO formDto) { public Result<Boolean> updataUserPoint(UserPointsFormDTO formDto) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "updataUserPoint", formDto); return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "updataUserPoint", formDto);
} }

5
esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/AcitveProductInfoServiceImpl.java

@ -250,7 +250,10 @@ public class AcitveProductInfoServiceImpl extends BaseServiceImpl<AcitveProductI
UserPointsFormDTO userPointsFormDTO = new UserPointsFormDTO(); UserPointsFormDTO userPointsFormDTO = new UserPointsFormDTO();
userPointsFormDTO.setPoints(-acitveProductInfoEntity.getPoints()); userPointsFormDTO.setPoints(-acitveProductInfoEntity.getPoints());
userPointsFormDTO.setUserId(formDTO.getUserId()); userPointsFormDTO.setUserId(formDTO.getUserId());
userPointsFeignClient.updataUserPoint(userPointsFormDTO); Result<Boolean> booleanResult = userPointsFeignClient.updataUserPoint(userPointsFormDTO);
if(!booleanResult.getData()){
throw new RenException("积分不足");
}
//生成商品兑换记录及积分消费记录。 //生成商品兑换记录及积分消费记录。
ActivePointLogDTO activePointLogDTO = new ActivePointLogDTO(); ActivePointLogDTO activePointLogDTO = new ActivePointLogDTO();

2
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java

@ -430,7 +430,7 @@ public class EpdcAppUserController {
* @date 2021/9/27 17:41 * @date 2021/9/27 17:41
*/ */
@PostMapping("updatePointsUser") @PostMapping("updatePointsUser")
public Result updatePointsUser(@RequestBody UserPointsFormDTO formDTO) { public Result<Boolean> updatePointsUser(@RequestBody UserPointsFormDTO formDTO) {
return userService.updatePointsUser(formDTO); return userService.updatePointsUser(formDTO);
} }

2
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java

@ -414,7 +414,7 @@ public interface UserService extends BaseService<UserEntity> {
* @author qushutong * @author qushutong
* @date 2021/9/27 17:50 * @date 2021/9/27 17:50
*/ */
Result updatePointsUser(UserPointsFormDTO formDTO); Result<Boolean> updatePointsUser(UserPointsFormDTO formDTO);
Result<UserActivePointsResultDTO> getActivePoints(String userId); Result<UserActivePointsResultDTO> getActivePoints(String userId);
} }

7
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java

@ -1670,14 +1670,15 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
} }
@Override @Override
public Result updatePointsUser(UserPointsFormDTO formDTO) { public Result<Boolean> updatePointsUser(UserPointsFormDTO formDTO) {
UserEntity userEntity = baseDao.selectById(formDTO.getUserId()); UserEntity userEntity = baseDao.selectById(formDTO.getUserId());
int activePoints = userEntity.getActivePoints() + formDTO.getPoints(); int activePoints = userEntity.getActivePoints() + formDTO.getPoints();
if (activePoints < 0) { if (activePoints < 0) {
throw new RenException("当前积分不够,不能够兑换"); return new Result<Boolean>().ok(false);
} }
userEntity.setActivePoints(activePoints); userEntity.setActivePoints(activePoints);
return new Result().ok(baseDao.updateById(userEntity)); baseDao.updateById(userEntity);
return new Result();
} }
@Override @Override

Loading…
Cancel
Save