Merge remote-tracking branch 'origin/dev' into dev

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

@@ -5,11 +5,15 @@ import com.hcloud.microserver.commoncore.base.BaseMapper;
 import com.hcloud.microserver.system.facade.carbon.entity.CollectiveFarmer;
 import com.hcloud.microserver.system.facade.carbon.forms.CollectiveFarmerForm;
 
+import java.util.List;
+
 /**
  * @author xiezt
  */
 public interface CollectiveFarmerMapper extends BaseMapper<CollectiveFarmer, String> {
     Page selectListByPage(CollectiveFarmerForm collectiveFarmerForm);
 
+    List<CollectiveFarmer> getListByPage(CollectiveFarmerForm collectiveFarmerForm);
+
     String getCurrentCode();
 }

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

@@ -21,6 +21,13 @@ public interface PovertyAreaMapper extends BaseMapper<PovertyArea, String> {
      */
     Page<Map> selectPovertyAreaListByPage(PovertyAreaForm povertyAreaForm);
 
+    /**
+     * 分页查询贫困区域列表
+     * @param povertyAreaForm
+     * @return
+     */
+    Page<PovertyArea> getPovertyAreaListByPage(PovertyAreaForm povertyAreaForm);
+
     /**
      * 贫困区域基本信息（包含：统计信息）
      * @param guid

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/PovertyArea.java

@@ -1,5 +1,7 @@
 package com.hcloud.microserver.system.facade.carbon.entity;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
@@ -8,38 +10,57 @@ import java.util.Date;
  * @author xiezt
  */
 @Data
+@ApiModel("区域信息实体")
 public class PovertyArea {
+    @ApiModelProperty("序列")
     private String guid;
 
+    @ApiModelProperty("扶贫区域名称")
     private String povertyAreaName;
 
+    @ApiModelProperty("区域地址")
     private String areaAddress;
 
+    @ApiModelProperty("区域描述")
     private String areaDesc;
 
+    @ApiModelProperty("城市id")
     private String cityId;
 
+    @ApiModelProperty("区县id")
     private String countyId;
 
+    @ApiModelProperty("乡镇id")
     private String townId;
 
+    @ApiModelProperty("村庄id")
     private String villageId;
 
+    @ApiModelProperty("区域图片")
     private String areaImages;
 
+    @ApiModelProperty("是否启用")
     private Integer isEnable;
 
+    @ApiModelProperty("记录状态")
     private Integer state;
 
+    @ApiModelProperty("创建用户")
     private String createUser;
 
+    @ApiModelProperty("创建时间")
     private Date createTime;
 
+    @ApiModelProperty("修改用户")
     private String modifiedUser;
 
+    @ApiModelProperty("修改时间")
     private Date modifiedTime;
 
+
+    @ApiModelProperty("省直辖市id")
     private String provinceId;
 
+    @ApiModelProperty("贫困户数")
     private Integer familyNum;
 }

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/PovertyAreaForm.java

@@ -1,6 +1,8 @@
 package com.hcloud.microserver.system.facade.carbon.forms;
 
 import com.hcloud.microserver.commoncore.base.BaseForm;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -8,60 +10,84 @@ import java.util.Date;
 import java.util.List;
 
 @Data
+@ApiModel("区域信息")
 public class PovertyAreaForm extends BaseForm {
 
+    @ApiModelProperty("序列")
     private String guid;
 
+    @ApiModelProperty("扶贫区域名称")
     private String povertyAreaName;
 
+    @ApiModelProperty("区域地址")
     private String areaAddress;
 
+    @ApiModelProperty("区域描述")
     private String areaDesc;
 
+    @ApiModelProperty("城市id")
     private String cityId;
 
+    @ApiModelProperty("区县id")
     private String countyId;
 
+    @ApiModelProperty("乡镇id")
     private String townId;
 
+    @ApiModelProperty("村庄id")
     private String villageId;
 
+    @ApiModelProperty("区域图片")
     private String areaImages;
 
+    @ApiModelProperty("是否启用")
     private Integer isEnable;
 
+    @ApiModelProperty("记录状态")
     private Integer state;
 
+    @ApiModelProperty("创建用户")
     private String createUser;
 
+    @ApiModelProperty("创建时间")
     private Date createTime;
 
+    @ApiModelProperty("修改用户")
     private String modifiedUser;
 
+    @ApiModelProperty("修改时间")
     private Date modifiedTime;
 
+    @ApiModelProperty("关键字")
     private String condition;
 
+    @ApiModelProperty("省直辖市id")
     private String provinceId;
 
+    @ApiModelProperty("贫困户数")
     private Integer familyNum;
 
+    @ApiModelProperty("农户信息列表")
     private List<FarmerInfoForm> farmerInfoList;
 
     /**
      * 总的农户数
      */
+    @ApiModelProperty("总的农户数")
     private Integer farmerNum;
     /**
      * 总的贫困人口数
      */
+    @ApiModelProperty("总的贫困人口数")
     private Integer farmerPersonNum;
     /**
      * 总的购碳资金数
      */
+    @ApiModelProperty("总的购碳资金数")
     private BigDecimal saleAmount;
     /**
      * 总的涉及商品数量
      */
+    @ApiModelProperty("总的涉及商品数量")
     private Integer goodsNum;
 }

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

@@ -4,6 +4,7 @@ import com.github.pagehelper.PageInfo;
 import com.hcloud.microserver.system.bank.service.CollectiveFarmerService;
 import com.hcloud.microserver.commoncore.base.BaseController;
 import com.hcloud.microserver.commoncore.base.ResponseBase;
+import com.hcloud.microserver.system.facade.carbon.entity.CollectiveFarmer;
 import com.hcloud.microserver.system.facade.carbon.forms.CollectiveFarmerForm;
 import com.hcloud.microserver.system.util.CurrUserUtil;
 import io.swagger.annotations.Api;
@@ -14,6 +15,8 @@ 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;
+
 /**
  * @author xiezt
  */
@@ -27,9 +30,9 @@ public class CollectiveFarmerController extends BaseController {
 
     @ApiOperation(value = "分页查询集体农户信息",notes = "分页查询集体农户信息")
     @PostMapping("/searchByPage")
-    public ResponseBase searchByPage(@RequestBody CollectiveFarmerForm collectiveFarmerForm) {
+    public ResponseBase<List<CollectiveFarmer>> searchByPage(@RequestBody CollectiveFarmerForm collectiveFarmerForm) {
-        PageInfo pageInfo = this.collectiveFarmerService.queryListByPage(collectiveFarmerForm);
+        PageInfo<CollectiveFarmer> listByPage = this.collectiveFarmerService.getListByPage(collectiveFarmerForm);
-        return responseSuccess(pageInfo);
+        return responseSuccess(listByPage);
     }
 
     @ApiOperation(value = "添加集体农户信息",notes = "添加集体农户信息")

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

@@ -23,8 +23,8 @@ public class FarmerInfoController extends BaseController {
 
     @ApiOperation(value = "分页查询农户信息")
     @PostMapping("/searchByPage")
-    public ResponseBase searchByPage(@RequestBody FarmerInfoForm farmerInfoForm) {
+    public ResponseBase<List<FarmerInfo>> searchByPage(@RequestBody FarmerInfoForm farmerInfoForm) {
-        PageInfo pageInfo = this.farmerInfoService.queryListByPage(farmerInfoForm);
+        PageInfo<FarmerInfo> pageInfo = this.farmerInfoService.getListByPage(farmerInfoForm);
         return responseSuccess(pageInfo);
     }
     @ApiOperation(value = "新增农户信息")
@@ -58,14 +58,14 @@ public class FarmerInfoController extends BaseController {
 
     @ApiOperation(value = "通过集体查询农户信息")
     @PostMapping("/searchByCollectiveId")
-    public ResponseBase findByCollectiveId(@RequestParam(name = "collectiveId") String collectiveId) {
+    public ResponseBase<FarmerInfo> 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) {
+    public ResponseBase<FarmerInfo> searchByProductGuid(@RequestParam(name = "productGuid") String productGuid) {
         List<FarmerInfo> farmerInfos = this.farmerInfoService.queryByProductGuid(productGuid);
         return responseResultSuccess(farmerInfos);
     }

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

@@ -1,39 +1,42 @@
 package com.hcloud.microserver.system.bank.controller;
 
 import com.github.pagehelper.PageInfo;
-import com.hcloud.microserver.system.bank.bo.CarbonBaseController;
+import com.hcloud.microserver.commoncore.base.BaseController;
 import com.hcloud.microserver.system.bank.service.PovertyAreaService;
 import com.hcloud.microserver.commoncore.base.ResponseBase;
 import com.hcloud.microserver.system.facade.carbon.entity.PovertyArea;
 import com.hcloud.microserver.system.facade.carbon.forms.PovertyAreaForm;
+import com.hcloud.microserver.system.util.CurrUserUtil;
 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;
+
 @Slf4j
 @RestController
 @RequestMapping("/web/area")
 @Api(tags = "贫困区域管理服务",description = "贫困区域管理服务")
-public class PovertyAreaController extends CarbonBaseController {
+public class PovertyAreaController extends BaseController {
 
     @Autowired
     private PovertyAreaService povertyAreaService;
 
     @ApiOperation("分页查询贫困区域")
     @PostMapping("/searchByPage")
-    public ResponseBase searchByPage(@RequestBody PovertyAreaForm povertyAreaForm) {
+    public ResponseBase<List<PovertyArea>> searchByPage(@RequestBody PovertyAreaForm povertyAreaForm) {
-        PageInfo pageInfo = this.povertyAreaService.queryListByPage(povertyAreaForm);
+        PageInfo<PovertyArea> list = this.povertyAreaService.getListByPage(povertyAreaForm);
-        return responseSuccess(pageInfo);
+        return responseSuccess(list);
     }
 
     @ApiOperation("新增贫困区域")
     @PostMapping("/save")
     public ResponseBase save(@RequestBody PovertyAreaForm povertyAreaForm) {
 
-        povertyAreaForm.setCreateUser(this.getUserId());
+        povertyAreaForm.setCreateUser(CurrUserUtil.getUserId());
-        povertyAreaForm.setModifiedUser(this.getUserId());
+        povertyAreaForm.setModifiedUser(CurrUserUtil.getUserId());
         int success = this.povertyAreaService.save(povertyAreaForm);
         if (success>0) {
             return responseResultSuccess();
@@ -63,7 +66,7 @@ public class PovertyAreaController extends CarbonBaseController {
 
     @ApiOperation("查询贫困区域明细")
     @GetMapping("/findByGuid")
-    public ResponseBase findByGuid(@RequestParam(name = "guid") String guid) {
+    public ResponseBase<PovertyArea> findByGuid(@RequestParam(name = "guid") String guid) {
         PovertyArea povertyArea = this.povertyAreaService.findByGuid(guid);
         return responseResultSuccess(povertyArea);
     }

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

@@ -54,17 +54,6 @@ public class SubscriptionApplyController extends BaseController
         return AjaxResult.success(subscriptionApplyService.selectSubscriptionApplyById(guid));
     }
 
-    /**
-     * 修改碳汇认购申请
-     */
-
-    @PutMapping
-    @AuthCarbonValidate
-    @ApiOperation("更新申请状态为认购成功")
-    public AjaxResult edit(String guid,String orderGuid)
-    {
-        return toAjax(subscriptionApplyService.updateSubscriptionApply(guid,orderGuid));
-    }
 
     /**
      * 删除碳汇认购申请

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/dao/CollectiveFarmerMapper.java

@@ -5,11 +5,15 @@ import com.hcloud.microserver.commoncore.base.BaseMapper;
 import com.hcloud.microserver.system.facade.carbon.entity.CollectiveFarmer;
 import com.hcloud.microserver.system.facade.carbon.forms.CollectiveFarmerForm;
 
+import java.util.List;
+
 /**
  * @author xiezt
  */
 public interface CollectiveFarmerMapper extends BaseMapper<CollectiveFarmer, String> {
     Page selectListByPage(CollectiveFarmerForm collectiveFarmerForm);
 
+    List<CollectiveFarmer> getListByPage(CollectiveFarmerForm collectiveFarmerForm);
+
     String getCurrentCode();
 }

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/dao/FarmerInfoMapper.java

@@ -15,6 +15,8 @@ import java.util.Map;
 public interface FarmerInfoMapper extends BaseMapper<FarmerInfo, String> {
     Page<Map> selectListByPage(FarmerInfoForm farmerInfoForm);
 
+    List<FarmerInfo> getListByPage(FarmerInfoForm farmerInfoForm);
+
     int batchInsert(List<FarmerInfo> farmerInfos);
 
     int updateByCollectiveId(@Param("collectiveId") String collectiveId);

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/dao/PovertyAreaMapper.java

@@ -1,10 +1,12 @@
 package com.hcloud.microserver.system.bank.dao;
 
 import com.github.pagehelper.Page;
-import com.hcloud.microserver.system.bank.bo.PovertyAreaBO;
+import com.hcloud.microserver.system.bank.bo.*;
 import com.hcloud.microserver.commoncore.base.BaseMapper;
 import com.hcloud.microserver.system.facade.carbon.entity.PovertyArea;
 import com.hcloud.microserver.system.facade.carbon.forms.PovertyAreaForm;
+import org.apache.ibatis.annotations.Mapper;
+
 
 import java.util.List;
 import java.util.Map;
@@ -12,6 +14,7 @@ import java.util.Map;
 /**
  * @author xiezt
  */
+@Mapper
 public interface PovertyAreaMapper extends BaseMapper<PovertyArea, String> {
 
     /**
@@ -21,6 +24,13 @@ public interface PovertyAreaMapper extends BaseMapper<PovertyArea, String> {
      */
     Page<Map> selectPovertyAreaListByPage(PovertyAreaForm povertyAreaForm);
 
+    /**
+     * 分页查询贫困区域列表
+     * @param povertyAreaForm
+     * @return
+     */
+    Page<PovertyArea> getPovertyAreaListByPage(PovertyAreaForm povertyAreaForm);
+
     /**
      * 贫困区域基本信息（包含：统计信息）
      * @param guid

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/dao/SubscriptionApplyMapper.java

@@ -32,11 +32,10 @@ public interface SubscriptionApplyMapper
 
     /**
      * 修改碳汇认购申请
-     * 
+     *
-     * @param guid 碳汇认购申请
      * @return 结果
      */
-    public int updateSubscriptionApply(@Param("guid") String guid,@Param("orderGuid") String orderGuid);
+    public int updateSubscriptionApply(SubscriptionApply apply);
 
     /**
      * 删除碳汇认购申请

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

@@ -15,5 +15,7 @@ public interface CollectiveFarmerService extends BaseServie<CollectiveFarmer, St
 
     PageInfo queryListByPage(CollectiveFarmerForm collectiveFarmerForm);
 
+    PageInfo<CollectiveFarmer> getListByPage(CollectiveFarmerForm collectiveFarmerForm);
+
     int verify(CollectiveFarmerForm collectiveFarmerForm);
 }

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

@@ -21,6 +21,7 @@ public interface FarmerInfoService extends BaseServie<FarmerInfo, String> {
     int modify(FarmerInfoForm farmerInfoForm);
 
     PageInfo queryListByPage(FarmerInfoForm farmerInfoForm);
+    PageInfo<FarmerInfo> getListByPage(FarmerInfoForm farmerInfoForm);
 
     int verify(FarmerInfoForm farmerInfoForm);
 

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

@@ -33,10 +33,10 @@ public interface ISubscriptionApplyService
     /**
      * 修改碳汇认购申请-更新为认购完成
      * 
-     * @param guid 碳汇认购申请
+     * @param apply 碳汇认购申请
      * @return 结果
      */
-    public int updateSubscriptionApply(String guid,String orderGuid);
+    public int updateSubscriptionApply(SubscriptionApply apply);
 
     /**
      * 批量删除碳汇认购申请

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

@@ -20,6 +20,7 @@ public interface PovertyAreaService {
     int modify(PovertyAreaForm povertyAreaForm);
 
     PageInfo<Page<Map>> queryListByPage(PovertyAreaForm povertyAreaForm);
+    PageInfo<PovertyArea> getListByPage(PovertyAreaForm povertyAreaForm);
 
     List<PovertyArea> areaTree();
 

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

@@ -281,6 +281,16 @@ public class CollectiveFarmerServiceImpl implements CollectiveFarmerService {
         return null;
     }
 
+    @Override
+    public PageInfo<CollectiveFarmer> getListByPage(CollectiveFarmerForm collectiveFarmerForm) {
+        PageHelper.startPage(collectiveFarmerForm.getPageNo(), collectiveFarmerForm.getPageSize());
+        List<CollectiveFarmer> page = this.collectiveFarmerMapper.getListByPage(collectiveFarmerForm);
+        if (Objects.nonNull(page) && page.size() > 0) {
+            return new PageInfo(page);
+        }
+        return null;
+    }
+
     /**
      * 审核卡
      *

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

@@ -111,6 +111,16 @@ public class FarmerInfoServiceImpl implements FarmerInfoService {
         return null;
     }
 
+    @Override
+    public PageInfo<FarmerInfo> getListByPage(FarmerInfoForm farmerInfoForm) {
+        PageHelper.startPage(farmerInfoForm.getPageNo(), farmerInfoForm.getPageSize());
+        List<FarmerInfo> page = this.farmerInfoMapper.getListByPage(farmerInfoForm);
+        if (Objects.nonNull(page) && page.size() > 0) {
+            return new PageInfo<>(page);
+        }
+        return null;
+    }
+
     @Override
     public int verify(FarmerInfoForm farmerInfoForm) {
         // TODO 审核卡

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

@@ -3,6 +3,7 @@ package com.hcloud.microserver.system.bank.service.impl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.hcloud.microserver.commoncore.util.UUIDUtils;
+import com.hcloud.microserver.commoncore.util.reflect.DateUtils;
 import com.hcloud.microserver.security.util.SecurityUtils;
 import com.hcloud.microserver.system.bank.bo.*;
 import com.hcloud.microserver.system.bank.dao.*;
@@ -469,7 +470,12 @@ public class OrderInfoServiceImpl implements OrderInfoService {
         int saveOrderResult =  goodsOrderInfoMapper.insertSelective(order);
 
         //更新申请表
-        subscriptionApplyMapper.updateSubscriptionApply(createOrderBO.getGuid(),order.getOrderNo());
+        SubscriptionApply apply = new SubscriptionApply();
+        apply.setModifiedTime(DateUtils.getNowDate());
+        apply.setApplyStatus(1);
+        apply.setGuid(createOrderBO.getGuid());
+        apply.setOrderGuid(order.getGuid());
+        subscriptionApplyMapper.updateSubscriptionApply(apply);
 
         return saveOrderResult;
     }

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

@@ -3,7 +3,7 @@ package com.hcloud.microserver.system.bank.service.impl;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.hcloud.microserver.system.bank.bo.PovertyAreaBO;
+import com.hcloud.microserver.system.bank.bo.*;
 import com.hcloud.microserver.system.bank.dao.FarmerInfoMapper;
 import com.hcloud.microserver.system.bank.dao.PovertyAreaMapper;
 import com.hcloud.microserver.system.bank.service.PovertyAreaService;
@@ -85,6 +85,16 @@ public class PovertyAreaServiceImpl implements PovertyAreaService {
         return null;
     }
 
+    @Override
+    public PageInfo<PovertyArea> getListByPage(PovertyAreaForm povertyAreaForm) {
+        PageHelper.startPage(povertyAreaForm.getPageNo(), povertyAreaForm.getPageSize());
+        Page<PovertyArea> list = povertyAreaMapper.getPovertyAreaListByPage(povertyAreaForm);
+        if (Objects.nonNull(list) && list.size() > 0) {
+            return new PageInfo(list);
+        }
+        return null;
+    }
+
     @Override
     public List<PovertyArea> areaTree() {
         return null;
@@ -104,6 +114,7 @@ public class PovertyAreaServiceImpl implements PovertyAreaService {
     @Override
     public PovertyAreaForm getFullPovertyAreaInfoById(String guid) {
         //查询出贫困统计信息
+
         PovertyAreaBO povertyArea = povertyAreaMapper.getPovertyAreaAnalysis(guid);
         if(povertyArea!=null && !"".equals(povertyArea.getGuid())){
             PovertyAreaForm povertyAreaForm = BeanCopyUtil.convertBean(povertyArea,PovertyAreaForm.class);

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

@@ -50,13 +50,13 @@ public class SubscriptionApplyServiceImpl implements ISubscriptionApplyService
     /**
      * 修改碳汇认购申请
      *
-     * @param guid 碳汇认购申请
+     * @param apply 碳汇认购申请
      * @return 结果
      */
     @Override
-    public int updateSubscriptionApply(String guid,String orderGuid)
+    public int updateSubscriptionApply(SubscriptionApply apply)
     {
-        return subscriptionApplyMapper.updateSubscriptionApply(guid,orderGuid);
+        return subscriptionApplyMapper.updateSubscriptionApply(apply);
     }
 
     /**

carbon-back/carbon-back-service/src/main/resources/carbon/CollectiveFarmerMapper.xml

@@ -309,6 +309,33 @@
         order by modified_time desc
     </select>
 
+    <select id="getListByPage" parameterType="CollectiveFarmerForm" resultMap="BaseResultMap">
+        select cf.* from t_collective_farmer cf
+        left join t_poverty_area pa on cf.fk_poverty_area_id = pa.guid
+        <where>
+            cf.state = 1 and pa.state = 1
+            <if test="condition != null and condition != ''">
+                and ((collective_name like concant('%', #{condition,jdbcType=VARCHAR}, '%')))
+            </if>
+            <if test="provinceId != null and provinceId != ''">
+                and pa.province_id = #{provinceId,jdbcType=VARCHAR}
+            </if>
+            <if test="cityId != null and cityId != ''">
+                and pa.city_id = #{cityId,jdbcType=VARCHAR}
+            </if>
+            <if test="townId != null and townId != ''">
+                and pa.town_id = #{townId,jdbcType=VARCHAR}
+            </if>
+            <if test="countyId != null and countyId != ''">
+                and pa.county_id = #{countyId,jdbcType=VARCHAR}
+            </if>
+            <if test="villageId != null and villageId != ''">
+                and pa.village_id = #{villageId,jdbcType=VARCHAR}
+            </if>
+        </where>
+        order by modified_time desc
+    </select>
+
     <select id="getCurrentCode" resultType="string">
         select max(collective_code) from t_collective_farmer
     </select>

carbon-back/carbon-back-service/src/main/resources/carbon/FarmerInfoMapper.xml

@@ -416,6 +416,48 @@
         order by farmer.modified_time desc
     </select>
 
+    <select id="getListByPage" parameterType="FarmerInfoForm" resultMap="BaseResultMap">
+        select
+        *
+        from t_farmer_info farmer
+        left join t_poverty_area area on farmer.fk_poverty_area_id = area.guid
+        <where>
+            farmer.state = 1 and area.state = 1
+            <if test="condition != null and condition != ''">
+                and ((farmer.farmer_name like concat('%', #{condition,jdbcType=VARCHAR} , '%')))
+            </if>
+            <if test="farmerName != null and farmerName != ''">
+                and farmer.farmer_name = #{farmerName,jdbcType=VARCHAR}
+            </if>
+            <if test="provinceId != null and provinceId != ''">
+                and area.province_id = #{provinceId,jdbcType=VARCHAR}
+            </if>
+            <if test="cityId != null and cityId != ''">
+                and area.city_id = #{cityId,jdbcType=VARCHAR}
+            </if>
+            <if test="townId != null and townId != ''">
+                and area.town_id = #{townId,jdbcType=VARCHAR}
+            </if>
+            <if test="countyId != null and countyId != ''">
+                and area.county_id = #{countyId,jdbcType=VARCHAR}
+            </if>
+            <if test="villageId != null and villageId != ''">
+                and area.village_id = #{villageId,jdbcType=VARCHAR}
+            </if>
+            <if test="fkPovertyAreaId != null and fkPovertyAreaId != ''">
+                and farmer.fk_poverty_area_id = #{fkPovertyAreaId,jdbcType=VARCHAR}
+            </if>
+            <if test="queryFlag != null">
+                <choose>
+                    <when test="queryFlag == 1">
+                        and farmer.fk_collective_id != null and farmer.fk_collective_id != '#'
+                    </when>
+                </choose>
+            </if>
+        </where>
+        order by farmer.modified_time desc
+    </select>
+
     <insert id="batchInsert" parameterType="java.util.List">
         insert into t_farmer_info (<include refid="Base_Column_List"/>)
         values

carbon-back/carbon-back-service/src/main/resources/carbon/PovertyAreaMapper.xml

@@ -255,6 +255,20 @@
         </where>
         order by modified_time desc
     </select>
+    <select id="getPovertyAreaListByPage" parameterType="PovertyAreaForm"
+            resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from t_poverty_area
+        <where>
+            state = 1
+            <if test="povertyAreaName != null and povertyAreaName != ''">
+                and poverty_area_name like concat('%', #{povertyAreaName,jdbcType=VARCHAR}, '%')
+            </if>
+
+        </where>
+        order by modified_time desc
+    </select>
     <select id="getPovertyAreaAnalysis" parameterType="java.lang.String"
             resultType="PovertyAreaBO">
         SELECT

carbon-bank/carbon-bank-common/src/main/java/com/hcloud/microserver/system/bank/carbon/bo/TransactionOrderStatusQueryParam.java

@@ -1,5 +1,6 @@
 package com.hcloud.microserver.system.bank.carbon.bo;
 
+import com.hcloud.microserver.system.bank.carbon.form.TransactionOrderStatusQueryForm;
 import lombok.Data;
 
 /***
@@ -15,4 +16,14 @@ public class TransactionOrderStatusQueryParam {
     /**业务类型;必输，如行内转账的业务类型为：CL0005;6A;*/
     private String I1YWLX;
 
+    public TransactionOrderStatusQueryParam(){
+
+    }
+    public TransactionOrderStatusQueryParam(TransactionOrderStatusQueryForm form){
+        this.I1QYLS = form.getEntSerialNO();
+        this.I1TLSQ = form.getChaSerialNo();
+        this.I1YWLX = form.getBusinessType();
+
+    }
+
 }

carbon-bank/carbon-bank-common/src/main/java/com/hcloud/microserver/system/bank/carbon/entity/TransactionOrderStatusQueryEntity.java

@@ -1,5 +1,6 @@
 package com.hcloud.microserver.system.bank.carbon.entity;
 
+import com.hcloud.microserver.system.bank.carbon.bo.TransactionOrderStatusQueryResp;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -25,4 +26,16 @@ public class TransactionOrderStatusQueryEntity {
 
     @ApiModelProperty("序号")
     private String serialNo;
+
+    public TransactionOrderStatusQueryEntity(TransactionOrderStatusQueryResp resp) {
+        this.payStatus = resp.getO1JYZT();
+        this.payMsg = resp.getO1ZTMS();
+        this.payResponseCode = resp.getO1JYYD();
+        this.failReason = resp.getO1SBYY();
+        this.retCode = resp.getRetCode();
+        this.serialNo = resp.getSerialNo();
+    }
+
+    public TransactionOrderStatusQueryEntity() {
+    }
 }

carbon-bank/carbon-bank-common/src/main/java/com/hcloud/microserver/system/bank/carbon/form/BankUserAndParam.java

@@ -12,5 +12,11 @@ public class BankUserAndParam {
 
     private String serviceId;
 
+    private String serialNo;
+
+    private String sessionId;
+
+    private String reqTime;
+
 
 }

carbon-bank/carbon-bank-common/src/main/java/com/hcloud/microserver/system/bank/carbon/form/TransferTransactionInstructionForm.java

@@ -0,0 +1,47 @@
+package com.hcloud.microserver.system.bank.carbon.form;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+@ApiModel("查询支付单笔指令列表（转账交易指令查询）")
+public class TransferTransactionInstructionForm extends RequestTransferForm {
+
+    /**交易类型;必输域0：行内转账1：行外转账;1A;*/
+    @ApiModelProperty("交易类型;必输域0：行内转账1：行外转账")
+    private String I1JYLX;
+    /**付款账号;可选;19A;*/
+    @ApiModelProperty("付款账号")
+    private String I1FKAC;
+    /**收款账号;可选;19A;*/
+    @ApiModelProperty("收款账号")
+    private String I1SKAC;
+
+    /**指令状态;可选;1A;*/
+    @ApiModelProperty("指令状态")
+    private String I1STT;
+    /**起始日期;必输域;8P0;*/
+    @ApiModelProperty("起始日期")
+    private String I1STDT;
+    /**终止日期;必输域;8P0;*/
+    @ApiModelProperty("终止日期")
+    private String I1EDDT;
+    /**起始金额;可选;15P2;*/
+    @ApiModelProperty("起始金额")
+    private BigDecimal I1BGAT;
+    /**终止金额;可选;15P2;*/
+    @ApiModelProperty("终止金额")
+    private BigDecimal I1EDAT;
+    /**起始条数;可选;5P0;*/
+    @ApiModelProperty("起始条数")
+    private BigDecimal Num;
+    /**查询条数;可选(最大2000);4P0;*/
+    @ApiModelProperty("起始条数")
+    private BigDecimal QryNum;
+
+
+
+}

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

@@ -6,9 +6,11 @@ import com.hcloud.microserver.system.bank.carbon.bo.CurrentAccountDetailQueryPar
 import com.hcloud.microserver.system.bank.carbon.entity.CurrentAccountHistoricalBalanceQueryEntity;
 import com.hcloud.microserver.system.bank.carbon.entity.CurrentAccountQueryDetailEntity;
 import com.hcloud.microserver.system.bank.carbon.entity.CurrentAccountQueryEntity;
+import com.hcloud.microserver.system.bank.carbon.entity.TransactionOrderStatusQueryEntity;
 import com.hcloud.microserver.system.bank.carbon.form.BankCurrentAccountForm;
 import com.hcloud.microserver.system.bank.carbon.form.CurrentAccountDetailQueryForm;
 import com.hcloud.microserver.system.bank.carbon.form.CurrentAccountHistoricalBalanceQueryForm;
+import com.hcloud.microserver.system.bank.carbon.form.TransactionOrderStatusQueryForm;
 import com.hcloud.microserver.system.bank.service.BankTransferService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -45,4 +47,11 @@ public class BankTransferController extends BaseController {
         CurrentAccountHistoricalBalanceQueryEntity entity = bankTransferService.currentAccountHistorical(form);
         return responseResultSuccess(entity);
     }
+
+    @ApiOperation("交易指令状态查询")
+    @PostMapping("/42")
+    public ResponseBase<TransactionOrderStatusQueryEntity> getTransactionOrderStatus(@RequestBody TransactionOrderStatusQueryForm form){
+        TransactionOrderStatusQueryEntity entity = bankTransferService.transactionOrderStatus(form);
+        return responseResultSuccess(entity);
+    }
 }

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

@@ -3,6 +3,7 @@ package com.hcloud.microserver.system.bank.service;
 import com.hcloud.microserver.bank.mbg.modul.BTransferDetailRequest;
 import com.hcloud.microserver.bank.mbg.modul.BTransferFarmerRequest;
 import com.hcloud.microserver.system.bank.carbon.bo.*;
+import com.hcloud.microserver.system.bank.carbon.entity.TransactionOrderStatusQueryEntity;
 import com.hcloud.microserver.system.bank.carbon.form.BankUserAndParam;
 import com.hcloud.microserver.system.bank.carbon.form.RequestTransferForm;
 
@@ -67,6 +68,8 @@ public interface BankTransactionService {
      */
     public CurrentAccountHistoricalBalanceQueryResp currentAccountHistoricalBalance(BankQueryBaseParam<CurrentAccountHistoricalBalanceQueryParam> param);
 
+
+    public TransactionOrderStatusQueryResp transactionOrderStatus(BankQueryBaseParam<TransactionOrderStatusQueryParam> param);
     /**
      * 获取需要验证密码的请求参数
      * @param form

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

@@ -39,4 +39,6 @@ public interface BankTransferService {
      */
     public TransactionOrderStatusQueryEntity transactionOrderStatus(TransactionOrderStatusQueryForm form);
 
+
+
 }

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

@@ -9,6 +9,7 @@ import com.hcloud.microserver.commoncore.enums.ResultEnum;
 import com.hcloud.microserver.commoncore.exception.GlobalException;
 import com.hcloud.microserver.commoncore.util.string.StringUtils;
 import com.hcloud.microserver.system.bank.carbon.bo.*;
+import com.hcloud.microserver.system.bank.carbon.entity.TransactionOrderStatusQueryEntity;
 import com.hcloud.microserver.system.bank.carbon.form.BankUserAndParam;
 import com.hcloud.microserver.system.bank.carbon.form.RequestTransferForm;
 import com.hcloud.microserver.system.bank.service.BUserService;

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

@@ -70,7 +70,16 @@ public class BankTransferServiceImpl implements BankTransferService {
 
     @Override
     public TransactionOrderStatusQueryEntity transactionOrderStatus(TransactionOrderStatusQueryForm form) {
-        return null;
+        BankUserAndParam param = bankTransactionService.getBankQueryBaseParam(form.getType(), form.getGuid());
+        form.setBusinessType(param.getServiceId());
+        TransactionOrderStatusQueryParam statusQueryParam = new TransactionOrderStatusQueryParam(form);
+        param.setServiceId("CL0042");
+        BankQueryBaseParam paramParam = param.getParam();
+        paramParam.setData(statusQueryParam);
+        TransactionOrderStatusQueryResp resp = bankTransactionService.transactionOrderStatus(paramParam);
+        TransactionOrderStatusQueryEntity entity = new TransactionOrderStatusQueryEntity(resp);
+
+        return entity;
     }
 
 

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/h5/dao/SubscriptionApplyMapper.java

@@ -28,7 +28,7 @@ public interface SubscriptionApplyMapper
      * @param applyCustomerId 当前用户id
      * @return 碳汇认购申请集合
      */
-    public List<SubscriptionApply> selectSubscriptionApplyList(@Param("applyCustomerId") Long applyCustomerId);
+    public List<SubscriptionApply> selectSubscriptionApplyList(@Param("applyCustomerId") String applyCustomerId);
 
     /**
      * 新增碳汇认购申请

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/h5/service/impl/SubscriptionApplyServiceImpl.java

@@ -48,7 +48,8 @@ public class SubscriptionApplyServiceImpl implements ISubscriptionApplyService
     @Override
     public List<SubscriptionApply> selectSubscriptionApplyList()
     {   //当前用户id
-        Long applyCustomerId = SecurityUtils.getUserId()==null?1:SecurityUtils.getUserId();
+        CustomerInfoForm customerInfo = customerService.getCurrentMember();
+        String applyCustomerId = customerInfo.getGuid();
         return subscriptionApplyMapper.selectSubscriptionApplyList(applyCustomerId);
     }
 

carbon-h5/carbon-h5-service/src/main/resources/com/hcloud/microserver/h5/dao/SubscriptionApplyMapper.xml

@@ -22,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select guid, apply_customer_id, apply_custom_name, amount, remark, apply_status, record_status,order_guid,apply_date, create_time, modified_time from t_subscription_apply
     </sql>
 
-    <select id="selectSubscriptionApplyList" parameterType="LONG" resultMap="SubscriptionApplyResult">
+    <select id="selectSubscriptionApplyList" parameterType="String" resultMap="SubscriptionApplyResult">
         <include refid="selectSubscriptionApplyVo"/>
         <where>
             <if test="applyCustomerId != null "> and apply_customer_id = #{applyCustomerId}</if>