供应链 发票

hx-common/library-supply/src/main/java/com/fjhx/entity/Invoice.java

@@ -0,0 +1,58 @@
+package com.fjhx.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.fjhx.base.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-08-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class Invoice extends BaseEntity {
+
+
+    /**
+     * 供应商id
+     */
+    private Long supplierId;
+
+    /**
+     * 发票类型
+     */
+    private Integer type;
+
+    /**
+     * 发票金额
+     */
+    private BigDecimal price;
+
+    /**
+     * 税率
+     */
+    private BigDecimal taxRate;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 逻辑删除 0未删除 1已删除
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer delFlag;
+
+
+}

hx-common/library-supply/src/main/java/com/fjhx/entity/InvoiceDetails.java

@@ -0,0 +1,58 @@
+package com.fjhx.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.fjhx.base.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-08-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class InvoiceDetails extends BaseEntity {
+
+
+    /**
+     * 发票id
+     */
+    private Long invoiceId;
+
+    /**
+     * 订单id
+     */
+    private Long orderId;
+
+    /**
+     * 订单编号
+     */
+    private String orderCode;
+
+    /**
+     * 订单金额
+     */
+    private BigDecimal orderPrice;
+
+    /**
+     * 发票金额
+     */
+    private BigDecimal invoicePrice;
+
+    /**
+     * 逻辑删除 0未删除 1已删除
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer delFlag;
+
+
+}

hx-common/library-supply/src/main/java/com/fjhx/entity/Order.java

@@ -4,6 +4,8 @@ import com.fjhx.base.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.math.BigDecimal;
+
 /**
  * <p>
  * 订单
@@ -33,6 +35,11 @@ public class Order extends BaseEntity {
     private Integer accountPeriod;
 
     /**
+     * 订单金额
+     */
+    private BigDecimal price;
+
+    /**
      * 状态 1待审批 2不通过 3审批通过 4完成
      */
     private Integer status;

hx-common/library-supply/src/main/java/com/fjhx/mapper/InvoiceDetailsMapper.java

@@ -0,0 +1,16 @@
+package com.fjhx.mapper;
+
+import com.fjhx.entity.InvoiceDetails;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-08-26
+ */
+public interface InvoiceDetailsMapper extends BaseMapper<InvoiceDetails> {
+
+}

hx-common/library-supply/src/main/java/com/fjhx/mapper/InvoiceDetailsMapper.xml

@@ -0,0 +1,5 @@
+<?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.fjhx.mapper.InvoiceDetailsMapper">
+
+</mapper>

hx-common/library-supply/src/main/java/com/fjhx/mapper/InvoiceMapper.java

@@ -0,0 +1,16 @@
+package com.fjhx.mapper;
+
+import com.fjhx.entity.Invoice;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-08-26
+ */
+public interface InvoiceMapper extends BaseMapper<Invoice> {
+
+}

hx-common/library-supply/src/main/java/com/fjhx/mapper/InvoiceMapper.xml

@@ -0,0 +1,5 @@
+<?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.fjhx.mapper.InvoiceMapper">
+
+</mapper>

hx-common/library-supply/src/main/java/com/fjhx/service/InvoiceDetailsService.java

@@ -0,0 +1,16 @@
+package com.fjhx.service;
+
+import com.fjhx.base.BaseService;
+import com.fjhx.entity.InvoiceDetails;
+
+/**
+ * <p>
+ * 服务类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-08-26
+ */
+public interface InvoiceDetailsService extends BaseService<InvoiceDetails> {
+
+}

hx-common/library-supply/src/main/java/com/fjhx/service/InvoiceService.java

@@ -0,0 +1,16 @@
+package com.fjhx.service;
+
+import com.fjhx.base.BaseService;
+import com.fjhx.entity.Invoice;
+
+/**
+ * <p>
+ * 服务类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-08-26
+ */
+public interface InvoiceService extends BaseService<Invoice> {
+
+}

hx-common/library-supply/src/main/java/com/fjhx/service/impl/InvoiceDetailsServiceImpl.java

@@ -0,0 +1,20 @@
+package com.fjhx.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.entity.InvoiceDetails;
+import com.fjhx.mapper.InvoiceDetailsMapper;
+import com.fjhx.service.InvoiceDetailsService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-08-26
+ */
+@Service
+public class InvoiceDetailsServiceImpl extends ServiceImpl<InvoiceDetailsMapper, InvoiceDetails> implements InvoiceDetailsService {
+
+}

hx-common/library-supply/src/main/java/com/fjhx/service/impl/InvoiceServiceImpl.java

@@ -0,0 +1,20 @@
+package com.fjhx.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.entity.Invoice;
+import com.fjhx.mapper.InvoiceMapper;
+import com.fjhx.service.InvoiceService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-08-26
+ */
+@Service
+public class InvoiceServiceImpl extends ServiceImpl<InvoiceMapper, Invoice> implements InvoiceService {
+
+}

hx-common/library-supply/src/main/java/com/fjhx/service/impl/OrderServiceImpl.java

@@ -22,6 +22,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -111,7 +112,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
             String code = fun.get();
 
+            BigDecimal price = applyPurchaseList.stream().map(ApplyPurchase::getApplyPrice)
+                    .reduce(BigDecimal.ZERO, BigDecimal::add);
+
             Order orderTemp = new Order();
+            orderTemp.setPrice(price);
             orderTemp.setSupplierId(supplierId);
             orderTemp.setAccountPeriod(accountPeriod);
             orderTemp.setCode(code);