Antiloveg 8 years ago
parent
commit
870024f6d6

+ 9 - 7
src/main/java/com/goafanti/common/controller/PortalController.java

@@ -172,14 +172,16 @@ public class PortalController extends BaseController {
 						if (null != bo.getMaturity()) {
 							bo.setMaturityS(bo.getMaturity() * MULTIPLE + "%");
 						}
-						if (null != bo.getTransferPrice()) {
-							bo.setTransferPriceS(bo.getTransferPrice() + UNIT);
-						} else {
-							bo.setTransferPriceS(PRICE_NEGOTIABLE);
-						}
+
 						if (null == bo.getBargainingMode()
 								|| AchievementBargainingMode.NEGOTIABLE.getCode().equals(bo.getBargainingMode())) {
 							bo.setTransferPriceS(PRICE_NEGOTIABLE);
+						} else {
+							if (null != bo.getTransferPrice()) {
+								bo.setTransferPriceS(bo.getTransferPrice() + UNIT);
+							} else {
+								bo.setTransferPriceS(PRICE_NEGOTIABLE);
+							}
 						}
 					}
 				}
@@ -231,7 +233,7 @@ public class PortalController extends BaseController {
 			String province = achievement.getProvince();
 			String city = achievement.getCity();
 			location += (StringUtils.isBlank(province) ? "" : province) + (StringUtils.isBlank(city) ? "" : city);
-			
+
 			if (null == achievement.getBargainingMode()
 					|| AchievementBargainingMode.NEGOTIABLE.equals(achievement.getBargainingMode())) {
 				achievement.setTransferPriceS(PRICE_NEGOTIABLE);
@@ -242,7 +244,7 @@ public class PortalController extends BaseController {
 					achievement.setTransferPriceS(PRICE_NEGOTIABLE);
 				}
 			}
-			
+
 			achievement.setLocation(location);
 
 		}