余额相关改动

pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserAccountFlowMapper.java

@@ -35,7 +35,7 @@ public interface UserAccountFlowMapper extends BaseMapper<UserAccountFlow> {
             "\torder by id desc  limit #{pageSize}  offset  #{offset} ")
     List<UserMakerQuotaVO> selectByUserIdType(@Param("userId") Long userId, @Param("pageSize") Integer pageSize, @Param("offset") Integer offset);
     @Select("SELECT\n" +
-            "\tSUM( amount ) \n" +
+            "\t IFNULL(SUM( amount ),0)  \n" +
             "FROM\n" +
             "\ttb_pluss_user_account_flow \n" +
             "WHERE\n" +

pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserMakerQuotaMapper.java

@@ -14,10 +14,12 @@ import java.math.BigDecimal;
  */
 public interface UserMakerQuotaMapper extends BaseMapper<UserMakerQuota> {
     BigDecimal sumQuota(@Param("userId") Long userId);
-    @Update(value = "update tb_pluss_user_account set amount=amount+#{amount} where userId=#{userId}")
+    @Update(value = "update tb_pluss_user_maker_quota set amount=#{amount} where userId=#{userId}")
     Integer updateMakerFreeze(@Param("userId") Integer userId, @Param("amount") BigDecimal amount);
 
     @Select(value ="SELECT * FROM tb_pluss_user_maker_quota WHERE userId = #{userId}")
     UserMakerQuota selectByUserId(@Param("userId") Long userId);
+    @Select(value ="SELECT * FROM tb_pluss_user_maker_quota WHERE userId = #{userId}")
+    UserMakerQuota selectByUserId(@Param("userId") Integer userId);
 
 }

pluss-dao-bundle/src/main/resources/mapper/UserPromotionMapper.xml

@@ -38,7 +38,8 @@
         where user_id = #{userId}
     </select>
     <select id="selectByUserIdMC" resultType="cn.pluss.platform.entity.UserPromotion">
-        select *
+        select user_id AS userId,type_code AS typeCode,current_fee AS currentFee,parent_user_id AS parentUserId,
+               is_extend AS isExtend,create_time AS createTime,update_time AS updateTime
         from tb_pluss_user_promotion
         <where>
             user_id = #{userId}