Browse Source

金额乘张数

lchao 6 months ago
parent
commit
6d0d964055

+ 4 - 3
songhua-system/src/main/java/com/songhua/system/domain/ShhTicketRules.java

@@ -5,6 +5,7 @@ import com.songhua.common.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -43,7 +44,7 @@ public class ShhTicketRules extends BaseEntity {
     /**
      * 金额
      */
-    private Integer ticketMoney;
+    private BigDecimal ticketMoney;
 
     /**
      * 票种集合
@@ -74,11 +75,11 @@ public class ShhTicketRules extends BaseEntity {
         return ticketName;
     }
 
-    public Integer getTicketMoney() {
+    public BigDecimal  getTicketMoney() {
         return ticketMoney;
     }
 
-    public void setTicketMoney(Integer ticketMoney) {
+    public void setTicketMoney(BigDecimal  ticketMoney) {
         this.ticketMoney = ticketMoney;
     }
 

+ 3 - 1
songhua-system/src/main/java/com/songhua/system/domain/vo/TicketRulesAndTicketIdsVO.java

@@ -3,6 +3,8 @@ package com.songhua.system.domain.vo;
 
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 @Data
 public class TicketRulesAndTicketIdsVO {
 
@@ -10,7 +12,7 @@ public class TicketRulesAndTicketIdsVO {
 
     private String ticketIds;
 
-    private Integer ticketMoney;
+    private BigDecimal ticketMoney;
 
 
 }

+ 5 - 2
songhua-system/src/main/java/com/songhua/system/service/impl/PzRawDataServiceImpl.java

@@ -397,9 +397,12 @@ public class PzRawDataServiceImpl implements IPzRawDataService {
                     int newNumberSheets = ticketRulesReqVO.getNumberSheets() + e.getNumber();
                     ticketRulesReqVO.setNumberSheets(newNumberSheets);
                     // 获取每张票的金额
-                    double ticketMoney = vo.getTicketMoney();
+                    BigDecimal  ticketMoney = vo.getTicketMoney();
+                    // 将 int 类型的 newNumberSheets 转换为 BigDecimal 类型
+                    BigDecimal newNumberSheetsBigDecimal = new BigDecimal(newNumberSheets);
                     // 计算总金额为总张数乘以每张票的金额
-                    BigDecimal newAmount = BigDecimal.valueOf(newNumberSheets * ticketMoney);
+                    BigDecimal newAmount = newNumberSheetsBigDecimal.multiply(ticketMoney);
+
                     // 更新总金额
                     ticketRulesReqVO.setAmount(newAmount);
                 }

+ 2 - 2
songhua-ui/src/views/system/ticketRules/index.vue

@@ -103,8 +103,8 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="票务规则金额" prop="ticketMoney">
-          <el-input v-model="form.ticketMoney" placeholder="请输入票务规则金额"/>
+        <el-form-item label="金额" prop="ticketMoney">
+          <el-input-number :min="0" :max="5000000" v-model="form.ticketMoney" placeholder="请输入金额" maxlength="20"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">