admin
2019-09-10 c8f0ea4627aceaff03c93de66e918864477463f8
不能申述违规订单
8个文件已修改
66 ■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/aspect/SignValidateAspect.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/LostOrderController.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RecommendControllerV2.java 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/taobao/TaoBaoPunishOrderMapper.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/mapping/taobao/TaoBaoPunishOrderMapper.xml 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/order/LostOrderServiceImpl.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoPunishOrderServiceImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/inter/taobao/TaoBaoPunishOrderService.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/aspect/SignValidateAspect.java
@@ -193,9 +193,9 @@
        while (its.hasNext()) {
            String key = its.next();
            if (key.equalsIgnoreCase("callback")) {
                fromWEB = true;
            }
//            if (key.equalsIgnoreCase("callback")) {
//                fromWEB = true;
//            }
            if (key.equalsIgnoreCase("sign") || key.equalsIgnoreCase("callback") || key.equalsIgnoreCase("_")) {
                continue;
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/LostOrderController.java
@@ -196,6 +196,8 @@
                stateInfo = "该订单申诉已失败,请在订单列表中查看";
            } else if (state == -7) {
                stateInfo = "今日申诉次数已达上限";
            }else if (state == -1001) {
                stateInfo = "订单违规";
            }
        }
        JSONObject data = new JSONObject();
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RecommendControllerV2.java
@@ -350,7 +350,6 @@
        return root;
    }
    
    /**
     * 金币兑换信息
     * 
@@ -388,7 +387,6 @@
        root.put("keyList", array);
        return root;
    }
    /**
     * 首页底部商品推荐
@@ -653,16 +651,16 @@
        out.print(JsonUtil.loadTrueResult(data));
    }
     /**
      *  搜索发现列表
     *
      * @param acceptData
      * @param uid
      * @param page
      * @param out
      */
    @RequestMapping(value = "getSearchDiscoveryTop", method = RequestMethod.POST)
    public void getSearchDiscoveryTop(AcceptData acceptData, Long uid, Integer page, PrintWriter out) {
    @RequestMapping(value = "getSearchDiscoveryTop")
    public void getSearchDiscoveryTop(AcceptData acceptData, Long uid, Integer page, String callback, PrintWriter out) {
        int count = 0;
        List<SearchKeyTOPVO> list = new ArrayList<SearchKeyTOPVO>();
        
@@ -685,8 +683,8 @@
                    List<DaTaoKeDetailV2> listTaoKe = daTaoKeGoodsService.getSearchDiscoveryGoods(words);
                    if (listTaoKe != null && listTaoKe.size() > 0) {
                        for (DaTaoKeDetailV2 daTaoKeDetailV2: listTaoKe) {
                            listGoods.add(GoodsDetailVOFactory.convertTaoBao(TaoBaoUtil.convert(daTaoKeDetailV2), null, fanLiRate,
                                    shareRate));
                            listGoods.add(GoodsDetailVOFactory.convertTaoBao(TaoBaoUtil.convert(daTaoKeDetailV2), null,
                                    fanLiRate, shareRate));
                            if (listGoods.size() >= 3)
                                break;
                        }
@@ -707,6 +705,9 @@
        JSONObject data = new JSONObject();
        data.put("count", count);
        data.put("list", gson.toJson(list));
        if (!StringUtil.isNullOrEmpty(callback)) {
            JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
        } else
        out.print(JsonUtil.loadTrueResult(data));
    }
    
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/taobao/TaoBaoPunishOrderMapper.java
@@ -11,5 +11,12 @@
     * @return
     */
    TaoBaoPunishOrder selectByTradeId(String tradeId);
    /**
     * 根据父交易ID查询数量
     * @param orderId
     * @return
     */
    long countByParentTradeId(String orderId);
}
fanli/src/main/java/com/yeshi/fanli/mapping/taobao/TaoBaoPunishOrderMapper.xml
@@ -38,6 +38,14 @@
        <include refid="Base_Column_List" />
        from yeshi_ec_taobao_punish_order where tb_trade_id = #{0}
    </select>
    <select id="countByParentTradeId" resultType="java.lang.Long"
        parameterType="java.lang.String">
        select
        count(*)
        from yeshi_ec_taobao_punish_order where tb_trade_parent_id = #{0}
    </select>
    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
        yeshi_ec_taobao_punish_order where id = #{id,jdbcType=BIGINT}
fanli/src/main/java/com/yeshi/fanli/service/impl/order/LostOrderServiceImpl.java
@@ -21,6 +21,7 @@
import com.yeshi.fanli.service.inter.order.HongBaoOrderService;
import com.yeshi.fanli.service.inter.order.LostOrderService;
import com.yeshi.fanli.service.inter.order.OrderService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoPunishOrderService;
import com.yeshi.fanli.util.Utils;
@Service
@@ -41,6 +42,9 @@
    @Resource
    private UserOrderMsgNotificationService userOrderMsgNotificationService;
    @Resource
    private TaoBaoPunishOrderService taoBaoPunishOrderService;
    @Transactional
    @Override
    public int addLostOrder(LostOrder lostOrder) {
@@ -49,6 +53,14 @@
        if (type == null) { // 默认为淘宝订单
            lostOrder.setType(1);
            type = 1;
        }
        // 是否处于违规订单中
        if (type == 1) {
            int count = taoBaoPunishOrderService.countByTradeParentId(orderId);
            if (count > 0) {
                return -1001;
            }
        }
        // 订单是否已申诉
@@ -291,7 +303,8 @@
     * @return
     */
    @Override
    public List<LostOrder> listQuery(long start, int count, String key, Integer state, Integer handleType, Integer type) {
    public List<LostOrder> listQuery(long start, int count, String key, Integer state, Integer handleType,
            Integer type) {
        return lostOrderMapper.listQuery(start, count, key, state, handleType, type);
    }
fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoPunishOrderServiceImpl.java
@@ -137,6 +137,11 @@
            userAccountService.forbiddenUserAll(uid, "产生违规订单自动封禁");
        }
    }
    @Override
    public int countByTradeParentId(String orderId) {
        return (int) (taoBaoPunishOrderMapper.countByParentTradeId(orderId));
    }
}
fanli/src/main/java/com/yeshi/fanli/service/inter/taobao/TaoBaoPunishOrderService.java
@@ -26,5 +26,13 @@
     * @param order
     */
    public void savePunishOrder(TaoBaoPunishOrder order);
    /**
     * 根据交易父ID查询
     * @param orderId
     * @return
     */
    public int countByTradeParentId(String orderId);
}