心愿互换状态改为取消的逻辑，需要修改心愿数量

common/src/main/java/com/jpsoft/employment/modules/base/entity/WishInfoUserRecord.java

@@ -35,7 +35,7 @@ public class WishInfoUserRecord {
 	@ApiModelProperty(value = "是否现场互换心愿")
 	private Boolean isSpot;
 
-	@ApiModelProperty(value = "互换状态(0：互换中，1：已完成)")
+	@ApiModelProperty(value = "互换状态(0：互换中，1：已完成，2:取消)")
 	private String status;
 
 	@ApiModelProperty(value = "流水号")

web/src/main/java/com/jpsoft/employment/modules/base/controller/WishInfoUserRecordController.java

@@ -228,6 +228,17 @@ public class WishInfoUserRecordController {
             int affectCount = wishInfoUserRecordService.update(wishInfoUserRecord);
 
             if (affectCount > 0) {
+                if(status.equals("2")){
+                    //如果更改为取消状态，需要修改心愿数量和已兑换数量
+                    WishInfo wishInfo = wishInfoService.get(wishInfoUserRecord.getWishInfoId());
+                    if(wishInfo!=null){
+                        int amount = wishInfo.getAmount() + 1;
+                        wishInfo.setAmount(amount);
+                        wishInfo.setUpdateBy(subject);
+                        wishInfo.setUpdateTime(new Date());
+                        wishInfoService.update(wishInfo);
+                    }
+                }
                 msgResult.setResult(true);
             } else {
                 msgResult.setResult(false);