conflict

src/main/java/au/com/royalpay/payment/manage/citypartner/web/CityPartnerRegisterController.java

@@ -1,10 +1,17 @@
 package au.com.royalpay.payment.manage.citypartner.web;
-import au.com.royalpay.payment.manage.citypartner.core.CityPartnerRegisterService;
 
+import au.com.royalpay.payment.manage.citypartner.beans.CityPartnerBean;
+import au.com.royalpay.payment.manage.citypartner.core.CityPartnerRegisterService;
+import au.com.royalpay.payment.tools.exceptions.ForbiddenException;
+import au.com.royalpay.payment.tools.http.HttpUtils;
+import org.springframework.validation.Errors;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.validation.Valid;
 
 /**
  * Created by yixian on 2017-01-23.
@@ -15,9 +22,12 @@ public class CityPartnerRegisterController {
     @Resource
     private CityPartnerRegisterService cityPartnerRegisterService;
 
-//    @RequestMapping(method = RequestMethod.POST)
-//    public void register(@RequestBody @Valid CityPartnerBean partner, Errors errors) {
-//        HttpUtils.handleValidErrors(errors);
-//        cityPartnerRegisterService.saveRegistry(partner);
-//    }
+    @RequestMapping(method = RequestMethod.POST)
+    public void register(@RequestBody @Valid CityPartnerBean partner, Errors errors) {
+        HttpUtils.handleValidErrors(errors);
+        if (true) {
+            throw new ForbiddenException();
+        }
+        cityPartnerRegisterService.saveRegistry(partner);
+    }
 }