admin
2020-03-09 df938b36603bd81a192a39e7a022e777231cfb40
增加运维专用controller
3个文件已修改
1个文件已添加
70 ■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/devops/OrderDevOpsController.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/dto/money/ExtractOrderStatisticDTO.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/money/extract/ExtractServiceImpl.java 34 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java
@@ -446,8 +446,7 @@
                        desc.append("180天安全订单数:" + record.getExtraInfo().getSafeOrderCount());
                    }
                    
                    Integer countOrder = commonOrderCountService.countOderByUidAndLess10(extract.getUserInfo().getId());
                    if (countOrder != null && countOrder > 10) {
                    if (record.getExtraInfo().getLess10OrderCount() != null && record.getExtraInfo().getLess10OrderCount() > 10) {
                        desc.append("刷单嫌疑\n#");
                    }
                    
fanli/src/main/java/com/yeshi/fanli/controller/devops/OrderDevOpsController.java
New file
@@ -0,0 +1,20 @@
package com.yeshi.fanli.controller.devops;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
/**
 * 运维订单接口
 *
 * @author Administrator
 *
 */
@Controller
@RequestMapping("devops/order")
public class OrderDevOpsController {
}
fanli/src/main/java/com/yeshi/fanli/dto/money/ExtractOrderStatisticDTO.java
@@ -19,13 +19,24 @@
    private BigDecimal weiQuanOrderFanAmount;// 维权订单返还的金额
    private int safeOrderCount;// 安全订单数量
    private Integer less10OrderCount;//付款金额少于10块的订单数量
    public Integer getLess10OrderCount() {
        return less10OrderCount;
    }
    public void setLess10OrderCount(Integer less10OrderCount) {
        this.less10OrderCount = less10OrderCount;
    }
    public ExtractOrderStatisticDTO(int orderCount50More, int weiQuanOrderCount, BigDecimal weiQuanOrderFanAmount,
            int safeOrderCount) {
            int safeOrderCount,Integer less10OrderCount) {
        this.orderCount50More = orderCount50More;
        this.weiQuanOrderCount = weiQuanOrderCount;
        this.weiQuanOrderFanAmount = weiQuanOrderFanAmount;
        this.safeOrderCount = safeOrderCount;
        this.less10OrderCount=less10OrderCount;
    }
    public ExtractOrderStatisticDTO() {
fanli/src/main/java/com/yeshi/fanli/service/impl/money/extract/ExtractServiceImpl.java
@@ -68,6 +68,7 @@
import com.yeshi.fanli.service.inter.money.extract.ExtractService;
import com.yeshi.fanli.service.inter.money.extract.ExtractWeiXinRecordService;
import com.yeshi.fanli.service.inter.money.msg.UserMoneyMsgNotificationService;
import com.yeshi.fanli.service.inter.order.CommonOrderCountService;
import com.yeshi.fanli.service.inter.order.HongBaoV2Service;
import com.yeshi.fanli.service.inter.order.OrderUserStatisticService;
import com.yeshi.fanli.service.inter.push.PushService;
@@ -78,6 +79,7 @@
import com.yeshi.fanli.util.GsonUtil;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.ThreadUtil;
import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.factory.UserMoneyDetailFactory;
@@ -151,6 +153,9 @@
    @Resource
    private ExtractWeiXinRecordService extractWeiXinRecordService;
    @Resource
    private CommonOrderCountService commonOrderCountService;
    @Transactional
    public Integer addExtract(Extract extract) {
@@ -292,21 +297,32 @@
        extractMapper.insertSelective(extract);
        ExtractAuditRecord auditRecord = new ExtractAuditRecord();
        final ExtractAuditRecord auditRecord = new ExtractAuditRecord();
        auditRecord.setBeforeMoney(user.getMyHongBao());
        auditRecord.setExtract(extract);
        Date minTime = new Date(System.currentTimeMillis() - 1000 * 60 * 60 * 24 * 180L);
        // 统计数据
        int orderCount50More = orderUserStatisticService.countOrderCount100MoreByUidAndMinTime(user.getId(), minTime);
        BigDecimal weiQuanOrderFanAmount = orderUserStatisticService.sumWeiQuanOrderFanAmountByUid(user.getId(),
                minTime);
        int weiQuanOrderCount = orderUserStatisticService.countWeiQuanOrderByUid(user.getId(), minTime);
        auditRecord.setExtraInfoStr(new Gson()
                .toJson(new ExtractOrderStatisticDTO(orderCount50More, weiQuanOrderCount, weiQuanOrderFanAmount, 0)));
        extractAuditRecordMapper.insertSelective(auditRecord);
        ThreadUtil.run(new Runnable() {
            @Override
            public void run() {
                // 统计数据
                int less10Count = commonOrderCountService.countOderByUidAndLess10(user.getId());
                ExtractAuditRecord update=new ExtractAuditRecord();
                update.setId(auditRecord.getId());
                int orderCount50More = orderUserStatisticService.countOrderCount100MoreByUidAndMinTime(user.getId(), minTime);
                BigDecimal weiQuanOrderFanAmount = orderUserStatisticService.sumWeiQuanOrderFanAmountByUid(user.getId(),
                        minTime);
                int weiQuanOrderCount = orderUserStatisticService.countWeiQuanOrderByUid(user.getId(), minTime);
                update.setExtraInfoStr(new Gson().toJson(
                        new ExtractOrderStatisticDTO(orderCount50More, weiQuanOrderCount, weiQuanOrderFanAmount, 0, less10Count)));
                extractAuditRecordMapper.updateByPrimaryKeySelective(update);
            }
        });
        // 新版资金详情
        UserMoneyDetail userMoneyDetail = null;
        try {