修改当前客户获取方式

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>