gc-core/src/main/java/com/xzx/gc/model/admin/UserModel.java

@@ -86,6 +86,8 @@
    BigDecimal money;

    @ApiModelProperty("积分数")

    BigDecimal collectScore;

    @ApiModelProperty("推广人电话号码")

    String tgrPhone;



    @ApiModelProperty("1:已删除 0：未删除")

    String delFlag;


 gc-sys/src/main/java/com/xzx/gc/system/dto/AddSysBannerDto.java

@@ -14,6 +14,9 @@
    @ApiModelProperty("图片链接")
    private String picUrl;

    @ApiModelProperty("图片外链接")
    private String picPath;

    @ApiModelProperty("排序")
    private Integer sort;


 gc-sys/src/main/java/com/xzx/gc/system/dto/UpdateSysBannerDto.java

@@ -12,8 +12,8 @@
    @ApiModelProperty("图片名称")
    private String picName;

//    @ApiModelProperty("图片路径")
//    private String picPath;
    @ApiModelProperty("图片路径")
    private String picPath;

    @ApiModelProperty("图片链接")
    private String picUrl;

 gc-sys/src/main/java/com/xzx/gc/system/mapper/BannerMapper.java

@@ -51,7 +51,7 @@

    BannerInfo selectBannerById(@Param("id")Long id);

    void updateBannerById(@Param("sort")Integer sort, @Param("picUrl")String picUrl,
    void updateBannerById(@Param("sort")Integer sort, @Param("picPath")String picPath, @Param("picUrl")String picUrl,
                          @Param("picName")String picName, @Param("id")Long id);

    void delSysBannerById(@Param("id")long id);

 gc-sys/src/main/java/com/xzx/gc/system/service/BannerService.java

@@ -125,6 +125,7 @@
        bannerInfo.setDelFlag(0);

        bannerInfo.setPicName(model.getPicName());

        bannerInfo.setPicUrl(model.getPicUrl());

        bannerInfo.setPicPath(model.getPicPath());

        bannerInfo.setSort(model.getSort());

        bannerMapper.insertSelective(bannerInfo);

    }

@@ -138,12 +139,13 @@
        viewSysBannerVo.setId(bannerInfo.getId());

        viewSysBannerVo.setPicName(bannerInfo.getPicName());

        viewSysBannerVo.setPicUrl(bannerInfo.getPicUrl());

        viewSysBannerVo.setPicPath(bannerInfo.getPicPath());

        return viewSysBannerVo;

    }



    public void updateSysBanner(UpdateSysBannerDto model) {



        bannerMapper.updateBannerById(model.getSort(),model.getPicUrl(),model.getPicName(),model.getId());

        bannerMapper.updateBannerById(model.getSort(),model.getPicPath(),model.getPicUrl(),model.getPicName(),model.getId());

    }



    public void delSysBanner(DelSysBannerDto model) {


 gc-sys/src/main/java/com/xzx/gc/system/vo/ApiBannerListVo.java

@@ -17,4 +17,7 @@
    @ApiModelProperty("图片链接")
    private String picUrl;

    @ApiModelProperty("图片链接")
    private String picPath;

}

 gc-sys/src/main/java/com/xzx/gc/system/vo/SysBannerListVo.java

@@ -16,8 +16,8 @@
    @ApiModelProperty("图片名称")
    private String picName;

//    @ApiModelProperty("图片路径")
//    private String picPath;
    @ApiModelProperty("图片路径")
    private String picPath;

    @ApiModelProperty("图片链接")
    private String picUrl;

 gc-sys/src/main/java/com/xzx/gc/system/vo/ViewSysBannerVo.java

@@ -14,8 +14,8 @@
    @ApiModelProperty("图片名称")
    private String picName;

//    @ApiModelProperty("图片路径")
//    private String picPath;
    @ApiModelProperty("图片路径")
    private String picPath;

    @ApiModelProperty("图片链接")
    private String picUrl;

 gc-sys/src/main/resources/mapper/system/BannerMapper.xml

@@ -105,6 +105,7 @@
        update xzx_sys_banner

        set sort = #{sort},

            pic_name = #{picName},

            pic_path = #{picPath},

            pic_url = #{picUrl}

        where  id = #{id}

    </update>


 gc-user/src/main/java/com/xzx/gc/user/mapper/OrderMapper.java

@@ -66,5 +66,7 @@
    List<CategaryVo> selectListByOrderId(String orderId);

    List<CategaryVo> selectJHYListByOrderId(String orderId);

    String selectTGRMobileByPhone(@Param("mobilePhone")String mobilePhone);
}


 gc-user/src/main/java/com/xzx/gc/user/service/UserService.java

@@ -443,6 +443,12 @@
                    mx.setCollectScore(new BigDecimal(collectScore).setScale( 2, BigDecimal.ROUND_DOWN ));
                }

                String mobilePhone = mx.getMobilePhone();
                if(StrUtil.isNotEmpty(mobilePhone)){
                    String tgrPhone = orderMapper.selectTGRMobileByPhone(mobilePhone);
                    mx.setTgrPhone(StrUtil.isEmpty(tgrPhone) ? "-" : tgrPhone);
                }

            }

            //设置登录时间

 gc-user/src/main/resources/mapper/user/OrderMapper.xml

@@ -609,4 +609,15 @@
            xzx_jhy_order_items a
        WHERE  a.order_id = (select b.id from xzx_jhy_order b where b.order_no = #{orderId})
    </select>


    <select id="selectTGRMobileByPhone" resultType="java.lang.String">

        SELECT
            a.mobile_phone tgrPhone
        FROM
            xzx_user_share_info a
        WHERE  a.register_mobile_phone = #{mobilePhone}
    </select>

</mapper>

 gc-user/src/main/resources/mapper/user/UserMapper.xml

@@ -250,10 +250,11 @@
    </update>

    <select id="queryCuserDetail" resultType="java.util.HashMap">
        SELECT a.*, b.money,b.collect_score collectScore, b.withdraw_money, c.pay_type, SUM(c.money) as moneyx FROM xzx_user_info a
        SELECT e.mobile_phone tgrPhone,a.*, b.money,b.collect_score collectScore, b.withdraw_money, c.pay_type, SUM(c.money) as moneyx FROM xzx_user_info a
            LEFT JOIN xzx_account_info b ON a.user_id=b.user_id
            LEFT JOIN xzx_pay_info c ON b.account_id=c.account_id
            LEFT JOIN xzx_sys_config_info d ON c.pay_type=d.config_value AND d.config_type_code='PAY_TYPE'
            LEFT JOIN xzx_user_share_info e ON e.register_mobile_phone=a.mobile_phone
        WHERE a.mobile_phone=#{phone} AND a.user_type=#{userType} AND a.del_flag=0 GROUP BY c.pay_type
    </select>