huihui 1 год назад
Родитель
Сommit
257e6272f1

+ 0 - 40
sql/Online.sql

@@ -174,46 +174,6 @@ CREATE TABLE `sys_user_agent_track`  (
 ) ENGINE = InnoDB AUTO_INCREMENT = 571 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '个代用户认证审核轨迹表' ROW_FORMAT = DYNAMIC;
 
 
--- 20241114 huihui --
-CREATE TABLE `send_collect_history` (
-                                        `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
-                                        `bank_number` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '银行卡号',
-                                        `amount` decimal(10,2) DEFAULT NULL COMMENT '提现金额',
-                                        `user_info` varchar(100) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '提现用户信息',
-                                        `collect_id` varchar(100) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '提现单号',
-                                        `collect_time` datetime DEFAULT NULL COMMENT '提现时间',
-                                        `send_state` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '推送状态 0-失败 1-成功 2-推送中',
-                                        `fail_num` int DEFAULT NULL COMMENT '失败次数',
-                                        `tran_type` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '交易类型 0-提现 1-退款',
-                                        `http_post` varchar(500) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'post请求',
-                                        `http_response` varchar(500) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '请求响应',
-                                        `send_uuid` varchar(100) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '推送uuid',
-                                        PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=12 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='推送提现记录历史表';
-
-CREATE TABLE `send_project_history` (
-                                        `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
-                                        `http_post` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'post请求',
-                                        `total_amount` decimal(10,2) DEFAULT NULL COMMENT '出口费用总金额/发放预算',
-                                        `user_name` varchar(150) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '用户姓名',
-                                        `user_car_num` varchar(10) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '用户车牌号',
-                                        `user_phone` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '用户手机号',
-                                        `http_response` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '请求响应',
-                                        `send_state` varchar(1) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '推送状态 0-推送失败 1-推送成功 2-推送中 9-未知',
-                                        `send_uuid` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '唯一编码',
-                                        `fail_num` int DEFAULT NULL COMMENT '失败次数',
-                                        `referrer_no` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '推荐人工号',
-                                        `user_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '归属人工号',
-                                        `state` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '1' COMMENT '数据是否有效 0-否 1-是',
-                                        `is_delete` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '0' COMMENT '数据是否删除 0-否 1-是',
-                                        `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建者',
-                                        `create_time` datetime DEFAULT NULL COMMENT '创建时间',
-                                        `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '修改者',
-                                        `update_time` datetime DEFAULT NULL COMMENT '修改时间',
-                                        `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '备注',
-                                        PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=37 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='推送用工平台服务历史记录表';
-
 
 
 

+ 0 - 6
src/main/java/com/ydtech/modules/admin/service/impl/SysAmountAuditingServiceImpl.java

@@ -26,7 +26,6 @@ import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.fnc.entity.InsPlyIncome;
 import com.ydtech.modules.order.entity.BasePageResult;
 import com.ydtech.utils.StringUtils;
-import com.ydtech.utils.sendCollectUtils.SendCollectUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -52,9 +51,6 @@ public class SysAmountAuditingServiceImpl extends ServiceImpl<SysAmountAuditingM
     @Autowired
     private SysUserAccountHistoryMapper sysUserAccountHistoryMapper;
 
-    @Autowired
-    private SendCollectUtils sendCollectUtils;
-
     /**
      *  @version
      *  @author: hxl
@@ -129,8 +125,6 @@ public class SysAmountAuditingServiceImpl extends ServiceImpl<SysAmountAuditingM
             BeanUtils.copyProperties(sysAmountAuditingVo, sysAmountAuditingEntity);
             sysAmountAuditingEntity.setCreateTime(null);
             baseMapper.updateById(sysAmountAuditingEntity);
-            //推送提现记录
-//            sendCollectUtils.sendCollect(sysAmountAuditingVo);
             //通过审核表id查询历史记录表
             LambdaQueryWrapper<SysUserAccountHistory> lqw = new LambdaQueryWrapper<>();
             lqw.eq(SysUserAccountHistory::getAuditiingId, sysAmountAuditingEntity.getId());

+ 0 - 6
src/main/java/com/ydtech/modules/fnc/controller/CarSettleController.java

@@ -16,7 +16,6 @@ import com.ydtech.modules.fnc.entity.InsFeeAuditHistory;
 import com.ydtech.modules.fnc.entity.vo.ProblemOrderQueryVo;
 import com.ydtech.modules.fnc.service.InsFeeAuditHistoryService;
 import com.ydtech.modules.fnc.service.InsFeeAuditService;
-import com.ydtech.modules.fnc.utils.SendProjectUtils;
 import com.ydtech.modules.ins.model.vo.CustomerInfoVo;
 import com.ydtech.modules.order.constants.OrderFeeAuditHistroy;
 import com.ydtech.modules.order.entity.BasePageResult;
@@ -68,9 +67,6 @@ public class CarSettleController extends BaseController {
 
     }
 
-    @Autowired
-    private SendProjectUtils sendProjectUtils;
-
     /**
      * 根据费用审核状态查询订单 auditStatus
      *
@@ -154,8 +150,6 @@ public class CarSettleController extends BaseController {
                 e.printStackTrace();
                 return HttpResult.error("系统异常");
             }
-            //异步处理推送用工账务平台发放服务
-            sendProjectUtils.sendProject(insOrderNo);
             return HttpResult.ok("审核成功");
         } else {
             return HttpResult.error("订单号有误-未承保");

+ 0 - 15
src/main/java/com/ydtech/modules/fnc/service/impl/InsFeeAuditServiceImpl.java

@@ -45,19 +45,15 @@ import com.ydtech.modules.order.entity.InsFeeOrder;
 import com.ydtech.modules.order.entity.InsOrders;
 import com.ydtech.modules.order.entity.vo.FeeOrderNewVo;
 import com.ydtech.modules.order.entity.vo.OrderVo;
-import com.ydtech.modules.order.entity.vo.sendProject.SendProjectInfo;
 import com.ydtech.modules.protocol.service.PtlAgreementService;
 import com.ydtech.modules.protocol.utils.AssertionUtils;
 import com.ydtech.modules.protocols.entity.po.InsFeeOrderNew;
 import com.ydtech.modules.protocols.entity.po.InsFeeOrderNewDistribution;
 import com.ydtech.modules.protocols.service.InsFeeOrderNewDistributionService;
 import com.ydtech.modules.protocols.service.InsFeeOrderNewService;
-import com.ydtech.modules.sendProject.dao.SendProjectMapper;
-import com.ydtech.modules.sendProject.entity.SendProjectEntity;
 import com.ydtech.utils.DateUtil;
 import com.ydtech.utils.StringUtils;
 import com.ydtech.utils.idgen.IdGenerate;
-import com.ydtech.utils.sendProjectUtils.SendProjrctUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.redisson.Redisson;
@@ -143,22 +139,11 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
     @Resource
     private InsFeeOrderNewDistributionService insFeeOrderNewDistributionService;
 
-    @Autowired
-    private SendProjrctUtils sendProjrctUtils;
-
     @Autowired
     private SysUserRoleService sysUserRoleService;
 
-    @Autowired
-    private SendProjectMapper sendProjectMapper;
-
     private ExecutorService executorService= Executors.newCachedThreadPool();
 
-    private static final String STRING_0 = "0";
-    private static final String STRING_1 = "1";
-    private static final String STRING_2 = "2";
-    private static final Integer INTEGER_0 = 0;
-
 
     public InsFeeAuditServiceImpl(FncInsAreaCompanyMapper insAreaCompanyMapper, InsOrdersMapper insOrdersMapper,
                                   InsDeptFeeService insDeptFeeService, EsmUserReferrerService esmUserReferrerService,

+ 0 - 90
src/main/java/com/ydtech/modules/fnc/utils/SendProjectUtils.java

@@ -1,90 +0,0 @@
-package com.ydtech.modules.fnc.utils;
-
-import com.alibaba.fastjson.JSON;
-import com.ydtech.modules.order.entity.vo.FeeOrderNewVo;
-import com.ydtech.modules.order.entity.vo.OrderVo;
-import com.ydtech.modules.order.entity.vo.sendProject.SendProjectInfo;
-import com.ydtech.modules.order.service.InsOrdersService;
-import com.ydtech.modules.sendProject.dao.SendProjectMapper;
-import com.ydtech.modules.sendProject.entity.SendProjectEntity;
-import com.ydtech.utils.sendProjectUtils.SendProjrctUtils;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.stereotype.Service;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-import java.util.UUID;
-
-@Slf4j
-@Service
-public class SendProjectUtils {
-
-    @Autowired
-    private InsOrdersService insOrdersService;
-
-    @Autowired
-    private SendProjectMapper sendProjectMapper;
-
-    @Autowired
-    private SendProjrctUtils sendProjrctUtils;
-
-    private static final String STRING_0 = "0";
-    private static final String STRING_1 = "1";
-    private static final String STRING_2 = "2";
-    private static final Integer INTEGER_0 = 0;
-
-    @Async
-    public void sendProject(String orderNo) {
-        SendProjectInfo sendProjectInfo = new SendProjectInfo();
-        OrderVo data = insOrdersService.getByCompanyId(orderNo, "accountingUser").getData();
-        List<FeeOrderNewVo.ExportFee> exportFee = data.getFeeOrderNewVo().getExportFee();
-
-        for (FeeOrderNewVo.ExportFee fee : exportFee) {
-            if ("合计".equals(fee.getInsuranceType())) {
-                sendProjectInfo.setGiveBudget(fee.getTotalAmount());
-            }
-        }
-
-        StringBuffer uuid = new StringBuffer();
-        uuid.append(new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()))
-                .append(UUID.randomUUID());
-        sendProjectInfo.setReferrerNo(data.getReferrerNo());
-        sendProjectInfo.setUserId(data.getUserid());
-        sendProjectInfo.setUserPhone(data.getApplyinfo().getString("mobile"));
-        sendProjectInfo.setUserCarNum(data.getLicenseno());
-        sendProjectInfo.setUserName(data.getInsuredname());
-        sendProjectInfo.setUuid(uuid.toString());
-
-
-
-        SendProjectEntity addSendProject = new SendProjectEntity();
-        addSendProject.setTotalAmount(sendProjectInfo.getGiveBudget());
-        addSendProject.setUserName(sendProjectInfo.getUserName());
-        addSendProject.setUserCarNum(sendProjectInfo.getUserCarNum());
-        addSendProject.setUserPhone(sendProjectInfo.getUserPhone());
-        addSendProject.setSendState(STRING_2);
-        addSendProject.setSendUuid(sendProjectInfo.getUuid());
-        addSendProject.setUserId(sendProjectInfo.getUserId());
-        addSendProject.setReferrerNo(sendProjectInfo.getReferrerNo());
-        addSendProject.setFailNum(INTEGER_0);
-        addSendProject.setState(STRING_1);
-        addSendProject.setIsDelete(STRING_0);
-        Date date = new Date();
-        addSendProject.setCreateTime(date);
-        addSendProject.setUpdateTime(date);
-        try {
-            log.info("新增推送服务数据库入参:{}", JSON.toJSON(addSendProject));
-            sendProjectMapper.addSendProjectInfo(addSendProject);
-        } catch (Exception e) {
-            e.printStackTrace();
-            log.error("新增推送服务数据库报错:{}", e.getMessage());
-        }
-
-        sendProjrctUtils.firstSendProject(sendProjectInfo);
-
-    }
-
-}

+ 0 - 6
src/main/java/com/ydtech/modules/order/dao/InsOrdersMapper.java

@@ -7,7 +7,6 @@ import com.ydtech.modules.ins.model.InsOrdersExcelVo;
 import com.ydtech.modules.order.entity.InsOrders;
 import com.ydtech.modules.order.entity.dto.TelemarketingAuditOrderDTO;
 import com.ydtech.modules.order.entity.vo.*;
-import com.ydtech.modules.order.entity.vo.sendProject.SendProjectInfo;
 import com.ydtech.modules.order.entity.vo.telemarketing.TelemarketingAuditOrderQueryVo;
 import org.apache.ibatis.annotations.Param;
 
@@ -166,9 +165,4 @@ public interface InsOrdersMapper extends BaseMapper<InsOrders> {
      * @return 被保人列表
      */
     List<String> queryInsured(@Param("queryInsuredInOrderVo") QueryLicenseInOrderVo queryInsuredInOrderVo, String userId);
-
-    /**
-     * 推送服务查询客户信息
-     */
-    SendProjectInfo getOrderByCompanyId(@Param("companyId") String companyId);
 }

+ 0 - 36
src/main/java/com/ydtech/modules/order/entity/vo/sendCollect/SendCollect.java

@@ -1,36 +0,0 @@
-package com.ydtech.modules.order.entity.vo.sendCollect;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-@Data
-public class SendCollect implements Serializable {
-
-    private static final long serialVersionUID = 1096616855277490184L;
-
-    /** 收款人 */
-    private String payee;
-
-    /** 收款账户 */
-    private String receivingAccount;
-
-    /** 提取金额 */
-    private BigDecimal extractMoney;
-
-    /** 服务费 */
-    private BigDecimal serviceCharge;
-
-    /** 交易类型0-提现;1退款 */
-    private String tranType;
-
-    /** 掌柜唯一ID */
-    private String zgUuid;
-
-    /**
-     * 提现时间
-     */
-    private Date applicationTime;
-}

+ 0 - 47
src/main/java/com/ydtech/modules/order/entity/vo/sendProject/SendProjectInfo.java

@@ -1,47 +0,0 @@
-package com.ydtech.modules.order.entity.vo.sendProject;
-
-import com.ydtech.modules.sendProject.entity.SendProjectEntity;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-
-@Data
-public class SendProjectInfo extends SendProjectEntity implements Serializable {
-
-    private static final long serialVersionUID = 4878818074979842364L;
-
-    /** 发放预算 */
-    private BigDecimal giveBudget;
-
-    /**
-     * 推送uuid
-     */
-    private String uuid;
-
-    /**
-     * 用户姓名
-     */
-    private String name;
-
-    /**
-     * 用户车牌号
-     */
-    private String userCarNum;
-
-    /**
-     * 用户电话号
-     */
-    private String mobile;
-
-    /**
-     * 推荐人工号
-     */
-    private String referrerNo;
-
-    /**
-     * 归属人工号
-     */
-    private String userId;
-
-}

+ 0 - 15
src/main/java/com/ydtech/modules/sendCollect/dao/SendCollectMapper.java

@@ -1,15 +0,0 @@
-package com.ydtech.modules.sendCollect.dao;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ydtech.modules.sendCollect.entity.SendCollectEntity;
-
-import java.util.List;
-
-public interface SendCollectMapper extends BaseMapper<SendCollectEntity> {
-
-    void addSendCollectInfo(SendCollectEntity sendCollectEntity);
-
-    void updateSendCollectInfo(SendCollectEntity sendCollectEntity);
-
-    List<SendCollectEntity> getSendCollectFailInfo();
-}

+ 0 - 91
src/main/java/com/ydtech/modules/sendCollect/entity/SendCollectEntity.java

@@ -1,91 +0,0 @@
-package com.ydtech.modules.sendCollect.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-@Data
-public class SendCollectEntity implements Serializable {
-
-    private static final long serialVersionUID = -9190669795077605460L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("主键")
-    @TableId(value = "id")
-    private Long id;
-
-    /**
-     * 银行卡号
-     */
-    @ApiModelProperty("银行卡号")
-    @TableField(value = "bank_number")
-    private String bankNumber;
-
-    /**
-     * 提现金额
-     */
-    @ApiModelProperty("提现金额")
-    @TableField(value = "amount")
-    private BigDecimal amount;
-
-    /**
-     * 提现用户信息
-     */
-    @ApiModelProperty("提现用户信息")
-    @TableField(value = "user_info")
-    private String userInfo;
-
-    /**
-     * 提现单号
-     */
-    @ApiModelProperty("提现单号")
-    @TableField(value = "collect_id")
-    private String collectId;
-
-    /**
-     * 提现时间
-     */
-    @ApiModelProperty("提现时间")
-    @TableField(value = "collect_time")
-    private Date collectTime;
-
-    /**
-     * 推送状态
-     */
-    @ApiModelProperty("推送状态")
-    @TableField(value = "send_state")
-    private String sendState;
-
-    /**
-     * 失败次数
-     */
-    @ApiModelProperty("失败次数")
-    @TableField(value = "fail_num")
-    private Integer failNum;
-
-    /**
-     * 交易类型
-     */
-    @ApiModelProperty("交易类型")
-    @TableField(value = "tran_type")
-    private String tranType;
-
-    @ApiModelProperty("post请求")
-    @TableField(value = "http_post")
-    private String httpPost;
-
-    @ApiModelProperty("请求响应")
-    @TableField(value = "http_response")
-    private String httpResponse;
-
-    @ApiModelProperty("推送uuid")
-    @TableField(value = "send_uuid")
-    private String sendUuid;
-}

+ 0 - 15
src/main/java/com/ydtech/modules/sendProject/dao/SendProjectMapper.java

@@ -1,15 +0,0 @@
-package com.ydtech.modules.sendProject.dao;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ydtech.modules.sendProject.entity.SendProjectEntity;
-
-import java.util.List;
-
-public interface SendProjectMapper extends BaseMapper<SendProjectEntity> {
-
-    void addSendProjectInfo(SendProjectEntity sendProjectEntity);
-
-    void updateSendProjectInfo(SendProjectEntity sendProjectEntity);
-
-    List<SendProjectEntity> getSendFailInfo();
-}

+ 0 - 115
src/main/java/com/ydtech/modules/sendProject/entity/SendProjectEntity.java

@@ -1,115 +0,0 @@
-package com.ydtech.modules.sendProject.entity;
-
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.*;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-@TableName("send_project_history")
-@Data
-@ToString
-@EqualsAndHashCode
-@AllArgsConstructor
-@NoArgsConstructor
-public class SendProjectEntity implements Serializable {
-
-    private static final long serialVersionUID = -6917312238129061700L;
-
-    @ApiModelProperty("主键")
-    @TableId(value = "id")
-    private Integer id;
-
-    @ApiModelProperty("post请求")
-    @TableField(value = "http_post")
-    private String httpPost;
-
-    @ApiModelProperty("出口费用总金额/发放预算")
-    @TableField(value = "total_amount")
-    private BigDecimal totalAmount;
-
-    @ApiModelProperty("用户姓名")
-    @TableField(value = "user_name")
-    private String userName;
-
-    @ApiModelProperty("用户车牌号")
-    @TableField(value = "user_car_num")
-    private String userCarNum;
-
-    @ApiModelProperty("用户手机号")
-    @TableField(value = "user_phone")
-    private String userPhone;
-
-    /**
-     * sendState=9 为报错信息  sendState=0 为推送失败信息
-     */
-    @ApiModelProperty("请求响应")
-    @TableField(value = "http_response")
-    private String httpResponse;
-
-    /**
-     * 推送状态 0-推送失败 1-推送成功 2-推送中 9-未知
-     */
-    @ApiModelProperty("推送状态")
-    @TableField(value = "send_state")
-    private String sendState;
-
-    @ApiModelProperty("唯一编码")
-    @TableField(value = "send_uuid")
-    private String sendUuid;
-
-    @ApiModelProperty("失败次数")
-    @TableField(value = "fail_num")
-    private Integer failNum;
-
-    @ApiModelProperty("推荐人工号")
-    @TableField(value = "referrer_no")
-    private String referrerNo;
-
-    @ApiModelProperty("归属人工号")
-    @TableField(value = "user_id")
-    private String userId;
-
-    /**
-     * 数据是否有效 0-否 1-是
-     */
-    @ApiModelProperty("数据是否有效")
-    @TableField(value = "state")
-    private String state;
-
-    /**
-     * 数据是否删除 0-否 1-是
-     */
-    @ApiModelProperty("数据是否删除")
-    @TableField(value = "is_delete")
-    private String isDelete;
-
-    @ApiModelProperty("创建者")
-    @TableField(fill = FieldFill.INSERT)
-    private String createBy;
-
-    @ApiModelProperty("创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(fill = FieldFill.INSERT)
-    private Date createTime;
-
-    @ApiModelProperty("修改者")
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-    private String updateBy;
-
-    @ApiModelProperty("修改时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-    private Date updateTime;
-
-    @ApiModelProperty("备注")
-    @TableField(value = "remark")
-    private String remark;
-
-}

+ 0 - 196
src/main/java/com/ydtech/utils/sendCollectUtils/SendCollectUtils.java

@@ -1,196 +0,0 @@
-package com.ydtech.utils.sendCollectUtils;
-
-import com.alibaba.fastjson.JSON;
-import com.ydtech.modules.admin.model.vo.SysAmountAuditingVo;
-import com.ydtech.modules.order.entity.vo.sendCollect.SendCollect;
-import com.ydtech.modules.sendCollect.dao.SendCollectMapper;
-import com.ydtech.modules.sendCollect.entity.SendCollectEntity;
-import com.ydtech.utils.StringUtils;
-import com.ydtech.utils.scheduledFutureUtil.ScheduledFutureUtil;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.http.HttpEntity;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.http.util.EntityUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.stereotype.Service;
-
-import java.io.IOException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.UUID;
-
-@Slf4j
-@Service
-public class SendCollectUtils{
-
-    @Autowired
-    private SendCollectMapper sendCollectMapper;
-
-    @Autowired
-    private ScheduledFutureUtil scheduledFutureUtil;
-
-    @Value("${sendMessage-zg-yggl-IP}")
-    private String sendMessageIP;
-
-    private Integer num = 0;
-
-    private static final String CORN = "0 */1 * * * ?";
-    private static final String STRING_0 = "0";
-    private static final String STRING_1 = "1";
-    private static final String STRING_2 = "2";
-    private static final Integer INTEGER_0 = 0;
-    private static final String RESPONSE_SUCCESS = "200";
-
-    @Async
-    public void send(SendCollectEntity sendCollectEntity, SendCollect sendCollect) {
-
-        // 获得Http客户端(可以理解为:你得先有一个浏览器;注意:实际上HttpClient与浏览器是不一样的)
-        CloseableHttpClient httpClient = HttpClientBuilder.create().build();
-
-        // 创建Post请求
-        HttpPost httpPost = new HttpPost(sendMessageIP + "withdrawal/record/acceptPushWithdrawalData");
-        // 我这里利用阿里的fastjson,将Object转换为json字符串;
-        // (需要导入com.alibaba.fastjson.JSON包)
-        String jsonString = JSON.toJSONString(sendCollect);
-
-        StringEntity entity = new StringEntity(jsonString, "UTF-8");
-
-        // post请求是将参数放在请求体里面传过去的;这里将entity放入post请求体中
-        httpPost.setEntity(entity);
-        httpPost.setHeader("Content-Type", "application/json;charset=utf8");
-
-        sendCollectEntity.setHttpPost(httpPost.toString());
-
-        // 响应模型
-        CloseableHttpResponse response = null;
-
-        try {
-
-            // 由客户端执行(发送)Post请求
-            response = httpClient.execute(httpPost);
-            // 从响应模型中获取响应实体
-            HttpEntity responseEntity = response.getEntity();
-
-
-            //从响应实体中截取状态码
-            String string = EntityUtils.toString(responseEntity);
-            sendCollectEntity.setHttpResponse(string);
-            String responseString = string.substring(string.lastIndexOf(":") + 1);
-            String responseCode = responseString.substring(0, responseString.length() - 1);
-            log.info("响应状态为:{}", response.getStatusLine());
-
-            if (RESPONSE_SUCCESS.equals(responseCode)) {
-                sendCollectEntity.setFailNum(null);
-                sendCollectEntity.setSendState(STRING_1);
-                log.info("修改send_collect_history数据库入参:{}", JSON.toJSONString(sendCollectEntity));
-                sendCollectMapper.updateSendCollectInfo(sendCollectEntity);
-            } else {
-                sendCollectEntity.setSendState(STRING_0);
-                log.info("修改send_collect_history数据库入参:{}", JSON.toJSONString(sendCollectEntity));
-                sendCollectMapper.updateSendCollectInfo(sendCollectEntity);
-            }
-
-        } catch (Exception e) {
-//            SendCollectUtils sendCollectUtils = new SendCollectUtils();
-//            scheduledFutureUtil.startJob(sendCollectUtils, CORN);
-//            e.printStackTrace();
-        } finally {
-            try {
-                // 释放资源
-                if (httpClient != null) {
-                    httpClient.close();
-                }
-                if (response != null) {
-                    response.close();
-                }
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-    }
-
-    public void sendCollect(SysAmountAuditingVo sysAmountAuditingVo) {
-
-        StringBuilder sendUuid = new StringBuilder();
-        sendUuid.append(new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()))
-                .append(UUID.randomUUID());
-
-        StringBuilder userInfo = new StringBuilder();
-        userInfo.append(sysAmountAuditingVo.getUserName())
-                .append("-")
-                .append(sysAmountAuditingVo.getUserId());
-        SendCollect sendCollect = new SendCollect();
-        sendCollect.setZgUuid(sysAmountAuditingVo.getId());
-        sendCollect.setApplicationTime(sysAmountAuditingVo.getCreateTime());
-        sendCollect.setExtractMoney(sysAmountAuditingVo.getAmount());
-        sendCollect.setReceivingAccount(sysAmountAuditingVo.getBankNumber());
-        sendCollect.setTranType(STRING_0);
-        sendCollect.setPayee(userInfo.toString());
-
-        SendCollectEntity sendCollectEntity = new SendCollectEntity();
-        sendCollectEntity.setCollectId(sysAmountAuditingVo.getId());
-        sendCollectEntity.setSendState(STRING_2);
-        sendCollectEntity.setCollectTime(sysAmountAuditingVo.getCreateTime());
-        sendCollectEntity.setAmount(sysAmountAuditingVo.getAmount());
-        sendCollectEntity.setBankNumber(sysAmountAuditingVo.getBankNumber());
-        sendCollectEntity.setUserInfo(userInfo.toString());
-        sendCollectEntity.setFailNum(INTEGER_0);
-        sendCollectEntity.setSendUuid(sendUuid.toString());
-        log.info("新增推送send_collect_history数据库入参:{}", JSON.toJSONString(sendCollectEntity));
-        sendCollectMapper.addSendCollectInfo(sendCollectEntity);
-
-        send(sendCollectEntity,sendCollect);
-    }
-
-    public void sendCollectRetry() {
-        log.info("推送提现历史补偿启动,启动时间:{}", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
-        List<SendCollectEntity> sendCollectFailInfoList = new ArrayList<SendCollectEntity>();
-        try {
-            sendCollectFailInfoList = sendCollectMapper.getSendCollectFailInfo();
-            log.info("查询send_collect_history数据库出参:{}", JSON.toJSON(sendCollectFailInfoList));
-        } catch (Exception e) {
-            e.printStackTrace();
-            log.error("查询send_collect_history数据库报错:{}", e.getMessage());
-        }
-        if (sendCollectFailInfoList != null && !sendCollectFailInfoList.isEmpty()) {
-            for (SendCollectEntity sendCollectEntity : sendCollectFailInfoList) {
-                if (sendCollectEntity == null && StringUtils.isNullOrEmpty(sendCollectEntity)) {
-                    continue;
-                }
-                if (sendCollectEntity.getFailNum() != null && sendCollectEntity.getFailNum() < 3) {
-                    Integer failNum = sendCollectEntity.getFailNum();
-                    failNum = ++failNum;
-                    sendCollectEntity.setFailNum(failNum);
-
-                    SendCollect sendCollect = new SendCollect();
-                    sendCollect.setZgUuid(sendCollectEntity.getCollectId());
-                    sendCollect.setApplicationTime(sendCollectEntity.getCollectTime());
-                    sendCollect.setExtractMoney(sendCollectEntity.getAmount());
-                    sendCollect.setReceivingAccount(sendCollectEntity.getBankNumber());
-                    sendCollect.setTranType(sendCollectEntity.getTranType());
-                    sendCollect.setPayee(sendCollectEntity.getUserInfo());
-                    send(sendCollectEntity, sendCollect);
-                }
-            }
-        }
-    }
-
-//    @Override
-//    public void run() {
-//        num++;
-//        log.info("第{}次重新推送提现记录消息", num);
-//        this.sendCollectRetry();
-//        if (num == 3) {
-//            //停止定时任务
-//            scheduledFutureUtil.endJob("com.ydtech.utils.scheduledFutureUtil");
-//        }
-//    }
-}

+ 0 - 203
src/main/java/com/ydtech/utils/sendProjectUtils/SendProjrctUtils.java

@@ -1,203 +0,0 @@
-package com.ydtech.utils.sendProjectUtils;
-
-import com.alibaba.fastjson.JSON;
-import com.ydtech.modules.order.entity.vo.sendProject.SendProjectInfo;
-import com.ydtech.modules.sendProject.dao.SendProjectMapper;
-import com.ydtech.modules.sendProject.entity.SendProjectEntity;
-import com.ydtech.utils.StringUtils;
-import com.ydtech.utils.scheduledFutureUtil.ScheduledFutureUtil;
-import com.ydtech.utils.sendCollectUtils.SendCollectUtils;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.http.HttpEntity;
-import org.apache.http.ParseException;
-import org.apache.http.client.ClientProtocolException;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.http.util.EntityUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
-import java.io.IOException;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-@Slf4j
-@Component
-public class SendProjrctUtils{
-
-    @Autowired
-    private SendProjectMapper sendProjectMapper;
-
-    @Autowired
-    private ScheduledFutureUtil scheduledFutureUtil;
-
-    @Value("${sendMessage-zg-yggl-IP}")
-    private String sendMessageIP;
-
-    private Integer num = 0;
-
-    private static final String CORN = "0 */1 * * * ?";
-    private static final String STRING_0 = "0";
-    private static final String STRING_1 = "1";
-    private static final String STRING_9 = "9";
-    private static final String RESPONSE_SUCCESS = "200";
-
-    public Map<String, String> sendProject(SendProjectInfo sendProjectInfo) {
-
-        // 获得Http客户端(可以理解为:你得先有一个浏览器;注意:实际上HttpClient与浏览器是不一样的)
-        CloseableHttpClient httpClient = HttpClientBuilder.create().build();
-
-        // 创建Post请求
-        HttpPost httpPost = new HttpPost(sendMessageIP + "system/record/receiveDistributeServices");
-        // 我这里利用阿里的fastjson,将Object转换为json字符串;
-        // (需要导入com.alibaba.fastjson.JSON包)
-        String jsonString = JSON.toJSONString(sendProjectInfo);
-
-        StringEntity entity = new StringEntity(jsonString, "UTF-8");
-
-        // post请求是将参数放在请求体里面传过去的;这里将entity放入post请求体中
-        httpPost.setEntity(entity);
-        httpPost.setHeader("Content-Type", "application/json;charset=utf8");
-        sendProjectInfo.setHttpPost(httpPost.toString());
-
-        // 响应模型
-        CloseableHttpResponse response = null;
-        String responseCode = new String();
-
-        try {
-
-            // 由客户端执行(发送)Post请求
-            response = httpClient.execute(httpPost);
-            // 从响应模型中获取响应实体
-            HttpEntity responseEntity = response.getEntity();
-
-            //从响应实体中截取状态码
-            String string = EntityUtils.toString(responseEntity);
-            sendProjectInfo.setHttpResponse(string);
-            String responseString = string.substring(string.lastIndexOf(":") + 1);
-            responseCode = responseString.substring(0, responseString.length() - 1);
-
-
-            log.info("响应状态为:{}", response.getStatusLine());
-        } catch (Exception e) {
-            sendProjectInfo.setHttpResponse(e.getMessage());
-            sendProjectInfo.setSendState(STRING_9);
-            updateSendProjectInfo(sendProjectInfo);
-//            SendProjrctUtils sendProjrctUtils = new SendProjrctUtils();
-//            scheduledFutureUtil.startJob(sendProjrctUtils, CORN);
-            e.printStackTrace();
-        } finally {
-            try {
-                // 释放资源
-                if (httpClient != null) {
-                    httpClient.close();
-                }
-                if (response != null) {
-                    response.close();
-                }
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-
-
-        final String code = responseCode;
-        return new HashMap<String, String>() {{
-            put("responseCode", code);
-        }};
-    }
-
-    public void firstSendProject(SendProjectInfo sendProjectInfo) {
-        log.info("首次推送服务接口入参:{}", sendProjectInfo);
-        Map<String, String> responseMap = new HashMap<>();
-        responseMap = sendProject(sendProjectInfo);
-        if (RESPONSE_SUCCESS.equals(responseMap.get("responseCode"))) {
-            sendProjectInfo.setSendState(STRING_1);
-            updateSendProjectInfo(sendProjectInfo);
-        } else {
-            sendProjectInfo.setSendState(STRING_0);
-            updateSendProjectInfo(sendProjectInfo);
-        }
-    }
-
-    public void sendProjectRetry(SendProjectInfo sendProjectInfo) {
-        Map<String, String> responseMap = new HashMap<>();
-        responseMap = sendProject(sendProjectInfo);
-        if (RESPONSE_SUCCESS.equals(responseMap.get("responseCode"))) {
-            sendProjectInfo.setSendState(STRING_1);
-            updateSendProjectInfo(sendProjectInfo);
-        } else {
-            Integer failNum = sendProjectInfo.getFailNum();
-            failNum = ++failNum;
-            sendProjectInfo.setFailNum(failNum);
-            sendProjectInfo.setSendState(STRING_0);
-            updateSendProjectInfo(sendProjectInfo);
-        }
-
-    }
-
-    private void updateSendProjectInfo(SendProjectInfo sendProjectInfo) {
-        SendProjectEntity updateSendProject = new SendProjectEntity();
-        if (sendProjectInfo.getFailNum() != null) {
-            Integer failNum = sendProjectInfo.getFailNum();
-            failNum = ++failNum;
-            updateSendProject.setFailNum(failNum);
-        }
-        updateSendProject.setSendUuid(sendProjectInfo.getUuid());
-        updateSendProject.setSendState(sendProjectInfo.getSendState());
-        updateSendProject.setHttpPost(sendProjectInfo.getHttpPost());
-        updateSendProject.setHttpResponse(sendProjectInfo.getHttpResponse());
-        updateSendProject.setUpdateTime(new Date());
-        try {
-            log.info("修改推送服务数据库入参:{}", JSON.toJSON(updateSendProject));
-            sendProjectMapper.updateSendProjectInfo(updateSendProject);
-        } catch (Exception e) {
-            e.printStackTrace();
-            log.error("修改推送服务数据库报错:{}", e.getMessage());
-        }
-    }
-
-    public void sendProjectRetry() {
-        log.info("推送服务补偿启动,启动时间:{}", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
-        List<SendProjectEntity> sendFailInfo = new ArrayList<SendProjectEntity>();
-        try {
-            sendFailInfo = sendProjectMapper.getSendFailInfo();
-            log.info("查询send_project_history数据库出参:{}", JSON.toJSON(sendFailInfo));
-        } catch (Exception e) {
-            e.printStackTrace();
-            log.error("查询send_project_history数据库报错:{}", e.getMessage());
-        }
-        if (sendFailInfo != null && !sendFailInfo.isEmpty()) {
-            for (SendProjectEntity sendProjectEntity : sendFailInfo) {
-                if (sendProjectEntity == null && StringUtils.isNullOrEmpty(sendProjectEntity)) {
-                    continue;
-                }
-                if (sendProjectEntity.getFailNum() != null && sendProjectEntity.getFailNum() < 3) {
-                    SendProjectInfo sendProjectInfo = new SendProjectInfo();
-                    sendProjectInfo.setGiveBudget(sendProjectEntity.getTotalAmount());
-                    sendProjectInfo.setUserName(sendProjectEntity.getUserName());
-                    sendProjectInfo.setUserPhone(sendProjectEntity.getUserPhone());
-                    sendProjectInfo.setUserCarNum(sendProjectEntity.getUserCarNum());
-                    sendProjectInfo.setUuid(sendProjectEntity.getSendUuid());
-                    sendProjectInfo.setFailNum(sendProjectEntity.getFailNum());
-                    this.sendProjectRetry(sendProjectInfo);
-                }
-            }
-        }
-    }
-
-//    @Override
-//    public void run() {
-//        num++;
-//        log.info("第{}次重新推送服务消息", num);
-//        this.sendProjectRetry();
-//        if (num == 3) {
-//            //停止定时任务
-//            scheduledFutureUtil.endJob("com.ydtech.utils.sendProjectUtils");
-//        }
-//    }
-}

+ 0 - 19
src/main/resources/mapper/modules/order/InsOrdersMapper.xml

@@ -1828,23 +1828,4 @@
         </if>
     </select>
 
-    <resultMap id="SendProjectInfoMap" type="com.ydtech.modules.order.entity.vo.sendProject.SendProjectInfo">
-        <result property="userName" column="user_name" jdbcType="VARCHAR"/>
-        <result property="userPhone" column="user_phone" jdbcType="VARCHAR"/>
-        <result property="userCarNum" column="user_car_num" jdbcType="VARCHAR"/>
-    </resultMap>
-
-    <select id="getOrderByCompanyId" resultMap="SendProjectInfoMap" parameterType="java.lang.String">
-        SELECT
-            REPLACE(o.applyinfo -> '$.name', '"', '') AS user_name,
-            REPLACE(o.applyinfo -> '$.mobile', '"', '') AS user_phone,
-            REPLACE(o.carinfo -> '$.licenseNo', '"', '') AS user_car_num
-        FROM
-            ins_orders AS o
-            JOIN
-                ins_area_company iac ON o.orderno = iac.orderno
-        WHERE
-            iac.id = #{companyId}
-    </select>
-
 </mapper>

+ 0 - 95
src/main/resources/mapper/modules/sendCollect/SendCollectMapper.xml

@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ydtech.modules.sendCollect.dao.SendCollectMapper">
-
-    <resultMap id="SendCollectEntityMap" type="com.ydtech.modules.sendCollect.entity.SendCollectEntity">
-        <result property="id" column="id"/>
-        <result property="amount" column="amount"/>
-        <result property="bankNumber" column="bank_number" jdbcType="VARCHAR"/>
-        <result property="userInfo" column="user_info" jdbcType="VARCHAR"/>
-        <result property="collectId" column="collect_id" jdbcType="VARCHAR"/>
-        <result property="collectTime" column="collect_time"/>
-        <result property="sendState" column="send_state" jdbcType="VARCHAR"/>
-        <result property="failNum" column="fail_num"/>
-        <result property="tranType" column="tran_type" jdbcType="VARCHAR"/>
-        <result property="httpPost" column="http_post"/>
-        <result property="httpResponse" column="http_response"/>
-        <result property="sendUuid" column="send_uuid"/>
-    </resultMap>
-
-    <sql id="selectSendCollectEntity">
-        SELECT
-            id,
-            amount,
-            bank_number,
-            user_info,
-            collect_id,
-            collect_time,
-            send_state,
-            fail_num,
-            tran_type,
-            http_post,
-            http_response,
-            send_uuid
-        FROM
-            send_collect_history
-    </sql>
-
-    <insert id="addSendCollectInfo" parameterType="com.ydtech.modules.sendCollect.entity.SendCollectEntity"
-            useGeneratedKeys="true" keyProperty="id">
-        INSERT INTO send_collect_history
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">id,</if>
-            <if test="amount != null">amount,</if>
-            <if test="bankNumber != null and bankNumber != ''">bank_number,</if>
-            <if test="userInfo != null and userInfo != ''">user_info,</if>
-            <if test="collectId != null and collectId != ''">collect_id,</if>
-            <if test="collectTime != null">collect_time,</if>
-            <if test="sendState != null and sendState != ''">send_state,</if>
-            <if test="failNum != null">fail_num,</if>
-            <if test="tranType != null and tranType != ''">tran_type,</if>
-            <if test="httpPost != null and httpPost != ''">http_post,</if>
-            <if test="httpResponse != null and httpResponse != ''">http_response,</if>
-            <if test="sendUuid != null and sendUuid != ''">send_uuid,</if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">#{id},</if>
-            <if test="amount != null">#{amount},</if>
-            <if test="bankNumber != null and bankNumber != ''">#{bankNumber},</if>
-            <if test="userInfo != null and userInfo != ''">#{userInfo},</if>
-            <if test="collectId != null and collectId != ''">#{collectId},</if>
-            <if test="collectTime != null">#{collectTime},</if>
-            <if test="sendState != null and sendState != ''">#{sendState},</if>
-            <if test="failNum != null">#{failNum},</if>
-            <if test="tranType != null and tranType != ''">#{tranType},</if>
-            <if test="httpPost != null and httpPost != ''">#{httpPost},</if>
-            <if test="httpResponse != null and httpResponse != ''">#{httpResponse},</if>
-            <if test="sendUuid != null and sendUuid != ''">#{sendUuid},</if>
-        </trim>
-    </insert>
-
-    <update id="updateSendCollectInfo" parameterType="com.ydtech.modules.sendCollect.entity.SendCollectEntity">
-        UPDATE send_collect_history
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="sendState != null and sendState != ''">send_state = #{sendState},</if>
-            <if test="httpPost != null and httpPost != ''">http_post = #{httpPost},</if>
-            <if test="httpResponse != null and httpResponse != ''">http_response = #{httpResponse},</if>
-            <if test="failNum != null">fail_num = #{failNum},</if>
-        </trim>
-        WHERE
-            send_uuid = #{sendUuid}
-    </update>
-
-
-
-    <select id="getSendCollectFailInfo" resultMap="SendCollectEntityMap">
-        <include refid="selectSendCollectEntity"/>
-        WHERE
-            send_state IN ('0')
-        AND
-            fail_num <![CDATA[<]]> 3
-    </select>
-
-</mapper>

+ 0 - 115
src/main/resources/mapper/modules/sendProject/SendProjectMapper.xml

@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ydtech.modules.sendProject.dao.SendProjectMapper">
-
-    <resultMap id="SendProjectEntityMap" type="com.ydtech.modules.sendProject.entity.SendProjectEntity">
-        <result property="id" column="id"/>
-        <result property="httpPost" column="http_post"/>
-        <result property="totalAmount" column="total_amount"/>
-        <result property="userName" column="user_name" jdbcType="VARCHAR"/>
-        <result property="userCarNum" column="user_car_num" jdbcType="VARCHAR"/>
-        <result property="userPhone" column="user_phone" jdbcType="VARCHAR"/>
-        <result property="httpResponse" column="http_response"/>
-        <result property="sendState" column="send_state" jdbcType="VARCHAR"/>
-        <result property="sendUuid" column="send_uuid" jdbcType="VARCHAR"/>
-        <result property="failNum" column="fail_num"/>
-        <result property="referrerNo" column="referrer_no" jdbcType="VARCHAR"/>
-        <result property="userId" column="user_id" jdbcType="VARCHAR"/>
-        <result property="state" column="state" jdbcType="VARCHAR"/>
-        <result property="isDelete" column="is_delete" jdbcType="VARCHAR"/>
-        <result property="createBy" column="create_by" jdbcType="VARCHAR"/>
-        <result property="createTime" column="create_time"/>
-        <result property="updateBy" column="update_by" jdbcType="VARCHAR"/>
-        <result property="updateTime" column="update_time"/>
-        <result property="remark" column="remark" jdbcType="VARCHAR"/>
-    </resultMap>
-
-    <sql id="selectSendProjectEntity">
-        SELECT
-            id,
-            http_post,
-            total_amount,
-            user_name,
-            user_car_num,
-            user_phone,
-            http_response,
-            send_state,
-            send_uuid,
-            fail_num,
-            user_id,
-            referrer_no
-        FROM
-            send_project_history
-    </sql>
-
-    <select id="getSendFailInfo" resultMap="SendProjectEntityMap">
-        <include refid="selectSendProjectEntity"/>
-        WHERE
-            send_state IN ('0', '9')
-        AND
-            fail_num <![CDATA[<]]> 3
-    </select>
-
-    <insert id="addSendProjectInfo" parameterType="com.ydtech.modules.sendProject.entity.SendProjectEntity"
-            useGeneratedKeys="true" keyProperty="id">
-        INSERT INTO send_project_history
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">id,</if>
-            <if test="httpPost != null and httpPost != ''">http_post,</if>
-            <if test="totalAmount != null">total_amount,</if>
-            <if test="userName != null and userName != ''">user_name,</if>
-            <if test="userCarNum != null and userCarNum != ''">user_car_num,</if>
-            <if test="userPhone != null and userPhone != ''">user_phone,</if>
-            <if test="httpResponse != null and httpResponse != ''">http_response,</if>
-            <if test="sendState != null and sendState != ''">send_state,</if>
-            <if test="sendUuid != null and sendUuid != ''">send_uuid,</if>
-            <if test="failNum != null">fail_num,</if>
-            <if test="referrerNo != null and referrerNo != ''">referrer_no,</if>
-            <if test="userId != null and userId != ''">user_id,</if>
-            <if test="state != null and state != ''">state,</if>
-            <if test="isDelete != null and isDelete != ''">is_delete,</if>
-            <if test="createBy != null and createBy != ''">create_by,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="updateBy != null and updateBy != ''">update_by,</if>
-            <if test="updateTime != null">update_time,</if>
-            <if test="remark != null and remark != ''">remark,</if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">#{id},</if>
-            <if test="httpPost != null and httpPost != ''">#{httpPost},</if>
-            <if test="totalAmount != null">#{totalAmount},</if>
-            <if test="userName != null and userName != ''">#{userName},</if>
-            <if test="userCarNum != null and userCarNum != ''">#{userCarNum},</if>
-            <if test="userPhone != null and userPhone != ''">#{userPhone},</if>
-            <if test="httpResponse != null and httpResponse != ''">#{httpResponse},</if>
-            <if test="sendState != null and sendState != ''">#{sendState},</if>
-            <if test="sendUuid != null and sendUuid != ''">#{sendUuid},</if>
-            <if test="failNum != null">#{failNum},</if>
-            <if test="referrerNo != null and referrerNo != ''">#{referrerNo},</if>
-            <if test="userId != null and userId != ''">#{userId},</if>
-            <if test="state != null and state != ''">#{state},</if>
-            <if test="isDelete != null and isDelete != ''">#{isDelete},</if>
-            <if test="createBy != null and createBy != ''">#{createBy},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateBy != null and updateBy != ''">#{updateBy},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-            <if test="remark != null and remark != ''">#{remark},</if>
-        </trim>
-    </insert>
-
-    <update id="updateSendProjectInfo" parameterType="com.ydtech.modules.sendProject.entity.SendProjectEntity">
-        UPDATE send_project_history
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="sendState != null and sendState != ''">send_state = #{sendState},</if>
-            <if test="httpPost != null and httpPost != ''">http_post = #{httpPost},</if>
-            <if test="httpResponse != null and httpResponse != ''">http_response = #{httpResponse},</if>
-            <if test="failNum != null">fail_num = #{failNum},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-        </trim>
-        WHERE
-            send_uuid = #{sendUuid}
-    </update>
-
-</mapper>