Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

zhubaomin

2024-09-26 5cb82c45b0369db9e1dcfe312e93cf0e2acb6c52

Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

 pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerTrampMapper.xml

@@ -138,13 +138,13 @@
                AND  protocol = #{protocol,jdbcType=VARCHAR}
            </if>
        </where>
        order by rtuAddr desc
        <trim prefix="limit " >
            <if test="start != null and count != null">
                #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
            </if>
        </trim>
        order by rtuAddr desc
    </select>
</select>
    <!--    根据条件获取流浪控制器数量-->
    <select id="getTrampControllersCount" resultType="java.lang.Long">
        select

 pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml

@@ -665,6 +665,7 @@
        pay.`name` AS paymentName,
        us.`name` AS operatorName,
        ope.operate_dt AS operateTime,
        ope.operator AS cashierId,
        NOW() AS currentTime
    FROM se_card_operate ope
    INNER JOIN se_client cli ON ope.client_id = cli.id

 pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateSv.java

@@ -539,6 +539,13 @@
     * @return
     */
    public Map getReceipts(QoReceipt queryVo) {
        if (queryVo.getTimeStart() != null && queryVo.getTimeStart() != ""){
            queryVo.setTimeStart(queryVo.getTimeStart() + " 00:00:00");
        }
        if (queryVo.getTimeStop() != null && queryVo.getTimeStop() != ""){
            queryVo.setTimeStop(queryVo.getTimeStop() + " 23:59:59");
        }

        Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo);

        DecimalFormat df = new DecimalFormat("#.00");

 pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/qo/QoReceipt.java

@@ -30,4 +30,8 @@
     * 是否仅存在赠送金额的
     */
    public Boolean onlyGift;
    /**
     * 收银员ID
     */
    public String cashierId;
}