cxc/wisdommining-serve
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bug fix

Browse Source
This commit is contained in:
quantulr
2024-06-07 16:43:30 +08:00
parent fc7f296506
commit 07294d5161
8 changed files with 48 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
.idea/workspace.xml generated
View File

@ -6,13 +6,13 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="bdad98b9-7a5e-48f7-b79e-ed6a34d55dab" name="Default Changelist" comment="第一次提交"> <list default="true" id="bdad98b9-7a5e-48f7-b79e-ed6a34d55dab" name="Default Changelist" comment="第一次提交">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/api/OrderApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/api/OrderApi.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/api/UserApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/api/UserApi.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/api/UserApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/api/UserApi.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/WisdOeder.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/entity/WisdOeder.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/impl/OrderServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/impl/OrderServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/application-db.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application-db.yml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/resources/application-db.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application-db.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/view/pages/order/order_find.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/view/pages/order/order_find.jsp" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/view/pages/order/order_logistics.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/view/pages/order/order_logistics.jsp" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/view/pages/order/order_refund_list.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/view/pages/order/order_refund_list.jsp" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/view/pages/order/order_refund_list.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/view/pages/order/order_refund_list.jsp" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/view/pages/package/package_list.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/view/pages/package/package_list.jsp" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/view/pages/welfare/welfare_list.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/view/pages/welfare/welfare_list.jsp" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -643,7 +643,9 @@
<workItem from="1716887246099" duration="1175000" /> <workItem from="1716887246099" duration="1175000" />
<workItem from="1717378949557" duration="4511000" /> <workItem from="1717378949557" duration="4511000" />
<workItem from="1717463046217" duration="13312000" /> <workItem from="1717463046217" duration="13312000" />
<workItem from="1717548903642" duration="12582000" /> <workItem from="1717548903642" duration="13189000" />
<workItem from="1717635858346" duration="3501000" />
<workItem from="1717722174072" duration="8229000" />
</task> </task>
<task id="LOCAL-00001" summary="第一次提交"> <task id="LOCAL-00001" summary="第一次提交">
<created>1623736948713</created> <created>1623736948713</created>

20
src/main/java/com/wisdo/mmining/api/OrderApi.java
View File

@ -364,8 +364,22 @@ public class OrderApi {
@ResponseBody @ResponseBody
public Result cancelRefund(Long orderId) { public Result cancelRefund(Long orderId) {
WisdOeder order = orderService.getById(orderId); WisdOeder order = orderService.getById(orderId);
order.setAfterSalesStatus(null); order.setAfterSalesStatus(67);
// TODO: 将退换货相关字段设为null // TODO: 将退换货相关字段设为null
order.setOrderRefund(null);
order.setOrderRefundImg(null);
order.setOrderRefundTime(null);
order.setOrderRefundName(null);
order.setOrderRefundNumber(null);
order.setOrderRefundRemarke(null);
order.setOrderRefundRemarkeTime(null);
order.setOrderRefundInstructions(null);
order.setOrderRefundNum(null);
order.setOrderRefundType(null);
order.setOrderRefundImage(null);
order.setOrderRefundMerchantsName(null);
order.setOrderRefundMerchantsNum(null);
order.setOrderRefundMerchantsTime(null);
orderService.updateById(order); orderService.updateById(order);
return ResultUtil.success("已撤销售后申请"); return ResultUtil.success("已撤销售后申请");
} }
@ -379,10 +393,10 @@ public class OrderApi {
queryWrapper.eq("is_deleted", 0); queryWrapper.eq("is_deleted", 0);
if (status != 0) { if (status != 0) {
if (status == 6) { if (status == 6) {
queryWrapper.and(wrapper -> wrapper.eq("after_sales_status", status).or().eq("after_sales_status", 61).or().eq("after_sales_status", 62).or().eq("after_sales_status", 63).or().eq("after_sales_status", 64).or().eq("after_sales_status", 65).or().eq("after_sales_status", 66)); queryWrapper.and(wrapper -> wrapper.eq("after_sales_status", status).or().eq("after_sales_status", 61).or().eq("after_sales_status", 62).or().eq("after_sales_status", 63).or().eq("after_sales_status", 64).or().eq("after_sales_status", 65).or().eq("after_sales_status", 66).or().eq("after_sales_status", 67));
queryWrapper.orderByDesc("create_time"); queryWrapper.orderByDesc("create_time");
} else { } else {
queryWrapper.and(wrapper -> wrapper.eq("after_sales_status", 66).or().isNull("after_sales_status")).and(wrapper -> wrapper.eq("status", status)); queryWrapper.and(wrapper -> wrapper.eq("after_sales_status", 66).or().eq("after_sales_status", 67).or().isNull("after_sales_status")).and(wrapper -> wrapper.eq("status", status));
queryWrapper.orderByDesc("create_time"); queryWrapper.orderByDesc("create_time");
} }
} else { } else {

4
src/main/java/com/wisdo/mmining/api/UserApi.java
View File

@ -110,10 +110,10 @@ public class UserApi {
QueryWrapper<WisdOeder> queryWrapper = new QueryWrapper<>(); QueryWrapper<WisdOeder> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("user_id", userId); queryWrapper.eq("user_id", userId);
if (status == 6) { if (status == 6) {
queryWrapper.and(wrapper -> wrapper.eq("after_sales_status", status).or().eq("after_sales_status", 61).or().eq("after_sales_status", 62).or().eq("after_sales_status", 63).or().eq("after_sales_status", 64).or().eq("after_sales_status", 65).or().eq("after_sales_status", 66)); queryWrapper.and(wrapper -> wrapper.eq("after_sales_status", status).or().eq("after_sales_status", 61).or().eq("after_sales_status", 62).or().eq("after_sales_status", 63).or().eq("after_sales_status", 64).or().eq("after_sales_status", 65).or().eq("after_sales_status", 66).or().eq("after_sales_status", 67));
} else { } else {
queryWrapper.eq("status", status).and(wrapper -> wrapper queryWrapper.eq("status", status).and(wrapper -> wrapper
.isNull("after_sales_status").or().eq("after_sales_status", 66) .isNull("after_sales_status").or().eq("after_sales_status", 66).or().eq("after_sales_status", 67)
); );
} }
queryWrapper.eq("is_deleted", 0); queryWrapper.eq("is_deleted", 0);

2
src/main/java/com/wisdo/mmining/entity/WisdOeder.java
View File

@ -126,7 +126,7 @@ public class WisdOeder implements Serializable {
private String orderPickTime; private String orderPickTime;
/** /**
* 状态（1待支付 2代发货/待核销 3待收货 4已完成/已核销 5已取消 61申请换货 62 申请退款 63退换货确认 64退换货物流信息提交 65退换货完成 66 退换货失败 ） * 状态（1待支付 2代发货/待核销 3待收货 4已完成/已核销 5已取消 61申请换货 62 申请退款 63退换货确认 64退换货物流信息提交 65退换货完成 66 退换货失败 67 撤销售后）
*/ */
private Integer status; private Integer status;

4
src/main/java/com/wisdo/mmining/service/impl/OrderServiceImpl.java
View File

@ -66,7 +66,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, WisdOeder> implem
@Override @Override
public IPage<WisdOeder> selectPage(String pickTimeStart, String pickTimeEnd, String createTimeStart, String createTimeEnd, Long companyId, Long addressId, Integer orderPick, String orderNumber, String userName, String userPhone, Integer status, Integer orderPayWay, int page, int num) { public IPage<WisdOeder> selectPage(String pickTimeStart, String pickTimeEnd, String createTimeStart, String createTimeEnd, Long companyId, Long addressId, Integer orderPick, String orderNumber, String userName, String userPhone, Integer status, Integer orderPayWay, int page, int num) {
QueryWrapper<WisdOeder> queryWrapper = new QueryWrapper<>(); QueryWrapper<WisdOeder> queryWrapper = new QueryWrapper<>();
queryWrapper.and(wrap -> wrap.eq("after_sales_status", 66).or().isNull("after_sales_status")); queryWrapper.and(wrap -> wrap.eq("after_sales_status", 66).or().eq("after_sales_status", 67).or().isNull("after_sales_status"));
if (orderNumber != null && !"".equals(orderNumber)) { if (orderNumber != null && !"".equals(orderNumber)) {
queryWrapper.like("order_number", orderNumber); queryWrapper.like("order_number", orderNumber);
} }
@ -144,7 +144,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, WisdOeder> implem
queryWrapper.eq("order_pick", 1); queryWrapper.eq("order_pick", 1);
} }
if (status != null && status != 0) { if (status != null && status != 0) {
queryWrapper.eq("after_sales_status", status); queryWrapper.eq("after_sales_status", status).ne("after_sales_status", 67);
} else { } else {
queryWrapper.and(wrapper -> wrapper.eq("after_sales_status", 61).or().eq("after_sales_status", 62).or().eq("after_sales_status", 63).or().eq("after_sales_status", 64).or().eq("after_sales_status", 65).or().eq("after_sales_status", 66)); queryWrapper.and(wrapper -> wrapper.eq("after_sales_status", 61).or().eq("after_sales_status", 62).or().eq("after_sales_status", 63).or().eq("after_sales_status", 64).or().eq("after_sales_status", 65).or().eq("after_sales_status", 66));
} }

12
src/main/resources/application-db.yml
View File

@ -1,12 +1,12 @@
#开发环境 #开发环境
spring: spring:
datasource: datasource:
url: jdbc:mysql://192.168.0.142:3306/wisdo?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8 # url: jdbc:mysql://192.168.0.142:3306/wisdo?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
# url: jdbc:mysql://146.56.198.32:3306/wisdo?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8 url: jdbc:mysql://146.56.198.32:3306/wisdo?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
username: yshop # username: yshop
# username: root username: root
password: Qwer1234. # password: Qwer1234.
# password: Sphc666888! password: Sphc666888!
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
druid: druid:

12
src/main/resources/application.yml
View File

@ -1,6 +1,6 @@
server: server:
port: 9000 # port: 9000
# port: 9090 port: 9090
servlet: servlet:
context-path: /wisdommining context-path: /wisdommining
spring: spring:
@ -39,8 +39,8 @@ spring:
# port: 6379 # port: 6379
redis: redis:
database: 10 database: 10
host: localhost # host: localhost
# host: 146.56.198.32 host: 146.56.198.32
timeout: 100000 timeout: 100000
jedis: jedis:
pool: pool:
@ -49,8 +49,8 @@ spring:
max-idle: 8 max-idle: 8
min-idle: 0 min-idle: 0
port: 6379 port: 6379
# password: Zsd@2021! password: Zsd@2021!
password: # password:
mybatis-plus: mybatis-plus:

10
src/main/webapp/WEB-INF/view/pages/order/order_refund_list.jsp
View File

@ -286,9 +286,13 @@
return '<button class="layui-btn layui-btn-sm" lay-event="edit">详情</button><button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="delivery">同意退款</button><button class="layui-btn layui-btn-sm layui-btn-danger" lay-event="nodeliverys">拒绝退款</button>'; return '<button class="layui-btn layui-btn-sm" lay-event="edit">详情</button><button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="delivery">同意退款</button><button class="layui-btn layui-btn-sm layui-btn-danger" lay-event="nodeliverys">拒绝退款</button>';
} else if (item.afterSalesStatus == 62 && item.orderRefundType == 3) { } else if (item.afterSalesStatus == 62 && item.orderRefundType == 3) {
return '<button class="layui-btn layui-btn-sm" lay-event="edit">详情</button><button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="deliveryStatus">同意退款</button><button class="layui-btn layui-btn-sm layui-btn-danger" lay-event="nodeliveryStatus">拒绝退款</button>'; return '<button class="layui-btn layui-btn-sm" lay-event="edit">详情</button><button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="deliveryStatus">同意退款</button><button class="layui-btn layui-btn-sm layui-btn-danger" lay-event="nodeliveryStatus">拒绝退款</button>';
} else if (item.afterSalesStatus == 64 && (item.orderRefundType == 1 || item.orderRefundType == 2)) { } else if (item.afterSalesStatus == 64 && item.orderRefundType == 1 ) {
return '<button class="layui-btn layui-btn-sm" lay-event="edit">详情</button><button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="deliveryMoney">${item.orderRefundType == 1 ? "退换货发货": '退款'}</button><button class="layui-btn layui-btn-sm layui-btn-danger" lay-event="nodelivery">拒绝退换货</button>'; return '<button class="layui-btn layui-btn-sm" lay-event="edit">详情</button><button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="deliveryMoney">退换货发货</button><button class="layui-btn layui-btn-sm layui-btn-danger" lay-event="nodelivery">拒绝退换货</button>';
} else { }
else if(item.afterSalesStatus == 64 && item.orderRefundType == 2){
return '<button class="layui-btn layui-btn-sm" lay-event="edit">详情</button><button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="deliveryMoney">退款</button><button class="layui-btn layui-btn-sm layui-btn-danger" lay-event="nodelivery">拒绝退换货</button>';
}
else {
return '<button class="layui-btn layui-btn-sm" lay-event="edit">详情</button><button class="layui-btn layui-btn-sm layui-btn-danger" lay-event="del">删除</button>'; return '<button class="layui-btn layui-btn-sm" lay-event="edit">详情</button><button class="layui-btn layui-btn-sm layui-btn-danger" lay-event="del">删除</button>';
} }
} }