订单bug修复

yujian

2019-12-02 2afe3a586ca9feb26f30e4d5af36941add5eca60

订单bug修复

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

@@ -38,6 +38,7 @@
import com.yeshi.fanli.entity.taobao.TLJFreeBuyGoods;

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

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

import com.yeshi.fanli.exception.user.UserInfoException;

import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;

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

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

@@ -772,17 +773,16 @@
     * @param uid

     * @param out

     */

    @RequestMapping(value = "gerFreeList", method = RequestMethod.POST)

    public void gerFreeList(AcceptData acceptData, int page, Long uid, PrintWriter out) {

    @RequestMapping(value = "gerFreeList")

    public void gerFreeList(String callback, AcceptData acceptData, int page, Long uid, PrintWriter out) {

        if (uid == null || uid <= 0) {

            out.print(JsonUtil.loadFalseResult(1, "用户未登录"));

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(1, "用户未登录"));

            return;

        }

        

        String day = TimeUtil.getGernalTime(java.lang.System.currentTimeMillis());

        List<TLJFreeBuyGoods> listFree = tljFreeBuyGoodsService.listByDay(day);

        if (listFree == null) {

            // TODO

            listFree = new ArrayList<TLJFreeBuyGoods>();

        }

        

@@ -819,11 +819,11 @@
        data.put("count", array.size());

        data.put("list", array);

        if (page == 1) {

            List<SwiperPicture> bannerList = swiperPictureService.getByBannerCard("free_buy_banner");

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

                data.put("topPicture", bannerList.get(0).getSrc());

            } else {

                data.put("topPicture", "");

            try {

                data.put("portrait", userInfoService.getUserInfo(uid).getPortrait());

            } catch (UserInfoException e) {

                JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(1, e.getMsg()));

                return;

            }

            

            String state = "已过期";

@@ -844,8 +844,8 @@
            

            data.put("state", state);

            data.put("balance","新人红包：" + balance.setScale(2) + "元");

            data.put("ruleUrl", configTaoLiJinService.getValueByKey("new_user_free_buy_list_rule"));

            data.put("rule", configTaoLiJinService.getValueByKey("new_user_free_buy_list_rule"));

        }

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

        JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));

    }

}


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

@@ -113,9 +113,9 @@
        Integer orderType = null;

        if (StringUtil.isNullOrEmpty(type)) {

            orderType = null;

        } else if ("0".equalsIgnoreCase(type)){

        } else if (!"0".equalsIgnoreCase(type)){

            orderType = Integer.parseInt(type); 

        }

        } 


        // 筛选时间

        if (slotTime != null) {


 fanli/src/main/java/com/yeshi/fanli/mapping/hongbao/HongBaoV2CountMapper.xml

@@ -198,7 +198,7 @@
    </select>
    
    <select id="getHongBaoCount" resultType="Long">
        SELECT IFNULL(count(v2.`hb_id`),0) FROM `yeshi_ec_hongbao_v2` v
        SELECT IFNULL(count(v.`hb_id`),0) FROM `yeshi_ec_hongbao_v2` v
        WHERE v.`hb_uid`=#{uid}
        <if test="type == 1"> <!-- 自购订单 -->
            AND (v.hb_type =1 or v.hb_type =2)