记得上下班打卡 | git大法好,push需谨慎

Commit 1a73d92d authored by 胡佳晨's avatar 胡佳晨

修改 会员适用时间文案 统计增加 useEnd

parent 53509f6e
...@@ -128,7 +128,7 @@ ...@@ -128,7 +128,7 @@
<span th:text="${dict2.title}"></span> <span th:text="${dict2.title}"></span>
</div> </div>
<div> <div>
<span>使用日期:</span> <span>用日期:</span>
<span th:text="${dict2.useStart}"></span> <span th:text="${dict2.useStart}"></span>
<span> - </span> <span> - </span>
<span th:text="${dict2.useEnd}"></span> <span th:text="${dict2.useEnd}"></span>
......
...@@ -126,9 +126,9 @@ ...@@ -126,9 +126,9 @@
</div> </div>
</table> </table>
</div> </div>
<button type="button" class="btn btn-w-m btn-success"> <!-- <button type="button" class="btn btn-w-m btn-success">-->
审核记录 <!-- 审核记录-->
</button> <!-- </button>-->
<button type="button" class="btn btn-w-m btn-success" th:if="*{isSubmit==0}" onclick="submitHandler()"> <button type="button" class="btn btn-w-m btn-success" th:if="*{isSubmit==0}" onclick="submitHandler()">
提交审核 提交审核
</button> </button>
......
...@@ -22,6 +22,7 @@ public class PerformanceOrderStatisticalDao { ...@@ -22,6 +22,7 @@ public class PerformanceOrderStatisticalDao {
private BigDecimal price; private BigDecimal price;
private Integer type; private Integer type;
private String useStart; private String useStart;
private String useEnd;
private BigDecimal totalGeneral = BigDecimal.ZERO; private BigDecimal totalGeneral = BigDecimal.ZERO;
private BigDecimal saleGeneral = BigDecimal.ZERO; private BigDecimal saleGeneral = BigDecimal.ZERO;
private BigDecimal surplusGeneral = BigDecimal.ZERO; private BigDecimal surplusGeneral = BigDecimal.ZERO;
......
...@@ -1342,6 +1342,9 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService { ...@@ -1342,6 +1342,9 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
orderRefundsVoBase.getStatus(), orderRefundsVoBase.getUpdatedAt(), orderRefundsId orderRefundsVoBase.getStatus(), orderRefundsVoBase.getUpdatedAt(), orderRefundsId
}); });
dataUtils.delOrderRefundVo(orderRefundsId);
dataUtils.delOrderRefundVoByOrderId(orderTicketsId);
sqls.add(SqlMapping.get("kylin_order_ticket_status.withDraw")); sqls.add(SqlMapping.get("kylin_order_ticket_status.withDraw"));
sqls.add(SqlMapping.get("kylin_order_ticket_entities.withDraw")); sqls.add(SqlMapping.get("kylin_order_ticket_entities.withDraw"));
sqls.add(SqlMapping.get("kylin_order_refund.withDraw")); sqls.add(SqlMapping.get("kylin_order_refund.withDraw"));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment