Merge remote-tracking branch 'origin/master'

wisenergy-mapper/src/main/java/cn/wisenergy/mapper/AccountMapper.java

@@ -52,4 +52,11 @@ public interface AccountMapper extends BaseMapper<AccountInfo> {
      * @return 账户信息
      */
     AccountInfo getByUserIdAndTime(@Param("userId") String userId, @Param("yearMonth") String yearMonth);
+
+    /**
+     * 修改用户的当月收益个累计收益
+     * @param accountInfo
+     * @return
+     */
+    int updateEarningsMonthAndEarningsTotalByid(AccountInfo accountInfo);
 }

wisenergy-mapper/src/main/java/cn/wisenergy/mapper/OrderMapper.java

@@ -56,4 +56,6 @@ public interface OrderMapper extends BaseMapper<OrderInfo> {
      * @return 订单列表
      */
     List<OrderInfo> getByCreateTime(@Param("created") Date created);
+
+    List<OrderInfo> getByLevelStatus(int levelStatus);
 }

wisenergy-mapper/src/main/resources/mapper/AccountInfoMapper.xml

@@ -103,4 +103,15 @@
         </where>
     </select>
 
+    <update id="updateEarningsMonthAndEarningsTotalByid" parameterType="cn.wisenergy.model.app.AccountInfo">
+        UPDATE
+        <include refid="table"/>
+        <set>
+            <include refid="updateCondition"/>
+        </set>
+        <where>
+            id = #{id}
+        </where>
+    </update>
+
 </mapper>
\ No newline at end of file

wisenergy-mapper/src/main/resources/mapper/OrderMapper.xml

@@ -17,6 +17,7 @@
         <result column="success_time" property="successTime"/>
         <result column="payment" property="payment"/>
         <result column="rebate_status" property="rebateStatus"/>
+        <result column="level_status" property="levelStatus"/>
         <result column="month_order_status" property="monthOrderStatus"/>
         <result column="monthly_task_status" property="monthlyTaskStatus"/>
         <result column="create_time" property="createTime"/>
@@ -34,13 +35,13 @@
 
     <sql id="cols_exclude_id">
         buyer_id,item_id,pay_type,youzan_update_time,tid,created,team_type,pay_time,pay_type_str,close_type,refund_state,
-        success_time,payment,rebate_status,month_order_status,monthly_task_status,create_time,update_time
+        success_time,payment,rebate_status,level_status,month_order_status,monthly_task_status,create_time,update_time
     </sql>
 
     <sql id="vals">
         #{buyerId},#{itemId},#{payType},#{youzanUpdateTime}, #{tid},#{created},#{teamType},#{payTime},#{payTypeStr},
         #{closeType},#{refundState},#{successTime},#{payment},
-        #{rebateStatus},#{monthOrderStatus},#{monthlyTaskStatus},now(),now()
+        #{rebateStatus},#{levelStatus},#{monthOrderStatus},#{monthlyTaskStatus},now(),now()
     </sql>
 
     <sql id="updateCondition">
@@ -58,6 +59,7 @@
         <if test="successTime != null">success_time =#{successTime},</if>
         <if test="payment != null">payment =#{payment},</if>
         <if test="rebateStatus != null">rebate_status =#{rebateStatus},</if>
+        <if test="levelStatus != null">level_status =#{levelStatus},</if>
         <if test="monthOrderStatus != null">month_order_status =#{monthOrderStatus},</if>
         <if test="monthlyTaskStatus != null">monthly_task_status =#{monthlyTaskStatus},</if>
         update_time =now()
@@ -79,6 +81,7 @@
         <if test="successTime != null">and success_time =#{successTime}</if>
         <if test="payment != null">and payment =#{payment}</if>
         <if test="rebateStatus != null">and rebate_status =#{rebateStatus}</if>
+        <if test="levelStatus != null">and level_status =#{levelStatus}</if>
         <if test="monthOrderStatus != null">and month_order_status =#{monthOrderStatus}</if>
         <if test="monthlyTaskStatus != null">and monthly_task_status =#{monthlyTaskStatus}</if>
         <if test="createTime != null">and create_time &gt;= #{createTime}</if>
@@ -153,4 +156,14 @@
         </where>
     </select>
 
+    <select id="getByLevelStatus" resultType="cn.wisenergy.model.app.OrderInfo">
+        SELECT
+        <include refid="cols_all"/>
+        from
+        <include refid="table"/>
+        <where>
+            level_status=#{levelStatus}
+        </where>
+    </select>
+
 </mapper>
\ No newline at end of file

wisenergy-mapper/src/main/resources/mapper/UsersMapper.xml

@@ -108,9 +108,10 @@
 
     <select id="getByUserId" resultType="cn.wisenergy.model.app.User" parameterType="string">
         select
-        <include refid="cols_all"/>
+        id,user_id,password,head_image,user_level,cross_border_line,id_card_number,fans_nickname,fans_id, invite_code,
+        be_invited_code,create_time,update_time
         from
-        <include refid="table"/>
+        user_info
         <where>
             user_id=#{userId}
         </where>

wisenergy-model/src/main/java/cn/wisenergy/model/app/OrderInfo.java

@@ -110,6 +110,12 @@ public class OrderInfo {
     @ApiModelProperty(name = "rebateStatus", value = "返佣状态")
     private Integer rebateStatus;
 
+    /**
+     * 升级状态  0:该笔订单已做升级处理 1: 该笔订单未做升级处理
+     */
+    @ApiModelProperty(name = "levelStatus",value = "升级状态")
+    private Integer levelStatus;
+
     /**
      * 当月订单处理状态  0: 未处理  1：处理
      */

wisenergy-model/src/main/java/cn/wisenergy/model/app/User.java

@@ -100,4 +100,12 @@ public class User extends Model<User> implements Serializable{
      */
     @ApiModelProperty(name = "updateTime", value = "修改时间")
     private Date updateTime;
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
 }

wisenergy-service/src/main/java/cn/wisenergy/service/app/UserLevelService.java

@@ -2,4 +2,5 @@ package cn.wisenergy.service.app;
 
 public interface UserLevelService {
     void userLevelUpgrade(String userId);
+    void userLevelUp();
 }

wisenergy-web-admin/src/main/java/cn/wisenergy/web/config/ShiroConfig.java

@@ -75,6 +75,7 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/webSocket/**", "anon");//socket
         filterChainDefinitionMap.put("/message/**", "anon");//消息推送接口
         filterChainDefinitionMap.put("/**", "oauth2");  // 其他路径均需要身份认证，一般位于最下面，优先级最低
+        filterChainDefinitionMap.put("/userlevel/test","anon");
 
         // 设置拦截器
         shiroFilterFactoryBean.setFilterChainDefinitionMap(filterChainDefinitionMap);