fanli/src/main/java/com/yeshi/fanli/controller/admin/OrderAdminController.java
@@ -10,13 +10,11 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.yeshi.utils.JsonUtil; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.yeshi.fanli.controller.admin.utils.AdminUtils; import com.yeshi.fanli.entity.admin.OrderAdmin; import com.yeshi.fanli.exception.order.CommonOrderException; import com.yeshi.fanli.service.inter.count.HongBaoV2CountService; import com.yeshi.fanli.service.inter.count.TaoBaoOrderCountService; fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderMapper.xml
@@ -95,17 +95,16 @@ <result column="userId" property="userId" jdbcType="VARCHAR" /> <result column="userName" property="userName" jdbcType="VARCHAR" /> <result column="userPortrait" property="userPortrait" jdbcType="VARCHAR" /> <result column="levelOneId" property="levelOneId" jdbcType="VARCHAR" /> <result column="levelOneMoney" property="levelOneMoney" jdbcType="VARCHAR" /> <result column="levelTwoId" property="levelTwoId" jdbcType="VARCHAR" /> <result column="levelTwoMoney" property="levelTwoMoney" jdbcType="VARCHAR" /> <result column="hb_id" property="hongbaoId" jdbcType="BIGINT" /> <result column="co_trade_id" property="tradeId" jdbcType="VARCHAR" /> <association property="userInfo" column="co_uid" resultMap="com.yeshi.fanli.dao.mybatis.UserInfoMapper.BaseResultMap" /> <association property="commonOrderGoods" column="co_order_goods_id" resultMap="com.yeshi.fanli.dao.mybatis.order.CommonOrderGoodsMapper.BaseResultMap" /> </resultMap> <sql id="Base_Column_List">co_id,co_uid,co_order_no,co_source_type,co_source_position,co_order_goods_id,co_count,co_state,co_state_whole_order,co_estimate,co_eIncome,co_payment,co_settlement,co_third_create_time,co_settle_time,co_order_by,co_create_time,co_update_time,co_trade_id </sql> @@ -612,9 +611,7 @@ </select> <select id="listQuery" resultMap="ResultMap"> SELECT A.*,u.id AS userId,u.`nick_name` AS userName,u.`portrait` AS userPortrait, pv2.`hb_uid` AS levelOneId,pv2.`hb_money` AS levelOneMoney, ppv2.`hb_uid` AS levelTwoId,ppv2.`hb_money` AS levelTwoMoney FROM (SELECT hb.hb_id,hb.hb_uid,hb.`hb_money` AS userPortrait FROM (SELECT hb.hb_id,hb.hb_uid,hb.`hb_money` AS totalMoney, hb.hb_state AS hongBaoState, hb.`hb_type` AS hongBaoType, hb.`hb_get_time` AS accountTime, hb.`hb_pre_get_time` AS preAccountTime, co.*,cog.* FROM yeshi_ec_hongbao_order ho LEFT JOIN @@ -638,9 +635,7 @@ <if test="keyType == 2 ">AND hb.hb_uid = ${key}</if> </if> ORDER BY co.co_third_create_time DESC LIMIT ${start},${count} ) A LEFT JOIN yeshi_ec_user u ON u.id = A.hb_uid LEFT JOIN yeshi_ec_hongbao_v2 pv2 ON pv2.`hb_pid` = A.hb_id LEFT JOIN yeshi_ec_hongbao_v2 ppv2 ON ppv2.`hb_pid` = pv2.hb_id JOIN yeshi_ec_user u ON u.id = A.hb_uid </select> <select id="countQuery" resultType="java.lang.Long"> SELECT count(ho.ho_id) FROM yeshi_ec_hongbao_order ho LEFT JOIN fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoV2ServiceImpl.java
@@ -1023,4 +1023,9 @@ else return money; } @Override public List<HongBaoV2> listChildrenById(Long id){ return hongBaoV2Mapper.listChildrenById(id); } } fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
@@ -32,6 +32,7 @@ import com.yeshi.fanli.service.inter.common.JumpDetailV2Service; import com.yeshi.fanli.service.inter.config.ConfigService; import com.yeshi.fanli.service.inter.config.SystemCouponService; import com.yeshi.fanli.service.inter.hongbao.HongBaoV2Service; import com.yeshi.fanli.service.inter.order.CommonOrderService; import com.yeshi.fanli.service.inter.user.UserSystemCouponRecordService; import com.yeshi.fanli.service.inter.user.UserSystemCouponService; @@ -74,6 +75,9 @@ @Resource private SystemCouponService systemCouponService; @Resource private HongBaoV2Service hongBaoV2Service; // 奖励订单图片 @@ -794,6 +798,29 @@ // 已失效 order.setHongBaoState(3); } List<HongBaoV2> listhb = hongBaoV2Service.listChildrenById(order.getHongbaoId()); if (listhb != null && listhb.size() > 0) { if (listhb.size() == 1) { UserInfo userInfo = listhb.get(0).getUserInfo(); if (userInfo != null) { order.setLevelOneId(userInfo.getId()+""); order.setLevelOneMoney(listhb.get(0).getMoney() + ""); } } else if (listhb.size() == 2) { UserInfo userInfo = listhb.get(0).getUserInfo(); if (userInfo != null) { order.setLevelOneId(userInfo.getId()+""); order.setLevelOneMoney(listhb.get(0).getMoney() + ""); } UserInfo userInfo2 = listhb.get(1).getUserInfo(); if (userInfo2 != null) { order.setLevelTwoId(userInfo2.getId()+""); order.setLevelTwoMoney(listhb.get(1).getMoney() + ""); } } } }
@@ -123,4 +123,11 @@ */ BigDecimal computeMoneyByUidAndState(Long uid,int state); /** * 查询子红包 * @param id * @return */ public List<HongBaoV2> listChildrenById(Long id); } fanli/src/main/java/com/yeshi/fanli/vo/order/CommonOrderVO.java
@@ -93,6 +93,9 @@ // 直接收益人-头像 private String userPortrait; // 头像 // 红包ID private Long hongbaoId; // 一级收益人-ID private String levelOneId; // 一级收益人-金额 @@ -340,4 +343,12 @@ this.couponMoney = couponMoney; } public Long getHongbaoId() { return hongbaoId; } public void setHongbaoId(Long hongbaoId) { this.hongbaoId = hongbaoId; } }
