大后台更新3

src/main/java/common/controller/ContractController.java

@@ -269,17 +269,17 @@ public class ContractController {
         return ResultModel.OK(service.build(contract));
     }
 
-    @RequestMapping(value = "trade", method = RequestMethod.POST)
+    @RequestMapping(value = "trade", method = RequestMethod.GET)
     @ResponseBody
-    public ResultModel baseCreate(@RequestBody Contract contract, @PathVariable String platform) {
+    public ResultModel baseCreate( @PathVariable String platform) {
 
         return ResultModel.OK(service.getTradeData(platform));
     }
 
 
-    @RequestMapping(value = "code/all", method = RequestMethod.POST)
+    @RequestMapping(value = "code/all", method = RequestMethod.GET)
     @ResponseBody
-    public ResultModel contractCodeAll(@RequestBody Contract contract, @PathVariable String platform) {
+    public ResultModel contractCodeAll( @PathVariable String platform) {
 
         return ResultModel.OK(service.contractCodeAll(platform));
     }

src/main/java/common/model/Contract.java

@@ -20,7 +20,7 @@ public class Contract {
     private String email; //客户主账号
     private String contractCode;
     //是否首次签约
-    private String contractType;
+    private String contractType; // 0 首次签约 1 续签 2 合同变更
     private String startDate;
     private String endDate;
     //套餐
@@ -53,7 +53,7 @@ public class Contract {
     private Boolean virtual;
 
     /**
-     * 新增字段
+     * 新增字段 20190427
      */
     private Long discountFlow; // 优惠流量
     private Long discountTimeLong; // 优惠时长

src/main/java/common/service/impl/ContractServiceImpl.java

@@ -180,10 +180,10 @@ public class ContractServiceImpl implements ContractService{
 
         int codeInt = countContract.intValue();
 
-        if(codeInt < 9){
-            lastCode = "0"+(codeInt+1);
-        }else{
-            lastCode = ""+(codeInt+1);
+        if (codeInt < 9) {
+            lastCode = "0" + (codeInt + 1);
+        } else {
+            lastCode = "" + (codeInt + 1);
         }
         return (company + "-" + platform + "-" + DateUtil.getDays2(0) + "-" + lastCode).toUpperCase();
     }