原始数据导出

songhua-system/src/main/java/com/songhua/system/domain/ShhTicketRules.java

@@ -39,6 +39,12 @@ public class ShhTicketRules extends BaseEntity {
      */
     private String ticketName;
 
+
+    /**
+     * 金额
+     */
+    private Integer ticketMoney;
+
     /**
      * 票种集合
      */
@@ -68,6 +74,14 @@ public class ShhTicketRules extends BaseEntity {
         return ticketName;
     }
 
+    public Integer getTicketMoney() {
+        return ticketMoney;
+    }
+
+    public void setTicketMoney(Integer ticketMoney) {
+        this.ticketMoney = ticketMoney;
+    }
+
     public void setTicketId(String ticketId) {
         this.ticketId = ticketId;
     }
@@ -91,6 +105,7 @@ public class ShhTicketRules extends BaseEntity {
                 .append("ticketRules", getTicketRules())
                 .append("ticketId", getTicketId())
                 .append("ticketName", getTicketName())
+                .append("ticketMoney", getTicketMoney())
                 .append("ticketList", getTicketList())
                 .toString();
     }

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

@@ -10,5 +10,7 @@ public class TicketRulesAndTicketIdsVO {
 
     private String ticketIds;
 
+    private Integer ticketMoney;
+
 
 }

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

@@ -391,8 +391,17 @@ public class PzRawDataServiceImpl implements IPzRawDataService {
             for (TicketRulesAndTicketIdsVO vo : ticketNames) {
                 if (map.containsKey(vo.getTicketRules())) {
                     ShhTicketRulesReqVO ticketRulesReqVO = map.get(vo.getTicketRules());
-                    ticketRulesReqVO.setNumberSheets(ticketRulesReqVO.getNumberSheets() + e.getNumber());
-                    ticketRulesReqVO.setAmount(ticketRulesReqVO.getAmount() == null ? BigDecimal.ZERO : ticketRulesReqVO.getAmount().add(e.getMoney()));
+//                    ticketRulesReqVO.setNumberSheets(ticketRulesReqVO.getNumberSheets() + e.getNumber());
+//                    ticketRulesReqVO.setAmount(BigDecimal.valueOf(vo.getTicketMoney()));
+                    // 获取总张数并更新
+                    int newNumberSheets = ticketRulesReqVO.getNumberSheets() + e.getNumber();
+                    ticketRulesReqVO.setNumberSheets(newNumberSheets);
+                    // 获取每张票的金额
+                    double ticketMoney = vo.getTicketMoney();
+                    // 计算总金额为总张数乘以每张票的金额
+                    BigDecimal newAmount = BigDecimal.valueOf(newNumberSheets * ticketMoney);
+                    // 更新总金额
+                    ticketRulesReqVO.setAmount(newAmount);
                 }
             }
         }

songhua-system/src/main/resources/mapper/system/PzRawDataMapper.xml

@@ -27,6 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="TicketRulesAndTicketIdsVO" id="TicketRulesAndTicketIdsVOResult">
         <result property="ticketRules"    column="ticket_rules"    />
         <result property="ticketIds"    column="ticketIds"    />
+        <result property="ticketMoney"    column="ticket_money"    />
     </resultMap>
 
     <sql id="selectPzRawDataVo">
@@ -144,6 +145,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         (
         SELECT
         tr.ticket_rules,
+        tr.ticket_money,
         GROUP_CONCAT( ttm.id ) AS ticketIds
         FROM
         `shh_ticket_rules` tr

songhua-system/src/main/resources/mapper/system/ShhTicketRulesMapper.xml

@@ -7,10 +7,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="ShhTicketRules" id="ShhTicketRulesResult">
         <result property="id"    column="id"    />
         <result property="ticketRules"    column="ticket_rules"    />
+        <result property="ticketMoney"    column="ticket_money"    />
     </resultMap>
 
     <sql id="selectShhTicketRulesVo">
-        select id, ticket_rules
+        select id, ticket_rules,ticket_money
         from shh_ticket_rules
     </sql>
 
@@ -18,6 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
         tr.id,
         ticket_rules,
+        ticket_money,
         GROUP_CONCAT( pttm.ticket_name ) AS ticketName
         FROM
         shh_ticket_rules tr
@@ -31,7 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     
     <select id="selectShhTicketRulesById" parameterType="Long" resultMap="ShhTicketRulesResult">
-        select tr.id, ticket_rules, GROUP_CONCAT(trd.ticket_id) as ticketId
+        select tr.id, ticket_rules,ticket_money, GROUP_CONCAT(trd.ticket_id) as ticketId
         from shh_ticket_rules tr
                  left join shh_ticket_rules_data trd on tr.id = trd.rules_id
         where tr.id = #{id}
@@ -43,9 +45,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         insert into shh_ticket_rules
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="ticketRules != null">ticket_rules,</if>
+            <if test="ticketMoney != null">ticket_money,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="ticketRules != null">#{ticketRules},</if>
+            <if test="ticketMoney != null">#{ticketMoney},</if>
          </trim>
     </insert>
 
@@ -53,6 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update shh_ticket_rules
         <trim prefix="SET" suffixOverrides=",">
             <if test="ticketRules != null">ticket_rules = #{ticketRules},</if>
+            <if test="ticketMoney != null">ticket_money = #{ticketMoney},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -56,6 +56,7 @@
       <el-table-column label="序号" align="center" type="index"/>
       <el-table-column label="票务规则名称" align="center" prop="ticketRules"/>
       <el-table-column label="票种名称" align="center" prop="ticketName"/>
+      <el-table-column label="金额" align="center" prop="ticketMoney"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -102,6 +103,9 @@
             ></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="票务规则金额" prop="ticketMoney">
+          <el-input v-model="form.ticketMoney" placeholder="请输入票务规则金额"/>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -145,7 +149,8 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        ticketRules: null
+        ticketRules: null,
+        ticketMoney: null
       },
       // 表单参数
       form: {},