Merge remote-tracking branch 'origin/div' into div

admin

2020-05-22 bbb7a538df960f2f47b0af8c3db03622fca08d99

Merge remote-tracking branch 'origin/div' into div

Conflicts:
	fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java

 fanli/src/main/java/com/yeshi/fanli/controller/admin/OrderAdminController.java

@@ -16,9 +16,6 @@
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.yeshi.utils.JsonUtil;

import com.google.gson.Gson;
import com.yeshi.fanli.controller.admin.utils.AdminUtils;
import com.yeshi.fanli.dto.ChartTDO;
import com.yeshi.fanli.dto.common.CategoryInfoDTO;
import com.yeshi.fanli.entity.bus.user.HongBaoV2;
import com.yeshi.fanli.entity.goods.CommonGoods;
@@ -56,7 +53,6 @@
import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;
import com.yeshi.fanli.vo.order.CommonOrderVO;

import net.sf.json.JSONArray;
import net.sf.json.JSONObject;

@Controller
@@ -465,7 +461,7 @@
        data.put("selfNumEnd", selfNumEnd);
        data.put("shareNumEnd", shareNumEnd);
        data.put("selfNum", selfNum);
        data.put("description", shareNum);
        data.put("shareNum", shareNum);
        JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
    }
    

 fanli/src/main/java/com/yeshi/fanli/controller/admin/UserInfoAdminController.java

@@ -34,6 +34,7 @@
import com.yeshi.fanli.entity.bus.user.UserExtraTaoBaoInfo;

import com.yeshi.fanli.entity.bus.user.UserInfo;

import com.yeshi.fanli.entity.bus.user.UserInfoExtra;

import com.yeshi.fanli.entity.bus.user.UserInviteValidNum;

import com.yeshi.fanli.entity.bus.user.UserRank;

import com.yeshi.fanli.entity.bus.user.vip.UserVIPInfo;

import com.yeshi.fanli.entity.common.AdminUser;

@@ -55,6 +56,7 @@
import com.yeshi.fanli.service.inter.user.UserRankService;

import com.yeshi.fanli.service.inter.user.integral.IntegralDetailService;

import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;

import com.yeshi.fanli.service.inter.user.invite.UserInviteValidNumService;

import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;

import com.yeshi.fanli.service.inter.user.vip.UserVIPInfoService;

import com.yeshi.fanli.tag.PageEntity;

@@ -113,7 +115,8 @@
    @Resource

    private IntegralDetailService integralDetailService;

    



    @Resource

    private UserInviteValidNumService userInviteValidNumService;

    

    /**

     * 查询用户信息列表 正常用户/异常用户

@@ -1274,7 +1277,6 @@
                    continue;

                }

                

				
                UserInfo user = userInfoService.selectByPKey(userInfo.getId());

                if (user != null) {

                    detail.setUserInfo(user);

@@ -1282,10 +1284,8 @@
            }



            long count = userMoneyDetailService.countQuery(key, keyType);



            int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);

            PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);



            

            GsonBuilder gsonBuilder = new GsonBuilder().setDateFormat("yyyy-MM-dd HH:mm:ss");

            gsonBuilder.registerTypeAdapter(UserMoneyDetailTypeEnum.class, new JsonSerializer<UserMoneyDetailTypeEnum>() {

@@ -1299,7 +1299,6 @@
                }

            });

            Gson gson = gsonBuilder.create();

			 
            

            JSONObject data = new JSONObject();

            data.put("pe", pe);

@@ -1310,4 +1309,32 @@
            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("查询失败"));

        }

    }

	
	
	
    /**

     *  用户粉丝统计

     * 
     * @param callback

     * @param pageIndex

     * @param pageSize

     * @param id

     * @param out

     */

    @RequestMapping(value = "countTeamFans")

    public void countTeamFans(String callback, Long uid, PrintWriter out) {

        int doneFirst = 0;

        int doneSecond = 0;

        UserInviteValidNum userInviteValidNum = userInviteValidNumService.selectByPrimaryKey(uid);

        if (userInviteValidNum != null) {

            doneFirst = userInviteValidNum.getNumFirst() == null ? 0 : userInviteValidNum.getNumFirst();

            doneSecond = userInviteValidNum.getNumSecond() == null ? 0 : userInviteValidNum.getNumSecond();

        }

        JSONObject data = new JSONObject();

        data.put("doneFirst", doneFirst); 
        data.put("doneSecond", doneSecond); 
        JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));

    }



			
}


 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java

@@ -1251,7 +1251,9 @@
                if (!StringUtil.isNullOrEmpty(special.getPicture())) {
                    imgs.add(special.getPicture());
                }
                title=special.getName();

                title = special.getName();

                desc = special.getRemark();
                startTime = special.getStartTime();
                endTime = special.getEndTime();
@@ -1266,8 +1268,9 @@
                if (!StringUtil.isNullOrEmpty(swiper.getSrc())) {
                    imgs.add(swiper.getSrc());
                }
                title=swiper.getTitle();
                desc = swiper.getRemark();

                title = swiper.getTitle();
                desc = swiper.getDesc();
                startTime = swiper.getStartTime();
                endTime = swiper.getEndTime();
            }

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserMoneyControllerV2.java

@@ -778,11 +778,11 @@
                minDay = TimeUtil.parseYYYYMMDD(DateUtil.getFirstDayOfMonth(date));

                maxDay = TimeUtil.parseYYYYMMDD_HHMMSS(DateUtil.getLastDayOfMonth(date) + " 23:59:59");

            }

            List<TeamDividentsVO> list = teamDividentsSourceOrderUserMapService.listByDateAndTargetUid((page-1) * pageSize, pageSize, uid, minDay, maxDay);

            List<TeamDividentsVO> list = teamDividentsSourceOrderUserMapService.listByDateAndTargetUid((page-1) * pageSize, pageSize, uid, minDay, maxDay, key);

            if (list == null) {

                list = new ArrayList<>();

            }

            long count = teamDividentsSourceOrderUserMapService.countByDateAndTargetUid(uid, minDay, maxDay);

            long count = teamDividentsSourceOrderUserMapService.countByDateAndTargetUid(uid, minDay, maxDay, key);

            

            GsonBuilder builder = new GsonBuilder();

            builder.registerTypeAdapter(BigDecimal.class, new JsonSerializer<BigDecimal>() {

@@ -802,7 +802,7 @@
            JSONObject object = new JSONObject();



            if (page == 1) {

                TeamDividentsVO teamDividentsVO = teamDividentsSourceOrderUserMapService.sumByDateAndTargetUid(uid, minDay, maxDay);

                TeamDividentsVO teamDividentsVO = teamDividentsSourceOrderUserMapService.sumByDateAndTargetUid(uid, minDay, maxDay, key);

                if (teamDividentsVO == null) {

                    teamDividentsVO = new TeamDividentsVO();

                    teamDividentsVO.setSubsidy(BigDecimal.ZERO);


 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/dividents/TeamDividentsSourceOrderUserMapMapper.java

@@ -90,13 +90,16 @@
     * @return
     */
    List<TeamDividentsVO> listByDateAndTargetUid(@Param("start") long start, @Param("count") int count,
            @Param("targetUid") Long targetUid, @Param("minTime") Date minTime, @Param("maxTime") Date maxTime);
            @Param("targetUid") Long targetUid, @Param("minTime") Date minTime,
            @Param("maxTime") Date maxTime, @Param("key")String key);
    
    
    Long countByDateAndTargetUid(@Param("targetUid") Long targetUid, @Param("minTime") Date minTime, @Param("maxTime") Date maxTime);
    Long countByDateAndTargetUid(@Param("targetUid") Long targetUid, @Param("minTime") Date minTime, 
            @Param("maxTime") Date maxTime, @Param("key")String key);


    TeamDividentsVO sumByDateAndTargetUid(@Param("targetUid") Long targetUid, @Param("minTime") Date minTime, @Param("maxTime") Date maxTime);
    TeamDividentsVO sumByDateAndTargetUid(@Param("targetUid") Long targetUid, @Param("minTime") Date minTime,
            @Param("maxTime") Date maxTime , @Param("key")String key);


}

 fanli/src/main/java/com/yeshi/fanli/mapping/homemodule/SwiperPictureMapper.xml

@@ -21,8 +21,10 @@
        <result column="pic_updatetime" property="updatetime" jdbcType="TIMESTAMP" />
        <result column="pic_title" property="title" jdbcType="VARCHAR" />
        <result column="pic_desc" property="desc" jdbcType="VARCHAR" />
			
        <association property="jumpDetail" column="pic_jumpid"
            resultMap="com.yeshi.fanli.dao.mybatis.common.JumpDetailV2Mapper.BaseResultMap" />
            select="com.yeshi.fanli.dao.mybatis.common.JumpDetailV2Mapper.selectByPrimaryKey">
        </association>

    </resultMap>
    <sql id="Base_Column_List">pic_id,pic_banner_id,pic_src,pic_jumpid,pic_params,pic_jump_need_login,pic_order,pic_remark,pic_state,pic_auto_control,pic_start_time,pic_end_time,pic_createtime,pic_updatetime,pic_title,pic_desc
@@ -124,10 +126,9 @@
        </set>
        where pic_id = #{id,jdbcType=BIGINT}
    </update>
    <select id="queryByBannerID" resultMap="BaseResultMap">SELECT * FROM
        yeshi_ec_swiper_banner_picture p LEFT JOIN
        `yeshi_ec_action_jumpdetail_v2` j ON j.`jp_id` = p.`pic_jumpid` WHERE
        pic_banner_id = #{bannerId} ORDER BY pic_order LIMIT ${start},${count}
    <select id="queryByBannerID" resultMap="BaseResultMap">
        SELECT * FROM yeshi_ec_swiper_banner_picture p
         WHERE    pic_banner_id = #{bannerId} ORDER BY pic_order LIMIT ${start},${count}
    </select>
    <select id="countQueryByBannerID" resultType="java.lang.Long">SELECT
        IFNULL(count(pic_id),0) FROM yeshi_ec_swiper_banner_picture WHERE
@@ -175,16 +176,14 @@
    <select id="getByBannerCard" resultMap="BaseResultMap">SELECT
        * FROM `yeshi_ec_swiper_banner` w LEFT JOIN
        `yeshi_ec_swiper_banner_picture` p ON p.`pic_banner_id` = w.`sp_id`
        LEFT JOIN `yeshi_ec_action_jumpdetail_v2` j ON j.`jp_id` =
        p.`pic_jumpid` WHERE w.`sp_card` = #{card} AND w.`sp_state` = 0 AND
        WHERE w.`sp_card` = #{card} AND w.`sp_state` = 0 AND
        p.`pic_state`= 0<![CDATA[AND IF(p.`pic_auto_control` = 1, p.`pic_start_time` <= NOW() AND p.`pic_end_time` >= NOW(),TRUE)]]>
        ORDER BY p.`pic_order`
    </select>
    <select id="getByBannerId" resultMap="BaseResultMap">SELECT
        * FROM `yeshi_ec_swiper_banner` w LEFT JOIN
        `yeshi_ec_swiper_banner_picture` p ON p.`pic_banner_id` = w.`sp_id`
        LEFT JOIN `yeshi_ec_action_jumpdetail_v2` j ON j.`jp_id` =
        p.`pic_jumpid` WHERE w.`sp_id` = #{bannerId} AND w.`sp_state` = 0 AND
        WHERE w.`sp_id` = #{bannerId} AND w.`sp_state` = 0 AND
        p.`pic_state`= 0<![CDATA[AND IF(p.`pic_auto_control` = 1, p.`pic_start_time` <= NOW() AND p.`pic_end_time` >= NOW(),TRUE)]]>
        ORDER BY p.`pic_order`
    </select>

 fanli/src/main/java/com/yeshi/fanli/mapping/order/dividents/TeamDividentsSourceOrderUserMapMapper.xml

@@ -202,6 +202,9 @@
        LEFT JOIN yeshi_ec_team_dividents_source_order t ON d.`sou_source_order_id` = t.`tdo_id`
        WHERE d.`sou_target_uid` = #{targetUid} AND t.`tdo_create_time` >= #{minTime}
          AND t.`tdo_create_time` <![CDATA[<=]]>#{maxTime}
          <if test = "key != null and key != ''">
              AND (t.`tdo_order_no` = #{key} OR d.`sou_source_uid` = #{key})
          </if>
        GROUP BY t.`tdo_order_no`,t.`tdo_source_type`
        ORDER BY t.`tdo_create_time` DESC
        LIMIT #{start},#{count}
@@ -212,7 +215,10 @@
        SELECT COUNT(A.sou_id) FROM (SELECT d.`sou_id` FROM  yeshi_ec_team_dividents_source_order_user d
        LEFT JOIN yeshi_ec_team_dividents_source_order t ON d.`sou_source_order_id` = t.`tdo_id`
        WHERE d.`sou_target_uid` = #{targetUid} AND t.`tdo_create_time` >= #{minTime}
          AND t.`tdo_create_time` <![CDATA[<=]]>#{maxTime}
          AND t.`tdo_create_time` <![CDATA[<=]]>#{maxTime} 
          <if test = "key != null and key != ''">
              AND (t.`tdo_order_no` = #{key} OR d.`sou_source_uid` = #{key})
          </if>
        GROUP BY t.`tdo_order_no`,t.`tdo_source_type`)A
    </select>
    
@@ -221,5 +227,8 @@
        LEFT JOIN yeshi_ec_team_dividents_source_order t ON d.`sou_source_order_id` = t.`tdo_id`
        WHERE d.`sou_target_uid` = #{targetUid} AND t.`tdo_create_time` >= #{minTime}
          AND t.`tdo_create_time` <![CDATA[<=]]>#{maxTime}
          <if test = "key != null and key != ''">
              AND (t.`tdo_order_no` = #{key} OR d.`sou_source_uid` = #{key})
          </if>
    </select>
</mapper>

 fanli/src/main/java/com/yeshi/fanli/service/impl/order/dividents/TeamDividentsSourceOrderUserMapServiceImpl.java

@@ -170,21 +170,21 @@
    }

    

    @Override

    public List<TeamDividentsVO> listByDateAndTargetUid(long start, int count, Long targetUid,Date minTime,Date maxTime) {

        return teamDividentsSourceOrderUserMapMapper.listByDateAndTargetUid(start, count, targetUid, minTime, maxTime);

    public List<TeamDividentsVO> listByDateAndTargetUid(long start, int count, Long targetUid,Date minTime,Date maxTime, String key) {

        return teamDividentsSourceOrderUserMapMapper.listByDateAndTargetUid(start, count, targetUid, minTime, maxTime, key);

    }

    

    @Override

    public long countByDateAndTargetUid(Long targetUid,Date minTime,Date maxTime) {

        Long count = teamDividentsSourceOrderUserMapMapper.countByDateAndTargetUid(targetUid, minTime, maxTime);

    public long countByDateAndTargetUid(Long targetUid,Date minTime,Date maxTime, String key) {

        Long count = teamDividentsSourceOrderUserMapMapper.countByDateAndTargetUid(targetUid, minTime, maxTime, key);

        if (count == null) 

            count = 0L;

        return count;

    }

    

    @Override

    public TeamDividentsVO sumByDateAndTargetUid(Long targetUid,Date minTime,Date maxTime) {

        return teamDividentsSourceOrderUserMapMapper.sumByDateAndTargetUid(targetUid, minTime, maxTime);

    public TeamDividentsVO sumByDateAndTargetUid(Long targetUid,Date minTime,Date maxTime, String key) {

        return teamDividentsSourceOrderUserMapMapper.sumByDateAndTargetUid(targetUid, minTime, maxTime, key);

    }

    

}


 fanli/src/main/java/com/yeshi/fanli/service/inter/order/dividents/TeamDividentsSourceOrderUserMapService.java

@@ -170,10 +170,10 @@
     * @param maxTime

     * @return

     */

    public List<TeamDividentsVO> listByDateAndTargetUid(long start, int count, Long targetUid, Date minTime, Date maxTime);

    public List<TeamDividentsVO> listByDateAndTargetUid(long start, int count, Long targetUid, Date minTime, Date maxTime, String key);



    public long countByDateAndTargetUid(Long targetUid, Date minTime, Date maxTime);

    public long countByDateAndTargetUid(Long targetUid, Date minTime, Date maxTime, String key);



    public TeamDividentsVO sumByDateAndTargetUid(Long targetUid, Date minTime, Date maxTime);

    public TeamDividentsVO sumByDateAndTargetUid(Long targetUid, Date minTime, Date maxTime, String key);



}


 fanli/src/main/resource/env-dev/mongo.properties

@@ -1,13 +1,13 @@
mongo.dbname=flq

mongo.port=27016

mongo.port=27017

#开发环境

#mongo.host=192.168.1.253

#mongo.username=admin

#mongo.password=123456

mongo.host=192.168.1.253

mongo.username=admin

mongo.password=123456



mongo.host=193.112.35.168

mongo.username=yeshi

mongo.password=Yeshi2016@

#mongo.host=193.112.35.168

#mongo.username=yeshi

#mongo.password=Yeshi2016@



mongo.connectionsPerHost=8

mongo.threadsAllowedToBlockForConnectionMultiplier=4


 fanli/src/test/java/org/fanli/MyBatisProduce.java

@@ -4,7 +4,7 @@
import org.yeshi.utils.mybatis.ColumnParseUtil;

import org.yeshi.utils.mybatis.MyBatisMapperUtil;



import com.yeshi.fanli.entity.bus.user.vip.UserVIPPreInfo;

import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture;

import com.yeshi.fanli.entity.money.TeamEincomeRecord;



//@Ignore

@@ -17,8 +17,8 @@


    @Test

    public void test1() {

        ColumnParseUtil.parseColumn(UserVIPPreInfo.class,

                "D:/workspace/fanli/fanli-server/fanli/src/main/java/com/yeshi/fanli/mapping/user/vip/UserVIPPreInfoMapper.xml");

        ColumnParseUtil.parseColumn(SwiperPicture.class,

                "D:/workspace/fanli/fanli-server/fanli/src/main/java/com/yeshi/fanli/mapping/homemodule/SwiperPictureMapper.xml");

    }



}


 fanli/src/test/java/org/fanli/TaoKeTest.java

@@ -86,10 +86,14 @@
        // e.printStackTrace();

        // }



        List<TaoBaoOrder> list = TaoKeOrderApiUtil.getTaoBaoRelationOrderList(

                TimeUtil.convertToTimeTemp("2019-12-09 10:13:52", "yyyy-MM-dd HH:mm:ss"),

                TimeUtil.convertToTimeTemp("2019-12-09 10:14:53", "yyyy-MM-dd HH:mm:ss"), 1);

        System.out.println(list);

//        List<TaoBaoOrder> list = TaoKeOrderApiUtil.getTaoBaoRelationOrderList(

//                TimeUtil.convertToTimeTemp("2019-12-09 10:13:52", "yyyy-MM-dd HH:mm:ss"),

//                TimeUtil.convertToTimeTemp("2019-12-09 10:14:53", "yyyy-MM-dd HH:mm:ss"), 1);

//        System.out.println(list);

		
         String result = TaoKeApiUtil.officialActivityConvert("19507100253",

                 "1571715733668", "20211660").getShort_click_url();

         System.out.println(result);

    }



    @Test