feat:分销金额

nightFragrance-massage/src/main/java/com/ylx/massage/domain/TWxUser.java

@@ -118,6 +118,13 @@ public class TWxUser implements Serializable {
     @ApiModelProperty("分销码")
     private String cScanImg;
 
+    /**
+     * 分销收益
+     */
+    @TableField("distribution_amount")
+    @ApiModelProperty("分销金额")
+    private BigDecimal distributionAmount;
+
     /**
      * 推荐者信息（上级）id
      */

nightFragrance-massage/src/main/java/com/ylx/massage/domain/vo/TWxUserVo.java

@@ -57,6 +57,10 @@ public class TWxUserVo extends TAddress implements Serializable {
     @ApiModelProperty("消费金额")
     private BigDecimal dMoney;
 
+    @TableField("distribution_amount")
+    @ApiModelProperty("分销金额")
+    private BigDecimal distributionAmount;
+
     /**
      * 下单次数
      */

nightFragrance-massage/src/main/java/com/ylx/massage/service/impl/TOrderServiceImpl.java

@@ -557,6 +557,7 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
         jsUp.setdBalance(jsUp.getdBalance().add(up));
         // 更新总钱数
         jsUp.setdAllMoney(jsUp.getdAllMoney().add(up));
+        jsUp.setDistributionAmount(up);
         wxUserService.updateById(jsUp);
 
         //记录分销收益

nightFragrance-massage/src/main/resources/mapper/massage/TWxUserMapper.xml

@@ -3,33 +3,54 @@
 <mapper namespace="com.ylx.massage.mapper.TWxUserMapper">
 
     <resultMap type="TWxUserVo" id="TWxUserResult">
-        <result property="id"    column="id"    />
-        <result property="cOpenid"    column="c_openid"    />
-        <result property="cPhone"    column="c_phone"    />
-        <result property="cNickName"    column="c_nick_name"    />
-        <result property="dMoney"    column="d_money"    />
-        <result property="nNum"    column="n_num"    />
-        <result property="dBalance"    column="d_balance"    />
-        <result property="dAllMoney"    column="d_all_money"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="isDelete"    column="is_delete"    />
-        <result property="openid"    column="openid"    />
-        <result property="phone"    column="phone"    />
-        <result property="userName"    column="user_name"    />
-        <result property="atlasAdd"    column="atlas_add"    />
-        <result property="longitude"    column="longitude"    />
-        <result property="latitude"    column="latitude"    />
-        <result property="type"    column="type"    />
-        <result property="address"    column="address"    />
+        <result property="id" column="id"/>
+        <result property="cOpenid" column="c_openid"/>
+        <result property="cPhone" column="c_phone"/>
+        <result property="cNickName" column="c_nick_name"/>
+        <result property="dMoney" column="d_money"/>
+        <result property="nNum" column="n_num"/>
+        <result property="distributionAmount" column="distribution_amount"/>
+        <result property="dBalance" column="d_balance"/>
+        <result property="dAllMoney" column="d_all_money"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="isDelete" column="is_delete"/>
+        <result property="openid" column="openid"/>
+        <result property="phone" column="phone"/>
+        <result property="userName" column="user_name"/>
+        <result property="atlasAdd" column="atlas_add"/>
+        <result property="longitude" column="longitude"/>
+        <result property="latitude" column="latitude"/>
+        <result property="type" column="type"/>
+        <result property="address" column="address"/>
     </resultMap>
 
     <sql id="selectTWxUserVo">
-        select u.id, u.c_openid, u.c_icon, u.c_phone, u.c_unionid, u.c_nick_name, u.d_money, u.n_num, u.c_address_list, u.d_balance, u.d_all_money, u.c_scan_img, u.c_up_user, u.c_mr_address_id, u.create_time, u.update_time, u.is_delete,
-               a.openid, a.phone, a.user_name, a.atlas_add, a.type, a.address
-               FROM
-            t_wx_user u
-                LEFT JOIN (select * from t_address where is_delete = 0 and type = 1) a ON u.c_openid = a.openid
+        select u.id,
+               u.c_openid,
+               u.c_icon,
+               u.c_phone,
+               u.c_unionid,
+               u.c_nick_name,
+               u.d_money,
+               u.n_num,
+               u.c_address_list,
+               u.d_balance,
+               u.d_all_money,
+               u.c_scan_img,
+               u.c_up_user,
+               u.c_mr_address_id,
+               u.create_time,
+               u.update_time,
+               u.is_delete,
+               a.openid,
+               a.phone,
+               a.user_name,
+               a.atlas_add,
+               a.type,
+               a.address
+        FROM t_wx_user u
+                 LEFT JOIN (select * from t_address where is_delete = 0 and type = 1) a ON u.c_openid = a.openid
     </sql>
     <select id="selectTWxUserList" parameterType="TWxUser" resultMap="TWxUserResult">
         <include refid="selectTWxUserVo"/>
@@ -112,7 +133,9 @@
     </update>
 
     <delete id="deleteTWxUserById" parameterType="String">
-        delete from t_wx_user where id = #{id}
+        delete
+        from t_wx_user
+        where id = #{id}
     </delete>
 
     <delete id="deleteTWxUserByIds" parameterType="String">