分享赚比例修改 增加单品的分享记录

admin

2018-12-10 5f01b1bf63bd3dd242fc29e012e15c37fc03a190

分享赚比例修改
增加单品的分享记录

 fanli/src/main/java/com/yeshi/fanli/controller/client/ShareController.java

@@ -23,9 +23,11 @@
import com.yeshi.fanli.entity.bus.share.UserShareGoodsGroup;

import com.yeshi.fanli.entity.bus.share.UserShareGoodsHistory;

import com.yeshi.fanli.entity.bus.share.UserShareGoodsRecord;

import com.yeshi.fanli.entity.bus.share.UserShareGoodsRecord.ShareSourceTypeEnum;

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

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

import com.yeshi.fanli.exception.ShareGoodsException;

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

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

import com.yeshi.fanli.service.inter.goods.ShareGoodsService;

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

@@ -53,10 +55,10 @@


    @Resource

    private MonitorService monitorService;

	


    @Resource

    private UserShareGoodsRecordService userShareGoodsRecordService;

	


    @Resource

    private UserShareGoodsGroupService userShareGoodsGroupService;



@@ -138,7 +140,7 @@
            data.put("notifyDesc", configService.get("goods_share_notify"));



            // 添加分享记录

            BigDecimal rate =hongBaoManageService.getFanLiRate();

            BigDecimal rate = hongBaoManageService.getFanLiRate();

            UserShareGoodsHistory history = new UserShareGoodsHistory();

            history.setTkCode(taoBaoLink.getTaoToken());

            history.setLink(taoBaoLink.getClickUrl());

@@ -164,6 +166,11 @@
                @Override

                public void run() {

                    shareGoodsService.addShareGoodsHistory(history);

                    try {

                        userShareGoodsRecordService.save(uid, ShareSourceTypeEnum.goodsDetail, taoBaoLink.getGoods());

                    } catch (UserShareGoodsRecordException e) {

                        e.printStackTrace();

                    }

                }

            });

            return;

@@ -176,11 +183,13 @@
        }



    }

	


    /**

     * 分享记录统计列表

     * 
     * @param acceptData

     * @param page 初始1

     * @param page

     *            初始1

     * @param uid

     * @param source

     * @param out

@@ -203,7 +212,7 @@
            List<UserShareGoodsRecord> list = new ArrayList<UserShareGoodsRecord>();



            long count = userShareGoodsRecordService.countQueryByUid(uid, source);

			


            if (count > 0) {

                list = userShareGoodsRecordService.getMyShareGoodsRecords((page - 1) * pageSize, pageSize, uid, source);

            }

@@ -218,9 +227,9 @@
        }

    }



	
    /**

     * 获取分享商品

     * 
     * @param acceptData

     * @param recordId

     * @param out

@@ -240,9 +249,10 @@
            e.printStackTrace();

        }

    }

	


    /**

     * 获取分享商品单个统计信息

     * 
     * @param acceptData

     * @param groupId

     * @param out

@@ -262,7 +272,7 @@
                userShareGoodsGroup.setUpdateTime(null);

                userShareGoodsGroup.setRecordId(null);

            }

			


            JSONObject data = new JSONObject();

            data.put("goodsData", userShareGoodsGroup);

            out.print(JsonUtil.loadTrueResult(data));

@@ -271,6 +281,5 @@
            e.printStackTrace();

        }

    }

	


}


 fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ShareGoodsServiceImpl.java

@@ -12,6 +12,12 @@
import javax.annotation.Resource;



import org.springframework.stereotype.Service;

import org.yeshi.utils.HttpUtil;

import org.yeshi.utils.JsonUtil;

import org.yeshi.utils.QRCodeUtil;

import org.yeshi.utils.entity.FileUploadResult;

import org.yeshi.utils.exception.HttpException;

import org.yeshi.utils.tencentcloud.COSManager;



import com.yeshi.fanli.dao.mybatis.HongBaoManageMapper;

import com.yeshi.fanli.dao.mybatis.UserInfoMapper;

@@ -34,6 +40,7 @@
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;

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

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

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

import com.yeshi.fanli.util.AESUtil;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.FileUtil;

@@ -42,12 +49,6 @@
import com.yeshi.fanli.util.StringUtil;

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

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

import org.yeshi.utils.HttpUtil;

import org.yeshi.utils.JsonUtil;

import org.yeshi.utils.QRCodeUtil;

import org.yeshi.utils.entity.FileUploadResult;

import org.yeshi.utils.exception.HttpException;

import org.yeshi.utils.tencentcloud.COSManager;



@Service

public class ShareGoodsServiceImpl implements ShareGoodsService {

@@ -78,9 +79,12 @@


    @Resource

    private UserAccountService userAccountService;

	


    @Resource

    private HongBaoManageService hongBaoManageService;



    @Resource

    private UserShareGoodsRecordService userShareGoodsRecordService;



    @Override

    public void addShareGoodsHistory(UserShareGoodsHistory history) {

@@ -93,6 +97,8 @@
            userShareGoodsHistoryMapper.updateByPrimaryKeySelective(userShareGoodsHistory);

        } else

            userShareGoodsHistoryMapper.insertSelective(history);



		
    }



    @Override

@@ -140,7 +146,7 @@
        if (StringUtil.isNullOrEmpty(goods.getCouponLink()) && StringUtil.isNullOrEmpty(goods.getAuctionUrl())) {

            throw new ShareGoodsException(10, "转链失败");

        }

		


        BigDecimal rate = hongBaoManageService.getShareRate();



        // 创建淘口令


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

@@ -257,7 +257,8 @@
        // 只看有用户Id的情况

        if (orders.get(0).getUserInfo() != null) {

            // 根据第一个的订单创建时间来确定返利比例

            BigDecimal rate = hongBaoManageService.getShareRate(orders.get(0).getOrderCreateTime().getTime());

            BigDecimal rate = hongBaoManageService.getShareRate(orders.get(0).getOrderCreateTime().getTime())

                    .divide(new BigDecimal("100"));

            List<HongBao> hbList = hongBaoMapper.selectByOrderId(orderId);

            if (hbList.size() <= 0) {// 还没有加入红包

                // 加入红包