yujian
2019-04-15 c4e7a59d3266c09f59405faface88f71a8da9a11
用户订单申诉-改为系统自动处理 + 次数限制
4个文件已修改
70 ■■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/controller/client/LostOrderController.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/LostOrderMapper.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/mapping/order/LostOrderMapper.xml 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/order/LostOrderServiceImpl.java 54 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/client/LostOrderController.java
@@ -171,6 +171,8 @@
                stateInfo = "分享奖金订单无需申诉";
            } else if (state == -6) {
                stateInfo = "该订单申诉已失败,请在订单列表中查看";
            } else if (state == -7) {
                stateInfo = "今日申诉次数已达上限";
            }
        }
        JSONObject data = new JSONObject();
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/LostOrderMapper.java
@@ -119,5 +119,12 @@
     */
    List<LostOrder> listByStateAndResultCode(@Param("state") Integer state, @Param("resultCode") Integer resultCode,
            @Param("start") long start, @Param("count") int count);
    /**
     * 统计今日申诉次数
     * @param uid
     * @return
     */
    long countTodayAppeal(@Param("uid")Long uid);
}
fanli/src/main/java/com/yeshi/fanli/mapping/order/LostOrderMapper.xml
@@ -205,4 +205,11 @@
        lo.`result_code`=3 WHERE lo.`state`=1 AND lo.`result_code`=1 AND
        UNIX_TIMESTAMP()*1000- lo.`handleTime`&gt;1000* 60 * 60 * 24 * 3
    </update>
    <select id="countTodayAppeal" resultType="java.lang.Long">
        SELECT IFNULL(COUNT(t.`id`),0) FROM yeshi_ec_lost_order t
        WHERE t.`uid` = #{uid}
            AND FROM_UNIXTIME(t.`createTime`/1000, '%Y-%m-%d') =DATE_FORMAT(NOW(),'%Y-%m-%d')
    </select>
</mapper>
fanli/src/main/java/com/yeshi/fanli/service/impl/order/LostOrderServiceImpl.java
@@ -15,6 +15,7 @@
import com.yeshi.fanli.entity.bus.user.HongBaoV2;
import com.yeshi.fanli.entity.bus.user.LostOrder;
import com.yeshi.fanli.entity.bus.user.Order;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.order.HongBaoOrderService;
import com.yeshi.fanli.service.inter.order.LostOrderService;
import com.yeshi.fanli.service.inter.order.OrderService;
@@ -32,6 +33,9 @@
    @Resource
    private LostOrderMapper lostOrderMapper;
    @Resource
    private ConfigService configService;
    @Transactional
    @Override
@@ -43,7 +47,7 @@
            type = 1;
        }
        // 查询是否提交
        // 订单是否已申诉
        List<LostOrder> orderList = lostOrderMapper.selectByOrderId(orderId);
        if (orderList != null && orderList.size() > 0) {
            if (orderList.get(0).getState() == 0 || orderList.get(0).getResultCode() == LostOrder.RESULT_CODE_VERFING) {
@@ -56,15 +60,24 @@
            }
        }
        // 订单已存在
        Order order = orderService.findOrderByOrderIdAndType(orderId, type);
        if (order != null) {
            return -3;
        }
        // 查询是否为分享赚订单
        // 是否为分享赚订单
        if (hongBaoOrderService.countByOrderNoAndHongBaoType(orderId, HongBaoV2.TYPE_SHARE_GOODS) > 0)
            return -5;
        // 次数限制
        long count = lostOrderMapper.countTodayAppeal(lostOrder.getUserInfo().getId());
        String countMax = configService.get("order_appeal_count_day");
        if (countMax != null && countMax.trim().length() > 0 && count >= Long.parseLong(countMax)) {
            return -7;
        }
        WriteLock lostOrderwriteLock = lostOrderLock.writeLock();
        ReadLock lostOrderReadLock = lostOrderLock.readLock();
        try {
@@ -87,9 +100,7 @@
                lostOrderReadLock.lock();
                lostOrderwriteLock.unlock();
            }
            lostOrder.setState(0);
            lostOrder.setHandleTime(0L);
            lostOrder.setCreateTime(System.currentTimeMillis());
            Order or = orderService.getSystemOrderByUid(Constant.TAOBAO, lostOrder.getUserInfo().getId());
            if (or != null) {
                boolean b = Utils.isUserOrder(or.getOrderId(), lostOrder.getOrderId());
@@ -103,7 +114,40 @@
                lostOrder.setJudge("不匹配");
            }
            try {
                Order addorder = new Order();
                addorder.setBeizhu("补单");
                addorder.setCreatetime(lostOrder.getCreateTime());
                addorder.setOrderId(lostOrder.getOrderId());
                addorder.setOrderType(lostOrder.getType());
                addorder.setState(1);
                addorder.setUserInfo(lostOrder.getUserInfo());
                boolean b = orderService.addOrder(addorder);
                if (b) {
                    lostOrder.setRemake("处理成功");
                    lostOrder.setState(LostOrder.STATE_PASS);
                    lostOrder.setOrder(order);
                } else {
                    lostOrder.setRemake("订单已存在!");
                    lostOrder.setState(LostOrder.STATE_REJECT);
                }
            } catch (Exception e) {
                e.printStackTrace();
                String message = e.getMessage();
                if (message.length() > 255) {
                    message = message.substring(0, 255);
                }
                lostOrder.setRemake(e.getMessage());
                lostOrder.setState(LostOrder.STATE_REJECT);
            }
            lostOrder.setResultCode(LostOrder.RESULT_CODE_VERFING);
            lostOrder.setHandleTime(System.currentTimeMillis());
            lostOrder.setCreateTime(System.currentTimeMillis());
            lostOrderMapper.insertSelective(lostOrder);
        } finally {
            lostOrderReadLock.unlock();
        }