he2802 2 жил өмнө
parent
commit
946c16b302

+ 64 - 0
zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/order/TopOrderBankPayController.java

@@ -0,0 +1,64 @@
+package com.zhongzheng.controller.order;
+
+import java.util.List;
+import java.util.Arrays;
+
+import com.zhongzheng.common.core.domain.model.TopLoginUser;
+import com.zhongzheng.common.utils.ServletUtils;
+import com.zhongzheng.framework.web.service.TopTokenService;
+import com.zhongzheng.modules.top.order.bo.TopOrderBankPayAddBo;
+import com.zhongzheng.modules.top.order.bo.TopOrderBankPayEditBo;
+import com.zhongzheng.modules.top.order.bo.TopOrderBankPayQueryBo;
+import com.zhongzheng.modules.top.order.service.ITopOrderBankPayService;
+import com.zhongzheng.modules.top.order.vo.TopOrderBankPayVo;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.common.utils.poi.ExcelUtil;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 订单网银打款Controller
+ *
+ * @author hjl
+ * @date 2023-05-08
+ */
+@Api(value = "订单网银打款控制器", tags = {"订单网银打款管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/order/bank/pay")
+public class TopOrderBankPayController extends BaseController {
+
+    private final ITopOrderBankPayService iTopOrderBankPayService;
+
+    private final TopTokenService tokenService;
+
+    /**
+     * 新增订单网银打款
+     */
+    @ApiOperation("新增订单网银打款")
+    @PreAuthorize("@ss.hasPermi('system:pay:add')")
+    @Log(title = "订单网银打款", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@RequestBody TopOrderBankPayAddBo bo) {
+        TopLoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setLoginId(loginUser.getUser().getUserId());
+        bo.setLoginName(loginUser.getUser().getUserName());
+        return toAjax(iTopOrderBankPayService.payToCompany(bo) ? 1 : 0);
+    }
+
+}

+ 5 - 0
zhongzheng-common/src/main/java/com/zhongzheng/common/utils/DateUtils.java

@@ -331,6 +331,11 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
         return "P"+getDateOrderSn();
     }
 
+    public static String getTagOrderSn(String tag)
+    {
+        return tag+getDateOrderSn();
+    }
+
     public static String secToTime(int time) {
         String timeStr = null;
         int hour = 0;

+ 1 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopOldOrderCheckLogServiceImpl.java

@@ -172,7 +172,7 @@ public class TopOldOrderCheckLogServiceImpl extends ServiceImpl<TopOldOrderCheck
             //最后一个审核
             //进入支付流程
             TopOldOrderCheckLog check = getOne(new LambdaQueryWrapper<TopOldOrderCheckLog>()
-                            .eq(TopOldOrderCheckLog::getRefundSn, checkLog.getRefundSn())
+                            .eq(TopOldOrderCheckLog::getOrderSn, checkLog.getOrderSn())
                             .eq(TopOldOrderCheckLog::getType, 6)//分成支付
                             .eq(TopOldOrderCheckLog::getStatus, 1)
                             .eq(TopOldOrderCheckLog::getCheckFrom, checkLog.getCheckFrom())

+ 69 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/top/order/bo/TopOrderBankPayAddBo.java

@@ -0,0 +1,69 @@
+package com.zhongzheng.modules.top.order.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+import java.math.BigDecimal;
+
+/**
+ * 订单网银打款添加对象 top_order_bank_pay
+ *
+ * @author hjl
+ * @date 2023-05-08
+ */
+@Data
+@ApiModel("订单网银打款添加对象")
+public class TopOrderBankPayAddBo {
+
+    /** 支付号 */
+    @ApiModelProperty("支付号")
+    private String paySn;
+    /** 订单号 */
+    @ApiModelProperty("订单号")
+    private String orderSn;
+    /** 银行账号 */
+    @ApiModelProperty("银行账号")
+    private String toBankAcount;
+    /** 账号名称 */
+    @ApiModelProperty("账号名称")
+    private String toBankName;
+    /** 银行名称 */
+    @ApiModelProperty("银行名称")
+    private String toBankTypeName;
+    /** 金额 */
+    @ApiModelProperty("金额")
+    private BigDecimal money;
+    /** 老机构ID */
+    @ApiModelProperty("老机构ID")
+    private String trainOrgId;
+    /** 创建时间 */
+    @ApiModelProperty("创建时间")
+    private Long createTime;
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+    /** 1有效 0无效 */
+    @ApiModelProperty("1有效 0无效")
+    private Integer status;
+    /** 参数 */
+    @ApiModelProperty("参数")
+    private String paramJson;
+    /** 支付结果 1成功 0失败 */
+    @ApiModelProperty("支付结果 1回调成功 0支付中未回调 -1回调失败")
+    private Integer resultStatus;
+    @ApiModelProperty("机构ID")
+    private String tenantId;
+    @ApiModelProperty("分成模式 1机构分成 2业务员分成")
+    private Integer divideModel;
+    @ApiModelProperty("收方行联行号")
+    private String ToBankConnetNum;
+    @ApiModelProperty("备注")
+    private String remark;
+    private String loginName;
+
+    private Long loginId;
+}

+ 70 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/top/order/bo/TopOrderBankPayEditBo.java

@@ -0,0 +1,70 @@
+package com.zhongzheng.modules.top.order.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+import java.math.BigDecimal;
+
+/**
+ * 订单网银打款编辑对象 top_order_bank_pay
+ *
+ * @author hjl
+ * @date 2023-05-08
+ */
+@Data
+@ApiModel("订单网银打款编辑对象")
+public class TopOrderBankPayEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long id;
+
+    /** 支付号 */
+    @ApiModelProperty("支付号")
+    private String paySn;
+
+    /** 订单号 */
+    @ApiModelProperty("订单号")
+    private String orderSn;
+
+
+    /** 银行账号 */
+    @ApiModelProperty("银行账号")
+    private String toBankAcount;
+
+    /** 账号名称 */
+    @ApiModelProperty("账号名称")
+    private String toBankName;
+
+    /** 银行名称 */
+    @ApiModelProperty("银行名称")
+    private String toBankTypeName;
+
+    /** 金额 */
+    @ApiModelProperty("金额")
+    private BigDecimal money;
+
+    /** 老机构ID */
+    @ApiModelProperty("老机构ID")
+    private String trainOrgId;
+
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+
+    /** 1有效 0无效 */
+    @ApiModelProperty("1有效 0无效")
+    private Integer status;
+
+    /** 参数 */
+    @ApiModelProperty("参数")
+    private String paramJson;
+
+    /** 支付结果 1成功 0失败 */
+    @ApiModelProperty("支付结果 1回调成功 0支付中未回调 -1回调失败")
+    private Integer resultStatus;
+
+}

+ 70 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/top/order/bo/TopOrderBankPayQueryBo.java

@@ -0,0 +1,70 @@
+package com.zhongzheng.modules.top.order.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.Map;
+import java.util.HashMap;
+
+import java.math.BigDecimal;
+import com.zhongzheng.common.core.domain.BaseEntity;
+
+/**
+ * 订单网银打款分页查询对象 top_order_bank_pay
+ *
+ * @author hjl
+ * @date 2023-05-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("订单网银打款分页查询对象")
+public class TopOrderBankPayQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** 支付号 */
+	@ApiModelProperty("支付号")
+	private String paySn;
+	/** 订单号 */
+	@ApiModelProperty("订单号")
+	private String orderSn;
+	/** 银行账号 */
+	@ApiModelProperty("银行账号")
+	private String toBankAcount;
+	/** 账号名称 */
+	@ApiModelProperty("账号名称")
+	private String toBankName;
+	/** 银行名称 */
+	@ApiModelProperty("银行名称")
+	private String toBankTypeName;
+	/** 金额 */
+	@ApiModelProperty("金额")
+	private BigDecimal money;
+	/** 老机构ID */
+	@ApiModelProperty("老机构ID")
+	private String trainOrgId;
+	/** 1有效 0无效 */
+	@ApiModelProperty("1有效 0无效")
+	private Integer status;
+	/** 参数 */
+	@ApiModelProperty("参数")
+	private String paramJson;
+	/** 支付结果 1成功 0失败 */
+	@ApiModelProperty("支付结果 1成功 0失败")
+	private Integer resultStatus;
+}

+ 57 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/top/order/domain/TopOrderBankPay.java

@@ -0,0 +1,57 @@
+package com.zhongzheng.modules.top.order.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.zhongzheng.common.annotation.Excel;
+
+/**
+ * 订单网银打款对象 top_order_bank_pay
+ *
+ * @author hjl
+ * @date 2023-05-08
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("top_order_bank_pay")
+public class TopOrderBankPay implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "id")
+    private Long id;
+    /** 支付号 */
+    private String paySn;
+    /** 订单号 */
+    private String orderSn;
+    /** 银行账号 */
+    private String toBankAcount;
+    /** 账号名称 */
+    private String toBankName;
+    /** 银行名称 */
+    private String toBankTypeName;
+    /** 金额 */
+    private BigDecimal money;
+    /** 老机构ID */
+    private String trainOrgId;
+    /** 创建时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** 更新时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+    /** 1有效 0无效 */
+    private Integer status;
+    /** 参数 */
+    private String paramJson;
+    /** 支付结果 1成功 0失败 */
+    private Integer resultStatus;
+    private String tenantId;
+    private String payUsername;
+}

+ 14 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/top/order/mapper/TopOrderBankPayMapper.java

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.top.order.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.top.order.domain.TopOrderBankPay;
+
+/**
+ * 订单网银打款Mapper接口
+ *
+ * @author hjl
+ * @date 2023-05-08
+ */
+public interface TopOrderBankPayMapper extends BaseMapper<TopOrderBankPay> {
+
+}

+ 55 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/top/order/service/ITopOrderBankPayService.java

@@ -0,0 +1,55 @@
+package com.zhongzheng.modules.top.order.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.top.goods.bo.TopOldOrderQueryBo;
+import com.zhongzheng.modules.top.order.bo.TopOrderBankPayAddBo;
+import com.zhongzheng.modules.top.order.bo.TopOrderBankPayEditBo;
+import com.zhongzheng.modules.top.order.bo.TopOrderBankPayQueryBo;
+import com.zhongzheng.modules.top.order.domain.TopOrderBankPay;
+import com.zhongzheng.modules.top.order.vo.TopOrderBankPayVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 订单网银打款Service接口
+ *
+ * @author hjl
+ * @date 2023-05-08
+ */
+public interface ITopOrderBankPayService extends IService<TopOrderBankPay> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	TopOrderBankPayVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+	List<TopOrderBankPayVo> queryList(TopOrderBankPayQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入订单网银打款
+	 * @param bo 订单网银打款新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(TopOrderBankPayAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改订单网银打款
+	 * @param bo 订单网银打款编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(TopOrderBankPayEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+	Boolean payToCompany(TopOrderBankPayAddBo bo);
+}

+ 242 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/top/order/service/impl/TopOrderBankPayServiceImpl.java

@@ -0,0 +1,242 @@
+package com.zhongzheng.modules.top.order.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.lang.Validator;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.zhongzheng.common.exception.CustomException;
+import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.common.utils.ToolsUtils;
+import com.zhongzheng.common.utils.http.HttpUtils;
+import com.zhongzheng.modules.order.domain.OrderGoods;
+import com.zhongzheng.modules.top.goods.domain.TopOldOrder;
+import com.zhongzheng.modules.top.goods.domain.TopOldOrderCheckLog;
+import com.zhongzheng.modules.top.goods.service.ITopOldOrderCheckLogService;
+import com.zhongzheng.modules.top.goods.service.ITopOldOrderService;
+import com.zhongzheng.modules.top.order.bo.TopOrderBankPayAddBo;
+import com.zhongzheng.modules.top.order.bo.TopOrderBankPayEditBo;
+import com.zhongzheng.modules.top.order.bo.TopOrderBankPayQueryBo;
+import com.zhongzheng.modules.top.order.domain.TopOrderBankPay;
+import com.zhongzheng.modules.top.order.mapper.TopOrderBankPayMapper;
+import com.zhongzheng.modules.top.order.service.ITopOrderBankPayService;
+import com.zhongzheng.modules.top.order.vo.TopOrderBankPayVo;
+import com.zhongzheng.modules.top.user.domain.TopSysUserRole;
+import com.zhongzheng.modules.top.user.service.ITopSysUserRoleService;
+import com.zhongzheng.modules.user.service.IUserService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.Page;
+
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * 订单网银打款Service业务层处理
+ *
+ * @author hjl
+ * @date 2023-05-08
+ */
+@Service
+public class TopOrderBankPayServiceImpl extends ServiceImpl<TopOrderBankPayMapper, TopOrderBankPay> implements ITopOrderBankPayService {
+
+    @Autowired
+    private ITopOldOrderService iTopOldOrderService;
+
+    @Autowired
+    private ITopOldOrderCheckLogService iTopOldOrderCheckLogService;
+
+    @Autowired
+    private ITopSysUserRoleService topSysUserRoleService;
+
+    @Value("${oldSys.host}")
+    private String OLD_SYS_HOST;
+
+    private static Logger log = LoggerFactory.getLogger(TopOrderBankPayServiceImpl.class);
+
+    @Override
+    public TopOrderBankPayVo queryById(Long id){
+        TopOrderBankPay db = this.baseMapper.selectById(id);
+        return BeanUtil.toBean(db, TopOrderBankPayVo.class);
+    }
+
+    @Override
+    public List<TopOrderBankPayVo> queryList(TopOrderBankPayQueryBo bo) {
+        LambdaQueryWrapper<TopOrderBankPay> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StrUtil.isNotBlank(bo.getPaySn()), TopOrderBankPay::getPaySn, bo.getPaySn());
+        lqw.eq(StrUtil.isNotBlank(bo.getOrderSn()), TopOrderBankPay::getOrderSn, bo.getOrderSn());
+        lqw.eq(StrUtil.isNotBlank(bo.getToBankAcount()), TopOrderBankPay::getToBankAcount, bo.getToBankAcount());
+        lqw.like(StrUtil.isNotBlank(bo.getToBankName()), TopOrderBankPay::getToBankName, bo.getToBankName());
+        lqw.like(StrUtil.isNotBlank(bo.getToBankTypeName()), TopOrderBankPay::getToBankTypeName, bo.getToBankTypeName());
+        lqw.eq(bo.getMoney() != null, TopOrderBankPay::getMoney, bo.getMoney());
+        lqw.eq(StrUtil.isNotBlank(bo.getTrainOrgId()), TopOrderBankPay::getTrainOrgId, bo.getTrainOrgId());
+        lqw.eq(bo.getStatus() != null, TopOrderBankPay::getStatus, bo.getStatus());
+        lqw.eq(StrUtil.isNotBlank(bo.getParamJson()), TopOrderBankPay::getParamJson, bo.getParamJson());
+        lqw.eq(bo.getResultStatus() != null, TopOrderBankPay::getResultStatus, bo.getResultStatus());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<TopOrderBankPayVo> entity2Vo(Collection<TopOrderBankPay> collection) {
+        List<TopOrderBankPayVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, TopOrderBankPayVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<TopOrderBankPay> page = (Page<TopOrderBankPay>)collection;
+            Page<TopOrderBankPayVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(TopOrderBankPayAddBo bo) {
+        TopOrderBankPay add = BeanUtil.toBean(bo, TopOrderBankPay.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(TopOrderBankPayEditBo bo) {
+        TopOrderBankPay update = BeanUtil.toBean(bo, TopOrderBankPay.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(TopOrderBankPay entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+
+    @Override
+    public Boolean payToCompany(TopOrderBankPayAddBo bo) {
+        if(Validator.isEmpty(bo.getOrderSn())||Validator.isEmpty(bo.getTenantId())||Validator.isEmpty(bo.getDivideModel())){
+            throw new CustomException("参数错误");
+        }
+        if(Validator.isEmpty(bo.getToBankAcount())||Validator.isEmpty(bo.getToBankName())||Validator.isEmpty(bo.getToBankTypeName())){
+            throw new CustomException("支付参数错误");
+        }
+        //校验当前角色审核权限
+        List<TopSysUserRole> userRoleList = topSysUserRoleService.list(new LambdaQueryWrapper<TopSysUserRole>().eq(TopSysUserRole::getUserId, bo.getLoginId()));
+        if (CollectionUtils.isEmpty(userRoleList) && !bo.getLoginName().equals("admin")) {
+            throw new CustomException("当前账号没有审核权限");
+        }
+        Integer checkFrom = bo.getDivideModel()+1;
+        List<Long> roleIds = userRoleList.stream().map(TopSysUserRole::getRoleId).collect(Collectors.toList());
+        TopOldOrderCheckLog checkLog = iTopOldOrderCheckLogService.getOne(new LambdaQueryWrapper<TopOldOrderCheckLog>()
+                .eq(TopOldOrderCheckLog::getOrderSn, bo.getOrderSn()).eq(TopOldOrderCheckLog::getStatus, 1)
+                .eq(TopOldOrderCheckLog::getCheckSign, 1)
+                .eq(TopOldOrderCheckLog::getCheckFrom, checkFrom).last("limit 1"));
+        if(Validator.isEmpty(checkLog)){
+            throw new CustomException("审核数据错误");
+        }
+        if (!roleIds.contains(checkLog.getRoleId()) && !bo.getLoginName().equals("admin") ) {
+            throw new CustomException("当前账号没有审核权限");
+        }
+
+        TopOldOrder order = iTopOldOrderService.getOne(new LambdaQueryWrapper<TopOldOrder>()
+                .eq(TopOldOrder::getOrderSn, bo.getOrderSn())
+                .eq(TopOldOrder::getTenantId, bo.getTenantId()).last("limit 1"));
+        if(Validator.isEmpty(order)||order.getDivideStatus()!=5){
+            throw new CustomException("订单数据错误无法支付");
+        }
+
+        TopOldOrderCheckLog check = iTopOldOrderCheckLogService.getOne(new LambdaQueryWrapper<TopOldOrderCheckLog>()
+                .eq(TopOldOrderCheckLog::getOrderSn, bo.getOrderSn())
+                .eq(TopOldOrderCheckLog::getType, 6)//分成支付
+                .eq(TopOldOrderCheckLog::getStatus, 1)
+                .eq(TopOldOrderCheckLog::getCheckFrom, checkFrom)
+                .eq(TopOldOrderCheckLog::getCheckSign, 1)
+                .eq(TopOldOrderCheckLog::getCheckStatus, 2)
+                .last("limit 1"));
+        if(Validator.isEmpty(check)){
+            throw new CustomException("当前订单未审核通过");
+        }
+
+        bo.setTrainOrgId(order.getTenantId().toString());//旧机构ID
+        String paySn = DateUtils.getTagOrderSn("CP");
+        TopOrderBankPay add = BeanUtil.toBean(bo, TopOrderBankPay.class);
+        add.setPaySn(paySn);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        add.setResultStatus(0);
+        add.setPayUsername(bo.getLoginName());
+        BigDecimal money = null;
+        if(bo.getDivideModel()==1){
+            money =order.getDivideCompanyMoney();
+        }
+        if(bo.getDivideModel()==2){
+            money =order.getDivideSellerMoney();
+        }
+        Map<String, String> params = new HashMap<>();
+        Long nowTime = DateUtils.getNowTime();
+        String sign = ToolsUtils.EncoderByMd5(paySn+nowTime.toString()+"pubilc2022");
+        params.put("stamp", nowTime.toString());
+        params.put("sign", sign);
+        params.put("MainUniqueId", paySn);
+        params.put("ToBankAcount", bo.getToBankAcount());
+        params.put("ToBankName", bo.getToBankName());
+        params.put("ToBankTypeName", bo.getToBankTypeName());
+        params.put("Money", money.toString());
+        params.put("TrainOrgId", bo.getTrainOrgId());
+        if(Validator.isNotEmpty(bo.getToBankConnetNum())){
+            params.put("ToBankConnetNum", bo.getToBankConnetNum());
+        }
+        if(Validator.isNotEmpty(bo.getRemark())){
+            params.put("Remark", bo.getRemark());
+        }
+        String respone = "";
+        String paramStr = JSON.toJSONString(params);
+        add.setParamJson(paramStr);
+        log.info("网银支付参数" + paramStr, "");
+        String path = OLD_SYS_HOST+"/WitSystem/BussinessApi/NeedToPay";
+        try {
+            respone = HttpUtils.postFormBody(path, params);
+            if (!respone.contains("\"Status\":true")) {
+
+                throw new CustomException("同步请求错误"+respone);
+            }
+        } catch (IOException e) {
+            throw new CustomException("同步请求错误"+e.getMessage());
+        }
+        if(this.save(add)){
+            order.setDivideStatus(6);//支付中
+            iTopOldOrderService.updateById(order);
+            check.setCheckStatus(3);
+            iTopOldOrderCheckLogService.updateById(check);
+            return  true;
+        }
+        return false;
+    }
+}

+ 68 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/top/order/vo/TopOrderBankPayVo.java

@@ -0,0 +1,68 @@
+package com.zhongzheng.modules.top.order.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.math.BigDecimal;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 订单网银打款视图对象 mall_package
+ *
+ * @author hjl
+ * @date 2023-05-08
+ */
+@Data
+@ApiModel("订单网银打款视图对象")
+public class TopOrderBankPayVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long id;
+
+	/** 支付号 */
+	@Excel(name = "支付号")
+	@ApiModelProperty("支付号")
+	private String paySn;
+	/** 订单号 */
+	@Excel(name = "订单号")
+	@ApiModelProperty("订单号")
+	private String orderSn;
+	/** 银行账号 */
+	@Excel(name = "银行账号")
+	@ApiModelProperty("银行账号")
+	private String toBankAcount;
+	/** 账号名称 */
+	@Excel(name = "账号名称")
+	@ApiModelProperty("账号名称")
+	private String toBankName;
+	/** 银行名称 */
+	@Excel(name = "银行名称")
+	@ApiModelProperty("银行名称")
+	private String toBankTypeName;
+	/** 金额 */
+	@Excel(name = "金额")
+	@ApiModelProperty("金额")
+	private BigDecimal money;
+	/** 老机构ID */
+	@Excel(name = "老机构ID")
+	@ApiModelProperty("老机构ID")
+	private String trainOrgId;
+	/** 1有效 0无效 */
+	@Excel(name = "1有效 0无效")
+	@ApiModelProperty("1有效 0无效")
+	private Integer status;
+	/** 参数 */
+	@Excel(name = "参数")
+	@ApiModelProperty("参数")
+	private String paramJson;
+	/** 支付结果 1成功 0失败 */
+	@Excel(name = "支付结果 1回调成功 0支付中未回调 -1回调失败")
+	@ApiModelProperty("支付结果 1回调成功 0支付中未回调 -1回调失败")
+	private Integer resultStatus;
+}

+ 24 - 0
zhongzheng-system/src/main/resources/mapper/modules/top/TopOrderBankPayMapper.xml

@@ -0,0 +1,24 @@
+<?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.zhongzheng.modules.top.order.mapper.TopOrderBankPayMapper">
+
+    <resultMap type="com.zhongzheng.modules.top.order.domain.TopOrderBankPay" id="TopOrderBankPayResult">
+        <result property="id" column="id"/>
+        <result property="paySn" column="pay_sn"/>
+        <result property="orderSn" column="order_sn"/>
+        <result property="toBankAcount" column="to_bank_acount"/>
+        <result property="toBankName" column="to_bank_name"/>
+        <result property="toBankTypeName" column="to_bank_type_name"/>
+        <result property="money" column="money"/>
+        <result property="trainOrgId" column="train_org_id"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="status" column="status"/>
+        <result property="paramJson" column="param_json"/>
+        <result property="resultStatus" column="result_status"/>
+    </resultMap>
+
+
+</mapper>