From 25a68e63470ab84cfb04595202b0faa2ea292c4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LI-CCONG=5C=E6=9D=8E=E8=81=AA=E8=81=AA?= <1441652193@qq.com> Date: Fri, 15 Mar 2024 14:25:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=95=86=E6=88=B7=E4=BA=A4?= =?UTF-8?q?=E6=98=93=E6=B5=81=E6=B0=B4=E8=AE=B0=E5=BD=95=E5=8A=9F=E8=83=BD?= =?UTF-8?q?v1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cc/yunxi/domain/po/Enterprise.java | 81 +++++++------------ .../domain/po/EnterpriseAccountBill.java | 75 +++++++++++++++++ .../cc/yunxi/domain/po/RecycleStation.java | 6 +- .../vo/clientaddress/ClientAddressReqVO.java | 6 +- .../java/cc/yunxi/enums/BusinessCodeEnum.java | 4 +- .../mapper/EnterpriseAccountBillMapper.java | 18 +++++ .../cc/yunxi/mapper/EnterpriseMapper.java | 8 ++ .../java/cc/yunxi/service/IClientService.java | 7 ++ .../cc/yunxi/service/IEnterpriseService.java | 13 +++ .../yunxi/service/impl/ClientServiceImpl.java | 68 ++++++++++++---- .../service/impl/EnterpriseServiceImpl.java | 37 +++++++++ .../service/impl/RecycleOrderServiceImpl.java | 5 +- .../mapper/EnterpriseAccountBillMapper.xml | 5 ++ 13 files changed, 259 insertions(+), 74 deletions(-) create mode 100644 nxhs-service/src/main/java/cc/yunxi/domain/po/EnterpriseAccountBill.java create mode 100644 nxhs-service/src/main/java/cc/yunxi/mapper/EnterpriseAccountBillMapper.java create mode 100644 nxhs-service/src/main/resources/mapper/EnterpriseAccountBillMapper.xml diff --git a/nxhs-service/src/main/java/cc/yunxi/domain/po/Enterprise.java b/nxhs-service/src/main/java/cc/yunxi/domain/po/Enterprise.java index 4d23dea..3640353 100644 --- a/nxhs-service/src/main/java/cc/yunxi/domain/po/Enterprise.java +++ b/nxhs-service/src/main/java/cc/yunxi/domain/po/Enterprise.java @@ -1,12 +1,15 @@ package cc.yunxi.domain.po; +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 java.math.BigDecimal; +import java.time.LocalDateTime; import java.util.Date; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; import lombok.Getter; import lombok.Setter; @@ -18,77 +21,53 @@ import lombok.Setter; * @author ccongli * @since 2024-03-10 09:04:53 */ -@Getter -@Setter -@TableName("nx_enterprise") +@Data +@TableName("base_organize") @ApiModel(value = "Enterprise对象", description = "企业(商户)信息") public class Enterprise { @ApiModelProperty("自然主键") - @TableId("id") + @TableId(value = "f_id", type = IdType.ASSIGN_ID) private String id; @ApiModelProperty("商户代码") - @TableField("enterprise_code") + @TableField("f_en_code") private String enterpriseCode; @ApiModelProperty("商户名称") - @TableField("enterprise_name") + @TableField("f_full_name") private String enterpriseName; - @ApiModelProperty("商户简称") - @TableField("enterprise_short_name") - private String enterpriseShortName; + @ApiModelProperty("描述") + @TableField("f_description") + private String description; + + @ApiModelProperty("有效标志(0-禁用,1-启用)") + @TableField("f_enabled_mark") + private Integer status; + @ApiModelProperty("商户余额") + @TableField("fund") + private BigDecimal fund; @ApiModelProperty("商户logo") - @TableField("enterprise_logo") + @TableField("pictures") private String enterpriseLogo; - @ApiModelProperty("主体类型id(国有企业,私有企业,集体)") - @TableField("principal_type_id") - private String principalTypeId; - - @ApiModelProperty("商户状态") - @TableField("enterprise_status") - private Integer enterpriseStatus; - - @ApiModelProperty("合约状态") - @TableField("contract_status") - private Integer contractStatus; - - @ApiModelProperty("所在城市") - @TableField("city") - private String city; - - @ApiModelProperty("传真") - @TableField("fax") - private String fax; - - @ApiModelProperty("联系电话") - @TableField("tele_phone") - private String telePhone; - - @ApiModelProperty("详细地址") - @TableField("address") - private String address; - - @ApiModelProperty("发票抬头") - @TableField("invoice_header") - private String invoiceHeader; - - @ApiModelProperty("商户税号") - @TableField("tax_id") - private String taxId; - - @ApiModelProperty("描述或说明") - @TableField("description") - private String description; +// @ApiModelProperty("注册人手持身份证照片") +// @TableField("registrant_pictures") +// private String registrantPictures; +// +// @ApiModelProperty("社会信用代码证照片") +// @TableField("society_pictures") +// private String societyPictures; +// @ApiModelProperty("拓展属性") +// @TableField("f_property_json") +// private String propertyJson; @ApiModelProperty("创建时间") @TableField("f_creator_time") - private Date fCreatorTime; - + private LocalDateTime creatorTime; @ApiModelProperty("修改时间") @TableField("f_last_modify_time") diff --git a/nxhs-service/src/main/java/cc/yunxi/domain/po/EnterpriseAccountBill.java b/nxhs-service/src/main/java/cc/yunxi/domain/po/EnterpriseAccountBill.java new file mode 100644 index 0000000..e2c1f75 --- /dev/null +++ b/nxhs-service/src/main/java/cc/yunxi/domain/po/EnterpriseAccountBill.java @@ -0,0 +1,75 @@ +package cc.yunxi.domain.po; + +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 java.math.BigDecimal; +import java.time.LocalDateTime; +import java.util.Date; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; + +/** + *
+ * 企业钱包流水 + *
+ * + * @author ccongli + * @since 2024-03-14 06:39:30 + */ +@Getter +@Setter +@TableName("nx_enterprise_account_bill") +@ApiModel(value = "EnterpriseAccountBill", description = "企业钱包流水") +public class EnterpriseAccountBill { + + @ApiModelProperty("主键id") + @TableId(value = "id", type = IdType.ASSIGN_ID) + private String id; + + @ApiModelProperty("企业id") + @TableField("enterprise_id") + private String enterpriseId; + + @ApiModelProperty("流水编号") + @TableField("bill_number") + private String billNumber; + + @ApiModelProperty("订单编号") + @TableField("order_number") + private String orderNumber; + +// @ApiModelProperty("订单类型id") +// @TableField("order_type_id") +// private String orderTypeId; + +// @ApiModelProperty("单据状态id") +// @TableField("bill_status_id") +// private String billStatusId; + +// @ApiModelProperty("收入(元)") +// @TableField("income_amount") +// private BigDecimal incomeAmount; + + @ApiModelProperty("交易额") + @TableField("payout_amount") + private BigDecimal payoutAmount; + + @ApiModelProperty("账户余额(元)") + @TableField("account_balance") + private BigDecimal accountBalance; + + + @ApiModelProperty("创建时间") + @TableField("creator_time") + private LocalDateTime creatorTime; + + @ApiModelProperty("备注") + @TableField("remark") + private String remark; + + +} diff --git a/nxhs-service/src/main/java/cc/yunxi/domain/po/RecycleStation.java b/nxhs-service/src/main/java/cc/yunxi/domain/po/RecycleStation.java index 1f31408..203ce86 100644 --- a/nxhs-service/src/main/java/cc/yunxi/domain/po/RecycleStation.java +++ b/nxhs-service/src/main/java/cc/yunxi/domain/po/RecycleStation.java @@ -122,9 +122,9 @@ public class RecycleStation { @TableField("accept_range") private Integer acceptRange; - @ApiModelProperty("服务范围内小区") - @TableField("accept_housing_estate") - private String acceptHousingEstate; +// @ApiModelProperty("服务范围内小区") +// @TableField("accept_housing_estate") +// private String acceptHousingEstate; @ApiModelProperty("创建时间") @TableField("creator_time") diff --git a/nxhs-service/src/main/java/cc/yunxi/domain/vo/clientaddress/ClientAddressReqVO.java b/nxhs-service/src/main/java/cc/yunxi/domain/vo/clientaddress/ClientAddressReqVO.java index 067c3f6..ce1b20e 100644 --- a/nxhs-service/src/main/java/cc/yunxi/domain/vo/clientaddress/ClientAddressReqVO.java +++ b/nxhs-service/src/main/java/cc/yunxi/domain/vo/clientaddress/ClientAddressReqVO.java @@ -33,9 +33,9 @@ public class ClientAddressReqVO { @NotBlank(message = "联系人手机号不能为空", groups = AddAddressGroup.class) private String receiveMobilePhone; - @ApiModelProperty(value = "城市",required = true) - @NotBlank(message = "城市不能为空", groups = AddAddressGroup.class) - private String receiveCity; +// @ApiModelProperty(value = "城市",required = true) +// @NotBlank(message = "城市不能为空", groups = AddAddressGroup.class) +// private String receiveCity; @ApiModelProperty(value = "地址",required = true) @NotBlank(message = "地址不能为空", groups = AddAddressGroup.class) diff --git a/nxhs-service/src/main/java/cc/yunxi/enums/BusinessCodeEnum.java b/nxhs-service/src/main/java/cc/yunxi/enums/BusinessCodeEnum.java index a36485f..df2fc9d 100644 --- a/nxhs-service/src/main/java/cc/yunxi/enums/BusinessCodeEnum.java +++ b/nxhs-service/src/main/java/cc/yunxi/enums/BusinessCodeEnum.java @@ -12,7 +12,9 @@ import lombok.Getter; @AllArgsConstructor public enum BusinessCodeEnum implements BaseEnum { - ORDER("RO", "订单业务码"); + ORDER("RO", "订单业务码"), + + BILL("BL", "商户流水业务码"); private final String code; diff --git a/nxhs-service/src/main/java/cc/yunxi/mapper/EnterpriseAccountBillMapper.java b/nxhs-service/src/main/java/cc/yunxi/mapper/EnterpriseAccountBillMapper.java new file mode 100644 index 0000000..26db5a6 --- /dev/null +++ b/nxhs-service/src/main/java/cc/yunxi/mapper/EnterpriseAccountBillMapper.java @@ -0,0 +1,18 @@ +package cc.yunxi.mapper; + +import cc.yunxi.domain.po.EnterpriseAccountBill; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + *+ * 企业钱包流水 Mapper 接口 + *
+ * + * @author ccongli + * @since 2024-03-14 06:39:30 + */ +@Mapper +public interface EnterpriseAccountBillMapper extends BaseMapper
@@ -15,4 +16,11 @@ import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface EnterpriseMapper extends BaseMapper
* 企业(商户)信息 服务实现类
@@ -17,4 +26,32 @@ import org.springframework.stereotype.Service;
@Service
public class EnterpriseServiceImpl extends ServiceImpl