修改返回体

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/controller/SubscriptionApplyController.java

@@ -3,6 +3,7 @@ package com.hcloud.microserver.system.bank.controller;
 
 import com.hcloud.microserver.commoncore.annotation.AuthCarbonValidate;
 import com.hcloud.microserver.commoncore.base.BaseController;
+import com.hcloud.microserver.commoncore.base.ResponseBase;
 import com.hcloud.microserver.commoncore.web.domain.AjaxResult;
 import com.hcloud.microserver.commoncore.web.page.TableDataInfo;
 import com.hcloud.microserver.system.bank.service.ISubscriptionApplyService;
@@ -14,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 碳汇认购申请Controller
@@ -36,11 +38,11 @@ public class SubscriptionApplyController extends BaseController
     @GetMapping("/list")
     @AuthCarbonValidate
     @ApiOperation("查询认购申请列表")
-    public TableDataInfo list(SubscriptionApply subscriptionApply)
+    public ResponseBase<SubscriptionApply> list(SubscriptionApply subscriptionApply)
     {
         startPage();
         List<SubscriptionApply> list = subscriptionApplyService.selectSubscriptionApplyList(subscriptionApply);
-        return getDataTable(list);
+        return responseResultSuccess(list);
     }
 
     /**
@@ -49,9 +51,9 @@ public class SubscriptionApplyController extends BaseController
     @GetMapping(value = "/{guid}")
     @AuthCarbonValidate
     @ApiOperation("获取认购申请详情")
-    public AjaxResult getInfo(@PathVariable("guid") String guid)
+    public ResponseBase getInfo(@PathVariable("guid") String guid)
     {
-        return AjaxResult.success(subscriptionApplyService.selectSubscriptionApplyById(guid));
+        return responseResultSuccess(subscriptionApplyService.selectSubscriptionApplyById(guid));
     }
 
 
@@ -62,8 +64,8 @@ public class SubscriptionApplyController extends BaseController
 	@DeleteMapping("/{guids}")
     @AuthCarbonValidate
     @ApiOperation("逻辑删除认购申请")
-    public AjaxResult remove(@PathVariable String[] guids)
+    public ResponseBase remove(@PathVariable String[] guids)
     {
-        return toAjax(subscriptionApplyService.deleteSubscriptionApplyByIds(guids));
+        return responseResultSuccess(subscriptionApplyService.deleteSubscriptionApplyByIds(guids));
     }
 }

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/service/impl/OrderInfoServiceImpl.java

@@ -531,7 +531,8 @@ public class OrderInfoServiceImpl implements OrderInfoService {
         goodsOrderInfoMapper.updateByPrimaryKeySelective(order);
         //保存收款凭证
         int result = orderPayVoucherService.newSavePayVoucher(payVoucher);
-        //保存证书 TODO
+        //保存证书
+        applicationContext.publishEvent(new CredentialInfoEvent(new Object(),payVoucher.getOrderId()));
         return result;
     }
 

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/h5/controller/web/SubscriptionApplyController.java

@@ -3,6 +3,7 @@ package com.hcloud.microserver.h5.controller.web;
 
 import com.hcloud.microserver.commoncore.annotation.AuthCarbonValidate;
 import com.hcloud.microserver.commoncore.base.BaseController;
+import com.hcloud.microserver.commoncore.base.ResponseBase;
 import com.hcloud.microserver.commoncore.web.domain.AjaxResult;
 import com.hcloud.microserver.commoncore.web.page.TableDataInfo;
 import com.hcloud.microserver.h5.entity.SubscriptionApply;
@@ -37,11 +38,11 @@ public class SubscriptionApplyController extends BaseController
     @GetMapping("/list")
     @AuthCarbonValidate
     @ApiOperation("查询认购申请列表")
-    public TableDataInfo list()
+    public ResponseBase<SubscriptionApply> list()
     {
         startPage();
         List<SubscriptionApply> list = subscriptionApplyService.selectSubscriptionApplyList();
-        return getDataTable(list);
+        return responseResultSuccess(list);
     }
 
     /**
@@ -50,9 +51,9 @@ public class SubscriptionApplyController extends BaseController
     @GetMapping(value = "/{guid}")
     @AuthCarbonValidate
     @ApiOperation("获取认购申请详情")
-    public AjaxResult getInfo(@PathVariable("guid") String guid)
+    public ResponseBase getInfo(@PathVariable("guid") String guid)
     {
-        return AjaxResult.success(subscriptionApplyService.selectSubscriptionApplyById(guid));
+        return responseResultSuccess(subscriptionApplyService.selectSubscriptionApplyById(guid));
     }
 
     /**
@@ -61,9 +62,9 @@ public class SubscriptionApplyController extends BaseController
     @PostMapping
     @AuthCarbonValidate
     @ApiOperation("保存碳汇认购申请")
-    public AjaxResult add(@RequestBody SubscriptionApplyForm applyForm)
+    public ResponseBase add(@RequestBody SubscriptionApplyForm applyForm)
     {
-        return toAjax(subscriptionApplyService.insertSubscriptionApply(applyForm));
+        return responseResultSuccess(subscriptionApplyService.insertSubscriptionApply(applyForm));
     }
 
     /**
@@ -73,9 +74,9 @@ public class SubscriptionApplyController extends BaseController
     @PutMapping
     @AuthCarbonValidate
     @ApiOperation(value = "更新申请状态为认购成功",hidden = true)
-    public AjaxResult edit(String guid)
+    public ResponseBase edit(String guid)
     {
-        return toAjax(subscriptionApplyService.updateSubscriptionApply(guid));
+        return responseResultSuccess(subscriptionApplyService.updateSubscriptionApply(guid));
     }
 
     /**
@@ -85,8 +86,8 @@ public class SubscriptionApplyController extends BaseController
 	@DeleteMapping("/{guids}")
     @AuthCarbonValidate
     @ApiOperation(value = "逻辑删除认购申请",hidden = true)
-    public AjaxResult remove(@PathVariable String[] guids)
+    public ResponseBase remove(@PathVariable String[] guids)
     {
-        return toAjax(subscriptionApplyService.deleteSubscriptionApplyByIds(guids));
+        return responseResultSuccess(subscriptionApplyService.deleteSubscriptionApplyByIds(guids));
     }
 }