获取结款信息

ch-admin-api/src/main/java/com/wwdz/ch/admin/controller/ConsignSaleController.java

@@ -154,4 +154,18 @@ public class ConsignSaleController {
         }
         return consignSaleService.cancel(dto);
     }
+
+
+    @ApiOperation(value = "获取结款信息")
+    @PostMapping("/getSettlementInfo")
+    public Result getSettlementInfo(@RequestBody ConsignSaleRecordRequestDto dto) {
+        logger.info("【请求开始】获取结款信息,请求参数:{}", JSON.toJSONString(dto));
+        Validator validator = new Validator(FormHandler.ofEntity(dto));
+        validator.set("saleId", "寄售单号").must().string()
+                .end();
+        if (!validator.isValid()) {
+            return Result.failed(ResultCode.PARAM_ERROR.getCode(), validator.getErrorInfo());
+        }
+        return consignSaleService.getSettlementInfo(dto);
+    }
 }

ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/ConsignSaleServiceImpl.java

@@ -15,6 +15,7 @@ import com.wwdz.ch.core.type.PageSearchResult;
 import com.wwdz.ch.core.type.Result;
 import com.wwdz.ch.core.util.CacheUtil;
 import com.wwdz.ch.core.util.MediaUtil;
+import com.wwdz.ch.core.util.PriceUtil;
 import com.wwdz.ch.db.dao.*;
 import com.wwdz.ch.db.domain.*;
 import com.wwdz.ch.db.dao.ConsignSaleDao;
@@ -34,10 +35,10 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+
+import java.lang.System;
+import java.math.BigDecimal;
+import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -178,6 +179,12 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
     public Result imgValuate(ConsignSaleRequestDto dto) {
         try {
             //估价完状态不变等待用户确认之后变更状态
+            ConsignSale consignSale = new ConsignSale();
+            consignSale.setImgValuation(dto.getImgValuation());
+            consignSale.setSaleId(dto.getSaleId());
+            consignSaleDao.update(consignSale);
+
+
             //插入操作记录,图文估价
             ConsignSaleRecord consignSaleRecord = new ConsignSaleRecord();
             consignSaleRecord.setSaleId(dto.getSaleId());
@@ -258,6 +265,13 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
     public Result identify(ConsignSaleRequestDto dto) {
         try {
             //鉴定完状态不变等待用户确认之后变更状态
+            ConsignSale consignSale = new ConsignSale();
+            //价格*100
+            consignSale.setValuation(dto.getValuation() * 100);
+            consignSale.setSaleId(dto.getSaleId());
+            consignSaleDao.update(consignSale);
+
+
             //插入操作记录,平台鉴定并估价
             ConsignSaleRecord consignSaleRecord = new ConsignSaleRecord();
             consignSaleRecord.setSaleId(dto.getSaleId());
@@ -291,20 +305,29 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
         return Result.failed();
     }
 
+
+
     @Transactional
     @Override
     public Result finishSale(ConsignSaleRequestDto dto) {
         try {
             ConsignSale consignSaleInfo = consignSaleDao.findById(dto.getSaleId());
             long itemId = consignSaleInfo.getItemId();
+            //建议寄售价
+            int valuationPrice = consignSaleInfo.getValuation();
+            //给用户结算金额,已经是乘以100了,结款金额-平台收取10%的手续费
+            int settleAmount = (int) (valuationPrice * 0.9);
 
             ConsignSale consignSale = new ConsignSale();
-            consignSale.setDealPrice(dto.getDealPrice());
+            //价格 * 100
+            consignSale.setDealPrice(dto.getDealPrice() * 100);
             consignSale.setSaleId(dto.getSaleId());
             consignSale.setCustomState(ConsignSaleEnum.SaleForUserStateEnum.PRE_PAY.getCode());
             consignSale.setSystemState(ConsignSaleEnum.SaleForSysStateEnum.PRE_PAY.getCode());
+            consignSale.setSettleAmount(settleAmount);
             consignSaleDao.update(consignSale);
 
+
             //卖出后商品下架
             itemDao.updateOnSale(itemId, ItemStateEnum.SALED.getCode());
             //插入操作记录,货品售出待结款
@@ -439,4 +462,30 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
         }
         return Result.failed();
     }
+
+    @Override
+    public Result getSettlementInfo(ConsignSaleRecordRequestDto dto) {
+        try {
+            ConsignSale consignSale = consignSaleDao.findById(dto.getSaleId());
+            if (consignSale == null) {
+                return Result.failed("寄售单不存在");
+            }
+            if (consignSale.getSystemState() != ConsignSaleEnum.SaleForSysStateEnum.PRE_PAY.getCode()) {
+                return Result.failed("寄售单状态不是待结款，无法查询结款信息");
+            }
+            long userId = consignSale.getUserId();
+            User user = userDao.queryById(userId);
+            int settleAmount = consignSale.getSettleAmount();
+            String amount = PriceUtil.convertPriceByTwo(settleAmount);
+            Map<String, String> map = new HashMap<>();
+            map.put("name", user.getNickname());
+            map.put("phone", user.getMobile());
+            map.put("settleAmount", amount);
+            return Result.success(map);
+        } catch (Exception e) {
+            logger.error("查询结款信息error : {}", e);
+        }
+        return Result.failed();
+
+    }
 }

ch-admin-api/src/main/java/com/wwdz/ch/admin/service/ConsignSaleService.java

@@ -62,4 +62,11 @@ public interface ConsignSaleService {
      * @return
      */
     Result cancel(ConsignSaleRecordRequestDto dto);
+
+    /**
+     * 获取结款信息
+     * @param dto
+     * @return
+     */
+    Result getSettlementInfo(ConsignSaleRecordRequestDto dto);
 }

ch-core/src/main/java/com/wwdz/ch/core/util/PriceUtil.java

 package com.wwdz.ch.core.util;
 
 import java.math.BigDecimal;
+import java.text.DecimalFormat;
 
 public class PriceUtil {
 
@@ -9,4 +10,16 @@ public class PriceUtil {
         price = price.setScale(2, BigDecimal.ROUND_HALF_UP);
         return price.toString();
     }
+
+    public static String convertPriceByTwo(int price){
+        double num = (double)price / 100;
+        BigDecimal bigDecimal = new BigDecimal(String.valueOf(num));
+        DecimalFormat df = new DecimalFormat("#0.00");
+        return df.format(bigDecimal);
+    }
+
+
+    public static void main(String[] args) {
+        System.out.println(convertPriceByTwo(18900));
+    }
 }

ch-dao/src/main/java/com/wwdz/ch/db/domain/ConsignSale.java

@@ -10,7 +10,7 @@ import lombok.Data;
 
 /**
  * @author shiyu
- * @date   2023/12/18
+ * @date   2023/12/21
  */
 @Data
 public class ConsignSale implements Entity {
@@ -56,6 +56,11 @@ public class ConsignSale implements Entity {
      */
     private Integer dealPrice;
 
+    /**
+     * 结算价格
+     */
+    private Integer settleAmount;
+
     /**
      * 客户端状态
      */
@@ -108,6 +113,7 @@ public class ConsignSale implements Entity {
         sb.append(", imgValuation=").append(imgValuation);
         sb.append(", valuation=").append(valuation);
         sb.append(", dealPrice=").append(dealPrice);
+        sb.append(", settleAmount=").append(settleAmount);
         sb.append(", customState=").append(customState);
         sb.append(", systemState=").append(systemState);
         sb.append(", logisticsCode=").append(logisticsCode);
@@ -141,6 +147,7 @@ public class ConsignSale implements Entity {
             && (this.getImgValuation() == null ? other.getImgValuation() == null : this.getImgValuation().equals(other.getImgValuation()))
             && (this.getValuation() == null ? other.getValuation() == null : this.getValuation().equals(other.getValuation()))
             && (this.getDealPrice() == null ? other.getDealPrice() == null : this.getDealPrice().equals(other.getDealPrice()))
+            && (this.getSettleAmount() == null ? other.getSettleAmount() == null : this.getSettleAmount().equals(other.getSettleAmount()))
             && (this.getCustomState() == null ? other.getCustomState() == null : this.getCustomState().equals(other.getCustomState()))
             && (this.getSystemState() == null ? other.getSystemState() == null : this.getSystemState().equals(other.getSystemState()))
             && (this.getLogisticsCode() == null ? other.getLogisticsCode() == null : this.getLogisticsCode().equals(other.getLogisticsCode()))
@@ -163,6 +170,7 @@ public class ConsignSale implements Entity {
         result = prime * result + ((getImgValuation() == null) ? 0 : getImgValuation().hashCode());
         result = prime * result + ((getValuation() == null) ? 0 : getValuation().hashCode());
         result = prime * result + ((getDealPrice() == null) ? 0 : getDealPrice().hashCode());
+        result = prime * result + ((getSettleAmount() == null) ? 0 : getSettleAmount().hashCode());
         result = prime * result + ((getCustomState() == null) ? 0 : getCustomState().hashCode());
         result = prime * result + ((getSystemState() == null) ? 0 : getSystemState().hashCode());
         result = prime * result + ((getLogisticsCode() == null) ? 0 : getLogisticsCode().hashCode());
@@ -190,6 +198,7 @@ public class ConsignSale implements Entity {
         imgValuation("img_valuation", "imgValuation", "VARCHAR", false),
         valuation("valuation", "valuation", "INTEGER", false),
         dealPrice("deal_price", "dealPrice", "INTEGER", false),
+        settleAmount("settle_amount", "settleAmount", "INTEGER", false),
         customState("custom_state", "customState", "INTEGER", false),
         systemState("system_state", "systemState", "INTEGER", false),
         logisticsCode("logistics_code", "logisticsCode", "VARCHAR", false),

ch-dao/src/main/java/com/wwdz/ch/db/domain/ConsignSaleExample.java

@@ -1356,6 +1356,138 @@ public class ConsignSaleExample {
             return (Criteria) this;
         }
 
+        public Criteria andSettleAmountIsNull() {
+            addCriterion("settle_amount is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSettleAmountIsNotNull() {
+            addCriterion("settle_amount is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSettleAmountEqualTo(Integer value) {
+            addCriterion("settle_amount =", value, "settleAmount");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table consign_sale
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andSettleAmountEqualToColumn(ConsignSale.Column column) {
+            addCriterion(new StringBuilder("settle_amount = ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andSettleAmountNotEqualTo(Integer value) {
+            addCriterion("settle_amount <>", value, "settleAmount");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table consign_sale
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andSettleAmountNotEqualToColumn(ConsignSale.Column column) {
+            addCriterion(new StringBuilder("settle_amount <> ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andSettleAmountGreaterThan(Integer value) {
+            addCriterion("settle_amount >", value, "settleAmount");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table consign_sale
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andSettleAmountGreaterThanColumn(ConsignSale.Column column) {
+            addCriterion(new StringBuilder("settle_amount > ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andSettleAmountGreaterThanOrEqualTo(Integer value) {
+            addCriterion("settle_amount >=", value, "settleAmount");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table consign_sale
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andSettleAmountGreaterThanOrEqualToColumn(ConsignSale.Column column) {
+            addCriterion(new StringBuilder("settle_amount >= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andSettleAmountLessThan(Integer value) {
+            addCriterion("settle_amount <", value, "settleAmount");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table consign_sale
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andSettleAmountLessThanColumn(ConsignSale.Column column) {
+            addCriterion(new StringBuilder("settle_amount < ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andSettleAmountLessThanOrEqualTo(Integer value) {
+            addCriterion("settle_amount <=", value, "settleAmount");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table consign_sale
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andSettleAmountLessThanOrEqualToColumn(ConsignSale.Column column) {
+            addCriterion(new StringBuilder("settle_amount <= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andSettleAmountIn(List<Integer> values) {
+            addCriterion("settle_amount in", values, "settleAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andSettleAmountNotIn(List<Integer> values) {
+            addCriterion("settle_amount not in", values, "settleAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andSettleAmountBetween(Integer value1, Integer value2) {
+            addCriterion("settle_amount between", value1, value2, "settleAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andSettleAmountNotBetween(Integer value1, Integer value2) {
+            addCriterion("settle_amount not between", value1, value2, "settleAmount");
+            return (Criteria) this;
+        }
+
         public Criteria andCustomStateIsNull() {
             addCriterion("custom_state is null");
             return (Criteria) this;

ch-dao/src/main/resources/com/wwdz/ch/db/mapper/ConsignSaleMapper.xml

@@ -11,6 +11,7 @@
     <result column="img_valuation" jdbcType="VARCHAR" property="imgValuation" />
     <result column="valuation" jdbcType="INTEGER" property="valuation" />
     <result column="deal_price" jdbcType="INTEGER" property="dealPrice" />
+    <result column="settle_amount" jdbcType="INTEGER" property="settleAmount" />
     <result column="custom_state" jdbcType="INTEGER" property="customState" />
     <result column="system_state" jdbcType="INTEGER" property="systemState" />
     <result column="logistics_code" jdbcType="VARCHAR" property="logisticsCode" />
@@ -79,7 +80,8 @@
   </sql>
   <sql id="Base_Column_List">
     id, sale_id, item_id, user_id, sale_time, user_price, img_valuation, valuation, deal_price, 
-    custom_state, system_state, logistics_code, waybill, credential, create_time, update_time
+    settle_amount, custom_state, system_state, logistics_code, waybill, credential, create_time, 
+    update_time
   </sql>
   <select id="selectByExample" parameterType="com.wwdz.ch.db.domain.ConsignSaleExample" resultMap="BaseResultMap">
     select
@@ -115,8 +117,8 @@
       </when>
       <otherwise>
         id, sale_id, item_id, user_id, sale_time, user_price, img_valuation, valuation, deal_price, 
-          custom_state, system_state, logistics_code, waybill, credential, create_time, update_time
-          
+          settle_amount, custom_state, system_state, logistics_code, waybill, credential, 
+          create_time, update_time
       </otherwise>
     </choose>
     from consign_sale
@@ -148,8 +150,8 @@
       </when>
       <otherwise>
         id, sale_id, item_id, user_id, sale_time, user_price, img_valuation, valuation, deal_price, 
-          custom_state, system_state, logistics_code, waybill, credential, create_time, update_time
-          
+          settle_amount, custom_state, system_state, logistics_code, waybill, credential, 
+          create_time, update_time
       </otherwise>
     </choose>
     from consign_sale
@@ -171,16 +173,16 @@
     </selectKey>
     insert into consign_sale (sale_id, item_id, user_id, 
       sale_time, user_price, img_valuation, 
-      valuation, deal_price, custom_state, 
-      system_state, logistics_code, waybill, 
-      credential, create_time, update_time
-      )
+      valuation, deal_price, settle_amount, 
+      custom_state, system_state, logistics_code, 
+      waybill, credential, create_time, 
+      update_time)
     values (#{saleId,jdbcType=VARCHAR}, #{itemId,jdbcType=BIGINT}, #{userId,jdbcType=BIGINT}, 
       #{saleTime,jdbcType=TIMESTAMP}, #{userPrice,jdbcType=INTEGER}, #{imgValuation,jdbcType=VARCHAR}, 
-      #{valuation,jdbcType=INTEGER}, #{dealPrice,jdbcType=INTEGER}, #{customState,jdbcType=INTEGER}, 
-      #{systemState,jdbcType=INTEGER}, #{logisticsCode,jdbcType=VARCHAR}, #{waybill,jdbcType=VARCHAR}, 
-      #{credential,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
-      )
+      #{valuation,jdbcType=INTEGER}, #{dealPrice,jdbcType=INTEGER}, #{settleAmount,jdbcType=INTEGER}, 
+      #{customState,jdbcType=INTEGER}, #{systemState,jdbcType=INTEGER}, #{logisticsCode,jdbcType=VARCHAR}, 
+      #{waybill,jdbcType=VARCHAR}, #{credential,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{updateTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.wwdz.ch.db.domain.ConsignSale">
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
@@ -212,6 +214,9 @@
       <if test="dealPrice != null">
         deal_price,
       </if>
+      <if test="settleAmount != null">
+        settle_amount,
+      </if>
       <if test="customState != null">
         custom_state,
       </if>
@@ -259,6 +264,9 @@
       <if test="dealPrice != null">
         #{dealPrice,jdbcType=INTEGER},
       </if>
+      <if test="settleAmount != null">
+        #{settleAmount,jdbcType=INTEGER},
+      </if>
       <if test="customState != null">
         #{customState,jdbcType=INTEGER},
       </if>
@@ -318,6 +326,9 @@
       <if test="record.dealPrice != null">
         deal_price = #{record.dealPrice,jdbcType=INTEGER},
       </if>
+      <if test="record.settleAmount != null">
+        settle_amount = #{record.settleAmount,jdbcType=INTEGER},
+      </if>
       <if test="record.customState != null">
         custom_state = #{record.customState,jdbcType=INTEGER},
       </if>
@@ -355,6 +366,7 @@
       img_valuation = #{record.imgValuation,jdbcType=VARCHAR},
       valuation = #{record.valuation,jdbcType=INTEGER},
       deal_price = #{record.dealPrice,jdbcType=INTEGER},
+      settle_amount = #{record.settleAmount,jdbcType=INTEGER},
       custom_state = #{record.customState,jdbcType=INTEGER},
       system_state = #{record.systemState,jdbcType=INTEGER},
       logistics_code = #{record.logisticsCode,jdbcType=VARCHAR},
@@ -393,6 +405,9 @@
       <if test="dealPrice != null">
         deal_price = #{dealPrice,jdbcType=INTEGER},
       </if>
+      <if test="settleAmount != null">
+        settle_amount = #{settleAmount,jdbcType=INTEGER},
+      </if>
       <if test="customState != null">
         custom_state = #{customState,jdbcType=INTEGER},
       </if>
@@ -427,6 +442,7 @@
       img_valuation = #{imgValuation,jdbcType=VARCHAR},
       valuation = #{valuation,jdbcType=INTEGER},
       deal_price = #{dealPrice,jdbcType=INTEGER},
+      settle_amount = #{settleAmount,jdbcType=INTEGER},
       custom_state = #{customState,jdbcType=INTEGER},
       system_state = #{systemState,jdbcType=INTEGER},
       logistics_code = #{logisticsCode,jdbcType=VARCHAR},
@@ -470,8 +486,8 @@
       </when>
       <otherwise>
         id, sale_id, item_id, user_id, sale_time, user_price, img_valuation, valuation, deal_price, 
-          custom_state, system_state, logistics_code, waybill, credential, create_time, update_time
-          
+          settle_amount, custom_state, system_state, logistics_code, waybill, credential, 
+          create_time, update_time
       </otherwise>
     </choose>
     from consign_sale