Merge branch 'dev' of cqcarbon/carbon-platform into master

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/CustomerCompanyType.java

@@ -0,0 +1,117 @@
+package com.hcloud.microserver.facade.carbon.entity;
+
+import javax.validation.constraints.NotEmpty;
+import java.util.Date;
+
+public class CustomerCompanyType {
+    private String guid;
+
+    private String parentId;
+
+    @NotEmpty(message = "企业类型不能为空")
+    private String typeName;
+
+    private String typeVal;
+
+    private Integer state;
+
+    private Date modifiedTime;
+
+    private String methodology;
+
+    private String typeDesc;
+
+    private String createUser;
+
+    private Date createTime;
+
+    private String modifiedUser;
+
+    public String getGuid() {
+        return guid;
+    }
+
+    public void setGuid(String guid) {
+        this.guid = guid == null ? null : guid.trim();
+    }
+
+    public String getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(String parentId) {
+        this.parentId = parentId == null ? null : parentId.trim();
+    }
+
+    public String getTypeName() {
+        return typeName;
+    }
+
+    public void setTypeName(String typeName) {
+        this.typeName = typeName == null ? null : typeName.trim();
+    }
+
+    public String getTypeVal() {
+        return typeVal;
+    }
+
+    public void setTypeVal(String typeVal) {
+        this.typeVal = typeVal == null ? null : typeVal.trim();
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public Date getModifiedTime() {
+        return modifiedTime;
+    }
+
+    public void setModifiedTime(Date modifiedTime) {
+        this.modifiedTime = modifiedTime;
+    }
+
+    public String getMethodology() {
+        return methodology;
+    }
+
+    public void setMethodology(String methodology) {
+        this.methodology = methodology == null ? null : methodology.trim();
+    }
+
+    public String getTypeDesc() {
+        return typeDesc;
+    }
+
+    public void setTypeDesc(String typeDesc) {
+        this.typeDesc = typeDesc == null ? null : typeDesc.trim();
+    }
+
+    public String getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(String createUser) {
+        this.createUser = createUser;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getModifiedUser() {
+        return modifiedUser;
+    }
+
+    public void setModifiedUser(String modifiedUser) {
+        this.modifiedUser = modifiedUser;
+    }
+}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/CustomerCompanyTypeForm.java

@@ -0,0 +1,28 @@
+package com.hcloud.microserver.facade.carbon.forms;
+
+import com.hcloud.microserver.commoncore.base.BaseForm;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@ApiModel("企业类型信息")
+public class CustomerCompanyTypeForm extends BaseForm {
+    private String guid;
+
+    private String parentId;
+
+    private String typeName;
+
+    private String typeVal;
+
+    private Integer state;
+
+    private Date modifiedTime;
+
+    private String methodology;
+
+    private String typeDesc;
+}

carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/bank/bo/CarbonBaseController.java

@@ -0,0 +1,19 @@
+package com.hcloud.microserver.bank.bo;
+
+import com.hcloud.microserver.commoncore.base.BaseController;
+import com.hcloud.microserver.commoncore.base.ResponseBase;
+import com.hcloud.microserver.sys.service.util.CurrUserUtil;
+
+public class CarbonBaseController extends BaseController {
+
+    public String getUserId(){
+        return CurrUserUtil.getUserId();
+    }
+
+    public ResponseBase thisReturn(int i){
+        if (i>0){
+            return responseResultSuccess();
+        }
+        return responseResultFailure();
+    }
+}

carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/bank/controller/BaseDictionaryController.java

@@ -0,0 +1,37 @@
+package com.hcloud.microserver.bank.controller;
+
+import com.hcloud.microserver.commoncore.base.BaseController;
+import com.hcloud.microserver.commoncore.base.ResponseBase;
+import com.hcloud.microserver.commoncore.base.ResultVO;
+import com.hcloud.microserver.commoncore.util.BeanCopyUtil;
+import com.hcloud.microserver.sys.facade.entity.BaseDictionary;
+import com.hcloud.microserver.sys.facade.forms.BaseDictionaryForm;
+import com.hcloud.microserver.sys.service.service.BaseDictionaryService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/web/dic")
+public class BaseDictionaryController extends BaseController {
+
+    @Autowired
+    private BaseDictionaryService baseDictionaryService;
+
+    /**
+     * 条件查询字典
+     * @param baseDictionaryForm
+     * @return
+     */
+    @PostMapping("/findByEntity")
+    public ResponseBase findByEntity(@RequestBody BaseDictionaryForm baseDictionaryForm) {
+
+        BaseDictionary baseDictionary = BeanCopyUtil.convertBean(baseDictionaryForm, BaseDictionary.class);
+        List<BaseDictionary> baseDictionaries = this.baseDictionaryService.findByEntity(baseDictionary);
+        return responseResultSuccess(baseDictionaries);
+    }
+}

carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/bank/controller/BasePositionManageController.java → carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/bank/controller/BasePositionController.java

@@ -1,10 +1,12 @@
 package com.hcloud.microserver.bank.controller;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.hcloud.microserver.bank.service.BasePositionService;
 import com.hcloud.microserver.commoncore.base.BaseController;
-import com.hcloud.microserver.commoncore.base.ResultVO;
-
+import com.hcloud.microserver.commoncore.base.ResponseBase;
 import com.hcloud.microserver.facade.carbon.entity.BasePosition;
+import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -14,33 +16,34 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
-/**
- * @author xiezt
- */
 @Slf4j
 @RestController
-@RequestMapping("/basePosition")
-public class BasePositionManageController extends BaseController {
+@RequestMapping("/web/position")
+@Api(description = "基本区域信息管理服务")
+public class BasePositionController extends BaseController {
 
     @Autowired
     private BasePositionService basePositionService;
 
     @PostMapping("/findByCodeAndLevel")
-    public ResultVO findByCodeAndLevel(@RequestBody BasePosition basePosition) {
+    public ResponseBase findByCodeAndLevel(@RequestBody BasePosition basePosition) {
         List<BasePosition> positionList = this.basePositionService.queryByCodeAndLevel(basePosition);
-        return success(positionList);
+        return responseResultSuccess(positionList);
     }
 
     @PostMapping("/findByCodes")
-    public ResultVO findByCodes(@RequestBody List<String> codes) {
-        log.info("list string codes ===============> {}", codes);
+    private ResponseBase findByCodes(@RequestBody JSONObject parameters) {
+        log.info("看看参数: {}", parameters);
+        JSONArray codesArray = parameters.getJSONArray("codes");
+        List<String> codes = codesArray.toJavaList(String.class);
+        log.info("能不能转换: {}", codes);
         List<BasePosition> positionList = this.basePositionService.queryByCodes(codes);
-        return success(positionList);
+        return responseResultSuccess(positionList);
     }
 
     @PostMapping("/findChongqingArea")
-    public ResultVO findChongqingArea(@RequestBody(required = false) BasePosition basePosition) {
+    private ResponseBase findChongqingArea(@RequestBody(required = false) BasePosition basePosition) {
         List<BasePosition> positionList = this.basePositionService.queryByChongqingArea(basePosition);
-        return success(positionList);
+        return responseResultSuccess(positionList);
     }
 }

carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/bank/controller/CollectiveFarmerController.java

@@ -0,0 +1,67 @@
+package com.hcloud.microserver.bank.controller;
+
+import com.github.pagehelper.PageInfo;
+import com.hcloud.microserver.bank.service.CollectiveFarmerService;
+import com.hcloud.microserver.commoncore.base.BaseController;
+import com.hcloud.microserver.commoncore.base.ResponseBase;
+import com.hcloud.microserver.facade.carbon.forms.CollectiveFarmerForm;
+import com.hcloud.microserver.sys.service.util.CurrUserUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author xiezt
+ */
+@RestController
+@RequestMapping("/web/collectiveFarmer")
+@Api(description = "集体农户信息管理服务")
+public class CollectiveFarmerController extends BaseController {
+
+    @Autowired
+    private CollectiveFarmerService collectiveFarmerService;
+
+    @ApiOperation(value = "分页查询集体农户信息",notes = "分页查询集体农户信息")
+    @PostMapping("/searchByPage")
+    public ResponseBase searchByPage(@RequestBody CollectiveFarmerForm collectiveFarmerForm) {
+        PageInfo pageInfo = this.collectiveFarmerService.queryListByPage(collectiveFarmerForm);
+        return responseSuccess(pageInfo);
+    }
+
+    @ApiOperation(value = "添加集体农户信息",notes = "添加集体农户信息")
+    @PostMapping("/save")
+    public ResponseBase save(@RequestBody CollectiveFarmerForm collectiveFarmerForm) {
+        String userId = CurrUserUtil.getUserId();
+        collectiveFarmerForm.setCreateUser(userId);
+        collectiveFarmerForm.setModifiedUser(userId);
+        int save = this.collectiveFarmerService.save(collectiveFarmerForm);
+        if (save>0) {
+            return responseResultSuccess();
+        }
+        return responseResultFailure();
+    }
+
+    @ApiOperation(value = "修改集体农户信息",notes = "修改集体农户信息")
+    @PostMapping("/update")
+    public ResponseBase update(@RequestBody CollectiveFarmerForm collectiveFarmerForm) {
+        String userId = CurrUserUtil.getUserId();
+        collectiveFarmerForm.setModifiedUser(userId);
+        int success = this.collectiveFarmerService.modify(collectiveFarmerForm);
+        if (success> 0)
+            return responseResultSuccess();
+        return responseResultFailure();
+    }
+
+    @ApiOperation(value = "删除集体农户信息",notes = "删除集体农户信息")
+    @PostMapping("/delete")
+    public ResponseBase del(@RequestBody CollectiveFarmerForm collectiveFarmerForm) {
+        int success = this.collectiveFarmerService.softRemove(collectiveFarmerForm);
+        if (success> 0)
+            return responseResultSuccess();
+        return responseResultFailure();
+    }
+}

carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/bank/controller/CollectiveFarmerManageController.java

@@ -1,64 +0,0 @@
-package com.hcloud.microserver.bank.controller;
-
-import com.github.pagehelper.PageInfo;
-import com.hcloud.microserver.bank.service.CollectiveFarmerService;
-import com.hcloud.microserver.commoncore.base.BaseController;
-import com.hcloud.microserver.commoncore.base.ResultVO;
-import com.hcloud.microserver.commoncore.enums.ResultEnum;
-import com.hcloud.microserver.facade.carbon.forms.CollectiveFarmerForm;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.Objects;
-
-/**
- * @author xiezt
- */
-@RestController
-@RequestMapping("/collectiveFarmer")
-public class CollectiveFarmerManageController extends BaseController {
-
-    @Autowired
-    private CollectiveFarmerService collectiveFarmerService;
-
-
-    @PostMapping("/save")
-    public ResultVO save(@RequestBody CollectiveFarmerForm collectiveFarmerForm) {
-        int success = this.collectiveFarmerService.save(collectiveFarmerForm);
-        if (success > 0) {
-            return success();
-        }
-        return new ResultVO(ResultEnum.SYS_ERROR);
-    }
-
-
-    @PostMapping("/delete")
-    public ResultVO delete(@RequestBody CollectiveFarmerForm collectiveFarmerForm) {
-        int success = this.collectiveFarmerService.softRemove(collectiveFarmerForm);
-        if (success > 0) {
-            return success();
-        }
-        return new ResultVO(ResultEnum.SYS_ERROR);
-    }
-
-
-    @PostMapping("/update")
-    public ResultVO update(@RequestBody CollectiveFarmerForm collectiveFarmerForm) {
-        int success = this.collectiveFarmerService.modify(collectiveFarmerForm);
-        if (success > 0) {
-            return success();
-        }
-        return new ResultVO(ResultEnum.SYS_ERROR);
-    }
-
-
-    @PostMapping("/searchByPage")
-    public ResultVO searchByPage(@RequestBody CollectiveFarmerForm collectiveFarmerForm) {
-        PageInfo pageInfo = this.collectiveFarmerService.queryListByPage(collectiveFarmerForm);
-        if (Objects.isNull(pageInfo)){ return success(null, 0);}
-        return success(pageInfo.getList(), pageInfo.getTotal());
-    }
-}

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/controller/CompanyManageController.java → carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/bank/controller/CompanyController.java

@@ -1,14 +1,18 @@
 package com.hcloud.microserver.bank.controller;
 
 import com.alibaba.fastjson.JSONObject;
+import com.github.pagehelper.PageInfo;
 import com.hcloud.microserver.bank.service.CompanyService;
+import com.hcloud.microserver.bank.service.CustomerCompanyInfoService;
 import com.hcloud.microserver.commoncore.base.BaseController;
-import com.hcloud.microserver.commoncore.base.ResultVO;
+import com.hcloud.microserver.commoncore.base.ResponseBase;
 import com.hcloud.microserver.commoncore.util.BeanCopyUtil;
 import com.hcloud.microserver.facade.carbon.entity.CustomerCompanyInfo;
 import com.hcloud.microserver.facade.carbon.entity.CustomerInfo;
 import com.hcloud.microserver.facade.carbon.forms.CustomerCompanyInfoForm;
 import com.hcloud.microserver.facade.carbon.forms.CustomerInfoForm;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -18,31 +22,43 @@ import org.springframework.web.bind.annotation.RestController;
 
 @Slf4j
 @RestController
-@RequestMapping("/company")
-public class CompanyManageController extends BaseController {
+@RequestMapping("/web/company")
+@Api(description = "企业信息管理服务")
+public class CompanyController extends BaseController {
+
+
+    @Autowired
+    private CustomerCompanyInfoService customerCompanyInfoService;
 
     @Autowired
     private CompanyService companyService;
 
+    @ApiOperation(value = "查询企业信息")
+    @PostMapping("/searchByPage")
+    public ResponseBase searchByPage(@RequestBody CustomerCompanyInfoForm customerCompanyInfoForm) {
+        PageInfo pageInfo = this.customerCompanyInfoService.queryListByPage(customerCompanyInfoForm);
+        return responseSuccess(pageInfo);
+    }
 
+    @ApiOperation(value = "添加企业信息")
     @PostMapping("/add")
-    public ResultVO addCompany(@RequestBody JSONObject jsonObject) {
+    public ResponseBase addCompany(@RequestBody JSONObject jsonObject) {
         log.info("前端的参数: {}", jsonObject.toJSONString());
         CustomerInfoForm customerInfoForm = jsonObject.getObject("customerInfoForm", CustomerInfoForm.class);
         CustomerCompanyInfoForm customerCompanyInfoForm = jsonObject.getObject("customerCompanyInfoForm", CustomerCompanyInfoForm.class);
 
         CustomerInfo customerInfo = BeanCopyUtil.convertBean(customerInfoForm, CustomerInfo.class);
         CustomerCompanyInfo customerCompanyInfo = BeanCopyUtil.convertBean(customerCompanyInfoForm, CustomerCompanyInfo.class);
-
         int success = this.companyService.saveCompany(customerInfo, customerCompanyInfo);
-        if (success >= 1)
-            return success();
-        return failure();
+        if (success>0){
+            return responseResultSuccess();
+        }
+        return responseResultFailure();
     }
 
-
+    @ApiOperation(value = "修改企业信息")
     @PostMapping("/update")
-    public ResultVO updateCompany(@RequestBody JSONObject jsonObject) {
+    public ResponseBase updateCompany(@RequestBody JSONObject jsonObject) {
         log.info("前端的参数: {}", jsonObject.toJSONString());
         CustomerInfoForm customerInfoForm = jsonObject.getObject("customerInfoForm", CustomerInfoForm.class);
         CustomerCompanyInfoForm customerCompanyInfoForm = jsonObject.getObject("customerCompanyInfoForm", CustomerCompanyInfoForm.class);
@@ -51,14 +67,14 @@ public class CompanyManageController extends BaseController {
         CustomerCompanyInfo customerCompanyInfo = BeanCopyUtil.convertBean(customerCompanyInfoForm, CustomerCompanyInfo.class);
 
         int success = this.companyService.modifyCompany(customerInfo, customerCompanyInfo);
-        if (success >= 1)
-            return success();
-        return failure();
-    }
-
+        if (success>0){
+            return responseResultSuccess();
+        }
+        return responseResultFailure();    }
 
+    @ApiOperation(value = "删除企业信息")
     @PostMapping("/delete")
-    public ResultVO deleteCompany(@RequestBody JSONObject jsonObject) {
+    public ResponseBase deleteCompany(@RequestBody JSONObject jsonObject) {
         log.info("前端的参数: {}", jsonObject.toJSONString());
         CustomerInfoForm customerInfoForm = jsonObject.getObject("customerInfoForm", CustomerInfoForm.class);
         CustomerCompanyInfoForm customerCompanyInfoForm = jsonObject.getObject("customerCompanyInfoForm", CustomerCompanyInfoForm.class);
@@ -67,8 +83,8 @@ public class CompanyManageController extends BaseController {
         CustomerCompanyInfo customerCompanyInfo = BeanCopyUtil.convertBean(customerCompanyInfoForm, CustomerCompanyInfo.class);
 
         int success = this.companyService.removeCompany(customerInfo, customerCompanyInfo);
-        if (success >= 1)
-            return success();
-        return failure();
-    }
+        if (success>0){
+            return responseResultSuccess();
+        }
+        return responseResultFailure();    }
 }

carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/bank/controller/CompanyManageController.java

@@ -1,74 +0,0 @@
-package com.hcloud.microserver.bank.controller;
-
-import com.alibaba.fastjson.JSONObject;
-import com.hcloud.microserver.bank.service.CompanyService;
-import com.hcloud.microserver.commoncore.base.BaseController;
-import com.hcloud.microserver.commoncore.base.ResultVO;
-import com.hcloud.microserver.commoncore.util.BeanCopyUtil;
-import com.hcloud.microserver.facade.carbon.entity.CustomerCompanyInfo;
-import com.hcloud.microserver.facade.carbon.entity.CustomerInfo;
-import com.hcloud.microserver.facade.carbon.forms.CustomerCompanyInfoForm;
-import com.hcloud.microserver.facade.carbon.forms.CustomerInfoForm;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@Slf4j
-@RestController
-@RequestMapping("/company")
-public class CompanyManageController extends BaseController {
-
-    @Autowired
-    private CompanyService companyService;
-
-
-    @PostMapping("/add")
-    public ResultVO addCompany(@RequestBody JSONObject jsonObject) {
-        log.info("前端的参数: {}", jsonObject.toJSONString());
-        CustomerInfoForm customerInfoForm = jsonObject.getObject("customerInfoForm", CustomerInfoForm.class);
-        CustomerCompanyInfoForm customerCompanyInfoForm = jsonObject.getObject("customerCompanyInfoForm", CustomerCompanyInfoForm.class);
-
-        CustomerInfo customerInfo = BeanCopyUtil.convertBean(customerInfoForm, CustomerInfo.class);
-        CustomerCompanyInfo customerCompanyInfo = BeanCopyUtil.convertBean(customerCompanyInfoForm, CustomerCompanyInfo.class);
-
-        int success = this.companyService.saveCompany(customerInfo, customerCompanyInfo);
-        if (success >= 1)
-            return success();
-        return failure();
-    }
-
-
-    @PostMapping("/update")
-    public ResultVO updateCompany(@RequestBody JSONObject jsonObject) {
-        log.info("前端的参数: {}", jsonObject.toJSONString());
-        CustomerInfoForm customerInfoForm = jsonObject.getObject("customerInfoForm", CustomerInfoForm.class);
-        CustomerCompanyInfoForm customerCompanyInfoForm = jsonObject.getObject("customerCompanyInfoForm", CustomerCompanyInfoForm.class);
-
-        CustomerInfo customerInfo = BeanCopyUtil.convertBean(customerInfoForm, CustomerInfo.class);
-        CustomerCompanyInfo customerCompanyInfo = BeanCopyUtil.convertBean(customerCompanyInfoForm, CustomerCompanyInfo.class);
-
-        int success = this.companyService.modifyCompany(customerInfo, customerCompanyInfo);
-        if (success >= 1)
-            return success();
-        return failure();
-    }
-
-
-    @PostMapping("/delete")
-    public ResultVO deleteCompany(@RequestBody JSONObject jsonObject) {
-        log.info("前端的参数: {}", jsonObject.toJSONString());
-        CustomerInfoForm customerInfoForm = jsonObject.getObject("customerInfoForm", CustomerInfoForm.class);
-        CustomerCompanyInfoForm customerCompanyInfoForm = jsonObject.getObject("customerCompanyInfoForm", CustomerCompanyInfoForm.class);
-
-        CustomerInfo customerInfo = BeanCopyUtil.convertBean(customerInfoForm, CustomerInfo.class);
-        CustomerCompanyInfo customerCompanyInfo = BeanCopyUtil.convertBean(customerCompanyInfoForm, CustomerCompanyInfo.class);
-
-        int success = this.companyService.removeCompany(customerInfo, customerCompanyInfo);
-        if (success >= 1)
-            return success();
-        return failure();
-    }
-}

carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/bank/controller/CustomerCompanyTypeController.java

@@ -0,0 +1,103 @@
+package com.hcloud.microserver.bank.controller;
+
+import com.github.pagehelper.PageInfo;
+import com.hcloud.microserver.bank.service.CustomerCompanyTypeService;
+import com.hcloud.microserver.commoncore.base.BaseController;
+import com.hcloud.microserver.commoncore.base.ResponseBase;
+import com.hcloud.microserver.commoncore.base.ResultVO;
+import com.hcloud.microserver.commoncore.enums.ResultEnum;
+import com.hcloud.microserver.facade.carbon.entity.CustomerCompanyType;
+import com.hcloud.microserver.facade.carbon.forms.CustomerCompanyTypeForm;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+@RestController
+@RequestMapping("/customerCompanyType")
+@Api(description = "企业类型管理")
+public class CustomerCompanyTypeController extends BaseController {
+
+    @Autowired
+    private CustomerCompanyTypeService customerCompanyTypeService;
+
+    @ApiOperation(value = "企业类型添加")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "customerCompanyType",value = "企业类型信息",dataType = "CustomerCompanyType")
+    })
+    @ApiResponse(code = 0, message = "操作成功")
+    @PostMapping("/save")
+    public ResponseBase save(@RequestBody @Valid CustomerCompanyType customerCompanyType){
+        int i = customerCompanyTypeService.saveSelective(customerCompanyType);
+        ResultVO resultVO = new ResultVO();
+        if (i < 1){
+            resultVO.setCode(ResultEnum.FAILURE.getCode());
+            resultVO.setMsg(ResultEnum.FAILURE.getMsg());
+            return responseError(resultVO);
+        }
+       return responseSuccess(resultVO);
+    }
+
+    @ApiOperation(value = "企业类型修改")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "customerCompanyType",value = "企业类型信息",dataType = "CustomerCompanyType")
+    })
+    @ApiResponse(code = 0, message = "操作成功")
+    @PostMapping("/update")
+    public ResponseBase update(@RequestBody @Valid CustomerCompanyType customerCompanyType){
+        int i = customerCompanyTypeService.modifyByPrimaryKeySelective(customerCompanyType);
+        ResultVO resultVO = new ResultVO();
+        if (i < 1){
+            resultVO.setCode(ResultEnum.FAILURE.getCode());
+            resultVO.setMsg(ResultEnum.FAILURE.getMsg());
+            return responseError(resultVO);
+        }
+        return responseSuccess(resultVO);
+    }
+
+    @ApiOperation(value = "企业类型详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "guid",value = "主键",dataType = "String")
+    })
+    @ApiResponse(code = 0, message = "操作成功")
+    @GetMapping("/findById")
+    public ResponseBase findById(@RequestParam("guid") String guid){
+        CustomerCompanyType customerCompanyType = customerCompanyTypeService.queryByPrimaryKey(guid);
+        ResultVO resultVO = new ResultVO();
+        resultVO.setData(customerCompanyType);
+        return responseSuccess(resultVO);
+    }
+
+    @ApiOperation(value = "企业类型信息删除")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "guid",value = "主键",dataType = "String")
+    })
+    @ApiResponse(code = 0, message = "操作成功")
+    @GetMapping("/delete")
+    public ResponseBase delete(@RequestParam("guid") String guid){
+        int i = customerCompanyTypeService.delByPrimaryKey(guid);
+        ResultVO resultVO = new ResultVO();
+        if (i < 1){
+            resultVO.setCode(ResultEnum.FAILURE.getCode());
+            resultVO.setMsg(ResultEnum.FAILURE.getMsg());
+            return responseError(resultVO);
+        }
+        return responseSuccess(resultVO);
+    }
+
+    @ApiOperation(value = "企业类型列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "customerCompanyTypeForm",value = "企业类型信息",dataType = "CustomerCompanyTypeForm")
+    })
+    @ApiResponse(code = 0, message = "操作成功")
+    @PostMapping("/list")
+    public ResponseBase selectList(@RequestBody CustomerCompanyTypeForm customerCompanyTypeForm){
+        PageInfo<List<CustomerCompanyType>> pageInfo = customerCompanyTypeService.selectList(customerCompanyTypeForm);
+        ResultVO resultVO = new ResultVO();
+        resultVO.setData(pageInfo.getList());
+        resultVO.setCount(pageInfo.getTotal());
+        return responseSuccess(resultVO);
+    }
+}

carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/bank/controller/CustomerInfoController.java

@@ -1,215 +1,58 @@
 package com.hcloud.microserver.bank.controller;
 
 import com.github.pagehelper.PageInfo;
-import com.hcloud.microserver.bank.service.CustomerCompanyInfoService;
 import com.hcloud.microserver.bank.service.CustomerInfoService;
-import com.hcloud.microserver.bank.service.OrderPayVoucherService;
 import com.hcloud.microserver.commoncore.base.BaseController;
-import com.hcloud.microserver.commoncore.base.ResultVO;
-import com.hcloud.microserver.commoncore.enums.ResultEnum;
-import com.hcloud.microserver.commoncore.util.Md5Util;
-import com.hcloud.microserver.commoncore.util.TracedCodeUtils;
-import com.hcloud.microserver.facade.carbon.forms.CustomerCompanyInfoForm;
+import com.hcloud.microserver.commoncore.base.ResponseBase;
 import com.hcloud.microserver.facade.carbon.forms.CustomerInfoForm;
-import com.hcloud.microserver.facade.carbon.forms.OrderPayVoucherForm;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-import java.util.Objects;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
- * @author xiezt
+ * @author JYJ
  */
 @RestController
-@RequestMapping("/customer")
-public class CustomerInfoController extends BaseController{
-
-    /**
-     * 默认初始密码
-     */
-    private static final String DEFAULT_PWD="000000";
+@RequestMapping("/web/customer")
+@Api(description = "管理端客户服务")
+public class CustomerInfoController extends BaseController {
 
     @Autowired
     private CustomerInfoService customerInfoService;
 
-    @Autowired
-    private CustomerCompanyInfoService customerCompanyInfoService;
-
-    @Autowired
-    private OrderPayVoucherService orderPayVoucherService;
-
     /**
      * 分页查询爱心用户信息
      *
      * @param customerInfoForm
      * @return
      */
-    @PostMapping("/searchCustomerByPage")
-    public ResultVO searchCustomerInfoByPage(@RequestBody CustomerInfoForm customerInfoForm) {
+    @ApiOperation(value = "分页查询爱心用户信息")
+    @PostMapping("/searchByPage")
+    public ResponseBase searchCustomerInfoByPage(@RequestBody CustomerInfoForm customerInfoForm) {
         PageInfo pageInfo = customerInfoService.searchCustomerByPage(customerInfoForm);
-        return success(pageInfo.getList(),pageInfo.getTotal());
-    }
-
-    /**
-     * 查询爱心用户明细
-     *
-     * @param guid
-     * @return
-     */
-    @GetMapping("/getCustomerInfoById")
-    public ResultVO getCustomerInfoById(@RequestParam("guid") String guid) {
-        CustomerInfoForm customerInfoForm = customerInfoService.getCustomerInfoById(guid);
-        return success(customerInfoForm);
-    }
-
-    /**
-     * 保存爱心用户信息
-     *
-     * @param customerInfoForm
-     * @return
-     */
-    @PostMapping("/saveCustomerInfo")
-    public ResultVO saveCustomerInfo(@RequestBody CustomerInfoForm customerInfoForm) {
-        customerInfoForm.setAccount(TracedCodeUtils.getCommonRandomCode());
-        //customerInfoForm.setPasswd(Md5Util.toMD5(CodeUtil.getSearchId()));
-        customerInfoForm.setPasswd(Md5Util.toMD5(DEFAULT_PWD));
-        int i = customerInfoService.saveCustomerInfoByChannelInfo(customerInfoForm);
-        if(i==0){return failure();}
-        return success(customerInfoForm);
-    }
-
-    /**
-     * 修改爱心用户信息
-     *
-     * @param customerInfoForm
-     * @return
-     */
-    @PostMapping("/updateCustomerInfo")
-    public ResultVO modifiedCustomerInfo(@RequestBody CustomerInfoForm customerInfoForm) {
-        int i = customerInfoService.modifyByPrimaryKeySelective(customerInfoForm);
-        if(i==0){return failure();}
-        return success();
-    }
-
-    /**
-     * 通过登录账号查询爱心用户信息
-     * @param account
-     * @return
-     */
-    @GetMapping("/getCustomerInfoByAccount")
-    public ResultVO getCustomerInfoByAccount(@RequestParam("account") String account) {
-        CustomerInfoForm customerInfoForm = customerInfoService.getCustomerInfoByAccount(account);
-        if(customerInfoForm==null){return new ResultVO(ResultEnum.LOGIN_ACCOUNT_MISS);}
-        return success(customerInfoForm);
-    }
-
-    /**
-     * 多条件查询爱心用户信息
-     * @param queryStr
-     * @return
-     */
-    @GetMapping("/getCustomerInfoByInfo")
-    public ResultVO getCustomerInfoByInfo(@RequestParam("queryStr") String queryStr) {
-       CustomerInfoForm customerInfo =  customerInfoService.getCustomerInfoByInfo(queryStr);
-       if(Objects.nonNull(customerInfo)){
-           return success(customerInfo);
-       }
-        return failure();
-    }
-
-    /**
-     * 通过爱心用户ID,查询爱心用户企业认证信息
-     * @param customerId
-     * @return
-     */
-    @GetMapping("/getCustomerCompanyInfo")
-    public ResultVO getCustomerCompanyInfo(@RequestParam("customerId") String customerId) {
-       CustomerCompanyInfoForm customerCompanyInfoForm =  customerCompanyInfoService.getCustomerCompanyInfoByCustomerId(customerId);
-        return success(customerCompanyInfoForm);
-    }
-
-    /**
-     * 通过登录渠道编码查询用户信息
-     * @param type
-     * @param threeCode
-     * @return
-     */
-    @GetMapping("/getCustomerInfoByChannel")
-    public ResultVO getCustomerInfoByChannelInfo(@RequestParam("channelType") Integer type, @RequestParam("code") String threeCode) {
-        CustomerInfoForm customerInfoForm = customerInfoService.getCustomerInfoByChannelInfo(type,threeCode);
-        return success(customerInfoForm);
-    }
-
-    /**
-     * 获取离线支付凭证通过用户信息
-     * @param customerId
-     * @return
-     */
-    @GetMapping("/getOfflinePayVoucherById")
-    public ResultVO getOfflinePayVoucherById(@RequestParam("customerId") String customerId) {
-       List<OrderPayVoucherForm> list =  orderPayVoucherService.getPayVoucherInfoByOrderId(customerId);
-        return success(list);
-    }
-
-    /**
-     * 企业分页
-     * @param customerCompanyInfoForm
-     * @return
-     */
-    @PostMapping("/searchCompanyByPage")
-    public ResultVO searchCompanyByPage(@RequestBody CustomerCompanyInfoForm customerCompanyInfoForm) {
-        PageInfo pageInfo = this.customerCompanyInfoService.queryListByPage(customerCompanyInfoForm);
-        if (Objects.isNull(pageInfo)){ return success(null, 0);}
-        return success(pageInfo.getList(), pageInfo.getTotal());
-    }
-
-    /**
-     * 验证爱心用户企业认证信息
-     * @param customerCompanyInfoForm
-     * @return
-     */
-    @PostMapping("/validateCompanyInfo")
-    public ResultVO validateCustomerCompany(@RequestBody CustomerCompanyInfoForm customerCompanyInfoForm) {
-        int i =customerCompanyInfoService.validateCompanyInfo(customerCompanyInfoForm);
-        if (i==0){return failure();}
-        return success();
+        return responseSuccess(pageInfo);
     }
 
+    @ApiOperation(value = "充值爱心用户信息密码")
     @PostMapping("/resetPassword")
-    public ResultVO resetPassword(@RequestBody CustomerInfoForm customerInfoForm) {
+    public ResponseBase resetPassword(@RequestBody CustomerInfoForm customerInfoForm) {
         int i = this.customerInfoService.resetPassword(customerInfoForm);
-        if (i > 0){ return success();}
-        return failure();
-    }
-
-    /**
-     * 更新用户信息（微信登录渠道及用户信息内的微信支付信息）
-     *
-     * @param customerInfoForm
-     * @return
-     */
-    @PostMapping("/updateCustomerInfoForWeChat")
-    public ResultVO updateCustomerInfoForWeChat(@RequestBody CustomerInfoForm customerInfoForm) {
-        int i =customerInfoService.updateCustomerInfoForWeChat(customerInfoForm);
-        if(i==0){return failure();}
-        return success();
+        if (i>0){
+            return responseResultSuccess();
+        }
+        return responseResultFailure();
     }
 
-    /**
-     * 绑定用户手机号，并合并订单相同手机号的订单信息
-     *
-     * @param customerId
-     * @param phone
-     * @return
-     */
-    @GetMapping("/bindCustomerPhone")
-    public ResultVO bindCustomerPhone(@RequestParam("customerId") String customerId,
-                                      @RequestParam("phone") String phone) {
-        if(null!=phone && !"".equals(phone)){
-            int i = customerInfoService.bindCustomerPhone(customerId,phone);
-            if(i==0){return failure();}
+    @ApiOperation(value = "修改爱心用户信息")
+    @PostMapping("/update")
+    public ResponseBase update(@RequestBody CustomerInfoForm customerInfoForm) {
+        int i = customerInfoService.modifyByPrimaryKeySelective(customerInfoForm);
+        if (i>0){
+            return responseResultSuccess();
         }
-        return success();
-    }
+        return responseResultFailure();    }
 }

carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/bank/controller/FarmerInfoController.java

@@ -0,0 +1,73 @@
+package com.hcloud.microserver.bank.controller;
+
+import com.github.pagehelper.PageInfo;
+import com.hcloud.microserver.bank.service.FarmerInfoService;
+import com.hcloud.microserver.commoncore.base.BaseController;
+import com.hcloud.microserver.commoncore.base.ResponseBase;
+import com.hcloud.microserver.facade.carbon.entity.FarmerInfo;
+import com.hcloud.microserver.facade.carbon.forms.FarmerInfoForm;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/web/farmer")
+@Api(description = "农户信息管理服务")
+public class FarmerInfoController extends BaseController {
+
+    @Autowired
+    private FarmerInfoService farmerInfoService;
+
+    @ApiOperation(value = "分页查询农户信息")
+    @PostMapping("/searchByPage")
+    public ResponseBase searchByPage(@RequestBody FarmerInfoForm farmerInfoForm) {
+        PageInfo pageInfo = this.farmerInfoService.queryListByPage(farmerInfoForm);
+        return responseSuccess(pageInfo);
+    }
+    @ApiOperation(value = "新增农户信息")
+    @PostMapping("/save")
+    public ResponseBase save(@RequestBody FarmerInfoForm farmerInfoForm) {
+        int success = this.farmerInfoService.save(farmerInfoForm);
+        if (success>0){
+            return responseResultSuccess();
+        }
+        return responseResultFailure();
+    }
+    @ApiOperation(value = "修改农户信息")
+    @PostMapping("/update")
+    public ResponseBase update(@RequestBody FarmerInfoForm farmerInfoForm) {
+        int success = this.farmerInfoService.modify(farmerInfoForm);
+        if (success>0){
+            return responseResultSuccess();
+        }
+        return responseResultFailure();
+    }
+
+    @ApiOperation(value = "删除农户信息")
+    @PostMapping("/delete")
+    public ResponseBase del(@RequestBody FarmerInfoForm farmerInfoForm) {
+        int success = this.farmerInfoService.softRemove(farmerInfoForm);
+        if (success>0){
+            return responseResultSuccess();
+        }
+        return responseResultFailure();
+    }
+
+    @ApiOperation(value = "通过集体查询农户信息")
+    @PostMapping("/searchByCollectiveId")
+    public ResponseBase findByCollectiveId(@RequestParam(name = "collectiveId") String collectiveId) {
+        List<FarmerInfo> farmerInfos = this.farmerInfoService.queryByCollectiveId(collectiveId);
+        return responseResultSuccess(farmerInfos);
+    }
+
+    @ApiOperation(value = "通过产品查询农户信息")
+    @PostMapping("/searchByProductGuid")
+    public ResponseBase searchByProductGuid(@RequestParam(name = "productGuid") String productGuid) {
+        List<FarmerInfo> farmerInfos = this.farmerInfoService.queryByProductGuid(productGuid);
+        return responseResultSuccess(farmerInfos);
+    }
+
+}

carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/bank/controller/FarmerInfoManageController.java

@@ -1,129 +0,0 @@
-package com.hcloud.microserver.bank.controller;
-
-import com.github.pagehelper.PageInfo;
-import com.hcloud.microserver.bank.service.FarmerInfoService;
-import com.hcloud.microserver.bank.service.PovertyAreaService;
-import com.hcloud.microserver.commoncore.base.BaseController;
-import com.hcloud.microserver.commoncore.base.ResultVO;
-import com.hcloud.microserver.commoncore.enums.ResultEnum;
-import com.hcloud.microserver.facade.carbon.entity.FarmerInfo;
-import com.hcloud.microserver.facade.carbon.forms.FarmerInfoForm;
-import com.hcloud.microserver.facade.carbon.forms.PovertyAreaForm;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-import java.util.Objects;
-
-/**
- * @author xiezt
- */
-@RestController
-@RequestMapping("/farmer")
-public class FarmerInfoManageController extends BaseController {
-
-
-    @Autowired
-    private FarmerInfoService farmerInfoService;
-
-    @Autowired
-    private PovertyAreaService povertyAreaService;
-
-    @PostMapping("/save")
-    public ResultVO save(@RequestBody FarmerInfoForm farmerInfoForm) {
-        int success = this.farmerInfoService.save(farmerInfoForm);
-        if (success > 0) {
-            return success();
-        }
-        return new ResultVO(ResultEnum.SYS_ERROR);
-    }
-
-    @PostMapping("/delete")
-    public ResultVO delete(@RequestBody FarmerInfoForm farmerInfoForm) {
-        int success = this.farmerInfoService.softRemove(farmerInfoForm);
-        if (success > 0) {
-            return success();
-        }
-        return new ResultVO(ResultEnum.SYS_ERROR);
-    }
-
-    @PostMapping("/update")
-    public ResultVO update(@RequestBody FarmerInfoForm farmerInfoForm) {
-        int success = this.farmerInfoService.modify(farmerInfoForm);
-        if (success > 0) {
-            return success();
-        }
-        return new ResultVO(ResultEnum.SYS_ERROR);
-    }
-
-    @PostMapping("/searchByPage")
-    public ResultVO searchByPage(@RequestBody FarmerInfoForm farmerInfoForm) {
-        PageInfo pageInfo = this.farmerInfoService.queryListByPage(farmerInfoForm);
-        if (Objects.isNull(pageInfo)){ return success(null, 0);}
-        return success(pageInfo.getList(), pageInfo.getTotal());
-    }
-
-    /**
-     * 查询贫困区域(分页查询)
-     *
-     * @param povertyAreaForm
-     * @return
-     */
-    @PostMapping("/searchAreaByPage")
-    public ResultVO searchPovertyAreaByPage(@RequestBody PovertyAreaForm povertyAreaForm) {
-       PageInfo pageInfo = povertyAreaService.queryListByPage(povertyAreaForm);
-        return success(pageInfo.getList(),pageInfo.getTotal());
-    }
-
-    /**
-     * 通过贫困区域询贫困户信息
-     *
-     * @param farmerInfoForm
-     * @return
-     */
-    @PostMapping("/getFarmerInfoByAreaId")
-    public ResultVO getFarmerInfoByAreaId(@RequestBody FarmerInfoForm farmerInfoForm) {
-       PageInfo pageInfo =  farmerInfoService.searchFarmerInfoByPovertyArea(farmerInfoForm);
-        return success(pageInfo.getList(),pageInfo.getTotal());
-    }
-
-    /**
-     * 查询贫困区域明细信息(含贫困户统计信息,贫困区域贫困户列表,贫困区域基本信息)
-     *
-     * @param areaId
-     * @return
-     */
-    @GetMapping("/getPovertyAreaById")
-    public ResultVO getPovertyAreaById(@RequestParam("areaId") String areaId) {
-       PovertyAreaForm povertyAreaForm =povertyAreaService.getFullPovertyAreaInfoById(areaId);
-       if(povertyAreaForm==null){return new ResultVO(ResultEnum.FAILURE);}
-        return success(povertyAreaForm);
-    }
-
-    @PostMapping("/searchByProductGuid")
-    public ResultVO searchByProductGuid(@RequestParam(name = "productGuid") String productGuid) {
-        List<FarmerInfo> farmerInfos = this.farmerInfoService.queryByProductGuid(productGuid);
-        return success(farmerInfos);
-    }
-
-    /**
-     * 获取农户明细信息
-     *
-     * @param farmerId
-     * @return
-     */
-    @GetMapping("/getFarmerInfoById")
-    public ResultVO getFarmerInfoById(@RequestParam("guid") String farmerId) {
-        FarmerInfo farmerInfo = farmerInfoService.queryByPrimaryKey(farmerId);
-        if(Objects.nonNull(farmerInfo)){
-            return success(farmerInfo);
-        }
-        return failure();
-    }
-
-    @PostMapping("/searchByCollectiveId")
-    public ResultVO searchByCollectiveId(@RequestParam(name = "collectiveId") String collectiveId) {
-        List<FarmerInfo> farmerInfos = this.farmerInfoService.queryByCollectiveId(collectiveId);
-        return success(farmerInfos);
-    }
-}

carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/bank/controller/GoodsInfoController.java

@@ -0,0 +1,103 @@
+package com.hcloud.microserver.bank.controller;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.github.pagehelper.PageInfo;
+import com.hcloud.microserver.bank.service.GoodsInfoService;
+import com.hcloud.microserver.commoncore.base.BaseController;
+import com.hcloud.microserver.commoncore.base.ResponseBase;
+import com.hcloud.microserver.facade.carbon.entity.GoodsInfo;
+import com.hcloud.microserver.facade.carbon.entity.GoodsSaleInfo;
+import com.hcloud.microserver.facade.carbon.entity.ProductInfo;
+import com.hcloud.microserver.facade.carbon.forms.GoodsInfoForm;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * @author xiezt
+ */
+@RestController
+@RequestMapping("/web/goods")
+@Api(description = "商品信息管理服务")
+public class GoodsInfoController extends BaseController {
+
+    @Autowired
+    private GoodsInfoService goodsInfoService;
+
+    @ApiOperation("商品上下架")
+    @PostMapping("/shelves")
+    public ResponseBase shelves(@RequestBody List<GoodsInfoForm> goodsInfoForms) {
+        int success = this.goodsInfoService.batchShelves(goodsInfoForms);
+        if (success>0){
+            return responseResultSuccess();
+        }
+        return responseResultFailure();    }
+
+    @ApiOperation("商品删除")
+    @PostMapping("/delete")
+    public ResponseBase delete(@RequestBody GoodsInfoForm goodsInfoForm) {
+        int success = this.goodsInfoService.remove(goodsInfoForm);
+        if (success>0){
+            return responseResultSuccess();
+        }
+        return responseResultFailure();
+    }
+
+    @ApiOperation("修改商品信息")
+    @PostMapping("/update")
+    public ResponseBase update(@RequestBody GoodsInfoForm goodsInfoForm) {
+        int success = this.goodsInfoService.modify(goodsInfoForm);
+        if (success>0){
+            return responseResultSuccess();
+        }
+        return responseResultFailure();    }
+
+    @ApiOperation("分页查询商品信息")
+    @PostMapping("/searchByPage")
+    public ResponseBase searchByPage(@RequestBody GoodsInfoForm goodsInfoForm) {
+        PageInfo pageInfo = this.goodsInfoService.queryListByPage(goodsInfoForm);
+        return responseSuccess(pageInfo);
+
+    }
+    @ApiOperation("分页查询商品关联信息")
+    @PostMapping("/searchJoinListByPage")
+    public ResponseBase searchJoinListByPage(@RequestBody GoodsInfoForm goodsInfoForm) {
+        PageInfo pageInfo = this.goodsInfoService.queryJoinListByPage(goodsInfoForm);
+        return responseSuccess(pageInfo);
+    }
+
+    @ApiOperation("修改商品信息")
+    @PostMapping("/updateGoods")
+    public ResponseBase modifyGoods(@RequestBody JSONObject jsonObject) {
+        JSONArray jsonArray = jsonObject.getJSONArray("productInfos");
+        List<ProductInfo> productInfos = JSONObject.parseArray(jsonArray.toJSONString(), ProductInfo.class);
+        GoodsInfoForm goodsInfoForm = jsonObject.getObject("goodsInfoForm", GoodsInfoForm.class);
+        boolean cond1 = Objects.nonNull(productInfos) && productInfos.size() > 0;
+        boolean cond2 = Objects.nonNull(goodsInfoForm);
+        if (cond1 && cond2) {
+            GoodsInfo goodsInfo = new GoodsInfo();
+            GoodsSaleInfo goodsSaleInfo = new GoodsSaleInfo();
+            goodsInfo.setGuid(goodsInfoForm.getGuid());
+            goodsInfo.setCarbonVal(goodsInfoForm.getCarbonVal());
+            goodsInfo.setPrice(goodsInfoForm.getPrice());
+            goodsInfo.setGoodsSaleDate(goodsInfoForm.getGoodsSaleDate());
+            goodsInfo.setGoodsUse(goodsInfoForm.getGoodsUse());
+            goodsSaleInfo.setSaleTargets(goodsInfoForm.getSaleTargets());
+            goodsSaleInfo.setSaleType(goodsInfoForm.getSaleType());
+            int success = this.goodsInfoService.modifyGoods(goodsInfo, goodsSaleInfo, productInfos);
+            if (success > 0) {
+                return responseResultSuccess();
+            }
+        }
+
+        return responseResultFailure();
+    }
+}

carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/bank/controller/GoodsInfoManageController.java

@@ -1,157 +0,0 @@
-package com.hcloud.microserver.bank.controller;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.github.pagehelper.PageInfo;
-import com.hcloud.microserver.bank.bo.GoodsInfoBO;
-import com.hcloud.microserver.bank.service.GoodsInfoService;
-import com.hcloud.microserver.commoncore.base.BaseController;
-import com.hcloud.microserver.commoncore.base.ResultVO;
-import com.hcloud.microserver.commoncore.enums.ResultEnum;
-import com.hcloud.microserver.commoncore.service.RedisUtils;
-import com.hcloud.microserver.facade.carbon.entity.GoodsInfo;
-import com.hcloud.microserver.facade.carbon.entity.GoodsSaleInfo;
-import com.hcloud.microserver.facade.carbon.entity.ProductInfo;
-import com.hcloud.microserver.facade.carbon.forms.FarmerInfoForm;
-import com.hcloud.microserver.facade.carbon.forms.GoodsInfoForm;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-import java.util.Objects;
-
-/**
- * @author xiezt
- */
-@RestController
-@RequestMapping("/goods")
-public class GoodsInfoManageController extends BaseController {
-
-
-
-    @Autowired
-    private GoodsInfoService goodsInfoService;
-
-
-    @Autowired
-    private RedisUtils redisUtils;
-
-
-    @PostMapping("/shelves")
-    public ResultVO shelves(@RequestBody List<GoodsInfoForm> goodsInfoForms) {
-        int success = this.goodsInfoService.batchShelves(goodsInfoForms);
-        if (success > 0) {
-            return success();
-        }
-        return new ResultVO(ResultEnum.SYS_ERROR);
-    }
-
-
-    @PostMapping("/delete")
-    public ResultVO delete(@RequestBody GoodsInfoForm goodsInfoForm) {
-        int success = this.goodsInfoService.remove(goodsInfoForm);
-        if (success > 0) {
-            return success();
-        }
-        return new ResultVO(ResultEnum.SYS_ERROR);
-    }
-
-
-    @PostMapping("/update")
-    public ResultVO update(@RequestBody GoodsInfoForm goodsInfoForm) {
-        int success = this.goodsInfoService.modify(goodsInfoForm);
-        if (success > 0) {
-            return success();
-        }
-        return new ResultVO(ResultEnum.SYS_ERROR);
-    }
-
-
-    @PostMapping("/searchByPage")
-    public ResultVO searchByPage(@RequestBody GoodsInfoForm goodsInfoForm) {
-        PageInfo pageInfo = this.goodsInfoService.queryListByPage(goodsInfoForm);
-        if (Objects.isNull(pageInfo)){ return success(null, 0);}
-        return success(pageInfo.getList(), pageInfo.getTotal());
-    }
-
-    @PostMapping("/searchJoinListByPage")
-    public ResultVO searchJoinListByPage(@RequestBody GoodsInfoForm goodsInfoForm) {
-        PageInfo pageInfo = this.goodsInfoService.queryJoinListByPage(goodsInfoForm);
-        if (Objects.isNull(pageInfo)){ return success(null, 0);}
-        return success(pageInfo.getList(), pageInfo.getTotal());
-    }
-
-    /**
-     * 分页查询商品类型信息（移动端展示）
-     *
-     * @param goodsInfoForm
-     * @return
-     */
-    @PostMapping("/searchGoodsInfoByPage")
-    public ResultVO searchGoodsInfoByPage(@RequestBody GoodsInfoForm goodsInfoForm) {
-        PageInfo pageInfo = goodsInfoService.searchGoodsInfoByPage(goodsInfoForm);
-        return success(pageInfo.getList(),pageInfo.getTotal());
-    }
-
-    /**
-     * 获取商品详情
-     * @param goodsId
-     * @return
-     */
-    @GetMapping("/getGoodsInfoById")
-    public ResultVO getGoodsInfoById(@RequestParam("goodsId") String goodsId) {
-        GoodsInfoBO goodsInfoBO = goodsInfoService.getGoodsInfoByGuid(goodsId);
-        return success(goodsInfoBO);
-    }
-
-    /**
-     * 根据需求碳汇量计算商品列表
-     *
-     * @param carbon
-     * @return
-     */
-    @GetMapping("/getGoodsInfoByCarbon")
-    public ResultVO getGoodsInfoByCarbon(@RequestParam("carbon") String carbon) {
-        List<GoodsInfoForm> goodsList = goodsInfoService.getGoodsInfoByCarbon(carbon);
-        return success(goodsList);
-    }
-
-    @PostMapping("/updateGoods")
-    public ResultVO updateGoods(@RequestBody JSONObject jsonObject) {
-        JSONArray jsonArray = jsonObject.getJSONArray("productInfos");
-        List<ProductInfo> productInfos = JSONObject.parseArray(jsonArray.toJSONString(), ProductInfo.class);
-        GoodsInfoForm goodsInfoForm = jsonObject.getObject("goodsInfoForm", GoodsInfoForm.class);
-        boolean cond1 = Objects.nonNull(productInfos) && productInfos.size() > 0;
-        boolean cond2 = Objects.nonNull(goodsInfoForm);
-        if (cond1 && cond2) {
-            GoodsInfo goodsInfo = new GoodsInfo();
-            GoodsSaleInfo goodsSaleInfo = new GoodsSaleInfo();
-            goodsInfo.setGuid(goodsInfoForm.getGuid());
-            goodsInfo.setCarbonVal(goodsInfoForm.getCarbonVal());
-            goodsInfo.setPrice(goodsInfoForm.getPrice());
-            goodsInfo.setGoodsSaleDate(goodsInfoForm.getGoodsSaleDate());
-            goodsInfo.setGoodsUse(goodsInfoForm.getGoodsUse());
-            goodsSaleInfo.setSaleTargets(goodsInfoForm.getSaleTargets());
-            goodsSaleInfo.setSaleType(goodsInfoForm.getSaleType());
-            int success = this.goodsInfoService.modifyGoods(goodsInfo, goodsSaleInfo, productInfos);
-            if (success > 0) {
-                return success();
-            }
-        }
-
-        return failure();
-    }
-
-    /**
-     * 通过农户Id查询所属商品
-     *
-     * @param farmerInfoForm
-     * @return
-     */
-    @PostMapping("/getGoodsInfoByFarmerId")
-    public ResultVO getGoodsInfoByFarmerId(@RequestBody FarmerInfoForm farmerInfoForm) {
-       PageInfo pageInfo = goodsInfoService.searchGoodsInfoByFarmerId(farmerInfoForm);
-        return success(pageInfo.getList(),pageInfo.getTotal());
-    }
-
-}

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/controller/OrderDetailManageController.java → carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/bank/controller/OrderDetailController.java

@@ -2,8 +2,11 @@ package com.hcloud.microserver.bank.controller;
 
 import com.hcloud.microserver.bank.service.OrderDetailInfoService;
 import com.hcloud.microserver.commoncore.base.BaseController;
+import com.hcloud.microserver.commoncore.base.ResponseBase;
 import com.hcloud.microserver.commoncore.base.ResultVO;
 import com.hcloud.microserver.facade.carbon.entity.GoodsOrderDetail;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -13,16 +16,17 @@ import org.springframework.web.bind.annotation.RestController;
 import java.util.List;
 
 @RestController
-@RequestMapping("/orderDetail")
-public class OrderDetailManageController extends BaseController {
+@RequestMapping("/web/orderDetail")
+@Api(tags = "OrderDetailController",description = "订单详细信息管理")
+public class OrderDetailController extends BaseController {
 
     @Autowired
     private OrderDetailInfoService orderDetailInfoService;
 
-
+    @ApiOperation("分页查询订单详细信息")
     @PostMapping("/searchByOrderGuid")
-    public ResultVO searchByOrderGuid(@RequestParam(name = "orderGuid") String orderGuid) {
+    public ResponseBase searchByOrderGuid(@RequestParam(name = "orderGuid") String orderGuid) {
         List<GoodsOrderDetail> goodsOrderDetails = this.orderDetailInfoService.findByGoodsOrderInfoGuid(orderGuid);
-        return success(goodsOrderDetails);
+        return responseResultSuccess(goodsOrderDetails);
     }
 }

carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/bank/controller/OrderDetailManageController.java

@@ -1,28 +0,0 @@
-package com.hcloud.microserver.bank.controller;
-
-import com.hcloud.microserver.bank.service.OrderDetailInfoService;
-import com.hcloud.microserver.commoncore.base.BaseController;
-import com.hcloud.microserver.commoncore.base.ResultVO;
-import com.hcloud.microserver.facade.carbon.entity.GoodsOrderDetail;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-@RestController
-@RequestMapping("/orderDetail")
-public class OrderDetailManageController extends BaseController {
-
-    @Autowired
-    private OrderDetailInfoService orderDetailInfoService;
-
-
-    @PostMapping("/searchByOrderGuid")
-    public ResultVO searchByOrderGuid(@RequestParam(name = "orderGuid") String orderGuid) {
-        List<GoodsOrderDetail> goodsOrderDetails = this.orderDetailInfoService.findByGoodsOrderInfoGuid(orderGuid);
-        return success(goodsOrderDetails);
-    }
-}

carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/bank/controller/OrderInfoController.java

@@ -0,0 +1,32 @@
+package com.hcloud.microserver.bank.controller;
+
+import com.github.pagehelper.PageInfo;
+import com.hcloud.microserver.bank.service.OrderInfoService;
+import com.hcloud.microserver.commoncore.base.BaseController;
+import com.hcloud.microserver.commoncore.base.ResponseBase;
+import com.hcloud.microserver.commoncore.base.ResultVO;
+import com.hcloud.microserver.facade.carbon.forms.GoodsOrderInfoForm;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/web/order")
+@Api(description = "订单信息管理服务")
+public class OrderInfoController extends BaseController {
+
+    @Autowired
+    private OrderInfoService orderInfoService;
+
+    @ApiOperation("分页查询订单信息")
+    @PostMapping("/searchByPage")
+    public ResponseBase searchByPage(@RequestBody GoodsOrderInfoForm goodsOrderInfoForm) {
+        PageInfo pageInfo = orderInfoService.searchOrderInfoByPage(goodsOrderInfoForm);
+        return responseSuccess(pageInfo);
+    }
+
+}

carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/bank/controller/OrderInfoManagerController.java

@@ -1,320 +0,0 @@
-package com.hcloud.microserver.bank.controller;
-
-import com.github.pagehelper.PageInfo;
-import com.google.common.collect.Lists;
-import com.hcloud.microserver.bank.bo.CredentialInfoBO;
-import com.hcloud.microserver.bank.service.*;
-import com.hcloud.microserver.commoncore.base.BaseController;
-import com.hcloud.microserver.commoncore.base.ResultVO;
-import com.hcloud.microserver.commoncore.enums.ResultEnum;
-import com.hcloud.microserver.commoncore.util.BeanCopyUtil;
-import com.hcloud.microserver.facade.carbon.entity.GoodsInfo;
-import com.hcloud.microserver.facade.carbon.forms.*;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * @author xiezt
- */
-@RestController
-@RequestMapping("/order")
-
-public class OrderInfoManagerController extends BaseController {
-
-    @Autowired
-    private OrderInfoService orderInfoService;
-
-    @Autowired
-    private OrderDetailInfoService orderDetailInfoService;
-
-    @Autowired
-    private CredentialInfoService credentialInfoService;
-
-    @Autowired
-    private CustomerInfoService customerInfoService;
-
-    @Autowired
-    private GoodsInfoService goodsInfoService;
-
-    /**
-     * 分页查询订单信息
-     *
-     * @param goodsOrderInfoForm
-     * @return
-     */
-    @PostMapping("/searchOrderInfoPage")
-
-    public ResultVO searchOrderInfoByPage(@RequestBody GoodsOrderInfoForm goodsOrderInfoForm) {
-        PageInfo pageInfo = orderInfoService.searchOrderInfoByPage(goodsOrderInfoForm);
-        return success(pageInfo.getList(),pageInfo.getTotal());
-    }
-
-    /**
-     * 分页获取爱心用户订单信息
-     *
-     * @param goodsOrderInfoForm
-     * @return
-     */
-    @PostMapping("/getOrderInfoByCustomerId")
-
-    public ResultVO getOrderInfoByCustomerId(@RequestBody GoodsOrderInfoForm goodsOrderInfoForm) {
-        PageInfo pageInfo =orderInfoService.searchOrderInfoByCustomerId(goodsOrderInfoForm);
-        List list = pageInfo.getList();
-        if(null!=list && list.size()>0){
-            List<GoodsOrderInfoForm> orderInfoFormList = BeanCopyUtil.convertList(list,GoodsOrderInfoForm.class);
-            for (GoodsOrderInfoForm form:orderInfoFormList) {
-                String guid = form.getGuid();
-                List<GoodsOrderDetailForm> detailFormList =orderDetailInfoService.getOrderDetailListByOrderId(guid);
-                form.setGoodsOrderDetailForm(detailFormList);
-            }
-            return success(orderInfoFormList,pageInfo.getTotal());
-        }
-        return success(pageInfo.getList(),pageInfo.getTotal());
-    }
-
-    /**
-     * 查询订单明细信息
-     *
-     * @param orderId
-     * @return
-     */
-    @GetMapping("/getOrderDetail")
-
-    public ResultVO getOrderDetailInfoByOrderId(@RequestParam("orderId") String orderId) {
-        List<GoodsOrderDetailForm> list =  orderDetailInfoService.getOrderDetailListByOrderId(orderId);
-        return success(list);
-    }
-
-    /**
-     * 获取某订单基本信息
-     *
-     * @param orderId
-     * @return
-     */
-    @GetMapping("/getOrderInfoById")
-
-    public ResultVO getOrderInfoById(@RequestParam("guid") String orderId) {
-       GoodsOrderInfoForm goodsOrderInfoForm =  orderInfoService.getOrderInfoById(orderId);
-        return success(goodsOrderInfoForm);
-    }
-
-    /**
-     * 删除订单信息
-     *
-     * @param orderId
-     * @return
-     */
-    @GetMapping("/delOderInfoById")
-
-    public ResultVO delOrderInfo(@RequestParam("guid") String orderId) {
-        GoodsOrderInfoForm goodsOrderInfoForm = orderInfoService.getOrderInfoById(orderId);
-        if(Objects.nonNull(goodsOrderInfoForm)){
-            Integer orderStatus = goodsOrderInfoForm.getOrderStatus();
-            if(orderStatus==1){
-                int i = orderInfoService.rollbackOrderInfo(orderId);
-                if(i==0){return failure();}
-            }else {
-                int j = orderInfoService.delOrderInfoByLogical(orderId);
-                if(j==0){return failure();}
-            }
-        }
-        return success();
-    }
-
-    /**
-     * 更新订单信息
-     *
-     * @param goodsOrderInfoForm
-     * @return
-     */
-    @PostMapping("/modifiedOrderInfo")
-
-    public ResultVO updateOrderInfo(@RequestBody GoodsOrderInfoForm goodsOrderInfoForm) {
-        int i = orderInfoService.modifyByPrimaryKeySelective(goodsOrderInfoForm);
-        if(i==0){return failure();}
-        return success();
-    }
-
-    /**
-     * 统一下单生成商品订单，并生成支付订单。返回支付订单信息
-     *
-     * @param goodsOrderInfoForm
-     * @return
-     */
-    @PostMapping("/insertOrderInfoForPay")
-
-    public ResultVO saveOrderInfoAndPayOrderInfo(@RequestBody GoodsOrderInfoForm goodsOrderInfoForm) {
-        int i = convertOrderInfoForm(goodsOrderInfoForm);
-        if(i==1){
-            String orderId = orderInfoService.saveFullOrderInfo(goodsOrderInfoForm);
-            if(orderId==null){return failure();}
-            return success(goodsOrderInfoForm);
-        }else if(i==-1){
-            return new ResultVO(ResultEnum.GOODS_BUY_AUTH);
-        }
-        return failure();
-    }
-
-    /**
-     * 转换客户订单信息,用于生成客户订单(含快照信息)
-     * @param goodsOrderInfoForm
-     * @return
-     */
-    private int convertOrderInfoForm(GoodsOrderInfoForm goodsOrderInfoForm){
-        //生成订单信息的类别
-        List<GoodsInfoForm> goodsList = goodsOrderInfoForm.getGoodsList();
-        CustomerInfoForm customerInfoForm = customerInfoService.getCustomerInfoById(goodsOrderInfoForm.getFkCustomerGuid());
-        if(Objects.nonNull(customerInfoForm)){
-            Integer customerType = customerInfoForm.getCustomerType();
-            String  typeName = "个人账户";
-            if(customerType==2){
-                typeName="履约企业";
-            }else if(customerType==3) {
-                typeName="普通履约企业";
-            }
-            goodsOrderInfoForm.setCustomerName(customerInfoForm.getCustomerName());
-            goodsOrderInfoForm.setCustomerType(typeName);
-            goodsOrderInfoForm.setOrderStatus(1);
-            //计算碳汇量及碳汇销售总价,生成订单详情列表
-            List<GoodsOrderDetailForm> goodsOrderDetailList = Lists.newArrayList();
-            Double amountMoney = 0d;
-            Double carbonAmount = 0d;
-            if(null!=goodsList && goodsList.size()>0){
-                for (GoodsInfoForm bean:goodsList) {
-                    BigDecimal carbon = bean.getCarbonSkin();
-                    String goodsId = bean.getGuid();
-                    Integer goodsUse =Integer.valueOf(bean.getGoodsUse()) ;
-                    //判断用户类型是否超出购买权限，如果超出购买权限将不允许直接购买
-                    if(customerType==1 && goodsUse==1){
-                        return -1;
-                    }
-                    //有非法商品数量,不生成订单详情
-                    if(carbon.intValue()==0 || Objects.isNull(carbon)){continue;}
-                    GoodsOrderDetailForm detailForm = new GoodsOrderDetailForm();
-                    GoodsInfo goodsInfo = goodsInfoService.queryByPrimaryKey(goodsId);
-                    BigDecimal detailMoney = goodsInfo.getPrice().multiply(carbon);
-                    detailForm.setFkGoodsGuid(goodsId);
-                    detailForm.setAmount(detailMoney);
-                    detailForm.setSaleNum(carbon);
-                    detailForm.setGoodsName(goodsInfo.getGoodsName());
-                    detailForm.setGoodsPrice(goodsInfo.getPrice());
-                    carbonAmount+=carbon.doubleValue();
-                    amountMoney+=detailMoney.doubleValue();
-                    goodsOrderDetailList.add(detailForm);
-                }
-                goodsOrderInfoForm.setOrderAmount(BigDecimal.valueOf(amountMoney));
-                goodsOrderInfoForm.setOrderCarbonAmount(BigDecimal.valueOf(carbonAmount));
-                goodsOrderInfoForm.setGoodsOrderDetailForm(goodsOrderDetailList);
-                return 1;
-            }
-        }
-        return 0;
-    }
-
-    /**
-     * 支付回调后，统一更新订单信息及支付订单信息
-     *
-     * @param payOrderNO
-     * @return
-     */
-    @GetMapping("/modifiedOrderInfoForPay")
-
-    public ResultVO updateOrderInfoAndPayOrderInfo(@RequestParam("payNo") String payOrderNO) {
-        int i = orderInfoService.updateFullOrderInfo(payOrderNO,2);
-        if(i==0){return failure();}
-        return success();
-    }
-
-    /**
-     * 获取用户证书列表
-     *
-     * @param goodsCredentialInfoForm
-     * @return
-     */
-    @PostMapping("/getCustomerCredentialList")
-
-    public ResultVO getCustomerCredentialList(@RequestBody GoodsCredentialInfoForm goodsCredentialInfoForm) {
-        PageInfo pageInfo = credentialInfoService.searchCredentialByPage(goodsCredentialInfoForm);
-        return success(pageInfo.getList(),pageInfo.getTotal());
-    }
-
-    /**
-     * 订单支付超时取消
-     *
-     * @param orderId
-     * @return
-     */
-    @GetMapping("/callbackOrderInfo")
-
-    public ResultVO callbackOrderInfo(@RequestParam("orderId") String orderId) {
-        int i = orderInfoService.rollbackOrderInfo(orderId);
-        if(i==0){return failure();}
-        return success();
-    }
-
-    /**
-     * 通过订单编号查询订单信息
-     *
-     * @param orderNo
-     * @return
-     */
-    @GetMapping("/getOrderInfoByNo")
-
-    public ResultVO getOrderInfoByOrderNo(@RequestParam("orderNo") String orderNo) {
-      GoodsOrderInfoForm goodsOrderInfoForm =  orderInfoService.getOrderInfoByNo(orderNo);
-      if(Objects.nonNull(goodsOrderInfoForm)){
-          success(goodsOrderInfoForm);
-      }
-        return failure();
-    }
-
-    /**
-     * 取消用户订单
-     *
-     * @param orderId
-     * @return
-     */
-    @GetMapping("/cancelOrderInfo")
-
-    public ResultVO cancelOrderInfo(@RequestParam("orderId") String orderId) {
-        //取消订单主体信息
-
-        //取消支付订单信息
-
-        //取消离线支付申请信息
-
-        return null;
-    }
-
-    /**
-     * 通过碳汇需求量购买指定农户下的碳汇商品
-     *
-     * @param goodsOrderInfoForm
-     * @return
-     */
-
-    public ResultVO saveOrderInfoForFarmer(GoodsOrderInfoForm goodsOrderInfoForm) {
-        //TODO 查询农户下的产品信息
-
-        //TODO 根据需求的碳汇量计算出产品列表
-        return null;
-    }
-
-    @GetMapping("/getCredential")
-
-    public ResultVO getCredentialInfo(@RequestParam(name = "guid") String guid) {
-        GoodsCredentialInfoForm goodsCredentialInfoForm = this.credentialInfoService.queryByPrimaryKey(guid);
-        return success(goodsCredentialInfoForm);
-    }
-
-    @GetMapping("/getCredentialByOrderId")
-
-    public ResultVO getCredentialByOrderId(@RequestParam(name = "orderId") String orderId) {
-        CredentialInfoBO credentialInfoBO = this.credentialInfoService.queryByOrderId(orderId);
-        return success(credentialInfoBO);
-    }
-}

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/controller/PayApplyManageController.java → carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/bank/controller/PayApplyController.java

@@ -4,46 +4,46 @@ import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageInfo;
 import com.hcloud.microserver.bank.service.OrderPayApplyService;
 import com.hcloud.microserver.commoncore.base.BaseController;
+import com.hcloud.microserver.commoncore.base.ResponseBase;
 import com.hcloud.microserver.commoncore.base.ResultVO;
 import com.hcloud.microserver.commoncore.util.BeanCopyUtil;
 import com.hcloud.microserver.facade.carbon.entity.GoodsOrderInfo;
 import com.hcloud.microserver.facade.carbon.entity.OrderPayApply;
 import com.hcloud.microserver.facade.carbon.forms.GoodsOrderInfoForm;
 import com.hcloud.microserver.facade.carbon.forms.OrderPayApplyForm;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.Objects;
-
 @RestController
-@RequestMapping("/payApply")
-public class PayApplyManageController extends BaseController {
+@RequestMapping("/web/payApply")
+@Api(tags = "PayApplyController",description = "订单支付信息管理")
+public class PayApplyController extends BaseController {
 
     @Autowired
     private OrderPayApplyService orderPayApplyService;
 
-
+    @ApiOperation("分页查询订单支付信息")
     @PostMapping("/searchByPage")
-    public ResultVO searchByPage(@RequestBody OrderPayApplyForm orderPayApplyForm) {
+    public ResponseBase searchByPage(@RequestBody OrderPayApplyForm orderPayApplyForm) {
         PageInfo pageInfo = this.orderPayApplyService.searchByPage(orderPayApplyForm);
-        if (Objects.isNull(pageInfo)) {
-            return success(null, 0);
-        }
-        return success(pageInfo.getList(), pageInfo.getTotal());
+        return responseSuccess(pageInfo);
     }
 
-
+    @ApiOperation("审核离线支付信息")
     @PostMapping("/audit")
-    public ResultVO audit(@RequestBody JSONObject jsonObject) {
+    public ResponseBase audit(@RequestBody JSONObject jsonObject) {
         GoodsOrderInfoForm goodsOrderInfoForm = jsonObject.getObject("goodsOrderInfoForm", GoodsOrderInfoForm.class);
         OrderPayApplyForm orderPayApplyForm = jsonObject.getObject("orderPayApplyForm", OrderPayApplyForm.class);
         GoodsOrderInfo goodsOrderInfo = BeanCopyUtil.convertBean(goodsOrderInfoForm, GoodsOrderInfo.class);
         OrderPayApply orderPayApply = BeanCopyUtil.convertBean(orderPayApplyForm, OrderPayApply.class);
         int success = this.orderPayApplyService.audit(orderPayApply, goodsOrderInfo);
-        if (success > 0) return success();
-        return failure();
-    }
+        if (success>0){
+            return responseResultSuccess();
+        }
+        return responseResultFailure();    }
 }

carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/bank/controller/PayApplyManageController.java

@@ -1,49 +0,0 @@
-package com.hcloud.microserver.bank.controller;
-
-import com.alibaba.fastjson.JSONObject;
-import com.github.pagehelper.PageInfo;
-import com.hcloud.microserver.bank.service.OrderPayApplyService;
-import com.hcloud.microserver.commoncore.base.BaseController;
-import com.hcloud.microserver.commoncore.base.ResultVO;
-import com.hcloud.microserver.commoncore.util.BeanCopyUtil;
-import com.hcloud.microserver.facade.carbon.entity.GoodsOrderInfo;
-import com.hcloud.microserver.facade.carbon.entity.OrderPayApply;
-import com.hcloud.microserver.facade.carbon.forms.GoodsOrderInfoForm;
-import com.hcloud.microserver.facade.carbon.forms.OrderPayApplyForm;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.Objects;
-
-@RestController
-@RequestMapping("/payApply")
-public class PayApplyManageController extends BaseController {
-
-    @Autowired
-    private OrderPayApplyService orderPayApplyService;
-
-
-    @PostMapping("/searchByPage")
-    public ResultVO searchByPage(@RequestBody OrderPayApplyForm orderPayApplyForm) {
-        PageInfo pageInfo = this.orderPayApplyService.searchByPage(orderPayApplyForm);
-        if (Objects.isNull(pageInfo)) {
-            return success(null, 0);
-        }
-        return success(pageInfo.getList(), pageInfo.getTotal());
-    }
-
-
-    @PostMapping("/audit")
-    public ResultVO audit(@RequestBody JSONObject jsonObject) {
-        GoodsOrderInfoForm goodsOrderInfoForm = jsonObject.getObject("goodsOrderInfoForm", GoodsOrderInfoForm.class);
-        OrderPayApplyForm orderPayApplyForm = jsonObject.getObject("orderPayApplyForm", OrderPayApplyForm.class);
-        GoodsOrderInfo goodsOrderInfo = BeanCopyUtil.convertBean(goodsOrderInfoForm, GoodsOrderInfo.class);
-        OrderPayApply orderPayApply = BeanCopyUtil.convertBean(orderPayApplyForm, OrderPayApply.class);
-        int success = this.orderPayApplyService.audit(orderPayApply, goodsOrderInfo);
-        if (success > 0) return success();
-        return failure();
-    }
-}

carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/bank/controller/PayApplyManagerController.java

@@ -1,119 +0,0 @@
-package com.hcloud.microserver.bank.controller;
-
-
-import com.github.pagehelper.PageInfo;
-import com.hcloud.microserver.bank.service.OrderInfoService;
-import com.hcloud.microserver.bank.service.OrderPayApplyService;
-import com.hcloud.microserver.bank.service.OrderPayVoucherService;
-import com.hcloud.microserver.commoncore.base.BaseController;
-import com.hcloud.microserver.commoncore.base.ResultVO;
-import com.hcloud.microserver.commoncore.enums.ResultEnum;
-import com.hcloud.microserver.facade.carbon.forms.GoodsOrderInfoForm;
-import com.hcloud.microserver.facade.carbon.forms.OrderPayApplyForm;
-import com.hcloud.microserver.facade.carbon.forms.OrderPayVoucherForm;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * @author xiezt
- */
-@RestController
-@RequestMapping("/pay/apply")
-public class PayApplyManagerController extends BaseController {
-
-    /**
-     * 订单未支付状态,
-     */
-    private static final Integer ORDER_NO_PAY_STATUS=1;
-
-    @Autowired
-    private OrderPayApplyService orderPayApplyService;
-
-    @Autowired
-    private OrderPayVoucherService orderPayVoucherService;
-
-    @Autowired
-    private OrderInfoService orderInfoService;
-    /**
-     * 分页查询离线支付申请信息
-     *
-     * @param orderPayApplyForm
-     * @return
-     */
-    @PostMapping("/searchByPage")
-
-    public ResultVO searchPayApplyByPage(@RequestBody OrderPayApplyForm orderPayApplyForm) {
-       PageInfo pageInfo =  orderPayApplyService.searchPayApplyInfoByPage(orderPayApplyForm);
-        return success(pageInfo.getList(),pageInfo.getTotal());
-    }
-
-    /**
-     * 更新离线支付申请信息
-     *
-     * @param orderPayApplyForm
-     * @return
-     */
-    @PostMapping("/updatePayApply")
-
-    public ResultVO updatePayApplyById(@RequestBody OrderPayApplyForm orderPayApplyForm) {
-        int i = orderPayApplyService.modifyByPrimaryKeySelective(orderPayApplyForm);
-        if (i==0){return failure();}
-        return success();
-    }
-
-    /**
-     * 删除离线支付申请信息
-     *
-     * @param guid
-     * @return
-     */
-    @GetMapping("/delPayApply")
-
-    public ResultVO delPayApply(@RequestParam("guid") String guid) {
-        OrderPayApplyForm orderPayApplyForm = orderPayApplyService.queryByPrimaryKey(guid);
-        if(orderPayApplyForm!=null){
-            orderPayApplyForm.setState(0);
-            int i = orderPayApplyService.modifyByPrimaryKeySelective(orderPayApplyForm);
-            if(i==0){return failure();}
-            return success();
-        }
-        return failure();
-    }
-
-    /**
-     * 生成离线支付申请
-     *
-     * @param goodsOrderInfoForm
-     * @return
-     */
-    @PostMapping("/savePayApplyInfo")
-
-    public ResultVO savePayApplyInfo(@RequestBody GoodsOrderInfoForm goodsOrderInfoForm) {
-        String orderId =  goodsOrderInfoForm.getGuid();
-        if(null!=orderId && !"".equals(orderId)){
-          GoodsOrderInfoForm orderInfoForm = orderInfoService.getOrderInfoById(orderId);
-          Integer orderSatus = orderInfoForm.getOrderStatus();
-          if(orderSatus!=1){
-              return new ResultVO(ResultEnum.ORDER_PAY_COMPLETE);
-          }
-            int i= orderPayApplyService.savePayApplyInfo(goodsOrderInfoForm);
-            if(i==0){return failure();}
-            return success();
-        }
-       return failure();
-    }
-
-    /**
-     * 生成离线支付凭证
-     *
-     * @param payVoucherForm
-     * @return
-     */
-    @PostMapping("/saveOffLienVoucher")
-
-    public ResultVO saveOffLienPayVoucher(@RequestBody OrderPayVoucherForm payVoucherForm) {
-        int i = orderPayVoucherService.savePayVoucherInfoAndOrderInfo(payVoucherForm);
-        if(i==0){return failure();}
-        return success();
-    }
-}

carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/bank/controller/PayOrderManagerController.java

@@ -1,88 +0,0 @@
-package com.hcloud.microserver.bank.controller;
-
-import com.hcloud.microserver.bank.bo.GoodsPayOrderBO;
-import com.hcloud.microserver.bank.service.OrderPayService;
-import com.hcloud.microserver.commoncore.base.BaseController;
-import com.hcloud.microserver.commoncore.base.ResultVO;
-import com.hcloud.microserver.facade.carbon.forms.GoodsPayOrderForm;
-import com.hcloud.microserver.facade.carbon.forms.PaymentForm;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-import java.util.Objects;
-
-/**
- * @author xiezt
- */
-@RestController
-@RequestMapping("/order/pay")
-public class PayOrderManagerController extends BaseController {
-
-    @Autowired
-    private OrderPayService orderPayService;
-
-
-    /**
-     * 查询某订单，支付流水明细
-     *
-     * @param orderId
-     * @return
-     */
-    @GetMapping("/getListById")
-
-    public ResultVO getOrderPayListByOrderId(@RequestParam("orderId") String orderId) {
-        List<GoodsPayOrderBO> list =  orderPayService.getPayOrderByOrderId(orderId);
-        return success(list);
-    }
-
-    /**
-     * 保存支付订单信息
-     *
-     * @param goodsPayOrderForm
-     * @return
-     */
-    @PostMapping("/saveOrderPayInfo")
-
-    public ResultVO savePayOrderInfo(@RequestBody GoodsPayOrderForm goodsPayOrderForm) {
-       int i =  orderPayService.saveSelective(goodsPayOrderForm);
-       if(i==0){return failure();}
-        return success();
-    }
-
-    /**
-     * 更新支付订单明细
-     *
-     * @param goodsPayOrderForm
-     * @return
-     */
-    @PostMapping("/modifiedOrderPayInfo")
-
-    public ResultVO updateOrderPayInfo(@RequestBody GoodsPayOrderForm goodsPayOrderForm) {
-        int i = orderPayService.modifyByPrimaryKeySelective(goodsPayOrderForm);
-        if(i==0){return failure();}
-        return success();
-    }
-
-    /**
-     * 通过支付订单编号查询支付信息
-     *
-     * @param payNo
-     * @return
-     */
-    @GetMapping("/getPayOrderInfoByNo")
-
-    public ResultVO getPayOrderInfoByPayNo(@RequestParam("payNo") String payNo) {
-       GoodsPayOrderForm goodsPayOrderForm = orderPayService.getPayOrderByNo(payNo);
-       if(Objects.nonNull(goodsPayOrderForm)){
-          return success(goodsPayOrderForm);
-       }
-        return failure();
-    }
-
-    @PostMapping("/queryPaymentByPage")
-
-    public ResultVO queryPaymentByPage(@RequestBody PaymentForm paymentForm) {
-        return success(orderPayService.queryPaymentByPage(paymentForm));
-    }
-}

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/controller/PayVoucherManageController.java → carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/bank/controller/PayVoucherController.java

@@ -3,30 +3,27 @@ package com.hcloud.microserver.bank.controller;
 import com.github.pagehelper.PageInfo;
 import com.hcloud.microserver.bank.service.OrderPayVoucherService;
 import com.hcloud.microserver.commoncore.base.BaseController;
+import com.hcloud.microserver.commoncore.base.ResponseBase;
 import com.hcloud.microserver.commoncore.base.ResultVO;
 import com.hcloud.microserver.facade.carbon.forms.OrderPayVoucherForm;
+import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.Objects;
-
 @RestController
-@RequestMapping("/voucher")
-public class PayVoucherManageController extends BaseController {
+@RequestMapping("/web/voucher")
+@Api(tags = "PayVoucherController",description = "离线支付凭证")
+public class PayVoucherController extends BaseController {
 
     @Autowired
     private OrderPayVoucherService orderPayVoucherService;
 
-
     @PostMapping("/searchByPage")
-    public ResultVO searchByPage(OrderPayVoucherForm orderPayVoucherForm) {
-        PageInfo pageInfo = this.orderPayVoucherService.queryListByPage(orderPayVoucherForm);
-        if (Objects.isNull(pageInfo)) {
-            return success(null, 0);
-        }
-        return success(pageInfo.getList(), pageInfo.getTotal());
-
+    public ResponseBase searchByPage(@RequestBody OrderPayVoucherForm orderPayVoucherForm) {
+        PageInfo pageInfo = orderPayVoucherService.queryListByPage(orderPayVoucherForm);
+        return responseSuccess(pageInfo);
     }
 }

carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/bank/controller/PayVoucherManageController.java

@@ -1,32 +0,0 @@
-package com.hcloud.microserver.bank.controller;
-
-import com.github.pagehelper.PageInfo;
-import com.hcloud.microserver.bank.service.OrderPayVoucherService;
-import com.hcloud.microserver.commoncore.base.BaseController;
-import com.hcloud.microserver.commoncore.base.ResultVO;
-import com.hcloud.microserver.facade.carbon.forms.OrderPayVoucherForm;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.Objects;
-
-@RestController
-@RequestMapping("/voucher")
-public class PayVoucherManageController extends BaseController {
-
-    @Autowired
-    private OrderPayVoucherService orderPayVoucherService;
-
-
-    @PostMapping("/searchByPage")
-    public ResultVO searchByPage(OrderPayVoucherForm orderPayVoucherForm) {
-        PageInfo pageInfo = this.orderPayVoucherService.queryListByPage(orderPayVoucherForm);
-        if (Objects.isNull(pageInfo)) {
-            return success(null, 0);
-        }
-        return success(pageInfo.getList(), pageInfo.getTotal());
-
-    }
-}

carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/bank/controller/PovertyAreaController.java

@@ -0,0 +1,70 @@
+package com.hcloud.microserver.bank.controller;
+
+import com.github.pagehelper.PageInfo;
+import com.hcloud.microserver.bank.bo.CarbonBaseController;
+import com.hcloud.microserver.bank.service.PovertyAreaService;
+import com.hcloud.microserver.commoncore.base.ResponseBase;
+import com.hcloud.microserver.facade.carbon.entity.PovertyArea;
+import com.hcloud.microserver.facade.carbon.forms.PovertyAreaForm;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+@Slf4j
+@RestController
+@RequestMapping("/web/area")
+@Api(description = "贫困区域管理服务")
+public class PovertyAreaController extends CarbonBaseController {
+
+    @Autowired
+    private PovertyAreaService povertyAreaService;
+
+    @ApiOperation("分页查询贫困区域")
+    @PostMapping("/searchByPage")
+    public ResponseBase searchByPage(@RequestBody PovertyAreaForm povertyAreaForm) {
+        PageInfo pageInfo = this.povertyAreaService.queryListByPage(povertyAreaForm);
+        return responseSuccess(pageInfo);
+    }
+
+    @ApiOperation("新增贫困区域")
+    @PostMapping("/save")
+    public ResponseBase save(@RequestBody PovertyAreaForm povertyAreaForm) {
+
+        povertyAreaForm.setCreateUser(this.getUserId());
+        povertyAreaForm.setModifiedUser(this.getUserId());
+        int success = this.povertyAreaService.save(povertyAreaForm);
+        if (success>0) {
+            return responseResultSuccess();
+        }
+        return responseResultFailure();
+    }
+
+    @ApiOperation("修改贫困区域")
+    @PostMapping("/update")
+    public ResponseBase update(@RequestBody PovertyAreaForm povertyAreaForm) {
+        int success = this.povertyAreaService.modify(povertyAreaForm);
+        if (success>0) {
+            return responseResultSuccess();
+        }
+        return responseResultFailure();
+    }
+
+    @ApiOperation("删除贫困区域")
+    @PostMapping("/del")
+    public ResponseBase del(@RequestBody PovertyAreaForm povertyAreaForm) {
+        int success = this.povertyAreaService.remove(povertyAreaForm);
+        if (success>0) {
+            return responseResultSuccess();
+        }
+        return responseResultFailure();
+    }
+
+    @ApiOperation("查询贫困区域明细")
+    @GetMapping("/findByGuid")
+    public ResponseBase findByGuid(@RequestParam(name = "guid") String guid) {
+        PovertyArea povertyArea = this.povertyAreaService.findByGuid(guid);
+        return responseResultSuccess(povertyArea);
+    }
+}

carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/bank/controller/PovertyAreaManageController.java

@@ -1,69 +0,0 @@
-package com.hcloud.microserver.bank.controller;
-
-import com.github.pagehelper.PageInfo;
-import com.hcloud.microserver.bank.service.PovertyAreaService;
-import com.hcloud.microserver.commoncore.base.BaseController;
-import com.hcloud.microserver.commoncore.base.ResultVO;
-import com.hcloud.microserver.commoncore.enums.ResultEnum;
-import com.hcloud.microserver.facade.carbon.entity.PovertyArea;
-import com.hcloud.microserver.facade.carbon.forms.PovertyAreaForm;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Objects;
-
-/**
- * @author xiezt
- */
-@RestController
-@RequestMapping("/povertyArea")
-public class PovertyAreaManageController extends BaseController {
-
-    @Autowired
-    private PovertyAreaService povertyAreaService;
-
-    @PostMapping("/searchByPage")
-
-    public ResultVO searchByPage(@RequestBody PovertyAreaForm povertyAreaForm) {
-        PageInfo pageInfo = this.povertyAreaService.queryListByPage(povertyAreaForm);
-        if (Objects.isNull(pageInfo)) return success(null, 0);
-        return success(pageInfo.getList(), pageInfo.getTotal());
-    }
-
-    @PostMapping("/save")
-
-    public ResultVO save(@RequestBody PovertyAreaForm povertyAreaForm) {
-        int success = this.povertyAreaService.save(povertyAreaForm);
-        if (success > 0) {
-            return success();
-        }
-        return new ResultVO(ResultEnum.SYS_ERROR);
-    }
-
-    @PostMapping("/update")
-
-    public ResultVO update(@RequestBody PovertyAreaForm povertyAreaForm) {
-        int success = this.povertyAreaService.modify(povertyAreaForm);
-        if (success > 0) {
-            return success();
-        }
-        return new ResultVO(ResultEnum.SYS_ERROR);
-    }
-
-    @PostMapping("/del")
-
-    public ResultVO del(@RequestBody PovertyAreaForm povertyAreaForm) {
-        int success = this.povertyAreaService.remove(povertyAreaForm);
-        if (success > 0) {
-            return success();
-        }
-        return new ResultVO(ResultEnum.SYS_ERROR);
-    }
-
-
-    @GetMapping("/findByGuid")
-    public ResultVO findByGuid(@RequestParam(name = "guid") String guid) {
-        PovertyArea povertyArea = this.povertyAreaService.findByGuid(guid);
-        return success(povertyArea);
-    }
-}

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/controller/ProductInfoManageController.java → carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/bank/controller/ProductInfoController.java

@@ -3,15 +3,17 @@ package com.hcloud.microserver.bank.controller;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageInfo;
+import com.hcloud.microserver.bank.bo.CarbonBaseController;
 import com.hcloud.microserver.bank.service.ProductBelongService;
 import com.hcloud.microserver.bank.service.ProductExpansionService;
 import com.hcloud.microserver.bank.service.ProductInfoService;
-import com.hcloud.microserver.commoncore.base.BaseController;
-import com.hcloud.microserver.commoncore.base.ResultVO;
+import com.hcloud.microserver.commoncore.base.ResponseBase;
 import com.hcloud.microserver.commoncore.enums.ResultEnum;
 import com.hcloud.microserver.facade.carbon.entity.*;
 import com.hcloud.microserver.facade.carbon.forms.GoodsInfoForm;
 import com.hcloud.microserver.facade.carbon.forms.ProductInfoForm;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -24,75 +26,65 @@ import java.util.Objects;
  */
 @Slf4j
 @RestController
-@RequestMapping("/product")
-public class ProductInfoManageController extends BaseController {
+@RequestMapping("/web/product")
+@Api(description = "产品信息管理服务")
+public class ProductInfoController extends CarbonBaseController {
 
     @Autowired
     private ProductInfoService productInfoService;
 
-    @Autowired
-    private ProductBelongService productBelongService;
-
     @Autowired
     private ProductExpansionService productExpansionService;
 
+    @Autowired
+    private ProductBelongService productBelongService;
 
+    @ApiOperation("保存产品")
     @PostMapping("/save")
-    public ResultVO save(@RequestBody ProductInfoForm productInfoForm) {
+    public ResponseBase save(@RequestBody ProductInfoForm productInfoForm) {
         int success = this.productInfoService.save(productInfoForm);
-        if (success > 0) {
-            return success();
-        }
-        return new ResultVO(ResultEnum.SYS_ERROR);
-    }
 
+        return thisReturn(success);
+    }
 
+    @ApiOperation("删除产品")
     @PostMapping("/delete")
-    public ResultVO delete(@RequestBody ProductInfoForm productInfoForm) {
+    public ResponseBase delete(@RequestBody ProductInfoForm productInfoForm) {
         int success = this.productInfoService.remove(productInfoForm);
-        if (success > 0) {
-            return success();
-        }
-        return new ResultVO(ResultEnum.SYS_ERROR);
+        return thisReturn(success);
     }
 
-
+    @ApiOperation("修改产品")
     @PostMapping("/update")
-    public ResultVO update(@RequestBody ProductInfoForm productInfoForm) {
+    public ResponseBase update(@RequestBody ProductInfoForm productInfoForm) {
         int success = this.productInfoService.modify(productInfoForm);
-        if (success > 0) {
-            return success();
-        }
-        return new ResultVO(ResultEnum.SYS_ERROR);
+        return thisReturn(success);
     }
 
-
+    @ApiOperation("分页获取产品")
     @PostMapping("/searchByPage")
-    public ResultVO searchByPage(@RequestBody ProductInfoForm productInfoForm) {
+    public ResponseBase searchByPage(@RequestBody ProductInfoForm productInfoForm) {
         PageInfo pageInfo = this.productInfoService.queryListByPage(productInfoForm);
-        if (Objects.isNull(pageInfo)) {
-            return success(null, 0);
-        }
-        return success(pageInfo.getList(), pageInfo.getTotal());
+        return responseSuccess(pageInfo);
     }
 
-
+    @ApiOperation("获取产品属性扩展")
     @PostMapping("/expansions")
-    public ResultVO expansions(@RequestParam("guid") String guid) {
+    public ResponseBase expansions(@RequestParam("guid") String guid) {
         List<ProductExpansion> expansions = this.productExpansionService.searchByProductGuid(guid);
-        return success(expansions);
+        return responseResultSuccess(expansions);
     }
 
-
+    @ApiOperation("获取产品属性")
     @PostMapping("/belongs")
-    public ResultVO belongs(@RequestParam("guid") String guid) {
-        List<ProductBelong> belongs = this.productBelongService.searchByProductGuid(guid);
-        return success(belongs);
+    public ResponseBase belongs(@RequestParam("guid") String guid) {
+        List<ProductBelong> belongs = productBelongService.searchByProductGuid(guid);
+        return responseResultSuccess(belongs);
     }
 
-
+    @ApiOperation("发布产品")
     @PostMapping("/publish")
-    public ResultVO publish(@RequestBody JSONObject jsonObject) {
+    public ResponseBase publish(@RequestBody JSONObject jsonObject) {
         log.info("参数: {}", jsonObject);
         ProductInfoForm productInfoForm = null;
         GoodsInfoForm goodsInfoForm = null;
@@ -107,18 +99,18 @@ public class ProductInfoManageController extends BaseController {
         if (Objects.nonNull(productInfoForm) && Objects.nonNull(goodsInfoForm)) {
             int success = this.productInfoService.publish(productInfoForm, goodsInfoForm);
             if (success > 0) {
-                return success();
+                return responseResultSuccess();
             } else {
-                return failure();
+                return responseResultFailure();
             }
         } else {
-            return new ResultVO(ResultEnum.PARAMETER_NOT_NULL);
+            return responseEnum(ResultEnum.PARAMETER_NOT_NULL);
         }
     }
 
-
+    @ApiOperation("发布商品")
     @PostMapping("/publishGoods")
-    public ResultVO publishGoods(@RequestBody JSONObject jsonObject) {
+    public ResponseBase publishGoods(@RequestBody JSONObject jsonObject) {
         log.info("参数: {}", jsonObject.toJSONString());
 
         JSONArray jsonArray = jsonObject.getJSONArray("productInfos");
@@ -143,17 +135,16 @@ public class ProductInfoManageController extends BaseController {
 
             int success = this.productInfoService.publishGoods(goodsInfo, goodsSaleInfo, productInfos);
             if (success > 0) {
-                return success();
+                return responseResultSuccess();
             }
         }
-        return failure();
+        return responseResultFailure();
     }
 
-
+    @ApiOperation("获取商品详细信息")
     @PostMapping("/findByGoodsInfoGuid")
-    public ResultVO findByGoodsInfoGuid(@RequestParam("goodsInfoGuid") String goodsInfoGuid) {
+    public ResponseBase findByGoodsInfoGuid(@RequestParam("goodsInfoGuid") String goodsInfoGuid) {
         List<ProductInfo> productInfos = this.productInfoService.searchByGoodsInfoGuid(goodsInfoGuid);
-        return success(productInfos);
+        return responseResultSuccess(productInfos);
     }
-
 }

carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/bank/controller/ProductInfoManageController.java

@@ -1,159 +0,0 @@
-package com.hcloud.microserver.bank.controller;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.github.pagehelper.PageInfo;
-import com.hcloud.microserver.bank.service.ProductBelongService;
-import com.hcloud.microserver.bank.service.ProductExpansionService;
-import com.hcloud.microserver.bank.service.ProductInfoService;
-import com.hcloud.microserver.commoncore.base.BaseController;
-import com.hcloud.microserver.commoncore.base.ResultVO;
-import com.hcloud.microserver.commoncore.enums.ResultEnum;
-import com.hcloud.microserver.facade.carbon.entity.*;
-import com.hcloud.microserver.facade.carbon.forms.GoodsInfoForm;
-import com.hcloud.microserver.facade.carbon.forms.ProductInfoForm;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-import java.util.Objects;
-
-/**
- * @author xiezt
- */
-@Slf4j
-@RestController
-@RequestMapping("/product")
-public class ProductInfoManageController extends BaseController {
-
-    @Autowired
-    private ProductInfoService productInfoService;
-
-    @Autowired
-    private ProductBelongService productBelongService;
-
-    @Autowired
-    private ProductExpansionService productExpansionService;
-
-
-    @PostMapping("/save")
-    public ResultVO save(@RequestBody ProductInfoForm productInfoForm) {
-        int success = this.productInfoService.save(productInfoForm);
-        if (success > 0) {
-            return success();
-        }
-        return new ResultVO(ResultEnum.SYS_ERROR);
-    }
-
-
-    @PostMapping("/delete")
-    public ResultVO delete(@RequestBody ProductInfoForm productInfoForm) {
-        int success = this.productInfoService.remove(productInfoForm);
-        if (success > 0) {
-            return success();
-        }
-        return new ResultVO(ResultEnum.SYS_ERROR);
-    }
-
-
-    @PostMapping("/update")
-    public ResultVO update(@RequestBody ProductInfoForm productInfoForm) {
-        int success = this.productInfoService.modify(productInfoForm);
-        if (success > 0) {
-            return success();
-        }
-        return new ResultVO(ResultEnum.SYS_ERROR);
-    }
-
-
-    @PostMapping("/searchByPage")
-    public ResultVO searchByPage(@RequestBody ProductInfoForm productInfoForm) {
-        PageInfo pageInfo = this.productInfoService.queryListByPage(productInfoForm);
-        if (Objects.isNull(pageInfo)) {
-            return success(null, 0);
-        }
-        return success(pageInfo.getList(), pageInfo.getTotal());
-    }
-
-
-    @PostMapping("/expansions")
-    public ResultVO expansions(@RequestParam("guid") String guid) {
-        List<ProductExpansion> expansions = this.productExpansionService.searchByProductGuid(guid);
-        return success(expansions);
-    }
-
-
-    @PostMapping("/belongs")
-    public ResultVO belongs(@RequestParam("guid") String guid) {
-        List<ProductBelong> belongs = this.productBelongService.searchByProductGuid(guid);
-        return success(belongs);
-    }
-
-
-    @PostMapping("/publish")
-    public ResultVO publish(@RequestBody JSONObject jsonObject) {
-        log.info("参数: {}", jsonObject);
-        ProductInfoForm productInfoForm = null;
-        GoodsInfoForm goodsInfoForm = null;
-
-        if (jsonObject.containsKey("productInfoForm")) {
-            productInfoForm = jsonObject.getObject("productInfoForm", ProductInfoForm.class);
-        }
-        if (jsonObject.containsKey("goodsInfoForm")) {
-            goodsInfoForm = jsonObject.getObject("goodsInfoForm", GoodsInfoForm.class);
-        }
-
-        if (Objects.nonNull(productInfoForm) && Objects.nonNull(goodsInfoForm)) {
-            int success = this.productInfoService.publish(productInfoForm, goodsInfoForm);
-            if (success > 0) {
-                return success();
-            } else {
-                return failure();
-            }
-        } else {
-            return new ResultVO(ResultEnum.PARAMETER_NOT_NULL);
-        }
-    }
-
-
-    @PostMapping("/publishGoods")
-    public ResultVO publishGoods(@RequestBody JSONObject jsonObject) {
-        log.info("参数: {}", jsonObject.toJSONString());
-
-        JSONArray jsonArray = jsonObject.getJSONArray("productInfos");
-        List<ProductInfo> productInfos = JSONObject.parseArray(jsonArray.toJSONString(), ProductInfo.class);
-
-        GoodsInfoForm goodsInfoForm = jsonObject.getObject("goodsInfoForm", GoodsInfoForm.class);
-        log.info("productInfos: {}", productInfos);
-        log.info("goodsInfoForm: {}", goodsInfoForm);
-
-        boolean cond1 = Objects.nonNull(productInfos) && productInfos.size() > 0;
-        boolean cond2 = Objects.nonNull(goodsInfoForm);
-
-        if (cond1 && cond2) {
-            GoodsInfo goodsInfo = new GoodsInfo();
-            GoodsSaleInfo goodsSaleInfo = new GoodsSaleInfo();
-            goodsInfo.setCarbonVal(goodsInfoForm.getCarbonVal());
-            goodsInfo.setPrice(goodsInfoForm.getPrice());
-            goodsInfo.setGoodsSaleDate(goodsInfoForm.getGoodsSaleDate());
-            goodsInfo.setGoodsUse(goodsInfoForm.getGoodsUse());
-            goodsSaleInfo.setSaleTargets(goodsInfoForm.getSaleTargets());
-            goodsSaleInfo.setSaleType(goodsInfoForm.getSaleType());
-
-            int success = this.productInfoService.publishGoods(goodsInfo, goodsSaleInfo, productInfos);
-            if (success > 0) {
-                return success();
-            }
-        }
-        return failure();
-    }
-
-
-    @PostMapping("/findByGoodsInfoGuid")
-    public ResultVO findByGoodsInfoGuid(@RequestParam("goodsInfoGuid") String goodsInfoGuid) {
-        List<ProductInfo> productInfos = this.productInfoService.searchByGoodsInfoGuid(goodsInfoGuid);
-        return success(productInfos);
-    }
-
-}

carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/bank/controller/ProductTypeController.java

@@ -0,0 +1,84 @@
+package com.hcloud.microserver.bank.controller;
+
+import com.github.pagehelper.PageInfo;
+import com.hcloud.microserver.bank.bo.CarbonBaseController;
+import com.hcloud.microserver.bank.service.ProductTypeExpansionService;
+import com.hcloud.microserver.bank.service.ProductTypeService;
+import com.hcloud.microserver.commoncore.base.ResponseBase;
+import com.hcloud.microserver.facade.carbon.entity.ProductType;
+import com.hcloud.microserver.facade.carbon.entity.ProductTypeExpansion;
+import com.hcloud.microserver.facade.carbon.forms.ProductTypeForm;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author xiezt
+ */
+@Slf4j
+@RestController
+@RequestMapping("/web/productType")
+@Api(description = "产品类型信息管理服务")
+public class ProductTypeController extends CarbonBaseController {
+
+    @Autowired
+    private ProductTypeService productTypeService;
+
+    @Autowired
+    private ProductTypeExpansionService productTypeExpansionService;
+
+    @ApiOperation("产品类型保存")
+    @PostMapping("/save")
+    public ResponseBase save(@RequestBody ProductTypeForm productTypeForm) {
+        int success = this.productTypeService.add(productTypeForm);
+        return thisReturn(success);
+    }
+
+    @ApiOperation("删除产品类型")
+    @PostMapping("/delete")
+    public ResponseBase delete(@RequestBody ProductTypeForm productTypeForm) {
+        int success = this.productTypeService.remove(productTypeForm);
+        return thisReturn(success);
+    }
+
+    @ApiOperation("修改产品类型")
+    public ResponseBase update(@RequestBody ProductTypeForm productTypeForm) {
+        int success = this.productTypeService.modify(productTypeForm);
+        return thisReturn(success);
+    }
+
+    @ApiOperation("分页获取产品类型")
+    public ResponseBase searchByPage(@RequestBody ProductTypeForm productTypeForm) {
+        PageInfo pageInfo = this.productTypeService.queryListByPage(productTypeForm);
+       return responseSuccess(pageInfo);
+    }
+
+    @ApiOperation("产品类型扩展")
+    @PostMapping("/expansions")
+    public ResponseBase expansions(@RequestParam(name = "guid") String guid) {
+        log.info("web =====> guid: {}", guid);
+        List<ProductTypeExpansion> result = this.productTypeExpansionService.searchByProductTypeGuid(guid);
+        return responseResultSuccess(result);
+    }
+
+    @ApiOperation("查询所有产品类型")
+    @PostMapping("/all")
+    public ResponseBase all(@RequestBody(required = false) ProductTypeForm productTypeForm) {
+        List<ProductType> productTypes = this.productTypeService.queryAll(productTypeForm);
+        return responseResultSuccess(productTypes);
+    }
+
+    @ApiOperation("校验产品类型值")
+    @PostMapping("/checkTypeVal")
+    public ResponseBase checkTypeVal(@RequestParam(name = "typeVal") String typeVal) {
+        int count = this.productTypeService.checkTypeVal(typeVal);
+        if (count<1){
+            return responseSuccess(success());
+        }
+        return responseResultFailure();
+    }
+}

carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/bank/controller/ProductTypeManageController.java

@@ -1,94 +0,0 @@
-package com.hcloud.microserver.bank.controller;
-
-import com.github.pagehelper.PageInfo;
-import com.hcloud.microserver.bank.service.ProductTypeExpansionService;
-import com.hcloud.microserver.bank.service.ProductTypeService;
-import com.hcloud.microserver.commoncore.base.BaseController;
-import com.hcloud.microserver.commoncore.base.ResultVO;
-import com.hcloud.microserver.commoncore.enums.ResultEnum;
-import com.hcloud.microserver.facade.carbon.entity.ProductType;
-import com.hcloud.microserver.facade.carbon.entity.ProductTypeExpansion;
-import com.hcloud.microserver.facade.carbon.forms.ProductTypeForm;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-import java.util.Objects;
-
-/**
- * @author xiezt
- */
-@Slf4j
-@RestController
-@RequestMapping("/productType")
-public class ProductTypeManageController extends BaseController  {
-
-    @Autowired
-    private ProductTypeService productTypeService;
-
-    @Autowired
-    private ProductTypeExpansionService productTypeExpansionService;
-
-
-    @PostMapping("/save")
-    public ResultVO save(@RequestBody ProductTypeForm productTypeForm) {
-        int success = this.productTypeService.add(productTypeForm);
-        if (success > 0) {
-            return success();
-        }
-        return new ResultVO(ResultEnum.SYS_ERROR);
-    }
-
-
-    @PostMapping("/delete")
-    public ResultVO delete(@RequestBody ProductTypeForm productTypeForm) {
-        int success = this.productTypeService.remove(productTypeForm);
-        if (success >= 0) {
-            return success();
-        } else
-        return new ResultVO(ResultEnum.SYS_ERROR);
-    }
-
-
-    @PostMapping("/update")
-    public ResultVO update(@RequestBody ProductTypeForm productTypeForm) {
-        int success = this.productTypeService.modify(productTypeForm);
-        if (success > 0) {
-            return success();
-        }
-        return new ResultVO(ResultEnum.SYS_ERROR);
-    }
-
-
-    @PostMapping("/searchByPage")
-    public ResultVO searchByPage(@RequestBody ProductTypeForm productTypeForm) {
-        PageInfo pageInfo = this.productTypeService.queryListByPage(productTypeForm);
-        if (Objects.isNull(pageInfo)){ return success(null, 0);}
-        return success(pageInfo.getList(), pageInfo.getTotal());
-    }
-
-
-    @PostMapping("/expansions")
-    public ResultVO expansions(@RequestParam String guid) {
-        log.info("guid: {}", guid);
-        List<ProductTypeExpansion> result = this.productTypeExpansionService.searchByProductTypeGuid(guid);
-        return success(result);
-    }
-
-
-    @PostMapping("/all")
-    public ResultVO findAll(@RequestBody(required = false) ProductTypeForm productTypeForm) {
-        List<ProductType> productTypes = this.productTypeService.queryAll(productTypeForm);
-        return success(productTypes);
-    }
-
-
-    public ResultVO checkTypeVal(@RequestParam(name = "typeVal") String typeVal) {
-        int count = this.productTypeService.checkTypeVal(typeVal);
-        if (count < 1) return success();
-        else return new ResultVO(113, "类型值" + typeVal + "已经存在");
-    }
-
-
-}

carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/bank/controller/SysDeptController.java

@@ -0,0 +1,87 @@
+package com.hcloud.microserver.bank.controller;
+
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageInfo;
+import com.hcloud.microserver.bank.bo.CarbonBaseController;
+import com.hcloud.microserver.commoncore.annotation.AuthCarbonValidate;
+import com.hcloud.microserver.commoncore.base.ResponseBase;
+import com.hcloud.microserver.commoncore.base.ResultVO;
+import com.hcloud.microserver.commoncore.enums.CarbonAuthEnum;
+import com.hcloud.microserver.commoncore.enums.ResultEnum;
+import com.hcloud.microserver.sys.facade.forms.SysDeptForm;
+import com.hcloud.microserver.sys.service.service.SysDepartmentService;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+/**
+ * @author xiezt
+ */
+@RestController
+@RequestMapping("/sys/dept")
+@Api(description = "系统部门信息服务")
+public class SysDeptController extends CarbonBaseController {
+
+
+    @Autowired
+    private SysDepartmentService sysDepartmentService;
+
+    @ApiOperation(value = "查询部门信息", notes = "分页查询信息,默认10行1页")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "sysDeptForm", value = "部门管理页面参数对象", dataType = "SysDeptForm")
+    })
+    @ApiResponse(code = 0, message = "操作成功")
+    @PostMapping("/searchByPage")
+    @AuthCarbonValidate(value = CarbonAuthEnum.SYS_DEPT_QUERY)
+    public ResponseBase searchByPage(@RequestBody SysDeptForm sysDeptForm){
+        PageInfo<Page<Map>> pageInfo = sysDepartmentService.queryDeptInfoListByPage(sysDeptForm);
+        if (pageInfo !=null){
+            return responseSuccess(pageInfo);
+        }
+       return responseEnum(ResultEnum.SYS_ERROR);
+    }
+
+    @ApiOperation(value = "新增部门信息", notes = "根据部门基本信息新增部门")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "sysDeptForm", value = "部门管理页面参数对象", dataType = "SysDeptForm")
+    })
+    @ApiResponse(code = 0, message = "操作成功")
+    @AuthCarbonValidate(value = CarbonAuthEnum.SYS_DEPT_ADD)
+    @PostMapping("/save")
+    public ResponseBase saveDepartmentInfo(@RequestBody SysDeptForm sysDeptForm){
+        int success = sysDepartmentService.saveDeptmentInfo(sysDeptForm);
+        if(success>0){return responseResultSuccess();}
+        return responseError(new ResultVO(ResultEnum.SYS_ERROR));
+    }
+
+    @ApiOperation(value = "更新部门信息", notes = "根据部门id更新部门信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "sysDeptForm", value = "部门管理页面参数对象", dataType = "SysDeptForm")
+    })
+    @ApiResponse(code = 0, message = "操作成功")
+    @PostMapping("update")
+    @AuthCarbonValidate(value = CarbonAuthEnum.SYS_DEPT_EDIT)
+    public ResponseBase updateDeptInfo(@RequestBody SysDeptForm sysDeptForm){
+        int success = sysDepartmentService.updateDepartmentInfo(sysDeptForm);
+        if(success>0){return responseResultSuccess();}
+        return responseError(new ResultVO(ResultEnum.SYS_ERROR));
+    }
+
+    @ApiOperation(value = "删除部门信息", notes = "根据部门id删除部门信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "sysDeptForm", value = "部门管理页面参数对象", dataType = "DefinedObject")
+    })
+    @ApiResponse(code = 0, message = "操作成功")
+    @AuthCarbonValidate(value = CarbonAuthEnum.SYS_DEPT_DELETE)
+    @PostMapping("del")
+    public ResponseBase delDeptInfo(@RequestBody SysDeptForm sysDeptForm){
+        int success = sysDepartmentService.delByPrimaryKey(sysDeptForm.getGuid());
+        if(success>0){return responseResultSuccess();}
+        return responseError(new ResultVO(ResultEnum.SYS_ERROR));
+    }
+}

carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/bank/controller/SysPermissionController.java

@@ -0,0 +1,56 @@
+package com.hcloud.microserver.bank.controller;
+
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageInfo;
+import com.hcloud.microserver.bank.bo.CarbonBaseController;
+import com.hcloud.microserver.commoncore.base.ResponseBase;
+import com.hcloud.microserver.commoncore.base.ResultVO;
+import com.hcloud.microserver.commoncore.enums.ResultEnum;
+import com.hcloud.microserver.sys.facade.entity.SysPermission;
+import com.hcloud.microserver.sys.facade.forms.SysPermissionForm;
+import com.hcloud.microserver.sys.service.service.SysPermissionService;
+import io.swagger.annotations.*;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
+
+@Slf4j
+@RestController
+@RequestMapping("/sys/permission")
+@Api(description = "权限管理服务")
+public class SysPermissionController extends CarbonBaseController {
+
+    @Autowired
+    private SysPermissionService sysPermissionService;
+
+    @ApiOperation(value = "分页查询权限信息", notes = "默认分页参数pageNo, pageSize")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "sysPermissionForm", value = "权限管理页面参数对象", dataType = "SysPermissionForm")
+    })
+    @ApiResponse(code = 0, message = "操作成功")
+    @PostMapping("/searchByPage")
+    public ResponseBase searchByPage(@RequestBody SysPermissionForm sysPermissionForm) {
+        PageInfo<Page<Map>> pageInfo = sysPermissionService.queryPermissionListByPage(sysPermissionForm);
+        if (pageInfo != null){
+            return responseSuccess(pageInfo);
+        }
+        return responseError(new ResultVO(ResultEnum.SYS_ERROR));
+    }
+
+    @ApiOperation(value = "权限列表", notes = "无分页参数")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "sysPermissionForm", value = "权限管理页面参数对象", dataType = "")
+    })
+    @ApiResponse(code = 0, message = "操作成功")
+    @PostMapping("/list")
+    public ResponseBase list(SysPermission sysPermission) {
+        List<SysPermission> list = sysPermissionService.queryByCondition(sysPermission);
+        return responseResultSuccess(list);
+    }
+}

carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/bank/controller/SysRoleController.java

@@ -0,0 +1,135 @@
+package com.hcloud.microserver.bank.controller;
+
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageInfo;
+import com.hcloud.microserver.bank.bo.CarbonBaseController;
+import com.hcloud.microserver.commoncore.annotation.AuthCarbonValidate;
+import com.hcloud.microserver.commoncore.base.ResponseBase;
+import com.hcloud.microserver.commoncore.base.ResultVO;
+import com.hcloud.microserver.commoncore.enums.CarbonAuthEnum;
+import com.hcloud.microserver.commoncore.enums.ResultEnum;
+import com.hcloud.microserver.sys.facade.entity.SysRole;
+import com.hcloud.microserver.sys.facade.forms.SysRoleForm;
+import com.hcloud.microserver.sys.facade.vo.SysTreeNode;
+import com.hcloud.microserver.sys.service.service.SysPermissionService;
+import com.hcloud.microserver.sys.service.service.SysRolePermissionService;
+import com.hcloud.microserver.sys.service.service.SysRoleService;
+import io.swagger.annotations.*;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author xiezt
+ */
+@Slf4j
+@RestController
+@RequestMapping("/sys/role")
+@Api(description = "系统角色服务")
+public class SysRoleController extends CarbonBaseController {
+
+    @Autowired
+    private SysRoleService sysRoleService;
+
+    @Autowired
+    private SysPermissionService sysPermissionService;
+
+    @Autowired
+    private SysRolePermissionService sysRolePermissionService;
+
+    @ApiOperation(value = "分页查询角色信息", notes = "默认分页参数pageNo，pageSize")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "sysRoleForm", value = "角色管理页面参数对象", dataType = "SysRoleForm")
+    })
+    @ApiResponse(code = 0, message = "操作成功")
+    @AuthCarbonValidate(value = CarbonAuthEnum.SYS_ROLE_QUERY)
+    @PostMapping("/searchByPage")
+    public ResponseBase querySysRoleInfo(@RequestBody SysRoleForm sysRoleForm){
+        PageInfo<Page<Map>> pageInfo = sysRoleService.queryRoleListByPage(sysRoleForm);
+        if (pageInfo != null){
+            return responseSuccess(pageInfo);
+        }
+        return responseError(new ResultVO(ResultEnum.SYS_ERROR));    }
+
+    @ApiOperation(value = "查询角色基本权限信息", notes = "以树型结构递归显示")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "sysRoleForm", value = "角色管理页面参数对象", dataType = "SysRoleForm")
+    })
+    @ApiResponse(code = 0, message = "操作成功")
+    @AuthCarbonValidate(CarbonAuthEnum.SYS_PERMISSION_ROLE_QUERY)
+    @PostMapping("/getAuth")
+    public ResponseBase getAuthInfoByRole(@RequestBody SysRoleForm sysRoleForm){
+        List<SysTreeNode> list = sysPermissionService.selectPermTree(sysRoleForm.getGuid(), "role");
+        return responseResultSuccess(list);
+    }
+    @ApiOperation(value = "新增角色基本信息", notes = "保存角色基本信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "sysRoleForm", value = "角色管理页面参数对象", dataType = "SysRoleForm")
+    })
+    @ApiResponse(code = 0, message = "操作成功")
+    @PostMapping("/save")
+    @AuthCarbonValidate(value = CarbonAuthEnum.SYS_ROLE_ADD)
+    public ResponseBase saveRoleInfo(@RequestBody SysRoleForm sysRoleForm){
+        int success = sysRoleService.saveRoleInfo(sysRoleForm);
+        if(success>0){
+            return responseSuccess(success());
+        }
+        return responseError(new ResultVO(ResultEnum.SYS_ERROR));
+    }
+
+    @ApiOperation(value = "更新角色基本信息", notes = "更新角色基本信息,不更新权限信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "sysRoleForm", value = "角色管理页面参数对象", dataType = "SysRoleForm")
+    })
+    @ApiResponse(code = 0, message = "操作成功")
+    @PostMapping("/update")
+    @AuthCarbonValidate(value = CarbonAuthEnum.SYS_ROLE_EDIT)
+    public ResponseBase updateRoleInfo(@RequestBody SysRoleForm sysRoleForm){
+        log.info("sysRoleForm===============>{}", sysRoleForm);
+        if (null != sysRoleForm && !"".equals(sysRoleForm.getGuid())) {
+            SysRole sysRole = new SysRole();
+            sysRole.setGuid(sysRoleForm.getGuid());
+            sysRole.setCname(sysRoleForm.getCname());
+            sysRole.setCdesc(sysRoleForm.getCdesc());
+            sysRole.setUpdatedate(new Date());
+            sysRole.setUpdateuser(sysRoleForm.getRealName());
+            int success = sysRoleService.modifyByPrimaryKeySelective(sysRole);
+            if (success > 0) {
+                return responseResultSuccess();
+            }
+        }
+        return responseError(new ResultVO(ResultEnum.SYS_ERROR));
+    }
+
+    @ApiOperation(value = "更新角色权限信息", notes = "更新角色权限基本信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "sysRoleForm", value = "角色管理页面参数对象", dataType = "DefinedObject")
+    })
+    @ApiResponse(code = 0, message = "操作成功")
+    @AuthCarbonValidate(value = CarbonAuthEnum.SYS_PERMISSION_ROLE_UPDATE)
+    @PostMapping("/updateAuth")
+    public ResponseBase updateRoleAuth(@RequestBody SysRoleForm sysRoleForm){
+        int success = sysRolePermissionService.updateRolePermissionByPermisList(sysRoleForm);
+       if(success>0){return responseSuccess(success());}
+       return responseError(new ResultVO(ResultEnum.SYS_ERROR));
+    }
+    @ApiOperation(value = "删除角色基本信息", notes = "删除角色基本信息,包含权限信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "sysRoleForm", value = "角色管理页面参数对象", dataType = "DefinedObject")
+    })
+    @ApiResponse(code = 0, message = "操作成功")
+    @PostMapping("/del")
+    @AuthCarbonValidate(value = CarbonAuthEnum.SYS_ROLE_DELETE)
+    public ResponseBase delRoleInfo(@RequestBody SysRoleForm sysRoleForm){
+        int success = sysRoleService.delRoleInfoAndPermission(sysRoleForm.getGuid());
+        if(success>0){return responseSuccess(success());}
+        return responseError(new ResultVO(ResultEnum.SYS_ERROR));
+    }
+}

carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/bank/controller/SysUserController.java

@@ -0,0 +1,248 @@
+package com.hcloud.microserver.bank.controller;
+
+
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageInfo;
+import com.hcloud.microserver.bank.bo.CarbonBaseController;
+import com.hcloud.microserver.commoncore.annotation.AuthCarbonValidate;
+import com.hcloud.microserver.commoncore.base.ResponseBase;
+import com.hcloud.microserver.commoncore.base.ResultVO;
+import com.hcloud.microserver.commoncore.enums.CarbonAuthEnum;
+import com.hcloud.microserver.commoncore.enums.ResultEnum;
+import com.hcloud.microserver.commoncore.service.RedisUtils;
+import com.hcloud.microserver.commoncore.util.string.StringUtils;
+import com.hcloud.microserver.sys.facade.entity.SysUser;
+import com.hcloud.microserver.sys.facade.forms.SysMangerForm;
+import com.hcloud.microserver.sys.facade.forms.SysUserForm;
+import com.hcloud.microserver.sys.facade.vo.SysTreeNode;
+import com.hcloud.microserver.sys.service.biz.LoginSystemService;
+import com.hcloud.microserver.sys.service.service.SysPermissionService;
+import com.hcloud.microserver.sys.service.service.SysUserService;
+import com.hcloud.microserver.sys.service.service.UserManagerCacheService;
+import com.hcloud.microserver.sys.service.util.CurrUserUtil;
+import io.swagger.annotations.*;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.security.Principal;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author xiezt
+ */
+@Slf4j
+@RestController
+@RequestMapping("/sys/user")
+@Api(description = "系统用户服务")
+public class SysUserController extends CarbonBaseController {
+
+
+    @Autowired
+    private LoginSystemService loginService;
+
+    @Autowired
+    private SysUserService sysUserService;
+
+    @Autowired
+    private com.hcloud.microserver.sys.service.service.SysPermissionService SysPermissionService;
+
+    @Autowired
+    private RedisUtils redisUtils;
+
+    @Autowired
+    private UserManagerCacheService userManagerCacheService;
+
+    @Value("${jwt.tokenHead}")
+    private String tokenHead;
+    @Value("${jwt.tokenHeader}")
+    private String tokenHeader;
+    @GetMapping("/findUserByAccount")
+
+    public ResultVO<SysUser> queryUserInfoByAccount(@RequestParam("account") String account) {
+        log.info("account=====================>{}", account);
+        return success();
+    }
+
+    @PostMapping("/login")
+
+    public ResponseBase login(@RequestParam("account") String account, @RequestParam("password") String password) {
+        log.info("登录的用户名：[{}]", account);
+        String token = loginService.login(account, password);
+        Map<String, String> tokenMap = new HashMap<>();
+        tokenMap.put("token", token);
+        tokenMap.put("tokenHead", tokenHead);
+        if (StringUtils.isNotEmpty(token)){
+            return responseSuccess(success(tokenMap));
+        }
+
+        return responseError(failure());
+    }
+
+
+    @ApiOperation(value = "登出功能")
+    @RequestMapping(value = "/logout", method = RequestMethod.POST)
+    @ResponseBody
+    public ResponseBase logout() {
+        userManagerCacheService.delToken(CurrUserUtil.getUmsAdmin().getCname());
+        return responseSuccess(success());
+    }
+    @ApiOperation(value = "刷新token")
+    @RequestMapping(value = "/refreshToken", method = RequestMethod.GET)
+    @ResponseBody
+    public ResponseBase refreshToken(HttpServletRequest request) {
+        String token = request.getHeader(tokenHeader);
+        String refreshToken = loginService.refreshToken(token);
+        UserDetails userDetails = (UserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+        if (refreshToken == null) {
+            userManagerCacheService.delToken(userDetails.getUsername());
+            return responseSuccess(failure("token已经过期!"));
+        }
+        Map<String, String> tokenMap = new HashMap<>();
+        tokenMap.put("token", refreshToken);
+        tokenMap.put("tokenHead", tokenHead);
+        userManagerCacheService.setToken(userDetails.getUsername(), tokenHead + refreshToken);
+        return responseSuccess(success(tokenMap));
+    }
+
+    @ApiOperation(value = "获取当前登录用户信息")
+    @RequestMapping(value = "/info", method = RequestMethod.GET)
+    @ResponseBody
+    public ResponseBase getAdminInfo(Principal principal) {
+        if (principal == null) {
+            return responseError(failure());
+        }
+        String username = principal.getName();
+        Map<String, Object> userByUsername = loginService.getUserByUsername(username);
+        return responseSuccess(success(userByUsername));
+    }
+
+    @ApiOperation(value = "保存用户信息", notes = "保存用户信息时，添加用户所选角色的相应权限")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "sysMangerForm", value = "用户管理页面参数对象", dataType = "DefinedObject")
+    })
+    @ApiResponse(code = 0, message = "操作成功")
+    @RequestMapping("/add")
+    @AuthCarbonValidate(CarbonAuthEnum.SYS_USER_CREATE)
+    public ResponseBase addUser(@RequestBody SysUserForm sysUserForm){
+        ResultVO resultVO = sysUserService.saveUserInfoAndPermission(sysUserForm);
+        if(resultVO.getCode()==0){return responseSuccess(resultVO);}
+       return responseError(resultVO);
+    }
+
+    @ApiOperation(value = "更新用户信息", notes = "更新用户信息时，变更角色后会删除缓存信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "sysMangerForm", value = "用户管理页面参数对象", dataType = "DefinedObject")
+    })
+    @ApiResponse(code = 0, message = "操作成功")
+    @RequestMapping("/update")
+    @AuthCarbonValidate(CarbonAuthEnum.SYS_USER_EDIT)
+    public ResponseBase modifiedUser(@RequestBody SysUserForm sysUserForm){
+        ResultVO resultVO = sysUserService.modifyUserInfoAndPermission(sysUserForm);
+        if(resultVO.getCode()==0){return responseSuccess(resultVO);}
+        return responseError(resultVO);
+    }
+
+
+    @ApiOperation(value = "分页查询用户基本信息", notes = "分页查询用户信息，默认每页每页10")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "sysMangerForm", value = "用户管理页面参数对象", dataType = "DefinedObject")
+    })
+    @ApiResponse(code = 0, message = "操作成功")
+    @RequestMapping("/searchByPage")
+    @AuthCarbonValidate(CarbonAuthEnum.SYS_USER_QUERY)
+    public ResponseBase searchByPage(@RequestBody SysMangerForm sysMangerForm){
+        PageInfo<Page<Map>> pageInfo = sysUserService.queryUserInfoByPage(sysMangerForm);
+        return responseSuccess(pageInfo);
+    }
+
+    @ApiOperation(value = "查询用户基本权限信息", notes = "以树型结构递归显示")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "sysMangerForm", value = "用户管理页面参数对象", dataType = "DefinedObject")
+    })
+    @ApiResponse(code = 0, message = "操作成功")
+    @PostMapping("/getAuthTreeById")
+    @AuthCarbonValidate(CarbonAuthEnum.SYS_PERMISSION_USER_QUERY)
+    public ResponseBase searchUserAuthById(@RequestBody SysMangerForm sysMangerForm){
+        List<SysTreeNode> list = SysPermissionService.selectPermTree(sysMangerForm.getUserId(), "user");
+        return responseResultSuccess(list);
+    }
+
+    @ApiOperation(value = "查询部门及角色信息", notes = "系统内所有部门及角色信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "refSysApp", value = "引用系统app标记，默认是1", dataType = "String")
+    })
+    @ApiResponse(code = 0, message = "操作成功")
+    @GetMapping("/selectList")
+    @AuthCarbonValidate(CarbonAuthEnum.SYS_DEPT_ROLE_INFO)
+    public ResponseBase getDeptAndRoleInfo(@RequestParam("sysApp") String refSysApp){
+        Map resMap = loginService.getAllDeptAndRole();
+        if (resMap != null){
+            return responseSuccess(success(resMap));
+        }
+        return responseError(new ResultVO(ResultEnum.SYS_ERROR));
+    }
+
+
+    @ApiOperation(value = "更新用户权限信息", notes = "根据用户变更的权限列表，更新用户权限")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "sysUserForm", value = "用户管理页面参数对象", dataType = "String")
+    })
+    @ApiResponse(code = 0, message = "操作成功")
+    @RequestMapping("/updateAuth")
+    @AuthCarbonValidate(CarbonAuthEnum.SYS_PERMISSION_USER_UPDATE)
+    public ResponseBase modifiedUserAuth(@RequestBody SysUserForm sysUserForm){
+        if (null != sysUserForm) {
+            int success = sysUserService.updateUserPermission(sysUserForm);
+            if (success > 0) {
+                return responseSuccess(success());
+            }
+        }
+        return responseError(new ResultVO(ResultEnum.SYS_ERROR));
+    }
+
+    @ApiOperation(value = "删除用户信息", notes = "根据用户id删除用户信息，含权限信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "sysUserForm", value = "用户管理页面参数对象", dataType = "String")
+    })
+    @ApiResponse(code = 0, message = "操作成功")
+    @PostMapping("/del")
+    @AuthCarbonValidate(CarbonAuthEnum.SYS_USER_DELETE)
+    public ResponseBase delUserInfo(@RequestBody SysUserForm sysUserForm){
+        if (null != sysUserForm) {
+            String guid = sysUserForm.getGuid();
+            int success = loginService.deluserInfo(guid);
+            if (success > 0) {
+                return responseSuccess(success());
+            }
+        }
+        return responseError(new ResultVO(ResultEnum.SYS_ERROR));
+    }
+
+    @ApiOperation(value = "禁用（启用）用户信息", notes = "根据用户id启用（禁用）用户信息，不删除权限信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "sysUserForm", value = "用户管理页面参数对象", dataType = "String")
+    })
+    @ApiResponse(code = 0, message = "操作成功")
+    @RequestMapping("/forbidden")
+    @AuthCarbonValidate
+    public ResponseBase forbiddenUser(@RequestBody SysUserForm sysUserForm){
+        if (null != sysUserForm) {
+            SysUser user = new SysUser();
+            user.setGuid(sysUserForm.getUserId());
+            user.setCstatus(sysUserForm.getCstatus());
+            int success = sysUserService.modifyByPrimaryKeySelective(user);
+            if (success > 0) {
+                return responseSuccess(success());
+            }
+        }
+        return responseError(new ResultVO(ResultEnum.SYS_ERROR));
+    }
+
+}

carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/bank/controller/WebIndexController.java

@@ -1,45 +0,0 @@
-package com.hcloud.microserver.bank.controller;
-
-import com.hcloud.microserver.facade.carbon.entity.DayCarbonBO;
-import com.hcloud.microserver.bank.service.WebIndexService;
-import com.hcloud.microserver.commoncore.base.BaseController;
-import com.hcloud.microserver.commoncore.base.ResultVO;
-import com.hcloud.microserver.facade.carbon.entity.GroupNumBO;
-import com.hcloud.microserver.facade.carbon.entity.UserBuyBO;
-import com.hcloud.microserver.facade.carbon.forms.DayCarbonFrom;
-import com.hcloud.microserver.facade.carbon.forms.GroupNumFrom;
-import com.hcloud.microserver.facade.carbon.forms.UserBuyFrom;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-@RestController
-@RequestMapping("/webindex")
-public class WebIndexController extends BaseController {
-
-    @Autowired
-    private WebIndexService webIndexService;
-
-    @ApiOperation("当日碳汇量")
-    @PostMapping("/dayCarbon")
-    public ResultVO dayCarbon(@RequestBody DayCarbonFrom dayCarbonFrom) {
-        DayCarbonBO dayCarbonBO = webIndexService.dayCarbon(dayCarbonFrom);
-        return success(dayCarbonBO);
-    }
-
-    @ApiOperation("统计用户购碳排名")
-    @PostMapping("/userBuy")
-    public ResultVO userBuy(@RequestBody(required = false) UserBuyFrom userBuyFrom) {
-        List<UserBuyBO> dayCarbonBO = webIndexService.userBuy(userBuyFrom);
-        return success(dayCarbonBO);
-    }
-
-    @ApiOperation("统计购买趋势")
-    @PostMapping("/groupnum")
-    public ResultVO GroupNum(@RequestBody(required = false) GroupNumFrom groupNumFrom) {
-        List<GroupNumBO> dayCarbonBO = webIndexService.GroupNum(groupNumFrom);
-        return success(dayCarbonBO);
-    }
-}

carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/bank/controller/CarbonStatisticsController.java → carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/bank/controller/provide/CarbonStatisticsWebController.java

@@ -1,33 +1,46 @@
-package com.hcloud.microserver.bank.controller;
+package com.hcloud.microserver.bank.controller.provide;
 
 
+
+import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageInfo;
 import com.hcloud.microserver.bank.service.CarbonStatisticsService;
 import com.hcloud.microserver.commoncore.base.BaseController;
-import com.hcloud.microserver.commoncore.base.ResultVO;
+import com.hcloud.microserver.commoncore.base.ResponseBase;
 import com.hcloud.microserver.facade.carbon.entity.CarbonPlatformStatiticsNum;
 import com.hcloud.microserver.facade.carbon.entity.CarbonStatisticsBuyTrend;
 import com.hcloud.microserver.facade.carbon.forms.CarbonTrendForm;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+@Slf4j
 @RestController
 @RequestMapping("/statistics")
-public class CarbonStatisticsController extends BaseController {
+@Api("碳汇统计")
+public class CarbonStatisticsWebController extends BaseController {
     @Autowired
     private CarbonStatisticsService carbonStatisticsService;
+
+    @ApiOperation("总碳汇统计")
     @GetMapping("/carbon/statistics/total")
-    public ResultVO<CarbonPlatformStatiticsNum> carbonPlatformStatitics(){
+    public ResponseBase carbonPlatformStatitics(){
         CarbonPlatformStatiticsNum carbonPlatformStatiticsNum = carbonStatisticsService.carbonPlatformTotal();
-        return success(carbonPlatformStatiticsNum);
+        return responseResultSuccess(carbonPlatformStatiticsNum);
     }
 
+    @ApiOperation("碳汇趋势统计")
     @PostMapping("/carbon/buy/amont")
-    public ResultVO buyAmont(CarbonTrendForm form){
+    public ResponseBase buyAmont(CarbonTrendForm form){
+        log.info("开始碳汇趋势统计"+ JSONObject.toJSONString(form));
+
         PageInfo<CarbonStatisticsBuyTrend> info = carbonStatisticsService.carbonStatisticsBuyTrend(form);
-        return success(info.getList(),info.getTotal());
+
+        return responseSuccess(info);
     }
 }

carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/bank/controller/provide/DataProvideController.java

@@ -0,0 +1,169 @@
+package com.hcloud.microserver.bank.controller.provide;
+
+import com.github.pagehelper.PageInfo;
+import com.hcloud.microserver.bank.bo.CredentialInfoBO;
+import com.hcloud.microserver.bank.bo.PaymentBO;
+import com.hcloud.microserver.bank.service.*;
+import com.hcloud.microserver.commoncore.base.BaseController;
+import com.hcloud.microserver.commoncore.base.ResponseBase;
+import com.hcloud.microserver.facade.carbon.entity.FarmerInfo;
+import com.hcloud.microserver.facade.carbon.forms.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("data")
+@Api(tags = "数据接口")
+public class DataProvideController extends BaseController {
+
+    @Autowired
+    private CustomerInfoService customerInfoService;
+
+    @Autowired
+    private CustomerCompanyInfoService customerCompanyInfoService;
+
+    @Autowired
+    private FarmerInfoService farmerInfoService;
+
+    @Autowired
+    private CollectiveFarmerService collectiveFarmerService;
+
+    @Autowired
+    private GoodsInfoService goodsInfoService;
+
+    @Autowired
+    private OrderInfoService orderInfoService;
+
+    @Autowired
+    private CredentialInfoService credentialInfoService;
+
+    @Autowired
+    private OrderPayService orderPayService;
+
+    /**
+     * 客户账号信息
+     *
+     * @return
+     */
+    @PostMapping("customers")
+    @ApiOperation(value = "客户账号信息", httpMethod = "POST", notes = "客户账号信息")
+    public ResponseBase customers(@RequestBody CustomerInfoForm customerInfoForm) {
+        PageInfo pageInfo = customerInfoService.searchCustomerByPage(customerInfoForm);
+        return responseSuccess(pageInfo);
+    }
+
+    /**
+     * 企业信息
+     *
+     * @param customerCompanyInfoForm
+     * @return
+     */
+    @ApiOperation(value = "企业信息", httpMethod = "POST", notes = "注册认证企业信息")
+    @PostMapping("companies")
+    public ResponseBase companies(@RequestBody CustomerCompanyInfoForm customerCompanyInfoForm) {
+        PageInfo pageInfo = customerCompanyInfoService.queryListByPage(customerCompanyInfoForm);
+        return responseSuccess(pageInfo);
+    }
+
+    /**
+     * 产品归属
+     * @param productGuid
+     * @return
+     */
+    @PostMapping("belongs")
+    @ApiOperation(value = "归属信息", httpMethod = "POST", notes = "归属")
+    public ResponseBase farmers(@RequestParam String productGuid) {
+        List<FarmerInfo> farmerInfos = this.farmerInfoService.queryByProductGuid(productGuid);
+        return responseResultSuccess(farmerInfos);
+    }
+
+    /**
+     * 农户信息
+     *
+     * @param farmerInfoForm
+     * @return
+     */
+    @PostMapping("farmers")
+    @ApiOperation(value = "村民信息", httpMethod = "POST", notes = "归属")
+    public ResponseBase farmers(@RequestBody FarmerInfoForm farmerInfoForm) {
+        PageInfo pageInfo = this.farmerInfoService.queryListByPage(farmerInfoForm);
+
+        return responseSuccess(pageInfo);
+    }
+
+    /**
+     * 集体信息
+     *
+     * @param collectiveFarmerForm
+     * @return
+     */
+    @ApiOperation(value = "村名组信息", httpMethod = "POST", notes = "归属")
+    @PostMapping("collectives")
+    public ResponseBase collectives(@RequestBody CollectiveFarmerForm collectiveFarmerForm) {
+        PageInfo pageInfo = collectiveFarmerService.queryListByPage(collectiveFarmerForm);
+
+        return responseSuccess(pageInfo);
+    }
+
+    /**
+     * 商品信息
+     *
+     * @param goodsInfoForm
+     * @return
+     */
+    @ApiOperation(value = "商品信息", httpMethod = "POST", notes = "森林碳汇开发信息里的森林碳汇商品数据")
+    @PostMapping("goods")
+    public ResponseBase goods(@RequestBody GoodsInfoForm goodsInfoForm) {
+        PageInfo pageInfo = this.goodsInfoService.queryListByPage(goodsInfoForm);
+        return responseSuccess(pageInfo);
+    }
+
+    /**
+     * 订单信息
+     *
+     * @param goodsOrderInfoForm
+     * @return
+     */
+    @ApiOperation(value = "订单数据", httpMethod = "POST", notes = "交易订单数据里的订单数据")
+    @PostMapping("orders")
+    public ResponseBase orders(@RequestBody GoodsOrderInfoForm goodsOrderInfoForm) {
+        PageInfo pageInfo = orderInfoService.searchOrderInfoByPage(goodsOrderInfoForm);
+        return responseSuccess(pageInfo);
+    }
+
+    /**
+     * 证书信息
+     *
+     * @param goodsCredentialInfoForm
+     * @return
+     */
+    @ApiOperation(value = "证书信息", httpMethod = "POST", notes = "交易订单数据里的激励证书数据")
+    @PostMapping("customer/credentials")
+    public ResponseBase credentials(@RequestBody GoodsCredentialInfoForm goodsCredentialInfoForm) {
+        PageInfo pageInfo = credentialInfoService.searchCredentialByPage(goodsCredentialInfoForm);
+        return responseSuccess(pageInfo);
+    }
+
+    @PostMapping("order/credentials")
+    public ResponseBase credentials(@RequestParam String orderId) {
+        CredentialInfoBO credentialInfoBO = this.credentialInfoService.queryByOrderId(orderId);
+        return responseResultSuccess(credentialInfoBO);
+    }
+
+    /**
+     * 在线支付信息
+     *
+     * @param
+     * @return
+     */
+    @ApiOperation(value = "支付信息", httpMethod = "POST", notes = "交易订单数据里的支付信息数据")
+    @PostMapping("order/payment")
+    public ResponseBase payment(@RequestBody PaymentForm paymentForm) {
+        List<PaymentBO> paymentBOS = orderPayService.queryPaymentByPage(paymentForm);
+        return responseResultSuccess(paymentBOS);
+    }
+}

carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/bank/dao/CustomerCompanyTypeMapper.java

@@ -0,0 +1,32 @@
+package com.hcloud.microserver.bank.dao;
+
+import com.hcloud.microserver.commoncore.base.BaseMapper;
+import com.hcloud.microserver.facade.carbon.entity.CustomerCompanyType;
+import com.hcloud.microserver.facade.carbon.forms.CustomerCompanyTypeForm;
+
+import java.util.List;
+
+public interface CustomerCompanyTypeMapper extends BaseMapper<CustomerCompanyType,String> {
+
+    /**
+     * 查询企业类型是否存在
+     * lym
+     * @param customerCompanyType
+     * @return
+     */
+    int isExist(CustomerCompanyType customerCompanyType);
+
+    /**
+     * 查询列表
+     * lym
+     * @return
+     */
+    List<CustomerCompanyType> selectList(CustomerCompanyTypeForm customerCompanyTypeForm);
+
+    /**
+     * 查询最大编码
+     * lym
+     * @return
+     */
+    String getMaxCode();
+}

carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/bank/service/CustomerCompanyTypeService.java

@@ -0,0 +1,27 @@
+package com.hcloud.microserver.bank.service;
+
+import com.github.pagehelper.PageInfo;
+import com.hcloud.microserver.commoncore.base.BaseServie;
+import com.hcloud.microserver.facade.carbon.entity.CustomerCompanyType;
+import com.hcloud.microserver.facade.carbon.forms.CustomerCompanyInfoForm;
+import com.hcloud.microserver.facade.carbon.forms.CustomerCompanyTypeForm;
+
+import java.util.List;
+
+public interface CustomerCompanyTypeService extends BaseServie<CustomerCompanyType,String> {
+
+    /**
+     * 查询列表
+     * lym
+     * @return
+     */
+    public PageInfo<List<CustomerCompanyType>> selectList(CustomerCompanyTypeForm customerCompanyTypeForm);
+
+    /**
+     * 企业类型列表，不分页
+     * lym
+     * @param customerCompanyTypeForm
+     * @return
+     */
+    public List<CustomerCompanyType> selectCompanyTypeList(CustomerCompanyTypeForm customerCompanyTypeForm);
+}

carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/bank/service/impl/CustomerCompanyTypeServiceImpl.java

@@ -0,0 +1,122 @@
+package com.hcloud.microserver.bank.service.impl;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.hcloud.microserver.bank.dao.CustomerCompanyTypeMapper;
+import com.hcloud.microserver.bank.service.CustomerCompanyTypeService;
+import com.hcloud.microserver.commoncore.enums.ResultEnum;
+import com.hcloud.microserver.commoncore.exception.GlobalException;
+import com.hcloud.microserver.commoncore.util.BusinessCodeRule;
+import com.hcloud.microserver.commoncore.util.GetUUID;
+import com.hcloud.microserver.commoncore.util.string.StringUtils;
+import com.hcloud.microserver.facade.carbon.entity.CustomerCompanyType;
+import com.hcloud.microserver.facade.carbon.forms.CustomerCompanyTypeForm;
+import com.hcloud.microserver.sys.service.util.CurrUserUtil;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+
+@Service
+public class CustomerCompanyTypeServiceImpl implements CustomerCompanyTypeService {
+
+    private static final String CODE_PREFIX = "Q";
+
+    @Resource
+    private CustomerCompanyTypeMapper customerCompanyTypeMapper;
+
+    @Override
+    public int delByPrimaryKey(String guid) {
+        CustomerCompanyType companyType = new CustomerCompanyType();
+        companyType.setGuid(guid);
+        companyType.setState(0);
+        return customerCompanyTypeMapper.updateByPrimaryKeySelective(companyType);
+    }
+
+    @Override
+    public int save(CustomerCompanyType record) {
+        record.setGuid(GetUUID.getUUID());
+        return customerCompanyTypeMapper.insert(record);
+    }
+
+    @Override
+    public int saveSelective(CustomerCompanyType record) {
+        isExist(record);
+        record.setGuid(GetUUID.getUUID());
+        record.setState(1);
+        record.setTypeVal(getMaxCode());
+        record.setCreateUser(CurrUserUtil.getUserId());
+        record.setCreateTime(new Date());
+        return customerCompanyTypeMapper.insertSelective(record);
+    }
+
+    @Override
+    public CustomerCompanyType queryByPrimaryKey(String guid) {
+        return customerCompanyTypeMapper.selectByPrimaryKey(guid);
+    }
+
+    @Override
+    public int modifyByPrimaryKeySelective(CustomerCompanyType record) {
+        isExist(record);
+        record.setModifiedUser(CurrUserUtil.getUserId());
+        record.setModifiedTime(new Date());
+        return customerCompanyTypeMapper.updateByPrimaryKeySelective(record);
+    }
+
+    @Override
+    public int modifyByPrimaryKeyWithBLOBs(CustomerCompanyType record) {
+        return 0;
+    }
+
+    @Override
+    public int modifyByPrimaryKey(CustomerCompanyType record) {
+        return 0;
+    }
+
+    /**
+     * 验证是否唯一
+     * lym
+     * @param companyType
+     */
+    private void isExist(CustomerCompanyType companyType){
+        int i = customerCompanyTypeMapper.isExist(companyType);
+        if (i > 0){
+            throw new GlobalException(ResultEnum.FAILURE.getCode(),"该企业类型已存在!");
+        }
+
+        if (StringUtils.isEmpty(companyType.getParentId())){
+            companyType.setParentId("#");
+        }
+        companyType.setModifiedTime(new Date());
+    }
+
+    /**
+     * 生成最大编码
+     * lym
+     * @return
+     */
+    private String getMaxCode(){
+        StringBuffer sbb = new StringBuffer();
+        String maxCode = customerCompanyTypeMapper.getMaxCode();
+        sbb.append(CODE_PREFIX);
+        int currentNum = 0;
+        if (StringUtils.isNotEmpty(maxCode)) {
+            currentNum = Integer.valueOf(maxCode.substring(sbb.toString().length()));
+        }
+        String newCode = BusinessCodeRule.notYearCodeRule(CODE_PREFIX, currentNum, 4);
+        return newCode;
+    }
+
+    @Override
+    public PageInfo<List<CustomerCompanyType>> selectList(CustomerCompanyTypeForm customerCompanyTypeForm) {
+        PageHelper.startPage(customerCompanyTypeForm.getPageNum(),customerCompanyTypeForm.getPageSize());
+        List<CustomerCompanyType> list = customerCompanyTypeMapper.selectList(customerCompanyTypeForm);
+        return new PageInfo(list);
+    }
+
+    @Override
+    public List<CustomerCompanyType> selectCompanyTypeList(CustomerCompanyTypeForm customerCompanyTypeForm) {
+        return customerCompanyTypeMapper.selectList(customerCompanyTypeForm);
+    }
+}

carbon-admin/carbon-admin-service/src/main/resources/com/hcloud/microserver/bank/dao/CustomerCompanyTypeMapper.xml

@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hcloud.microserver.bank.dao.CustomerCompanyTypeMapper">
+  <resultMap id="BaseResultMap" type="com.hcloud.microserver.facade.carbon.entity.CustomerCompanyType">
+    <id column="guid" jdbcType="CHAR" property="guid" />
+    <result column="parent_id" jdbcType="CHAR" property="parentId" />
+    <result column="type_name" jdbcType="VARCHAR" property="typeName" />
+    <result column="type_val" jdbcType="VARCHAR" property="typeVal" />
+    <result column="state" jdbcType="INTEGER" property="state" />
+    <result column="modified_time" jdbcType="TIMESTAMP" property="modifiedTime" />
+    <result column="methodology" jdbcType="VARCHAR" property="methodology" />
+    <result column="type_desc" jdbcType="VARCHAR" property="typeDesc" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    guid, parent_id, type_name, type_val, state, modified_time, methodology, type_desc
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from t_customer_company_type
+    where guid = #{guid,jdbcType=CHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from t_customer_company_type
+    where guid = #{guid,jdbcType=CHAR}
+  </delete>
+  <insert id="insert" parameterType="com.hcloud.microserver.facade.carbon.entity.CustomerCompanyType">
+    insert into t_customer_company_type (guid, parent_id, type_name, 
+      type_val, state, modified_time, 
+      methodology, type_desc)
+    values (#{guid,jdbcType=CHAR}, #{parentId,jdbcType=CHAR}, #{typeName,jdbcType=VARCHAR}, 
+      #{typeVal,jdbcType=VARCHAR}, #{state,jdbcType=INTEGER}, #{modifiedTime,jdbcType=TIMESTAMP}, 
+      #{methodology,jdbcType=VARCHAR}, #{typeDesc,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.hcloud.microserver.facade.carbon.entity.CustomerCompanyType">
+    insert into t_customer_company_type
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="guid != null">
+        guid,
+      </if>
+      <if test="parentId != null">
+        parent_id,
+      </if>
+      <if test="typeName != null">
+        type_name,
+      </if>
+      <if test="typeVal != null">
+        type_val,
+      </if>
+      <if test="state != null">
+        state,
+      </if>
+      <if test="modifiedTime != null">
+        modified_time,
+      </if>
+      <if test="methodology != null">
+        methodology,
+      </if>
+      <if test="typeDesc != null">
+        type_desc,
+      </if>
+      <if test="createUser != null">
+        create_user,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="guid != null">
+        #{guid,jdbcType=CHAR},
+      </if>
+      <if test="parentId != null">
+        #{parentId,jdbcType=CHAR},
+      </if>
+      <if test="typeName != null">
+        #{typeName,jdbcType=VARCHAR},
+      </if>
+      <if test="typeVal != null">
+        #{typeVal,jdbcType=VARCHAR},
+      </if>
+      <if test="state != null">
+        #{state,jdbcType=INTEGER},
+      </if>
+      <if test="modifiedTime != null">
+        #{modifiedTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="methodology != null">
+        #{methodology,jdbcType=VARCHAR},
+      </if>
+      <if test="typeDesc != null">
+        #{typeDesc,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null">
+        #{createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.hcloud.microserver.facade.carbon.entity.CustomerCompanyType">
+    update t_customer_company_type
+    <set>
+      <if test="parentId != null">
+        parent_id = #{parentId,jdbcType=CHAR},
+      </if>
+      <if test="typeName != null">
+        type_name = #{typeName,jdbcType=VARCHAR},
+      </if>
+      <if test="typeVal != null">
+        type_val = #{typeVal,jdbcType=VARCHAR},
+      </if>
+      <if test="state != null">
+        state = #{state,jdbcType=INTEGER},
+      </if>
+      <if test="modifiedTime != null">
+        modified_time = #{modifiedTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="methodology != null">
+        methodology = #{methodology,jdbcType=VARCHAR},
+      </if>
+      <if test="typeDesc != null">
+        type_desc = #{typeDesc,jdbcType=VARCHAR},
+      </if>
+      <if test="modifiedUser != null">
+        modified_user = #{modifiedUser,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where guid = #{guid,jdbcType=CHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.hcloud.microserver.facade.carbon.entity.CustomerCompanyType">
+    update t_customer_company_type
+    set parent_id = #{parentId,jdbcType=CHAR},
+      type_name = #{typeName,jdbcType=VARCHAR},
+      type_val = #{typeVal,jdbcType=VARCHAR},
+      state = #{state,jdbcType=INTEGER},
+      modified_time = #{modifiedTime,jdbcType=TIMESTAMP},
+      methodology = #{methodology,jdbcType=VARCHAR},
+      type_desc = #{typeDesc,jdbcType=VARCHAR}
+    where guid = #{guid,jdbcType=CHAR}
+  </update>
+
+  <!-- 查询企业类型是否存在 lym -->
+  <select id="isExist" parameterType="com.hcloud.microserver.facade.carbon.entity.CustomerCompanyType" resultType="int">
+    SELECT IFNULL(COUNT(*),0) FROM t_customer_company_type
+    where state = 1
+    <if test="parentId != null and parentId != ''">
+      AND parent_id = #{parentId}
+    </if>
+    <if test="typeName != null and typeName != ''">
+      AND type_name = #{typeName}
+    </if>
+    <if test="guid != null and guid != ''">
+      AND guid != #{guid}
+    </if>
+  </select>
+
+  <!-- 查询列表 lym -->
+  <select id="selectList" resultType="com.hcloud.microserver.facade.carbon.forms.CustomerCompanyTypeForm" resultMap="BaseResultMap">
+    SELECT <include refid="Base_Column_List"/> FROM t_customer_company_type
+    where state = 1
+    <if test="parentId != null and parentId != ''">
+      AND parent_id = #{parentId}
+    </if>
+    <if test="typeName != null and typeName != ''">
+      AND type_name LIKE CONCAT("%",#{typeName},"%")
+    </if>
+    ORDER BY modified_time DESC
+  </select>
+
+  <!-- 查询最大编码 lym -->
+  <select id="getMaxCode" resultType="String">
+    SELECT MAX(type_val) FROM t_customer_company_type
+    where state = 1
+  </select>
+</mapper>

carbon-bank/carbon-bank-common/pom.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>carbon-bank</artifactId>
+        <groupId>com.hcloud.microserver</groupId>
+        <version>0.0.1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>carbon-bank-common</artifactId>
+    <groupId>com.hcloud.microserver</groupId>
+    <version>0.0.1-SNAPSHOT</version>
+    <name>carbon-bank-common</name>
+    <packaging>jar</packaging>
+
+
+
+
+</project>

carbon-bank/carbon-bank-service/pom.xml

@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>carbon-bank</artifactId>
+        <groupId>com.hcloud.microserver</groupId>
+        <version>0.0.1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>carbon-bank-service</artifactId>
+    <groupId>com.hcloud.microserver</groupId>
+    <version>0.0.1-SNAPSHOT</version>
+    <name>carbon-bank-service</name>
+    <dependencies>
+        <dependency>
+            <groupId>com.hcloud.microserver</groupId>
+            <artifactId>carbon-security</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <!-- nacos discovery-->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+        </dependency>
+        <!-- nacos config -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+        </dependency>
+        <!--zipkin-->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-zipkin</artifactId>
+        </dependency>
+        <!-- spring boot admin client -->
+        <dependency>
+            <groupId>de.codecentric</groupId>
+            <artifactId>spring-boot-admin-starter-client</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>net.logstash.logback</groupId>
+            <artifactId>logstash-logback-encoder</artifactId>
+        </dependency>
+        <!-- xls格式excel依赖包 -->
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi</artifactId>
+            <version>3.17</version>
+        </dependency>
+        <!--xlsx格式excel依赖包-->
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml</artifactId>
+            <version>3.17</version>
+        </dependency>
+        <!--easyexcel，推荐使用2.0 以上版本，功能更加完善-->
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>easyexcel</artifactId>
+            <version>2.2.6</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <version>5.1.7.RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>1.3.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.qiniu</groupId>
+            <artifactId>qiniu-java-sdk</artifactId>
+            <version>7.2.28</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.github.xiaoymin</groupId>
+            <artifactId>knife4j-micro-spring-boot-starter</artifactId>
+            <version>2.0.4</version>
+        </dependency>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <!-- druid -->
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid</artifactId>
+            <version>1.2.3</version>
+        </dependency>
+
+
+        <dependency>
+            <artifactId>carbon-bank-common</artifactId>
+            <groupId>com.hcloud.microserver</groupId>
+            <version>0.0.1-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+
+            <groupId>commons-httpclient</groupId>
+
+            <artifactId>commons-httpclient</artifactId>
+
+            <version>3.1</version>
+
+    </dependency>
+
+    </dependencies>
+
+
+</project>

carbon-bank/carbon-bank-service/src/main/java/com/hcloud/microserver/bank/CarbonManagerServiceApplication.java

@@ -0,0 +1,26 @@
+package com.hcloud.microserver.bank;
+
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+/**
+ * @author xiezt
+ */
+@EnableAsync
+@EnableDiscoveryClient
+@EnableTransactionManagement
+@ComponentScan(basePackages = "com.hcloud")
+@MapperScan(basePackages = {"com.hcloud.microserver.bank.dao"})
+@SpringBootApplication
+public class CarbonManagerServiceApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(CarbonManagerServiceApplication.class, args);
+    }
+
+}

carbon-bank/carbon-bank-service/src/main/java/com/hcloud/microserver/bank/bo/BankLoginUserReqParam.java

@@ -0,0 +1,14 @@
+package com.hcloud.microserver.bank.bo;
+
+import lombok.Data;
+
+/**
+ * 用户登录请求参数实体类
+ */
+@Data
+public class BankLoginUserReqParam {
+    private String userID;
+    private String userPWD;
+    private String systemId;
+
+}

carbon-bank/carbon-bank-service/src/main/java/com/hcloud/microserver/bank/bo/BankLoginUserRespBO.java

@@ -0,0 +1,9 @@
+package com.hcloud.microserver.bank.bo;
+
+import lombok.Data;
+
+@Data
+public class BankLoginUserRespBO extends BankResponseBase {
+    private String corpName;
+
+}

carbon-bank/carbon-bank-service/src/main/java/com/hcloud/microserver/bank/bo/BankQueryBaseParam.java

@@ -0,0 +1,18 @@
+package com.hcloud.microserver.bank.bo;
+
+import lombok.Data;
+
+@Data
+public class BankQueryBaseParam<T> {
+    /** 1.	sessionId为会话编号，每次登录之后会产生一个唯一的编号，用于标识这次会话。用户每次进行交易时都必须上送该Id。如果是登录交易，则请求报文头中的sessionId传-1即可**/
+    private String sessionId;
+    /** 12.	serviceId为服务编号，用以区分不同的操作，见具体交易格式说明，如登录交易的服务编号为： CL0001。**/
+    private String serviceId;
+    /** 3.	serialNo为交易序列号，客户端唯一标识，返回时原样返回。**/
+    private String serialNo;
+    /** 3.	serialNo为交易序列号，客户端唯一标识，返回时原样返回。**/
+    private String reqTime;
+
+    private T data;
+
+}

carbon-bank/carbon-bank-service/src/main/java/com/hcloud/microserver/bank/bo/BankResponseBase.java

@@ -0,0 +1,19 @@
+package com.hcloud.microserver.bank.bo;
+
+import lombok.Data;
+
+/**
+ * 银行系统响应参数公共实体类
+ */
+@Data
+public class BankResponseBase {
+
+    private String sessionId;
+    private String serialNo;
+    private String retCode;
+    private String errorMsg;
+
+
+
+
+}

carbon-bank/carbon-bank-service/src/main/java/com/hcloud/microserver/bank/bo/BankUpdateUserPwdParam.java

@@ -0,0 +1,12 @@
+package com.hcloud.microserver.bank.bo;
+
+import lombok.Data;
+
+/**
+ * 修改密码请求参数实体类
+ */
+@Data
+public class BankUpdateUserPwdParam {
+    private String OLDPWD;
+    private String NEWPWD;
+}

carbon-bank/carbon-bank-service/src/main/java/com/hcloud/microserver/bank/bo/CurrentAccountDetailQueryParam.java

@@ -0,0 +1,45 @@
+package com.hcloud.microserver.bank.bo;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 2.5.	账务查询：活期账户明细查询CL0004
+ */
+
+@Data
+public class CurrentAccountDetailQueryParam implements Serializable {
+    /**账户号	19A	必输*/
+    @JSONField(name = "I1ACNO")
+    private String  I1ACNO;
+    /**币种	3A	暂不使用*/
+    @JSONField(name = "I1CYTP")
+    private String  I1CYTP;
+    /**起始日期	8P0	必输*/
+    @JSONField(name = "I1STDT")
+    private String  I1STDT;
+    /**终止日期	8P0	必输*/
+    @JSONField(name = "I1EDDT")
+    private String  I1EDDT;
+    /**起始金额	15P2	非必输*/
+    @JSONField(name = "I1BGAT")
+    private String  I1BGAT;
+    /**终止金额	15P2	非必输*/
+    @JSONField(name = "I1EDAT")
+    private String  I1EDAT;
+    /**借贷标志	1A	空：全部;0：支出;1：收入*/
+    @JSONField(name = "I1JDBZ")
+    private String  I1JDBZ;
+    /**查询标志	1A	0-顺查1-倒查*/
+    @JSONField(name = "I1QYFG")
+    private String  I1QYFG;
+    /**起始条数	5P0	可选*/
+    @JSONField(name = "Num")
+    private String  Num;
+    /**查询条数	4P0	可选(最大2000)*/
+    @JSONField(name = "QryNum")
+    private String  QryNum;
+}

carbon-bank/carbon-bank-service/src/main/java/com/hcloud/microserver/bank/bo/CurrentAccountHistoricalBalanceQueryParam.java

@@ -0,0 +1,13 @@
+package com.hcloud.microserver.bank.bo;
+
+import java.math.BigDecimal;
+
+/**
+ * 活期账户历史余额查询
+ */
+public class CurrentAccountHistoricalBalanceQueryParam {
+    /**账户号;必输;32A;*/
+    private String accNo;
+    /**日期;必输;8P0;*/
+    private BigDecimal date;
+}

carbon-bank/carbon-bank-service/src/main/java/com/hcloud/microserver/bank/bo/CurrentAccountHistoricalBalanceQueryResp.java

@@ -0,0 +1,16 @@
+package com.hcloud.microserver.bank.bo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 获取账户历史余额查询
+ */
+@Data
+public class CurrentAccountHistoricalBalanceQueryResp {
+    /**账户名称;null;100*O;*/
+    private String accName;
+    /**账户余额;null;15P2;*/
+    private BigDecimal balance;
+}

carbon-bank/carbon-bank-service/src/main/java/com/hcloud/microserver/bank/bo/CurrentAccountQueryDetailResp.java

@@ -0,0 +1,53 @@
+package com.hcloud.microserver.bank.bo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 活期账户明细返回参数
+ */
+@Data
+public class CurrentAccountQueryDetailResp {
+    /**交易日期 	8P0	*/
+    private String O2TRDT;
+    /**交易时间 	6P0	*/
+    private String O2TRTM;
+    /**币种	3A	*/
+    private String O2CYTP;
+    /**币种中文描述	10*O	*/
+    private String O2CYMS;
+    /**借贷标记 	2*O	*/
+    private String O2AMCD;
+    /**交易金额 	15P2	*/
+    private BigDecimal O2NGAM;
+    /**账户余额 	15P2	*/
+    private BigDecimal O2ACBL;
+    /**核心流水号	15A	*/
+    private String O2TLSQ;
+    /**摘要	15*O	*/
+    private String O2SMCD;
+    /**备注	200*O	*/
+    private String O2DESC;
+    /**交易渠道	3*O	*/
+    private String O2CHAN;
+    /**对方账号	30A	*/
+    private String O2REAC;
+    /**对方户名	62*O	*/
+    private String O2RENM;
+    /**对方开户行	100*O	*/
+    private String O2REKH;
+    /**手续费	15P2	*/
+    private BigDecimal O2SHXF;
+    /**用途	100*O	*/
+    private String O2YOTU;
+    /**账号1	32A	*/
+    private String O2AC1;
+    /**账户户名1	100*O	*/
+    private String O2NM1;
+    /**业务种类	1A	*/
+    private String O2YWZL;
+    /**记录信息	200*O	*/
+    private String O2JLXX;
+
+}

carbon-bank/carbon-bank-service/src/main/java/com/hcloud/microserver/bank/bo/CurrentAccountQueryDetailRespRecord.java

@@ -0,0 +1,14 @@
+package com.hcloud.microserver.bank.bo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 活期账户明细返回参数
+ */
+@Data
+public class CurrentAccountQueryDetailRespRecord {
+   private CurrentAccountQueryDetailResp RECORD;
+
+}

carbon-bank/carbon-bank-service/src/main/java/com/hcloud/microserver/bank/bo/CurrentAccountQueryDetailTotalResp.java

@@ -0,0 +1,28 @@
+package com.hcloud.microserver.bank.bo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+@Data
+public class CurrentAccountQueryDetailTotalResp extends BankResponseBase implements Serializable {
+    /**总笔数	5P0*/
+    private String O1TLNM;
+    /**汇出总笔数	4P0*/
+    private String O1OTNM;
+    /**汇出总金额	15P2*/
+    private BigDecimal O1OTAT;
+    /**汇入总笔数	4P0*/
+    private String O1INNM;
+    /**汇入总金额	15P2*/
+    private BigDecimal O1INAT;
+    /**查询明细*/
+    private List<CurrentAccountQueryDetailRespRecord> list;
+
+
+
+
+
+}

carbon-bank/carbon-bank-service/src/main/java/com/hcloud/microserver/bank/bo/CurrentAccountQueryParam.java

@@ -0,0 +1,16 @@
+package com.hcloud.microserver.bank.bo;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonFilter;
+import lombok.Data;
+
+/**
+ * 活期账户查询请求参数
+ */
+@Data
+public class CurrentAccountQueryParam {
+    //账号
+
+    @JSONField(name = "I1ACNO")
+    private String I1ACNO;
+}

carbon-bank/carbon-bank-service/src/main/java/com/hcloud/microserver/bank/bo/CurrentAccountQueryResp.java

@@ -0,0 +1,40 @@
+package com.hcloud.microserver.bank.bo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 活期账户查询返回
+ */
+@Data
+public class CurrentAccountQueryResp extends BankResponseBase {
+    /**账户号                     	19A	*/
+    private String O1ACNO;
+    /**客户号                     	10A	*/
+    private String O1CUNO;
+    /**客户中文名	62*O	*/
+    private String O1CUNM;
+    /**保留余额 	15P2	*/
+    private BigDecimal O1HOBL;
+    /**可用余额 	15P2	*/
+    private BigDecimal O1KYYE;
+    /**账户余额 	15P2	*/
+    private BigDecimal O1ACBL;
+    /**开户日期 	8P0	*/
+    private BigDecimal O1OPDT;
+    /**账务归属机构 	6A	*/
+    private String O1ACSB;
+    /**账户状态中文描述	10*O	*/
+    private String O1STCD;
+    /**币种	2A	*/
+    private String O1CRTP;
+    /**币种中文描述	10*O	*/
+    private String O1BZZW;
+    /**开户机构	6A	*/
+    private String O1OPOG;
+    /**开户机构名称	62*O	*/
+    private String O1OPPL;
+    /**协定存款标志	2*O	*/
+    private String O1XDFG;
+}

carbon-bank/carbon-bank-service/src/main/java/com/hcloud/microserver/bank/bo/InquiryOfWithholdingInstructionDetailsParam.java

@@ -0,0 +1,33 @@
+package com.hcloud.microserver.bank.bo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 2.15.	账务支付：代发/代扣指令详情信息查询CL0034
+ */
+@Data
+public class InquiryOfWithholdingInstructionDetailsParam {
+
+    /**交易类型;可选01-代发、02-代扣;2A;*/
+    private String BsnType;
+    /**账号1;可选，交易类型为“01”时，账号1为付款账号；交易类型为“02”时，账号1为收款账号；;32A;*/
+    private String AcctNo;
+    /**账号2;可选，交易类型为“01”时，账号2为收款账号；交易类型为“02”时，账号2为付款账号；;32A;*/
+    private String AnAcctNo;
+    /**操作方式;默认：0；0：账务处理1：数据校验;1A;*/
+    private String OperFlg;
+    /**开始金额;可选;15P2;*/
+    private BigDecimal StartAmt;
+    /**结束金额;可选;15P2;*/
+    private BigDecimal EndAmt;
+    /**起始日期;必输;8P0;*/
+    private BigDecimal StartDt;
+    /**终止日期;必输;8P0;*/
+    private BigDecimal EndDt;
+    /**起始条数;必输域;6P0;*/
+    private BigDecimal Num;
+    /**查询条数;必输域;4P0;*/
+    private BigDecimal QryNum;
+}

carbon-bank/carbon-bank-service/src/main/java/com/hcloud/microserver/bank/bo/InquiryOfWithholdingInstructionDetailsRecord.java

@@ -0,0 +1,12 @@
+package com.hcloud.microserver.bank.bo;
+
+import lombok.Data;
+
+/**
+ * 2.15.	账务支付：代发/代扣指令详情信息查询CL0034
+ */
+@Data
+public class InquiryOfWithholdingInstructionDetailsRecord {
+    private InquiryOfWithholdingInstructionDetailsRespDetail RECORD;
+
+}

carbon-bank/carbon-bank-service/src/main/java/com/hcloud/microserver/bank/bo/InquiryOfWithholdingInstructionDetailsResp.java

@@ -0,0 +1,19 @@
+package com.hcloud.microserver.bank.bo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 2.15.	账务支付：代发/代扣指令详情信息查询CL0034
+ */
+@Data
+public class InquiryOfWithholdingInstructionDetailsResp {
+    /**返回笔数;返回笔数;3P0;*/
+    private BigDecimal returnNum;
+    /**查询总条数;满足条件总记录数;5P0;*/
+    private BigDecimal totalNum;
+
+    private List<InquiryOfWithholdingInstructionDetailsRecord> list;
+}

carbon-bank/carbon-bank-service/src/main/java/com/hcloud/microserver/bank/bo/InquiryOfWithholdingInstructionDetailsRespDetail.java

@@ -0,0 +1,67 @@
+package com.hcloud.microserver.bank.bo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 2.15.	账务支付：代发/代扣指令详情信息查询CL0034
+ */
+@Data
+public class InquiryOfWithholdingInstructionDetailsRespDetail {
+    /**提交日期;null;14P0;*/
+    private BigDecimal TxnDt;
+    /**交易类型;01-代发、02-代扣;2A;*/
+    private String BsnType;
+    /**账号1;null;32A;*/
+    private String AcctNo;
+    /**账号1名称;null;100*O;*/
+    private String AcctName;
+    /**账号2;null;32A;*/
+    private String AnAcctNo;
+    /**账号2名称;null;100*O;*/
+    private String AnAcctName;
+    /**币种;01-人民币;2A;*/
+    private String Ccy;
+    /**交易总金额;null;15P2;*/
+    private BigDecimal BatAmt;
+    /**批次号;null;15A;*/
+    private String BatFlow;
+    /**批次状态;批次成功时，交易结果以明细状态为准; 批次失败时，所有明细均失败;2A;*/
+    private String BatState;
+    /**批次状态描述;null;20*O;*/
+    private String BatDesc;
+    /**批次错误代码;null;20A;*/
+    private String BatCode;
+    /**批次错误信息;null;100*O;*/
+    private String BatMsg;
+    /**企业流水号;null;20A;*/
+    private String CstFlow;
+    /**商户号;null;30A;*/
+    private String CstNo;
+    /**业务类型;当交易类型为01时，101：代发
+     102：代报销
+     103：预借
+     104：行内代付
+     当交易类型为02时，
+     0：批量扣个人
+     1：批量扣企业
+     仅交易类型为02时，该项为空;3A;*/
+    private String BusType;
+    /**月份;仅交易类型为02时，该项为空;6P0;*/
+    private BigDecimal Month;
+    /**明细序号;null;20A;*/
+    private BigDecimal DetFlow;
+    /**明细交易状态;0-交易成功
+     1-交易失败
+     2-入账中;1A;*/
+    private String DetState;
+    /**明细金额;null;15P2;*/
+    private BigDecimal DetAmt;
+    /**明细错误代码;null;20A;*/
+    private String DetCode;
+    /**明细错误信息;null;100*O;*/
+    private String DetMsg;
+    /**备注;null;42*O;*/
+    private String DetRem;
+}

carbon-bank/carbon-bank-service/src/main/java/com/hcloud/microserver/bank/bo/InterbankNumberInformationParam.java

@@ -0,0 +1,19 @@
+package com.hcloud.microserver.bank.bo;
+
+import lombok.Data;
+
+/**
+ * 2.16.	获取联行号信息 CL0101
+ */
+@Data
+public class InterbankNumberInformationParam {
+    /**银行行名;必输;8-100*O;*/
+    private String bankName;
+    /**渠道号;至少四个汉字
+     非必输，不送查询所有
+     0：大小额
+     1：大小额
+     2：同城农信银;1A;*/
+    private String channel;
+
+}

carbon-bank/carbon-bank-service/src/main/java/com/hcloud/microserver/bank/bo/InterbankNumberInformationResp.java

@@ -0,0 +1,10 @@
+package com.hcloud.microserver.bank.bo;
+
+import lombok.Data;
+
+/**
+ * 2.16.	获取联行号信息 CL0101
+ */
+@Data
+public class InterbankNumberInformationResp {
+}

carbon-bank/carbon-bank-service/src/main/java/com/hcloud/microserver/bank/bo/InterbankNumberInformationRespDetail.java

@@ -0,0 +1,10 @@
+package com.hcloud.microserver.bank.bo;
+
+import lombok.Data;
+
+/**
+ * 2.16.	获取联行号信息 CL0101
+ */
+@Data
+public class InterbankNumberInformationRespDetail {
+}

carbon-bank/carbon-bank-service/src/main/java/com/hcloud/microserver/bank/bo/InterbankNumberInformationRespRecord.java

@@ -0,0 +1,10 @@
+package com.hcloud.microserver.bank.bo;
+
+import lombok.Data;
+
+/**
+ * 2.16.	获取联行号信息 CL0101
+ */
+@Data
+public class InterbankNumberInformationRespRecord {
+}

carbon-bank/carbon-bank-service/src/main/java/com/hcloud/microserver/bank/bo/IntrabankTransferParam.java

@@ -0,0 +1,70 @@
+package com.hcloud.microserver.bank.bo;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/***
+ * 2.6.	转账：行内转账CL0005（需签名）
+ */
+@Data
+public class IntrabankTransferParam {
+    /**企业流水号;必输域，企业自己生成的流水号，在企业内部唯一;20A;*/
+    @JSONField(name = "I1QYLS")
+    private String I1QYLS;
+    /**提交人ID;null;30A;*/
+    @JSONField(name = "I1SMID")
+    private String I1SMID;
+    /**最后授权人ID;null;30A;*/
+    @JSONField(name = "I1ATID")
+    private String I1ATID;
+    /**付款账号;必输域;32A;*/
+    @JSONField(name = "I1FKAC")
+    private String I1FKAC;
+    /**付款方户名;null;60*O;*/
+    @JSONField(name = "I1FKNM")
+    private String I1FKNM;
+    /**收款方户名;必输域;60*O;*/
+    @JSONField(name = "I1CUNM")
+    private String I1CUNM;
+    /**收款账号;必输域;32A;*/
+    @JSONField(name = "I1SKAC")
+    private String I1SKAC;
+    /**金额;必输域;15P2;*/
+    @JSONField(name = "I1TRAM")
+    private BigDecimal I1TRAM;
+    /**币种;必输域(固定值01);2A;*/
+    @JSONField(name = "I1TRCY")
+    private BigDecimal I1TRCY;
+    /**用途;必输域;30*O;*/
+    @JSONField(name = "I1PUPS")
+    private BigDecimal I1PUPS;
+    /**备注;null;150*O;*/
+    @JSONField(name = "I1REM")
+    private String I1REM;
+    /**交易类型;0：集团账号转账1：普通转账;1A;*/
+    @JSONField(name = "IJYLX")
+    private String IJYLX;
+    /**企业指令内部编号;null;30A;*/
+    @JSONField(name = "I1NBBH")
+    private String I1NBBH;
+    /**校验标志;0：无（默认）1：招标账户校验;1A;*/
+    @JSONField(name = "I1JYBZ")
+    private String I1JYBZ;
+    /**原明细序号;null;8A;*/
+    @JSONField(name = "I1MXXH")
+    private String I1MXXH;
+    /**账号1;null;32A;*/
+    @JSONField(name = "I1AC1")
+    private String I1AC1;
+    /**账户户名1;null;100*O;*/
+    @JSONField(name = "I1NM1")
+    private String I1NM1;
+    /**业务种类;1-代理支付;1A;*/
+    @JSONField(name = "I1YWZL")
+    private String I1YWZL;
+    /**记录信息;null;200*O;*/
+    @JSONField(name = "I1JLXX")
+    private String I1JLXX;
+}

carbon-bank/carbon-bank-service/src/main/java/com/hcloud/microserver/bank/bo/IntrabankTransferResp.java

@@ -0,0 +1,26 @@
+package com.hcloud.microserver.bank.bo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class IntrabankTransferResp extends BankResponseBase {
+
+    /**渠道流水号;null;15A;*/
+    private String O1TLSQ;
+    /**交易状态;见数据字典说明;2A;*/
+    private String O1JYZT;
+    /**状态描述;null;20*O;*/
+    private String O1ZTMS;
+    /**交易应答代码;null;20A;*/
+    private String O1JYYD;
+    /**失败原因;null;100*O;*/
+    private String O1SBYY;
+    /**付款账户余额;null;15P2;*/
+    private BigDecimal O1ZHYE;
+    /**手续费;null;15P2;*/
+    private BigDecimal O1PCDF;
+    /**邮电费;null;15P2;*/
+    private BigDecimal O1PSTF;
+}

carbon-bank/carbon-bank-service/src/main/java/com/hcloud/microserver/bank/bo/MyX509Manager.java

@@ -0,0 +1,22 @@
+package com.hcloud.microserver.bank.bo;
+
+import javax.net.ssl.X509TrustManager;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+
+public class MyX509Manager implements X509TrustManager {
+    @Override
+    public void checkClientTrusted(X509Certificate[] x509Certificates, String s) throws CertificateException {
+
+    }
+
+    @Override
+    public void checkServerTrusted(X509Certificate[] x509Certificates, String s) throws CertificateException {
+
+    }
+
+    @Override
+    public X509Certificate[] getAcceptedIssuers() {
+        return new X509Certificate[0];
+    }
+}

carbon-bank/carbon-bank-service/src/main/java/com/hcloud/microserver/bank/bo/OutOfBankTransferParam.java

@@ -0,0 +1,67 @@
+package com.hcloud.microserver.bank.bo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 2.7.	转账：行外转账CL0006（需签名）
+ */
+@Data
+public class OutOfBankTransferParam {
+
+    /**企业流水号;必输域;20A;*/
+    private String I1QYLS;
+    /**提交人ID;null;30A;*/
+    private String I1SMID;
+    /**最后授权人ID;null;30A;*/
+    private String I1ATID;
+    /**货币符号;必输域币种表人民币01;2A;*/
+    private String CYNO;
+    /**付款金额;必输域;15P2;*/
+    private BigDecimal HBJE;
+    /**付款人开户行;必输域;12A;*/
+    private String FKKH;
+    /**付款人账号;必输域;32A;*/
+    private String FKZH;
+    /**付款人名称;必输域;60*O;*/
+    private String FKRM;
+    /**收款人开户行;当加急标志为0，1时必输;12A;*/
+    private String SKKH;
+    /**收款人开户行名;当加急标志为2时必输;100*O;*/
+    private String SKHM;
+    /**收款人账号;必输域;32A;*/
+    private String SKZH;
+    /**收款人名称;必输域;60*O;*/
+    private String SKRM;
+    /**付款用途;必输域;30*O;*/
+    private String FYAN;
+    /**付款人备注;null;30*O;*/
+    private String FKBZ;
+    /**加急标志;必输域0：普通（小额），1：加急（大额），2：支付平台;1A;*/
+    private String JJBZ;
+    /**交易类型;必输域0：集团账号转账1：普通转账;1A;*/
+    private String IJYLX;
+    /**核心流水号;null;15A;*/
+    private String I1TLSQ;
+    /**交易日期;null;8A;*/
+    private String I1TRDT;
+    /**交易序号;null;15A;*/
+    private String I1ZFXH;
+    /**企业指令内部编号;null;30A;*/
+    private String I1NBBH;
+    /**手续费支付方;0：付款人支付(默认);1A;*/
+    private String I1SXZF;
+    /**校验标志;0：无（默认）1：招标账户校验;1A;*/
+    private String I1JYBZ;
+    /**原明细序号;null;8A;*/
+    private String I1MXXH;
+    /**账号1;null;32A;*/
+    private String I1AC1;
+    /**账户户名1;null;100*O;*/
+    private String I1NM1;
+    /**业务种类;1-代理支付;1A;*/
+    private String I1YWZL;
+    /**记录信息;null;200*O;*/
+    private String I1JLXX;
+}

carbon-bank/carbon-bank-service/src/main/java/com/hcloud/microserver/bank/bo/OutOfBankTransferResp.java

@@ -0,0 +1,28 @@
+package com.hcloud.microserver.bank.bo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 2.7.	转账：行外转账CL0006（需签名）
+ */
+@Data
+public class OutOfBankTransferResp {
+    /**渠道流水号;null;15A;*/
+    private String O1TLSQ;
+    /**交易状态;见数据字典说明;2A;*/
+    private String O1JYZT;
+    /**状态描述;null;10*O;*/
+    private String O1ZTMS;
+    /**交易应答代码;null;7A;*/
+    private String O1JYYD;
+    /**失败原因;null;60*O;*/
+    private String O1SBYY;
+    /**付款账户余额;null;15P2;*/
+    private BigDecimal O1ZHYE;
+    /**手续费;null;15P2;*/
+    private BigDecimal O1PCDF;
+    /**邮电费;null;15P2;*/
+    private BigDecimal O1PSTF;
+}

carbon-bank/carbon-bank-service/src/main/java/com/hcloud/microserver/bank/bo/PayWagesOrReimbursementDetail.java

@@ -0,0 +1,18 @@
+package com.hcloud.microserver.bank.bo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class PayWagesOrReimbursementDetail {
+    /**收款人账号;必输域;19A;*/
+    private String O2SKZH;
+    /**收款人姓名;必输域;62*O;*/
+    private String O2SKXM;
+    /**金额;必输域;15P2;*/
+    private BigDecimal O2JYJE;
+    /**备注/用途;null;42*O;*/
+    private String O2JYBZ;
+
+}

carbon-bank/carbon-bank-service/src/main/java/com/hcloud/microserver/bank/bo/PayWagesOrReimbursementParam.java

@@ -0,0 +1,43 @@
+package com.hcloud.microserver.bank.bo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 2.12.	账务支付：代发工资/代报销CL0033（需签名）
+ */
+@Data
+public class PayWagesOrReimbursementParam {
+
+    /**企业流水号;必输域;20A;*/
+    private String I1QYLS;
+    /**提交人ID;null;30A;*/
+    private String I1SMID;
+    /**最后授权人ID;null;30A;*/
+    private String I1ATID;
+    /**业务类型;必输域;3A;*/
+    private String O1YWLX;
+    /**代发月份;必输域;6P0;*/
+    private BigDecimal O1DFYF;
+    /**付款账号;必输域;19A;*/
+    private String O1FKAC;
+    /**总笔数;必输域;3P0;*/
+    private BigDecimal O1TRCT;
+    /**总金额;必输域;15P2;*/
+    private BigDecimal O1TRAM;
+    /**批次备注;null;32*O;*/
+    private BigDecimal O1PCBZ;
+    /**企业指令内部编号;null;30A;*/
+    private BigDecimal I1NBBH;
+    /**操作方式;默认：0；0：账务处理1：数据校验;1A;*/
+    private String O1FLAG;
+    /**明细展示;0：隐藏明细；1：显示明细；默认：0;1A;*/
+    private String O1SHOW;
+    /**交易类型;0：集团账号转账；1：普通转账；默认：0;1A;*/
+    private String IJYLX;
+    /**明细组合*/
+    private List<PayWagesOrReimbursementRecord> list;
+
+}

carbon-bank/carbon-bank-service/src/main/java/com/hcloud/microserver/bank/bo/PayWagesOrReimbursementRecord.java

@@ -0,0 +1,8 @@
+package com.hcloud.microserver.bank.bo;
+
+import lombok.Data;
+
+@Data
+public class PayWagesOrReimbursementRecord {
+    private PayWagesOrReimbursementDetail RECORD;
+}

carbon-bank/carbon-bank-service/src/main/java/com/hcloud/microserver/bank/bo/PayWagesOrReimbursementResp.java

@@ -0,0 +1,20 @@
+package com.hcloud.microserver.bank.bo;
+
+import lombok.Data;
+
+/**
+ * 2.12.	账务支付：代发工资/代报销CL0033（需签名）
+ */
+@Data
+public class PayWagesOrReimbursementResp extends BankResponseBase{
+    /**渠道流水号;null;15A;*/
+    private String O1TLSQ;
+    /**交易状态;见数据字典说明;2A;*/
+    private String O1JYZT;
+    /**状态描述;null;20*O;*/
+    private String O1ZTMS;
+    /**交易应答代码;null;20A;*/
+    private String O1JYYD;
+    /**失败原因;null;100*O;*/
+    private String O1SBYY;
+}

carbon-bank/carbon-bank-service/src/main/java/com/hcloud/microserver/bank/bo/ReimbursementInstructionQureyParam.java

@@ -0,0 +1,32 @@
+package com.hcloud.microserver.bank.bo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 2.13.	账务支付：代发/代报销指令列表查询CL0031
+ */
+@Data
+public class ReimbursementInstructionQureyParam {
+    /**业务类型;101：代发、102：代报销;3A;*/
+    private String I1YWLX;
+    /**付款账号;可选;19A;*/
+    private String I1FKAC;
+    /**指令状态;可选，0：全部、1：等待企业处理、2：银行处理中、3：处理完成;1A;*/
+    private String I1STT;
+    /**操作方式;默认：0、0：账务处理、1：数据校验;1A;*/
+    private String O1FLAG;
+    /**起始日期;必输域;8P0;*/
+    private BigDecimal I1STDT;
+    /**终止日期;必输域;8P0;*/
+    private BigDecimal I1EDDT;
+    /**起始金额;可选;15P2;*/
+    private BigDecimal I1BGAT;
+    /**终止金额;可选;15P2;*/
+    private BigDecimal I1EDAT;
+    /**起始条数;必输域;5P0;*/
+    private BigDecimal Num;
+    /**查询条数;必输域;3P0;*/
+    private BigDecimal QryNum;
+}