| | |
|---|
| | | //活动商品判断 |
|---|
| | | if(appGoodsInfoGetDto.getActivityFlag()==1){ |
|---|
| | | ActivityGoods activityGoods = activityGoodsService.getByGoodsId(appGoodsInfoGetDto.getActivityId(),goods.getGoodsId()); |
|---|
| | | Activity activity = activityService.getById(appGoodsInfoGetDto.getActivityId()); |
|---|
| | | //原价取较大值 |
|---|
| | | if(shopGoods!=null&&goods.getSalesPrice().compareTo(shopGoods.getSalesPrice())>0){ |
|---|
| | | appGoodsInfoVo.setSalesPrice(goods.getSalesPrice()); |
|---|
| | |
|---|
| | | appGoodsInfoVo.setActivityFlag(1); |
|---|
| | | appGoodsInfoVo.setActivityPrice(activityGoods.getActivityPrice()); |
|---|
| | | appGoodsInfoVo.setSalesNum(activityGoods.getSalesNumber()); |
|---|
| | | appGoodsInfoVo.setActivityDeadline(activityGoods.getActivityDeadline()); |
|---|
| | | appGoodsInfoVo.setTimestamp(activityGoods.getActivityDeadline().getTime()); |
|---|
| | | appGoodsInfoVo.setActivityStartTime(activity.getActivityStartTime()); |
|---|
| | | appGoodsInfoVo.setActivityDeadline(activity.getActivityEndTime()); |
|---|
| | | appGoodsInfoVo.setTimestamp(activity.getActivityEndTime().getTime()); |
|---|
| | | Integer availableBuyNum = 0; |
|---|
| | | //售罄判断 |
|---|
| | | if(activityGoods.getActivityNumber().equals(activityGoods.getSalesNumber())){ |
|---|
