活动红包规则添加

admin

2019-01-29 8269e7b56dace572d0abf328bebad6cabaed069e

活动红包规则添加

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/ShareGoodsActivityOrderMapper.java

@@ -25,4 +25,12 @@
     * @return
     */
    List<ShareGoodsActivityOrder> listByOrderIdAndUid(@Param("uid") Long uid, @Param("orderId") Long orderId);
	
	
    /**
     * 根据用户查询
     * @param uid
     * @return
     */
    List<ShareGoodsActivityOrder> listByUid(@Param("uid") Long uid);
}

 fanli/src/main/java/com/yeshi/fanli/mapping/order/ShareGoodsActivityOrderMapper.xml

@@ -50,6 +50,13 @@
    </select>


    <select id="listByUid" resultMap="BaseResultMap" parameterType="java.lang.Long">
        select
        <include refid="Base_Column_List" />
        from yeshi_ec_share_goods_activity_order where sgao_uid =#{uid}
    </select>




    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from

 fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoV2ServiceImpl.java

@@ -31,26 +31,31 @@
import com.yeshi.fanli.entity.bus.msg.MsgOrderDetail;

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

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

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

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

import com.yeshi.fanli.entity.order.CommonOrder;

import com.yeshi.fanli.entity.order.CommonOrderGoods;

import com.yeshi.fanli.entity.order.HongBaoOrder;

import com.yeshi.fanli.entity.order.ShareGoodsActivityOrder;

import com.yeshi.fanli.entity.taobao.PidOrder;

import com.yeshi.fanli.entity.taobao.TaoBaoOrder;

import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;

import com.yeshi.fanli.exception.HongBaoException;

import com.yeshi.fanli.exception.share.UserShareGoodsRecordException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;

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

import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;

import com.yeshi.fanli.service.inter.msg.UserOrderMsgNotificationService;

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

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

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

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

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

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;



@@ -107,6 +112,12 @@


    @Resource

    private UserOrderMsgNotificationService userOrderMsgNotificationService;



    @Resource

    private ConfigService configService;



    @Resource

    private ShareGoodsActivityOrderService shareGoodsActivityOrderService;



    @Override

    public int insert(HongBaoV2 record) {

@@ -577,7 +588,16 @@
                }



        } else if (type == HongBaoV2.TYPE_SHARE_GOODS) {

            BigDecimal fanliRate = hongBaoManageService.getFanLiRate(commonOrder.getCreateTime().getTime());

            BigDecimal fanliRate = hongBaoManageService.getShareRate(commonOrder.getCreateTime().getTime());

            Order order = orderMapper.selectOrderByOrderId(commonOrder.getOrderNo());

            if (order != null) {

                List<ShareGoodsActivityOrder> list = shareGoodsActivityOrderService

                        .listByOrderIdAndUid(commonOrder.getUserInfo().getId(), order.getId());

                if (list != null && list.size() > 0) {

                    fanliRate = list.get(0).getShareRate();

                }

            }



            HongBaoV2 hongBao = new HongBaoV2(hongBaoOrder.getHongBaoV2().getId());

            hongBao.setUpdateTime(new Date());

            // 更改状态与资金

@@ -815,6 +835,21 @@
                return;

            // 分享赚

            BigDecimal shareRate = hongBaoManageService.getShareRate(commonOrder.getCreateTime().getTime());



            // 判断订单分享活动是否开启

            if ("1".equalsIgnoreCase(configService.get("share_goods_activity_open"))) {

                // 没有订单，并且是渠道ID来的，并且

                List<TaoBaoOrder> taoBaoOrderList = taoBaoOrderMapper

                        .selectTaoBaoOrderByOrderId(commonOrder.getOrderNo());

                if (taoBaoOrderList != null && taoBaoOrderList.size() > 0

                        && !StringUtil.isNullOrEmpty(taoBaoOrderList.get(0).getRelationId())) {

                    if (shareGoodsActivityOrderService.listByUid(commonOrder.getUserInfo().getId()).size() < 1) {

                        shareRate = new BigDecimal(hongBaoManageService.get("share_activity_proportion"));

                    }

                }



            }



            HongBaoV2 hongBao = new HongBaoV2();

            hongBao.setCreateTime(new Date());

            hongBao.setType(HongBaoV2.TYPE_SHARE_GOODS);


 fanli/src/main/java/com/yeshi/fanli/service/impl/order/ShareGoodsActivityOrderServiceImpl.java

@@ -49,4 +49,10 @@
        return shareGoodsActivityOrderMapper.listByOrderIdAndUid(uid, orderId);

    }



    @Override

    public List<ShareGoodsActivityOrder> listByUid(Long uid) {



        return shareGoodsActivityOrderMapper.listByUid(uid);

    }



}


 fanli/src/main/java/com/yeshi/fanli/service/inter/order/ShareGoodsActivityOrderService.java

@@ -43,4 +43,12 @@
     */

    public List<ShareGoodsActivityOrder> listByOrderIdAndUid(Long uid, Long orderId);



    /**

     * 根据用户ID查询订单

     * 
     * @param uid

     * @return

     */

    public List<ShareGoodsActivityOrder> listByUid(Long uid);



}