bug修改

admin

2021-09-30 42411e4a26461229c6bca6e89ca55e98a80f5a4e

bug修改

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

@@ -714,27 +714,26 @@
    @RequestMapping(value = "getShowAd")
    public void showAd(AcceptData acceptData, Long uid, PrintWriter out) {
        String value = configService.getValue(ConfigKeyEnum.showSplashAd.getKey(), acceptData.getSystem());
        boolean huaweiShowAd = true;
        if ("huawei".equalsIgnoreCase(acceptData.getChannel())) {
            String version = configService.getValue(ConfigKeyEnum.huaweiOnLineVersionCode.getKey(), acceptData.getSystem());
            if (!StringUtil.isNullOrEmpty(version)) {
                if (Integer.parseInt(version) == Integer.parseInt(acceptData.getVersion())) {
                    huaweiShowAd = false;
                }
            }
        JSONObject configData = JSONObject.fromObject(value);
        String channel = acceptData.getChannel().toLowerCase();
        if (configData.optString(channel) == null) {
            channel = "qq";
        }
        int version = configData.optInt(channel);
        JSONObject data = new JSONObject();
        boolean show;
        if (Integer.parseInt(acceptData.getVersion()) >= version) {
            show = false;
        } else {
            show = true;
        }

        JSONObject data = new JSONObject();
        if ("0".equalsIgnoreCase(value.trim())) {
        if (show) {
            data.put("show", true);
            //加载广告数据
            data.put("ad", configService.getValue(ConfigKeyEnum.gdtAdInfo, acceptData.getSystem()));
        } else
            data.put("show", false);
        } else {
            if (huaweiShowAd) {
                data.put("show", true);
                //加载广告数据
                data.put("ad", configService.getValue(ConfigKeyEnum.gdtAdInfo, acceptData.getSystem()));
            } else
                data.put("show", false);
        }
        out.print(JsonUtil.loadTrueResult(data));
    }


 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/vipshop/VipShopOrderMapper.java

@@ -20,6 +20,8 @@
    public class DaoQuery extends BaseDaoQuery {

        public String orderSubStatusName;


    }

}

 fanli/src/main/java/com/yeshi/fanli/entity/system/ConfigKeyEnum.java

@@ -222,7 +222,7 @@
    // 平台规则
    platformRule("platform_rule_link", "平台规则"),

    showSplashAd("show_splash_ad", "是否显示开屏广告"),
    showSplashAd("show_splash_ad_new", "是否显示开屏广告"),

    huaweiOnLineVersionCode("huawei_online_version_code", "华为渠道正在上线的版本"),


 fanli/src/main/java/com/yeshi/fanli/job/order/vipshop/UpdateVipShopOrderJob.java

@@ -97,15 +97,17 @@
    //根据订单号更新
    @XxlJob("order-vip-updateByOrderSn")
    public ReturnT<String> updateByOrderSn(String param) throws Exception {
        List<VipShopOrder> orders = vipShopOrderService.listByOrderSn(param);
        if (orders == null || orders.size() == 0)
            throw new Exception("订单不存在");

        VipShopOrder vipShopOrder = DingDanXiaApiUtil.getOrderDetail(param);
        if (vipShopOrder != null) {
            List<VipShopOrder> vipShopOrderList = new ArrayList<>();
            vipShopOrderList.add(vipShopOrder);
            saveVipShopOrders(vipShopOrderList);
        String[] ps = param.split(",");
        for (String p : ps) {
            List<VipShopOrder> orders = vipShopOrderService.listByOrderSn(p);
            if (orders == null || orders.size() == 0)
                throw new Exception("订单不存在");
            VipShopOrder vipShopOrder = DingDanXiaApiUtil.getOrderDetail(p);
            if (vipShopOrder != null) {
                List<VipShopOrder> vipShopOrderList = new ArrayList<>();
                vipShopOrderList.add(vipShopOrder);
                saveVipShopOrders(vipShopOrderList);
            }
        }
        return ReturnT.SUCCESS;
    }
@@ -120,7 +122,7 @@
     */
    @XxlJob("order-vip-updateByLongTimeNoUpdate")
    public ReturnT<String> updateByLongTimeNoUpdate(String param) throws Exception {
        Date maxCreateTime = new Date(System.currentTimeMillis() - 1000 * 60 * 60 * 24L * 30);
        Date maxCreateTime = new Date(System.currentTimeMillis() - 1000 * 60 * 60 * 24L * 15);
        Date minCreateTime = new Date(maxCreateTime.getTime() - 1000 * 60 * 60 * 24L * 60L);
        VipShopOrderMapper.DaoQuery daoQuery = new VipShopOrderMapper.DaoQuery();
        daoQuery.orderSubStatusName = "已付款";

 fanli/src/main/java/com/yeshi/fanli/service/impl/order/vipshop/VipShopOrderServiceImpl.java

@@ -22,147 +22,147 @@
@Service
public class VipShopOrderServiceImpl implements VipShopOrderService {

    @Resource
    private VipShopOrderMapper vipShopOrderMapper;
    @Resource
    private VipShopOrderMapper vipShopOrderMapper;

    @Resource
    private VipShopOrderDetailMapper vipShopOrderDetailMapper;
    @Resource
    private VipShopOrderDetailMapper vipShopOrderDetailMapper;

    @Resource
    private VipShopAfterSaleDetailInfoMapper vipShopAfterSaleDetailInfoMapper;
    @Resource
    private VipShopAfterSaleDetailInfoMapper vipShopAfterSaleDetailInfoMapper;

    @Override
    public void addOrder(VipShopOrder order) throws VipShopOrderException {
    @Override
    public void addOrder(VipShopOrder order) throws VipShopOrderException {

        if (order == null || StringUtil.isNullOrEmpty(order.getOrderSn())) {
            throw new VipShopOrderException(1, "数据不完整");
        }
        if (order == null || StringUtil.isNullOrEmpty(order.getOrderSn())) {
            throw new VipShopOrderException(1, "数据不完整");
        }

        // 查询是否添加过
        VipShopOrder old = vipShopOrderMapper.selectByOrderSn(order.getOrderSn());
        if (old == null) {// 新增
            // 添加信息
            if (order.getCreateTime() == null)
                order.setCreateTime(new Date());
            vipShopOrderMapper.insertSelective(order);
        } else {// 更新
            order.setId(old.getId());
            order.setUpdateTime(new Date());
            vipShopOrderMapper.updateByPrimaryKeySelective(order);
        }
        // 查询是否添加过
        VipShopOrder old = vipShopOrderMapper.selectByOrderSn(order.getOrderSn());
        if (old == null) {// 新增
            // 添加信息
            if (order.getCreateTime() == null)
                order.setCreateTime(new Date());
            vipShopOrderMapper.insertSelective(order);
        } else {// 更新
            order.setId(old.getId());
            order.setUpdateTime(new Date());
            vipShopOrderMapper.updateByPrimaryKeySelective(order);
        }

        for (VipShopOrderDetail detail : order.getDetailList()) {
            detail.setIdentifyCode(VipShopUtil.getOrderDetailIdentifyCode(order.getOrderSn(), detail.getGoodsId(),
                    detail.getSizeId()));
            detail.setOrderSn(order.getOrderSn());
            addOrderDetail(detail);
        }
    }
        for (VipShopOrderDetail detail : order.getDetailList()) {
            detail.setIdentifyCode(VipShopUtil.getOrderDetailIdentifyCode(order.getOrderSn(), detail.getGoodsId(),
                    detail.getSizeId()));
            detail.setOrderSn(order.getOrderSn());
            addOrderDetail(detail);
        }
    }

    /**
     * 添加详情信息
     * @Title: addOrderDetail
     * @Description: 
     * @param detail 
     * void 返回类型
     * @throws
     */
    private void addOrderDetail(VipShopOrderDetail detail) {
        VipShopOrderDetail old = vipShopOrderDetailMapper.selectByIdentifyCode(detail.getIdentifyCode());
        Long detailId = null;
        if (old == null) {
            if (detail.getCreateTime() == null)
                detail.setCreateTime(new Date());
            vipShopOrderDetailMapper.insertSelective(detail);
            detailId = detail.getId();
        } else {
            detail.setId(old.getId());
            detail.setUpdateTime(new Date());
            vipShopOrderDetailMapper.updateByPrimaryKey(detail);
            detailId = detail.getId();
        }
    /**
     * 添加详情信息
     *
     * @param detail void 返回类型
     * @throws
     * @Title: addOrderDetail
     * @Description:
     */
    private void addOrderDetail(VipShopOrderDetail detail) {
        VipShopOrderDetail old = vipShopOrderDetailMapper.selectByIdentifyCode(detail.getIdentifyCode());
        Long detailId = null;
        if (old == null) {
            if (detail.getCreateTime() == null)
                detail.setCreateTime(new Date());
            vipShopOrderDetailMapper.insertSelective(detail);
            detailId = detail.getId();
        } else {
            detail.setId(old.getId());
            detail.setUpdateTime(new Date());
            vipShopOrderDetailMapper.updateByPrimaryKey(detail);
            detailId = detail.getId();
        }

        if (detail.getAfterSaleInfo() != null)
            for (VipShopAfterSaleDetailInfo info : detail.getAfterSaleInfo()) {
                info.setOrderDetailId(detailId);
                addAfterSaleDetailInfo(info);
            }
    }
        if (detail.getAfterSaleInfo() != null)
            for (VipShopAfterSaleDetailInfo info : detail.getAfterSaleInfo()) {
                info.setOrderDetailId(detailId);
                addAfterSaleDetailInfo(info);
            }
    }

    /**
     * 添加售后信息
     * @Title: addAfterSaleDetailInfo
     * @Description: 
     * @param detailInfo 
     * void 返回类型
     * @throws
     */
    private void addAfterSaleDetailInfo(VipShopAfterSaleDetailInfo detailInfo) {
        VipShopAfterSaleDetailInfo oldInfo = vipShopAfterSaleDetailInfoMapper.selectByOrderDetailId(detailInfo.getId());
        if (oldInfo == null) {
            if (detailInfo.getCreateTime() == null)
                detailInfo.setCreateTime(new Date());
            vipShopAfterSaleDetailInfoMapper.insertSelective(detailInfo);
        } else {
            detailInfo.setId(oldInfo.getId());
            detailInfo.setUpdateTime(new Date());
            vipShopAfterSaleDetailInfoMapper.updateByPrimaryKeySelective(detailInfo);
        }
    }
    /**
     * 添加售后信息
     *
     * @param detailInfo void 返回类型
     * @throws
     * @Title: addAfterSaleDetailInfo
     * @Description:
     */
    private void addAfterSaleDetailInfo(VipShopAfterSaleDetailInfo detailInfo) {
        VipShopAfterSaleDetailInfo oldInfo = vipShopAfterSaleDetailInfoMapper.selectByOrderDetailId(detailInfo.getId());
        if (oldInfo == null) {
            if (detailInfo.getCreateTime() == null)
                detailInfo.setCreateTime(new Date());
            vipShopAfterSaleDetailInfoMapper.insertSelective(detailInfo);
        } else {
            detailInfo.setId(oldInfo.getId());
            detailInfo.setUpdateTime(new Date());
            vipShopAfterSaleDetailInfoMapper.updateByPrimaryKeySelective(detailInfo);
        }
    }

    @Override
    public VipShopOrder selectByPrimaryKey(Long orderId) {
    @Override
    public VipShopOrder selectByPrimaryKey(Long orderId) {

        return vipShopOrderMapper.selectByPrimaryKey(orderId);
    }
        return vipShopOrderMapper.selectByPrimaryKey(orderId);
    }

    @Override
    public List<VipShopOrder> listByOrderSn(String orderSn) {
        List<VipShopOrder> list = new ArrayList<>();
        VipShopOrder order = vipShopOrderMapper.selectByOrderSn(orderSn);
        if (order == null)
            return null;
        list.add(order);
        return list;
    }
    @Override
    public List<VipShopOrder> listByOrderSn(String orderSn) {
        List<VipShopOrder> list = new ArrayList<>();
        VipShopOrder order = vipShopOrderMapper.selectByOrderSn(orderSn);
        if (order == null)
            return null;
        list.add(order);
        return list;
    }

    @Override
    public List<VipShopOrder> listDetailByOrderSn(String orderSn) {
        List<VipShopOrder> list = new ArrayList<>();
        VipShopOrder order = vipShopOrderMapper.selectByOrderSn(orderSn);
        if (order == null)
            return null;
        order = selectDetailByPrimaryKey(order.getId());
        list.add(order);
        return list;
    }
    @Override
    public List<VipShopOrder> listDetailByOrderSn(String orderSn) {
        List<VipShopOrder> list = new ArrayList<>();
        VipShopOrder order = vipShopOrderMapper.selectByOrderSn(orderSn);
        if (order == null)
            return null;
        order = selectDetailByPrimaryKey(order.getId());
        list.add(order);
        return list;
    }

    @Override
    public VipShopOrder selectDetailByPrimaryKey(Long orderId) {
        VipShopOrder order = vipShopOrderMapper.selectByPrimaryKey(orderId);
        if (order == null)
            return null;
        List<VipShopOrderDetail> detailList = vipShopOrderDetailMapper.listByOrderSn(order.getOrderSn());
        order.setDetailList(detailList);
        return order;
    }
    @Override
    public VipShopOrder selectDetailByPrimaryKey(Long orderId) {
        VipShopOrder order = vipShopOrderMapper.selectByPrimaryKey(orderId);
        if (order == null)
            return null;
        List<VipShopOrderDetail> detailList = vipShopOrderDetailMapper.listByOrderSn(order.getOrderSn());
        order.setDetailList(detailList);
        return order;
    }

    @Override
    public Long countOrderByDay(String preDay) {
        // TODO Auto-generated method stub
        return null;
    }
    @Override
    public Long countOrderByDay(String preDay) {
        // TODO Auto-generated method stub
        return null;
    }

    @Override
    public List<VipShopOrderDetail> listDetailQuery(long start, int count, String key) {
        // TODO Auto-generated method stub
        return null;
    }
    @Override
    public List<VipShopOrderDetail> listDetailQuery(long start, int count, String key) {
        // TODO Auto-generated method stub
        return null;
    }

    @Override
    public long countDetailQuery(String key) {
        // TODO Auto-generated method stub
        return 0;
    }
    @Override
    public long countDetailQuery(String key) {
        // TODO Auto-generated method stub
        return 0;
    }

}

 fanli/src/main/java/com/yeshi/fanli/service/inter/order/vipshop/VipShopOrderService.java

@@ -27,10 +27,11 @@
    /**
     * 根据订单号查询
     * 
     * @param orderId
     * @param orderSn
     * @return
     */
    public List<VipShopOrder> listByOrderSn(String orderSn);

    
    /**
     * 根据订单号查询