后台编辑

yujian

2020-05-21 1e1ae4f19489644c9ff35125d075a30f89536d16

后台编辑

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

@@ -427,10 +427,6 @@
            e.printStackTrace();
        }
    }

	

	
    

    @RequestMapping(value = "uploadTaoBaoWeiQuanOrder")
@@ -452,6 +448,26 @@
        }
    }
    
	 
	
    @RequestMapping(value = "countOrderInfo")
    public void countOrderInfo(String callback, Long uid, PrintWriter out) {
        // 自购已到账
        long selfNumEnd = hongBaoV2CountService.countMyDirectOrderByCashArrival(uid, Constant.VIP_ORDER_PAY, 1);
        // 分享已到账
        long shareNumEnd = hongBaoV2CountService.countMyDirectOrderByCashArrival(uid, Constant.VIP_ORDER_PAY, 2);
		
        // 自购未到账
        long selfNum = hongBaoV2CountService.countMyDirectOrderByCashNotArrival(uid, Constant.VIP_ORDER_PAY, 1);
        // 分享未到账
        long shareNum = hongBaoV2CountService.countMyDirectOrderByCashNotArrival(uid, Constant.VIP_ORDER_PAY, 2);
		
        JSONObject data = new JSONObject();
        data.put("selfNumEnd", selfNumEnd);
        data.put("shareNumEnd", shareNumEnd);
        data.put("selfNum", selfNum);
        data.put("description", shareNum);
        JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
    }
	

}

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

@@ -1299,7 +1299,14 @@
        if (activeTime == null) {

            activeTime = new Date(user.getCreatetime());

        }



		
        String inviteCode = "";

        if (!StringUtil.isNullOrEmpty(userInfoExtra.getInviteCode()))

            inviteCode = userInfoExtra.getInviteCode();

        if (!StringUtil.isNullOrEmpty(userInfoExtra.getInviteCodeVip()))

            inviteCode = userInfoExtra.getInviteCodeVip();

		
        data.put("inviteCode", inviteCode);

        data.put("weixin", StringUtil.isNullOrEmpty(weixin) ? "" : weixin);

        data.put("loginTime", TimeUtil.formatDate(activeTime));



@@ -1311,27 +1318,16 @@
            data.put("taobao", false);

        }



        UserVIPPreInfo userVIPPreInfo = userVIPPreInfoService.getLatestProcessInfo(fansId);

        if (userVIPPreInfo != null) {

            String levelName = null;

            Integer process = userVIPPreInfo.getProcess();

            if (process == UserVIPPreInfo.PROCESS_2) {

                levelName = "高级会员";

            } else if (process == UserVIPPreInfo.PROCESS_3) {

                levelName = "超级会员";

            } else if (process == UserVIPPreInfo.PROCESS_4) {

                levelName = "资深导师";

            }



            Integer sourceType = userVIPPreInfo.getSourceType();

            if (sourceType != null && levelName != null) {

                if (sourceType == UserVIPPreInfo.SOURCE_TYPE_ORDER) {

                    data.put("level", levelName += "(自购分享型)");

                } else if (sourceType == UserVIPPreInfo.SOURCE_TYPE_TEAM) {

                    data.put("level", levelName += "(邀请团队型)");

                }

            }

        // 当前等级

        UserLevelEnum level = null;

        UserVIPLevel vipLevel = userInviteService.getVIPLevelByUid(fansId);

        if (vipLevel != null && vipLevel.getLevel() != null) {

            level = UserLevelUtil.getByLevel(vipLevel.getLevel());

        }

        if (level == null) {

            level = UserLevelEnum.daRen;

        }

        data.put("level", UserLevelUtil.getShowLevel(level));



        // 粉丝统计

        long indirectNum = 0;


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

@@ -41,6 +41,7 @@
import com.yeshi.fanli.service.inter.money.extract.ExtractService;

import com.yeshi.fanli.service.inter.order.HongBaoV2Service;

import com.yeshi.fanli.service.inter.order.OrderMoneyDailyCountService;

import com.yeshi.fanli.service.inter.order.dividents.TeamDividentsSourceOrderUserMapService;

import com.yeshi.fanli.service.inter.user.PreviewInfoService;

import com.yeshi.fanli.service.inter.user.UserInfoExtraService;

import com.yeshi.fanli.service.inter.user.UserInfoService;

@@ -54,6 +55,7 @@
import com.yeshi.fanli.vo.money.MoneyStatisticVO;

import com.yeshi.fanli.vo.money.TeamPredictVO;

import com.yeshi.fanli.vo.order.OrderRankingVO;

import com.yeshi.fanli.vo.order.TeamDividentsVO;



import net.sf.json.JSONArray;

import net.sf.json.JSONObject;

@@ -97,6 +99,9 @@
    

    @Resource

    private PreviewInfoService previewInfoService;

	
    @Resource

    private TeamDividentsSourceOrderUserMapService teamDividentsSourceOrderUserMapService;

    



    private Gson getGson() {

@@ -736,6 +741,88 @@
    }



    

	
    /**

     *  分红详情

     * 
     * @param acceptData

     * @param uid

     * @param datetype   1-天 - 2月

     * @param out

     */

    @RequestMapping(value = "getTeamDividendDetail")

    public void getTeamDividendDetail(String callback, AcceptData acceptData, Integer page, Long uid, 
            String date, Integer datetype, String key, PrintWriter out) {

        if (uid == null || uid == 0) {

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("用户未登录"));

            return;

        }



        if (StringUtil.isNullOrEmpty(date) || datetype == null) {

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("参数不完整"));

            return;

        }

		
        if (page == null)

            page = 1;

        int pageSize = Constant.PAGE_SIZE;

		


        try {

            Date minDay = new Date();

            Date maxDay = new Date();

            if (datetype == 1) {

                minDay = TimeUtil.parseYYYYMMDD(date);

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

            } else if (datetype == 2) {

                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);

            if (list == null) {

                list = new ArrayList<>();

            }

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

			
            GsonBuilder builder = new GsonBuilder();

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

                @Override

                public JsonElement serialize(BigDecimal value, Type theType, JsonSerializationContext context) {

                    if (value == null) {

                        return new JsonPrimitive("0.000");

                    } else {

                        // 保留2位小数

                        value = value.setScale(3);

                        return new JsonPrimitive(value.toString());

                    }

                }

            });

 
            Gson gson = builder.create();

            JSONObject object = new JSONObject();



            if (page == 1) {

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

                if (teamDividentsVO == null) {

                    teamDividentsVO = new TeamDividentsVO();

                    teamDividentsVO.setSubsidy(BigDecimal.ZERO);

                    teamDividentsVO.setDividents(BigDecimal.ZERO);

                }

                object.put("subsidy", teamDividentsVO.getSubsidy().setScale(3).toString());

                object.put("dividents", teamDividentsVO.getDividents().setScale(3).toString());

            }

			
			
            object.put("count", count);

            object.put("list", gson.toJson(list));

            JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(object));

        } catch (Exception e) {

            e.printStackTrace();

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("查询失败"));

        }

    }



	
    /**

     * 订单统计-h5

     * 


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

@@ -802,13 +802,12 @@
     *    type 类型：0全部、1淘宝 2京东、拼多多

     * @param out

     */

    @RequestMapping(value = "teamOrderSearch", method = RequestMethod.POST)

    @RequestMapping(value = "teamOrderSearch")

    public void teamOrderSearch(String callback, AcceptData acceptData, Long uid, String key, PrintWriter out) {

        if (uid == null) {

            out.print(JsonUtil.loadFalseResult(1, "用户未登录"));

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(1, "用户未登录"));

            return;

        }

		
        

        List<TeamOrderVO> resultList = new ArrayList<>();

        if (StringUtil.isNullOrEmpty(key)) {

@@ -917,6 +916,14 @@
                                }

                            }

                        }

                        String orderTime = "下单" + teamVO.getDownTime() ;

                        if (!StringUtil.isNullOrEmpty(teamVO.getSettleTime())) {

                            orderTime += "\n收货" + teamVO.getSettleTime();

                        }

                        if (!StringUtil.isNullOrEmpty(teamVO.getServiceTime())) {

                            orderTime += "\n售后" + teamVO.getServiceTime();

                        }

                        teamVO.setOrderTime(orderTime);

                        map.put(mapKey, teamVO);

                    }

                    


 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2CountMapper.java

@@ -140,8 +140,17 @@
     * @param payment

     * @return

     */

    Long countMyDirectOrderByCashArrival(@Param("uid") Long uid, @Param("payment") BigDecimal payment);

    Long countMyDirectOrderByCashArrival(@Param("uid") Long uid, @Param("payment") BigDecimal payment,

             @Param("type")Integer type);

    

    /**

     *  注：1笔且付款总金额不小于 payment 元（退款为失效

     * @param uid

     * @param payment

     * @return

     */

    Long countMyDirectOrderByCashNotArrival(@Param("uid") Long uid, @Param("payment") BigDecimal payment,

             @Param("type")Integer type);

    

    

    /**


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

@@ -7,6 +7,7 @@

import com.yeshi.fanli.dao.BaseMapper;
import com.yeshi.fanli.entity.order.dividents.TeamDividentsSourceOrderUserMap;
import com.yeshi.fanli.vo.order.TeamDividentsVO;

public interface TeamDividentsSourceOrderUserMapMapper extends BaseMapper<TeamDividentsSourceOrderUserMap> {

@@ -78,4 +79,24 @@
    int invalidOrderBySourceUid(@Param("sourceUid") Long sourceUid, @Param("beiZhu") String beiZhu,
            @Param("stateList") List<Integer> stateList);

	
    /**
     * 查询每个订单补贴-分红
     * @param start
     * @param count
     * @param targetUid
     * @param minTime
     * @param maxTime
     * @return
     */
    List<TeamDividentsVO> listByDateAndTargetUid(@Param("start") long start, @Param("count") int count,
            @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);


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


}

 fanli/src/main/java/com/yeshi/fanli/mapping/hongbao/HongBaoV2CountMapper.xml

@@ -298,7 +298,23 @@
        SELECT COUNT(0)  FROM (SELECT co.`co_order_no` FROM yeshi_ec_hongbao_v2 v2

        LEFT JOIN yeshi_ec_hongbao_order h ON v2.`hb_id` = h.`ho_hongbao_id`

        LEFT JOIN yeshi_ec_common_order co ON h.`ho_order_id` = co.`co_id`

        WHERE v2.`hb_state` = 3 AND (v2.`hb_type` = 1 OR v2.`hb_type` = 20) 
        WHERE v2.`hb_state` = 3 
             <if test="type == 1">AND v2.`hb_type` = 1</if>

             <if test="type == 2">AND v2.`hb_type` = 20</if>

             <if test="type == null">AND (v2.`hb_type` = 1 OR v2.`hb_type` = 20)</if>

            AND v2.`hb_uid` = #{uid} AND   co.`co_payment` >=  #{payment} 
        GROUP BY co.`co_order_no`,co.`co_source_type`)A

    </select>

	
	
    <select id="countMyDirectOrderByCashNotArrival" resultType="Long">

        SELECT COUNT(0)  FROM (SELECT co.`co_order_no` FROM yeshi_ec_hongbao_v2 v2

        LEFT JOIN yeshi_ec_hongbao_order h ON v2.`hb_id` = h.`ho_hongbao_id`

        LEFT JOIN yeshi_ec_common_order co ON h.`ho_order_id` = co.`co_id`

        WHERE (v2.`hb_state` = 1 or v2.`hb_state` = 2)

             <if test="type == 1">AND v2.`hb_type` = 1</if>

             <if test="type == 2">AND v2.`hb_type` = 20</if>

             <if test="type == null">AND (v2.`hb_type` = 1 OR v2.`hb_type` = 20)</if>

            AND v2.`hb_uid` = #{uid} AND   co.`co_payment` >=  #{payment} 

        GROUP BY co.`co_order_no`,co.`co_source_type`)A

    </select>


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

@@ -26,6 +26,14 @@
        </association>

    </resultMap>
	
    <resultMap id="TeamDividentsVOMap" type="com.yeshi.fanli.vo.order.TeamDividentsVO">
        <result column="tdo_order_no" property="orderNo" jdbcType="VARCHAR" />
        <result column="tdo_source_type" property="sourceType"    jdbcType="INTEGER" />
        <result column="dividents" property="dividents" jdbcType="DECIMAL" />
        <result column="subsidy" property="subsidy" jdbcType="DECIMAL" />
    </resultMap>
	
    <sql id="Base_Column_List">sou_id,sou_source_order_id,sou_source_uid,sou_target_uid,sou_state,sou_type,sou_rate,sou_money,sou_pre_send_time,sou_create_time,sou_update_time,sou_beizhu,sou_send_time
    </sql>
    <select id="selectByPrimaryKey" resultMap="BaseResultMap"
@@ -186,4 +194,32 @@
        `yeshi_ec_team_dividents_source_order_user` o WHERE o.`sou_state`=2
        AND o.`sou_pre_send_time`=#{preSendTime}
    </select>
	
	
    <select id="listByDateAndTargetUid" resultMap="TeamDividentsVOMap">
        SELECT  t.`tdo_order_no`,t.`tdo_source_type`, SUM(IF(d.`sou_type` = 1, d.`sou_money`,0)) AS subsidy,
             SUM(IF(d.`sou_type` = 2, d.`sou_money`,0)) AS dividents  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}
        GROUP BY t.`tdo_order_no`,t.`tdo_source_type`
        ORDER BY t.`tdo_create_time` DESC
        LIMIT #{start},#{count}
    </select>
	
	
    <select id="countByDateAndTargetUid" resultType="Long">
        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}
        GROUP BY t.`tdo_order_no`,t.`tdo_source_type`)A
    </select>
	
    <select id="sumByDateAndTargetUid" resultMap="TeamDividentsVOMap">
        SELECT SUM(IF(d.`sou_type` = 1, d.`sou_money`,0)) AS subsidy, SUM(IF(d.`sou_type` = 2, d.`sou_money`,0)) AS dividents  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}
    </select>
</mapper>

 fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java

@@ -140,7 +140,7 @@
    

    @Override

    public long countMyDirectOrderByCashArrival(Long uid, BigDecimal payment) {

        Long count = hongBaoV2CountMapper.countMyDirectOrderByCashArrival(uid, payment);

        Long count = hongBaoV2CountMapper.countMyDirectOrderByCashArrival(uid, payment, null);

        if (count == null) {

            count = 0L;

        }

@@ -149,6 +149,24 @@
    

    

    @Override

    public long countMyDirectOrderByCashArrival(Long uid, BigDecimal payment, Integer type) {

        Long count = hongBaoV2CountMapper.countMyDirectOrderByCashArrival(uid, payment, type);

        if (count == null) {

            count = 0L;

        }

        return count;

    }

	
    @Override

    public long countMyDirectOrderByCashNotArrival(Long uid, BigDecimal payment, Integer type) {

        Long count = hongBaoV2CountMapper.countMyDirectOrderByCashNotArrival(uid, payment, type);

        if (count == null) {

            count = 0L;

        }

        return count;

    }

	
    @Override

    public BigDecimal getRewardMoneyToCount(Long uid, Integer dateType, Integer hbType, List<Integer> listSource) {

        BigDecimal money = hongBaoV2CountMapper.getRewardMoneyByDate(uid, dateType, hbType, null, null, null, null, null, listSource);

        if (money == null)


 fanli/src/main/java/com/yeshi/fanli/service/impl/money/extract/ExtractServiceImpl.java

@@ -622,7 +622,7 @@
        BigDecimal after = hongBaoMoney.subtract(extractMoney.add(weiqaunMoney).add(balance).add(compensateMoney));



        if (after.compareTo(new BigDecimal("0")) != 0)

            throw new ExtractException(2, "结算资金异常");

            throw new ExtractException(2, "结算资金异常：" + after);

    }



    @Override


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

@@ -15,6 +15,7 @@
import com.yeshi.fanli.exception.ParamsException;

import com.yeshi.fanli.service.inter.order.dividents.TeamDividentsSourceOrderUserMapService;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

import com.yeshi.fanli.vo.order.TeamDividentsVO;



@Service

public class TeamDividentsSourceOrderUserMapServiceImpl implements TeamDividentsSourceOrderUserMapService {

@@ -168,5 +169,22 @@
        return teamDividentsSourceOrderUserMapMapper.list(sourceOrderId, null, targetUid, null, null, null, 0, 10000);

    }

    

    @Override

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

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

    }

	
    @Override

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

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

        if (count == null) 
            count = 0L;

        return count;

    }

	
    @Override

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

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

    }

    

}


 fanli/src/main/java/com/yeshi/fanli/service/inter/count/HongBaoV2CountService.java

@@ -198,6 +198,17 @@
     */

    public long countMyDirectOrderByCashArrival(Long uid, BigDecimal payment);



    /**

     * 统计订单数量

     * @param uid

     * @param time 下单开始时间

     * @param payment 付款金额

     * @param type 订单类型  1自购 2分享

     * @return

     */

    public long countMyDirectOrderByCashArrival(Long uid, BigDecimal payment, Integer type);

	
	


    public BigDecimal geBonusByuid(Long uid, Integer dateType, Integer hbType, Integer moneyState);



@@ -224,6 +235,15 @@
     * @param uid

     * @return

     */

    public BigDecimal sumMoneyByANotSettleAndUid(Long uid);
    public BigDecimal sumMoneyByANotSettleAndUid(Long uid);



    /**

     * 统计未到账的数量

     * @param uid

     * @param payment

     * @param type

     * @return

     */

    public long countMyDirectOrderByCashNotArrival(Long uid, BigDecimal payment, Integer type);


}


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

@@ -6,6 +6,7 @@


import com.yeshi.fanli.entity.order.dividents.TeamDividentsSourceOrderUserMap;

import com.yeshi.fanli.exception.ParamsException;

import com.yeshi.fanli.vo.order.TeamDividentsVO;



/**

 * 分红源订单与参与分红用户的对应关系

@@ -160,4 +161,19 @@
     */

    public List<TeamDividentsSourceOrderUserMap> listBySourceOrderIdAndTargetUid(Long sourceOrderId, Long targetUid);



    /**

     * 统计每个订单补贴-分红

     * @param start

     * @param count

     * @param targetUid

     * @param minTime

     * @param maxTime

     * @return

     */

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



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



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



}


 fanli/src/main/java/com/yeshi/fanli/vo/order/TeamOrderVO.java

@@ -40,6 +40,8 @@
    @Expose

    private String serviceTime; // 售后时间

    @Expose

    private String orderTime; // 订单时间时间

    @Expose

    private BigDecimal divMoney; // 分红金额

    @Expose

    private Integer divState; // 分红状态

@@ -165,6 +167,14 @@
    public void setSourceName(String sourceName) {

        this.sourceName = sourceName;

    }



    public String getOrderTime() {

        return orderTime;

    }



    public void setOrderTime(String orderTime) {

        this.orderTime = orderTime;

    }

    

    

}