Skip to content

F
farming
Commit 50b82ac0 by zhengyunfei
Options

退款申请提交bug修复

parent 35d4cbb2
Showing with 45 additions and 27 deletions
src/main/java/com/yunniu/farming/webadmin/model/OrderMain.java
......@@ -99,7 +99,10 @@ public class OrderMain {
private Integer ipaystatus; // 支付状态[0:未支付1:支付成功2:支付失败]
private Date tpaytime; // 支付时间[yyyy-MM-dd hh:mm:ss]
private String refundorderno;
private Integer irefundstatus; // 退款状态[101退款申请中 102待退货 103待退款 104退款成功 105退款拒绝]
private Integer irefundstatus; // 退款状态[1退款申请，2申请通过，3申请拒绝，4待退货，5退款成功,6待退款]
@TableField(exist = false)
private Integer irefundtype; // 退款类型[1：仅退款，2退货退款]
private Double irefundmoney; // 退款金额
private Date trefundtime; // 退款时间[yyyy-MM-dd hh:mm:ss]
private String srefundreason; // 退款理由
......
src/main/java/com/yunniu/farming/webadmin/service/impl/OrderMainServiceImpl.java
......@@ -435,7 +435,7 @@ public class OrderMainServiceImpl {
if (StringUtils.isEmpty(co.getSdef4())) {
//支会回调标志
co.setIstatus(OrderMain.STATUS_WAITING);//待收货
co.setIstatus(OrderMain.STATUS_YESPAY);//待发货
co.setIpaystatus(OrderMain.PAY_STATUS_OK);//支付成功
co.setTpaytime(new Date());//支付时间
co.setSdef4("1");
......
src/main/resources/application.properties
#spring.datasource.url=jdbc:mysql://152.136.113.101:3306/farming?autoReconnect=true&useUnicode=true&allowMultiQueries=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
#spring.datasource.username=root
#spring.datasource.password=Root_123456
spring.datasource.url=jdbc:mysql://1.15.43.240:3306/farming?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
spring.datasource.url=jdbc:mysql://127.0.0.1:3306/farming?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
spring.datasource.username=farming
spring.datasource.password=PKWB6psxa7FBApZB
#spring.datasource.url=jdbc:mysql://db.dev.yyinhong.cn:3317/farming?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
......
src/main/resources/mappings/OrderMainMapper.xml
......@@ -211,6 +211,7 @@
<result column="ipaystatus" property="ipaystatus" jdbcType="INTEGER"/>
<result column="group_order_id" property="groupOrderId" jdbcType="INTEGER"/>
<result column="irefundstatus" property="irefundstatus" jdbcType="INTEGER"/>
<result column="irefundtype" property="irefundtype" jdbcType="INTEGER"/>
<result column="tpaytime" property="tpaytime" jdbcType="TIMESTAMP"/>
<result column="trefundtime" property="trefundtime" jdbcType="TIMESTAMP"/>
<result column="istatus" property="istatus" jdbcType="INTEGER"/>
......@@ -291,10 +292,10 @@
, tpaytime
, refundorderno
, irefundmoney
, trefundtime
, srefundreason
, srefundpic
, refund.couriernumber
, refund.refund_time as trefundtime
, refund.refund_reason as srefundreason
, refund.refund_img as srefundpic
, ordermain.couriernumber
, istatus
, itype
, group_order_id
......@@ -319,6 +320,7 @@
, scity
, sregion
, refund.refund_status as irefundstatus
, refund.refund_type as irefundtype
<!-- 关联子表信息 -->
FROM order_main ordermain
left join order_refund refund
......@@ -335,9 +337,16 @@
AND ordermain.customerid = #{customerid,jdbcType=INTEGER}
</if>
<if test="istatus != null">
AND ordermain.istatus = #{istatus,jdbcType=INTEGER}
</if>
<choose>
<when test="istatus != null and istatus ==30">
AND ordermain.istatus in (20, 30)
</when>
<otherwise>
<if test="istatus != null">
AND ordermain.istatus = #{istatus,jdbcType=INTEGER}
</if>
</otherwise>
</choose>
<if test="irefundstatus != null">
AND ordermain.irefundstatus = #{irefundstatus,jdbcType=INTEGER}
</if>
......
src/main/resources/templates/index.html
......@@ -2,7 +2,7 @@
<html lang="en" xmlns:th="http://www.thymeleaf.org">
<head>
<meta charset="UTF-8">
<title>管理系统</title>
<title>米菇菜果管理系统</title>
<meta name="renderer" content="webkit|ie-comp|ie-stand">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta http-equiv="Cache-Control" content="no-siteapp"/>
......@@ -19,7 +19,7 @@
<!-- 顶部开始 -->
<div class="container">
<div class="logo"><a>管理系统</a></div>
<div class="logo"><a>米菇菜果管理系统</a></div>
<div class="left_open">
<i title="展开左侧栏" class="iconfont">&#xe699;</i>
</div>
......@@ -120,4 +120,4 @@
<script type="text/javascript" th:src="@{/js/xadmin.js}"></script>
<script type="text/javascript" th:src="@{/beta/js/xadmin.js}"></script>
</body>
</html>
\ No newline at end of file
</html>
src/main/resources/templates/login.html
......@@ -2,7 +2,7 @@
<html lang="en" xmlns:th="http://www.thymeleaf.org">
<head>
<meta charset="UTF-8">
<title>后台管理系统</title>
<title>米菇菜果后台管理系统</title>
<meta name="renderer" content="webkit|ie-comp|ie-stand">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta http-equiv="Cache-Control" content="no-siteapp">
......@@ -19,7 +19,7 @@
<div class="layadmin-user-login-main">
<div class="layadmin-user-login-box layadmin-user-login-header">
<h1>后台管理系统</h1>
<h1>米菇菜果后台管理系统</h1>
<!--<p></p>-->
</div>
<div class="layadmin-user-login-box layadmin-user-login-body layui-form">
......@@ -41,6 +41,14 @@
<a href="https://beian.miit.gov.cn" style="padding: 80px; font-size: 14px; color: #21874d"
target="_blank">备案号：沪ICP备2023006275号-1</a>
</div>
<div class="layui-panel">
<a style="padding: 51px; font-size: 14px; color: #21874d"
target="_blank">公司地址：上海市青浦区华科路68弄3号202</a>
</div>
<div class="layui-panel">
<a style="padding: 107px; font-size: 14px; color: #21874d"
target="_blank">联系电话：021-69216508</a>
</div>
</div>
</div>
</div>
......@@ -97,4 +105,4 @@
</script>
</body>
</html>
\ No newline at end of file
</html>
src/main/resources/templates/order/loanList.html
......@@ -83,12 +83,12 @@
<script type="text/html" id="table-handle">
<i class="layui-icon layui-icon-form" lay-event="orderDetail" title="订单详情"></i>
<!-- 101退款申请中 102待退货 103待退款 104退款成功 105退款拒绝 106 仅退款-->
{{#if (d.irefundstatus == 101) { }}
{{#if (d.irefundstatus == 1 && d.irefundtype == 2) { }}
<i class="layui-icon layui-icon-ok" lay-event="pass" title="退款申请通过"></i>
<i class="layui-icon layui-icon-close" lay-event="refuse" title="退款申请拒绝"></i>
{{# }else if(d.irefundstatus == 103){ }}
{{# }else if(d.irefundstatus == 4){ }}
<i class="layui-icon layui-icon-component" lay-event="receive" title="退款已收货"></i>
{{# }else if(d.irefundstatus == 106){ }}
{{# }else if(d.irefundstatus == 1 && d.irefundtype == 1){ }}
<i class="layui-icon layui-icon-ok" lay-event="pass" title="仅退款申请通过"></i>
<i class="layui-icon layui-icon-close" lay-event="refuse" title="仅退款申请拒绝"></i>
{{# }else if (d.istatus == 0 || d.istatus == 10) { }}
......@@ -213,12 +213,12 @@
str += ' <span>' + status + '</span>';
// 101退款申请中 102待退货 103待退款 104退款成功
var refundStatus = "";
if (d.irefundstatus == 101) refundStatus = "<span class='layui-badge layui-bg-red'>退款申请</span>";
if (d.irefundstatus == 102) refundStatus = "<span class='layui-badge layui-bg-orange'>待退货</span>";
if (d.irefundstatus == 103) refundStatus = "<span class='layui-badge layui-bg-orange'>待退款</span>";
if (d.irefundstatus == 104) refundStatus = "<span class='layui-badge layui-bg-green'>退款成功</span>";
if (d.irefundstatus == 105) refundStatus = "<span class='layui-badge layui-bg-cyan'>退款拒绝</span>";
if (d.irefundstatus == 106) refundStatus = "<span class='layui-badge layui-bg-red'>仅退款申请</span>";
if (d.irefundstatus == 1 && d.irefundtype == 2) refundStatus = "<span class='layui-badge layui-bg-red'>退款申请</span>";
if (d.irefundstatus == 4) refundStatus = "<span class='layui-badge layui-bg-orange'>待退货</span>";
if (d.irefundstatus == 6) refundStatus = "<span class='layui-badge layui-bg-orange'>待退款</span>";
if (d.irefundstatus == 5) refundStatus = "<span class='layui-badge layui-bg-green'>退款成功</span>";
if (d.irefundstatus == 3) refundStatus = "<span class='layui-badge layui-bg-cyan'>退款拒绝</span>";
if (d.irefundstatus == 1 && d.irefundtype == 1) refundStatus = "<span class='layui-badge layui-bg-red'>仅退款申请</span>";
str += ' <span>' + refundStatus + '</span>';
str += '</div>';
return str ? str : "";
......
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