对公转账信息接口

performance-api/src/main/java/com/clx/performance/param/pc/PlatformAccountTopUpParam.java

@@ -28,7 +28,7 @@ public class PlatformAccountTopUpParam{
     @ApiModelProperty(value="审批拒绝原因")
     private String turnDownContent;
 
-    @ApiModelProperty(value="是否通过 true:通过 false:拒绝",example = "true")
+    @ApiModelProperty(value="是否通过 1:通过 0:拒绝",example = "true")
     private Boolean passType;
 
 

performance-web/src/main/java/com/clx/performance/component/OrderGoodsStatusLazyComponent.java

@@ -104,17 +104,17 @@ public class OrderGoodsStatusLazyComponent implements InitializingBean {
                     BigDecimal childSum = list.stream().map(OrderGoods::getExtractWeight).reduce(BigDecimal.ZERO, BigDecimal::add);
                     log.info("算出所有货单总量:{}, 订单总吨数：{}", childSum, orderInfoFeign.getTransportWeight());
 
-                    if (childSum.compareTo(new BigDecimal(orderInfoFeign.getTransportWeight())) == 0) {
-                        log.info("已完成的货单已经等于订单的拉运吨数，提前更新订单状态 已完成");
-                        //已完成的货单已经等于订单的拉运吨数，提前更新订单状态 已完成
-                        UpdateOrderInfoParam updateOrderInfoParam = new UpdateOrderInfoParam();
-                        updateOrderInfoParam.setOrderId(orderInfoFeign.getId());
-                        updateOrderInfoParam.setOrderStatus(OrderEnum.Status.SUCCESS.getCode());
-                        orderFeign.updateOrderInfo(updateOrderInfoParam);
-                    } else {
-                        log.info("判断吨数不一致：childSum{}, transportWeight {}", childSum, new BigDecimal(orderInfoFeign.getTransportWeight()));
-
-                    }
+//                    if (childSum.compareTo(new BigDecimal(orderInfoFeign.getTransportWeight())) == 0) {
+//                        log.info("已完成的货单已经等于订单的拉运吨数，提前更新订单状态 已完成");
+//                        //已完成的货单已经等于订单的拉运吨数，提前更新订单状态 已完成
+//                        UpdateOrderInfoParam updateOrderInfoParam = new UpdateOrderInfoParam();
+//                        updateOrderInfoParam.setOrderId(orderInfoFeign.getId());
+//                        updateOrderInfoParam.setOrderStatus(OrderEnum.Status.SUCCESS.getCode());
+//                        orderFeign.updateOrderInfo(updateOrderInfoParam);
+//                    } else {
+//                        log.info("判断吨数不一致：childSum{}, transportWeight {}", childSum, new BigDecimal(orderInfoFeign.getTransportWeight()));
+//
+//                    }
                 } else {
                     log.info("当前货单状态为已完结");
                     //更新货单已完结

performance-web/src/main/java/com/clx/performance/controller/pc/owner/OwnerAccountController.java

 package com.clx.performance.controller.pc.owner;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.dao.OwnerTransferInfoDao;
+import com.clx.performance.model.OwnerTransferInfo;
 import com.clx.performance.param.pc.*;
 import com.clx.performance.service.OwnerAccountService;
 import com.clx.performance.service.OwnerCaseOutService;
@@ -43,6 +45,8 @@ public class OwnerAccountController {
 
     private final OwnerRunningWaterRecordService ownerRunningWaterRecordService;
 
+    private final OwnerTransferInfoDao ownerTransferInfoDao;
+
     @ApiOperation(value = "账户信息", notes = "<br>By:胡宇帆")
     @GetMapping("/accountInfo")
     @UnitCovert(param = false)
@@ -107,4 +111,10 @@ public class OwnerAccountController {
         response.setHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_OCTET_STREAM_VALUE);
         workbook.write(response.getOutputStream());
     }
+
+    @ApiOperation(value = "对公转账信息", notes = "<br>By:胡宇帆")
+    @GetMapping("/transferPublic")
+    public Result<OwnerTransferInfo> transferPublic() {
+        return Result.ok(ownerTransferInfoDao.getEntityByKey(1).orElse(null));
+    }
 }

performance-web/src/main/java/com/clx/performance/dao/OwnerTransferInfoDao.java

+package com.clx.performance.dao;
+
+import com.clx.performance.mapper.OwnerTransferInfoMapper;
+import com.clx.performance.model.OwnerTransferInfo;
+import com.msl.common.dao.BaseDao;
+
+/**
+ * @author kavin
+ * Date 2023-10-16
+ * Time 20:01
+ */
+public interface OwnerTransferInfoDao extends BaseDao<OwnerTransferInfoMapper, OwnerTransferInfo, Integer> {
+}

performance-web/src/main/java/com/clx/performance/dao/impl/OwnerTransferInfoDaoImpl.java

+package com.clx.performance.dao.impl;
+
+import com.clx.performance.dao.OwnerTransferInfoDao;
+import com.clx.performance.mapper.OwnerTransferInfoMapper;
+import com.clx.performance.model.OwnerTransferInfo;
+import com.msl.common.dao.impl.BaseDaoImpl;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author kavin
+ * Date 2023-10-16
+ * Time 20:01
+ */
+@Repository
+public class OwnerTransferInfoDaoImpl extends BaseDaoImpl<OwnerTransferInfoMapper, OwnerTransferInfo, Integer> implements OwnerTransferInfoDao {
+}

performance-web/src/main/java/com/clx/performance/mapper/OwnerTransferInfoMapper.java

+package com.clx.performance.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.clx.performance.model.OwnerTransferInfo;
+
+/**
+ * @author kavin
+ * Date 2023-10-16
+ * Time 20:01
+ */
+public interface OwnerTransferInfoMapper extends BaseMapper<OwnerTransferInfo> {
+}

performance-web/src/main/java/com/clx/performance/model/OwnerTransferInfo.java

+package com.clx.performance.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.msl.common.config.KeyColumn;
+import com.msl.common.model.HasKey;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDateTime;
+
+/**
+ * @author kavin
+ * Date 2023-10-16
+ * Time 20:01
+ */
+@Getter
+@Setter
+@Accessors(chain = true)
+@TableName("owner_transfer_info")
+public class OwnerTransferInfo implements HasKey<Integer> {
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @TableField("transfer_tip")
+    @ApiModelProperty("转账提示信息")
+    private String transferTip;
+
+    @TableField("enterprise_name")
+    @ApiModelProperty("企业信息")
+    private String enterpriseName;
+
+    @TableField("open_account_bank")
+    @ApiModelProperty("开户行")
+    private String openAccountBank;
+
+    @TableField("open_account_bank_number")
+    @ApiModelProperty("开户行银行代码")
+    private String openAccountBankNumber;
+
+    @TableField("account_number")
+    @ApiModelProperty("账户账号")
+    private String accountNumber;
+
+    @TableField("create_time")
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @TableField("modified_time")
+    @ApiModelProperty("修改时间")
+    private LocalDateTime modifiedTime;
+
+    @Override
+    @KeyColumn("id")
+    public Integer gainKey() {
+    return this.id;
+    }
+}