修改更新申请状态为完成

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/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/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/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/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);
     }
 
     /**