--
admin
2019-07-11 923ff69b123119ce1de5d93fb92aaeda10be555f
--
4个文件已修改
11 ■■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/service/impl/goods/recommend/HomeRecommendGoodsServiceImpl.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderRepairServiceImpl.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/inter/goods/recommend/HomeRecommendGoodsService.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/vo/goods/taobao/TLJBuyHongBaoVO.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/goods/recommend/HomeRecommendGoodsServiceImpl.java
@@ -30,6 +30,7 @@
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
@Service
public class HomeRecommendGoodsServiceImpl implements HomeRecommendGoodsService {
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderRepairServiceImpl.java
@@ -154,7 +154,11 @@
        Long mainUid = null;
        // 统计返利的资金
        for (CommonOrder co : commonOrderList) {
            hongBaoOrder = hongBaoOrderService.selectDetailByCommonOrderId(co.getId());
            HongBaoOrder tempHongBaoOrder = hongBaoOrderService.selectDetailByCommonOrderId(co.getId());
            if (tempHongBaoOrder == null || tempHongBaoOrder.getHongBaoV2() == null)
                continue;
            hongBaoOrder = tempHongBaoOrder;
            mainUid = hongBaoOrder.getHongBaoV2().getUserInfo().getId();
            if (oldMoney.get(mainUid) == null)
                oldMoney.put(mainUid, new BigDecimal(0));
@@ -808,6 +812,8 @@
    @Transactional
    private void deleteByCommonOrderId(Long commonOrderId) {
        HongBaoOrder hongBaoOrder = hongBaoOrderService.selectDetailByCommonOrderId(commonOrderId);
        if (hongBaoOrder == null || hongBaoOrder.getHongBaoV2() == null)
            return;
        List<HongBaoV2> children = hongBaoV2Service.listChildrenById(hongBaoOrder.getHongBaoV2().getId());
        if (children != null)
            for (HongBaoV2 hongBao : children) {
fanli/src/main/java/com/yeshi/fanli/service/inter/goods/recommend/HomeRecommendGoodsService.java
@@ -10,6 +10,7 @@
 * 
 * @author Administrator
 *
 *
 */
public interface HomeRecommendGoodsService {
fanli/src/main/java/com/yeshi/fanli/vo/goods/taobao/TLJBuyHongBaoVO.java
@@ -3,6 +3,7 @@
import com.google.gson.annotations.Expose;
public class TLJBuyHongBaoVO {
    @Expose
    private String tagName;
    @Expose