Skip to content

Q
qianhe-slsy
Commit 93c702d5 by jiang'yun
Options

修改问题

parent 6e7d6cb1
Showing with 59 additions and 13 deletions
qianhe-admin/src/main/java/com/qianhe/system/controller/WaterOrderController.java
...@@ -247,7 +247,14 @@ public class WaterOrderController extends BaseController ...@@ -247,7 +247,14 @@ public class WaterOrderController extends BaseController
@PostMapping("/updateOrderState") @PostMapping("/updateOrderState")
@RepeatSubmit(message = "请勿重复操作!") @RepeatSubmit(message = "请勿重复操作!")
public AjaxResult updateOrderState(@RequestBody WaterOrderVo waterOrderVo){ public AjaxResult updateOrderState(@RequestBody WaterOrderVo waterOrderVo){
return toAjax(waterOrderService.updateOrderState(waterOrderVo)); int i = waterOrderService.updateOrderState(waterOrderVo);
if(i==3){
return AjaxResult.success("该订单已超过下单时间的晚上0点，请联系商家退款");
}else {
return toAjax(i);
}
} }
/** /**
......
qianhe-admin/src/main/java/com/qianhe/system/domain/WaterOrder.java
...@@ -193,4 +193,8 @@ public class WaterOrder extends BaseEntity ...@@ -193,4 +193,8 @@ public class WaterOrder extends BaseEntity
/** 退款原因 */ /** 退款原因 */
private String returnOrderResult; private String returnOrderResult;
/** 下单时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "下单时间", dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date xdsj;
} }
qianhe-admin/src/main/java/com/qianhe/system/service/impl/WaterOrderServiceImpl.java
...@@ -331,6 +331,7 @@ public class WaterOrderServiceImpl implements IWaterOrderService ...@@ -331,6 +331,7 @@ public class WaterOrderServiceImpl implements IWaterOrderService
@Transactional @Transactional
public int updateOrderState(WaterOrderVo waterOrderVo) { public int updateOrderState(WaterOrderVo waterOrderVo) {
WaterOrder waterOrder = waterOrderMapper.selectWaterOrderById(waterOrderVo.getId()); WaterOrder waterOrder = waterOrderMapper.selectWaterOrderById(waterOrderVo.getId());
boolean flag=false;
//接单时需再次查看该订单是否已经被用户所取消 //接单时需再次查看该订单是否已经被用户所取消
if (waterOrderVo.getOrderState() == 3){ if (waterOrderVo.getOrderState() == 3){
if (waterOrder.getOrderState() == 5){ if (waterOrder.getOrderState() == 5){
...@@ -348,17 +349,45 @@ public class WaterOrderServiceImpl implements IWaterOrderService ...@@ -348,17 +349,45 @@ public class WaterOrderServiceImpl implements IWaterOrderService
}else { }else {
//银行支付，涉及线上退款 //银行支付，涉及线上退款
if (waterOrder.getOrderState() == 2){ if (waterOrder.getOrderState() == 2){
Date xdsj = waterOrder.getXdsj();
Date nowDate = DateUtils.getNowDate();
Calendar time1 = Calendar.getInstance();
Calendar time2 = Calendar.getInstance();
time1.setTime(xdsj);
time1.set(Calendar.HOUR_OF_DAY, 0);
time1.set(Calendar.MINUTE, 0);
time1.set(Calendar.SECOND, 0);
time1.set(Calendar.MILLISECOND, 0);
time2.setTime(nowDate);
time2.set(Calendar.HOUR_OF_DAY, 0);
time2.set(Calendar.MINUTE, 0);
time2.set(Calendar.SECOND, 0);
time2.set(Calendar.MILLISECOND, 0);
if(time1.equals(time2)){
//相等说明下单时间的晚上0点
//TODO 执行退款操作
//不相等说明下单时间的晚上0点
waterOrderVo.setOrderState(6);//已退款
}else {
flag=true;
//不相等说明下单时间的晚上0点
waterOrderVo.setOrderState(7);//线下处理
}
// waterOrder
//订单类型改为退款订单 //订单类型改为退款订单
waterOrderVo.setOrderType(2); waterOrderVo.setOrderType(2);
//订单状态改为进行中
waterOrderVo.setOrderState(3);
//此时取消原因为退款原因 //此时取消原因为退款原因
waterOrderVo.setReturnOrderResult(waterOrderVo.getCancelResult()); waterOrderVo.setReturnOrderResult(waterOrderVo.getCancelResult());
} }
} }
} }
return waterOrderMapper.updateWaterOrder(waterOrderVo); int i = waterOrderMapper.updateWaterOrder(waterOrderVo);
if(flag){
i=3;
}
return i;
} }
/** /**
......
qianhe-admin/src/main/resources/application.yml
...@@ -72,15 +72,14 @@ spring: ...@@ -72,15 +72,14 @@ spring:
# redis 配置 # redis 配置
redis: redis:
# 地址 # 地址
# host: 1.116.38.25 host: 1.116.38.25
# # 端口，默认为6379 # 端口，默认为6379
# port: 7789 port: 7789
#
# # 密码 # # 密码
# password: qianheRedis2021 password: qianheRedis2021
host: 127.0.0.1 # host: 127.0.0.1
port: 34597 # port: 34597
password: # password:
# 数据库索引 # 数据库索引
database: 2 database: 2
# 连接超时时间 # 连接超时时间
......
qianhe-admin/src/main/resources/mapper/WaterOrderMapper.xml
...@@ -50,10 +50,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -50,10 +50,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="goodsVal" column="goods_val" /> <result property="goodsVal" column="goods_val" />
<result property="orderType" column="order_type" /> <result property="orderType" column="order_type" />
<result property="returnOrderResult" column="return_order_result" /> <result property="returnOrderResult" column="return_order_result" />
<result property="xdsj" column="xdsj" />
</resultMap> </resultMap>
<sql id="selectWaterOrderVo"> <sql id="selectWaterOrderVo">
select id, order_num, user_id, user_name, user_phone, user_province, user_city, user_area, user_address, station_id, station_name, station_phone, station_province, station_city, station_area, station_address, order_goods_type, order_state, complete_state, confirm_state, pay_state, pay_type, pay_num, cancel_result, user_address_id, name, province, city, area, address, lon, lat, mobile, deliever_time, deliever_name, deliever_mobile, create_time, create_user, deliever_over, take_time, finish_time, remark, goods_val, order_type, return_order_result from water_order select id, order_num, user_id, user_name, user_phone, user_province, user_city, user_area, user_address,
station_id, station_name, station_phone, station_province, station_city, station_area,
station_address, order_goods_type, order_state, complete_state, confirm_state,
pay_state, pay_type, pay_num, cancel_result, user_address_id, name, province,
city, area, address, lon, lat, mobile, deliever_time, deliever_name, deliever_mobile,
create_time, create_user, deliever_over, take_time, finish_time, remark, goods_val,
order_type, return_order_result,xdsj from water_order
</sql> </sql>
<select id="selectWaterOrderList" parameterType="com.qianhe.system.vo.WaterOrderVo" resultMap="WaterOrderResult"> <select id="selectWaterOrderList" parameterType="com.qianhe.system.vo.WaterOrderVo" resultMap="WaterOrderResult">
......
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