admin
2020-04-28 6b1188418a128aeb9ce787d8530ba6a1c8c6d405
淘宝订单商品BUG修改
5个文件已修改
29 ■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/mapping/msg/UserSystemMsgMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/money/extract/ExtractServiceImpl.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/util/Constant.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeOrderApiUtil.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/util/user/UserLevelUtil.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/mapping/msg/UserSystemMsgMapper.xml
@@ -55,7 +55,7 @@
        select
        <include refid="Base_Column_List" />
        from yeshi_ec_user_msg_system where ms_system_znx_id =
        #{id,jdbcType=BIGINT} and ms_uid=#{uid}
        #{id,jdbcType=BIGINT} and ms_uid=#{uid} limit 1
    </select>
    
    
fanli/src/main/java/com/yeshi/fanli/service/impl/money/extract/ExtractServiceImpl.java
@@ -523,7 +523,7 @@
     * @param session
     */
    @Transactional
    private void extractSuccess(Extract extract) {
    private void extractSuccess(Extract extract,String alipayNo) {
        // 老版本功能
        // List<MoneyRecord> list = moneyRecordDao.list("from MoneyRecord mr
        // where mr.extract.id = " + extract.getId());
@@ -546,14 +546,10 @@
        } catch (Exception e) {
            e.printStackTrace();
        }
        List<PayInfo> payInfoList = payInfoMapper.getListbyExtractId(extract.getId());
        String alipayNo = "";
        if (payInfoList != null && payInfoList.size() > 0)
            alipayNo = payInfoList.get(0).getOrderId();
        UserMoneyDetail detailNew = null;
        try {
            detailNew = UserMoneyDetailFactory.createExtract(updateExtract, alipayNo);
            detailNew = UserMoneyDetailFactory.createExtract(extract, alipayNo);
        } catch (UserMoneyDetailException e) {
            e.printStackTrace();
        }
@@ -603,8 +599,10 @@
        // 获取提现,获取提现验证
        List<UserMoneyDetailTypeEnum> typeList = new ArrayList<>();
        typeList.add(UserMoneyDetailTypeEnum.extract);
        typeList.add(UserMoneyDetailTypeEnum.extractNew);
        typeList.add(UserMoneyDetailTypeEnum.extractReject);
        typeList.add(UserMoneyDetailTypeEnum.extractVerify);
        typeList.add(UserMoneyDetailTypeEnum.extractVerifyNew);
        BigDecimal extractMoney = userMoneyDetailService.statisticUserTypeMoneyWithDate(uid, typeList, new Date(0),
                now);
        extractMoney = extractMoney.abs();
@@ -673,7 +671,7 @@
        if (response.isSuccess()) {
            String code = response.getCode();
            if ("10000".equals(code)) {
                extractSuccess(extract);
                extractSuccess(extract,response.getOrderId());
            } else {
                extractFail(extract, response.getSubMsg());
            }
@@ -741,7 +739,7 @@
    @Override
    public void testExtractSuccess(Long id) {
        Extract extract = extractMapper.selectByPrimaryKey(id);
        extractSuccess(extract);
        extractSuccess(extract,null);
        Long uid = extract.getUserInfo().getId();
        // 更新审核记录
fanli/src/main/java/com/yeshi/fanli/util/Constant.java
@@ -24,7 +24,7 @@
    public static boolean IS_TEST = true;
    public static boolean ENABLE_MQ = false;
    public static boolean ENABLE_MQ = true;
    public static int PAGE_SIZE = 20;
    
fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeOrderApiUtil.java
@@ -204,7 +204,10 @@
                    goods.setPrice(item.optString("item_price"));
                    goods.setTitle(item.optString("item_title"));
                    goods.setTradeId(item.optString("trade_id"));
                    if (goods.getImg() != null && !goods.getImg().startsWith("http")) {
                        goods.setImg("http:" + goods.getImg());
                    }
                    taoBaoOrder.setGoods(goods);
                    orderList.add(taoBaoOrder);
                } catch (Exception e) {
fanli/src/main/java/com/yeshi/fanli/util/user/UserLevelUtil.java
@@ -46,15 +46,15 @@
     * UserLevelEnum 返回类型
     * @throws
     */
    public static UserLevelEnum getByOrderRank(Integer orderRank) {
    public static UserLevelEnum getByOrderRank(Integer orderRank) {//其他结果返回达人
        if (orderRank == null)
            return null;
            return UserLevelEnum.daRen;
        for (UserLevelEnum level : UserLevelEnum.values()) {
            if (level.getOrderRank() == orderRank)
                return level;
        }
        return null;
        return UserLevelEnum.daRen;
    }
    /**