update
This commit is contained in:
quantulr
69
.idea/workspace.xml
generated
69
.idea/workspace.xml
generated
@ -6,12 +6,14 @@
|
||||
<component name="ChangeListManager">
|
||||
<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$/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/controller/OrderController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/OrderController.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/dto/GoodsDeDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/dto/GoodsDeDto.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/dto/PackageDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/dto/PackageDto.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/webapp/WEB-INF/view/pages/order/order_edit_address.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/view/pages/order/order_edit_address.jsp" 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_update_address.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/view/pages/order/order_update_address.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_remarke.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/view/pages/order/order_refund_remarke.jsp" afterDir="false" />
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
@ -194,6 +196,9 @@
|
||||
<component name="Git.Settings">
|
||||
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
||||
</component>
|
||||
<component name="HighlightingSettingsPerFile">
|
||||
<setting file="file://$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/impl/OrderServiceImpl.java" root0="FORCE_HIGHLIGHTING" />
|
||||
</component>
|
||||
<component name="IdeDocumentHistory">
|
||||
<option name="CHANGED_PATHS">
|
||||
<list>
|
||||
@ -446,33 +451,33 @@
|
||||
<option name="hideEmptyMiddlePackages" value="true" />
|
||||
<option name="showLibraryContents" value="true" />
|
||||
</component>
|
||||
<component name="PropertiesComponent"><![CDATA[{
|
||||
"keyToString": {
|
||||
"Maven.wisdommining [clean].executor": "Run",
|
||||
"Maven.wisdommining [package].executor": "Run",
|
||||
"RequestMappingsPanelOrder0": "0",
|
||||
"RequestMappingsPanelOrder1": "1",
|
||||
"RequestMappingsPanelWidth0": "75",
|
||||
"RequestMappingsPanelWidth1": "75",
|
||||
"RunOnceActivity.ShowReadmeOnStart": "true",
|
||||
"Spring Boot.WisdoMminingApplication.executor": "Debug",
|
||||
"dart.analysis.tool.window.visible": "false",
|
||||
"git-widget-placeholder": "master",
|
||||
"kotlin-language-version-configured": "true",
|
||||
"last_opened_file_path": "D:/Documents/IdeaProjects/wisdommining-serve/src/main/webapp/static/dist/order_logistics",
|
||||
"node.js.detected.package.eslint": "true",
|
||||
"node.js.detected.package.tslint": "true",
|
||||
"node.js.selected.package.eslint": "(autodetect)",
|
||||
"node.js.selected.package.tslint": "(autodetect)",
|
||||
"nodejs_package_manager_path": "npm",
|
||||
"project.structure.last.edited": "全局库",
|
||||
"project.structure.proportion": "0.0",
|
||||
"project.structure.side.proportion": "0.2",
|
||||
"settings.editor.selected.configurable": "project.propVCSSupport.DirectoryMappings",
|
||||
"show.migrate.to.gradle.popup": "false",
|
||||
"vue.rearranger.settings.migration": "true"
|
||||
<component name="PropertiesComponent">{
|
||||
"keyToString": {
|
||||
"Maven.wisdommining [clean].executor": "Run",
|
||||
"Maven.wisdommining [package].executor": "Run",
|
||||
"RequestMappingsPanelOrder0": "0",
|
||||
"RequestMappingsPanelOrder1": "1",
|
||||
"RequestMappingsPanelWidth0": "75",
|
||||
"RequestMappingsPanelWidth1": "75",
|
||||
"RunOnceActivity.ShowReadmeOnStart": "true",
|
||||
"Spring Boot.WisdoMminingApplication.executor": "Debug",
|
||||
"dart.analysis.tool.window.visible": "false",
|
||||
"git-widget-placeholder": "master",
|
||||
"kotlin-language-version-configured": "true",
|
||||
"last_opened_file_path": "D:/Documents/IdeaProjects/wisdommining-serve/src/main/webapp/static/dist/order_logistics",
|
||||
"node.js.detected.package.eslint": "true",
|
||||
"node.js.detected.package.tslint": "true",
|
||||
"node.js.selected.package.eslint": "(autodetect)",
|
||||
"node.js.selected.package.tslint": "(autodetect)",
|
||||
"nodejs_package_manager_path": "npm",
|
||||
"project.structure.last.edited": "全局库",
|
||||
"project.structure.proportion": "0.0",
|
||||
"project.structure.side.proportion": "0.2",
|
||||
"settings.editor.selected.configurable": "project.propVCSSupport.DirectoryMappings",
|
||||
"show.migrate.to.gradle.popup": "false",
|
||||
"vue.rearranger.settings.migration": "true"
|
||||
}
|
||||
}]]></component>
|
||||
}</component>
|
||||
<component name="ReactorSettings">
|
||||
<option name="notificationShown" value="true" />
|
||||
</component>
|
||||
@ -619,7 +624,9 @@
|
||||
<workItem from="1715569361646" duration="7895000" />
|
||||
<workItem from="1715648805827" duration="24869000" />
|
||||
<workItem from="1715733500690" duration="26406000" />
|
||||
<workItem from="1715820168403" duration="8722000" />
|
||||
<workItem from="1715820168403" duration="9618000" />
|
||||
<workItem from="1715830422976" duration="3631000" />
|
||||
<workItem from="1715906701068" duration="17004000" />
|
||||
</task>
|
||||
<task id="LOCAL-00001" summary="第一次提交">
|
||||
<created>1623736948713</created>
|
||||
|
||||
@ -2,8 +2,12 @@ package com.wisdo.mmining.api;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.fasterxml.jackson.core.JsonProcessingException;
|
||||
import com.fasterxml.jackson.core.type.TypeReference;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.wisdo.mmining.api.dto.AmountDto;
|
||||
import com.wisdo.mmining.api.dto.GoodsDto;
|
||||
import com.wisdo.mmining.controller.dto.PackageDto;
|
||||
import com.wisdo.mmining.entity.*;
|
||||
import com.wisdo.mmining.result.Result;
|
||||
import com.wisdo.mmining.result.ResultUtil;
|
||||
@ -186,7 +190,7 @@ public class OrderApi {
|
||||
|
||||
@ApiOperation(value = "申请退换货")
|
||||
@PostMapping("afterSales")
|
||||
public Result afterSales(Long orderId, String orderRefund, String orderRefundImg, Integer status) {
|
||||
public Result afterSales(Long orderId, String orderRefund, String orderRefundImg, Integer status, Long packageId) throws JsonProcessingException {
|
||||
WisdOeder wisdOeder = orderService.getById(orderId);
|
||||
Long orderNumber = (new Date()).getTime();
|
||||
wisdOeder.setOrderRefundNum("T" + orderNumber);
|
||||
@ -197,7 +201,8 @@ public class OrderApi {
|
||||
}
|
||||
}
|
||||
if (wisdOeder.getStatus() == 2) {
|
||||
wisdOeder.setStatus(62);
|
||||
// wisdOeder.setStatus(62);
|
||||
wisdOeder.setAfterSalesStatus(62);
|
||||
wisdOeder.setOrderRefundType(3);
|
||||
// if (wisdOeder.getOrderPayWay()==2){
|
||||
// WisdWxuser wisdWxuser=wxuserService.getById(wisdOeder.getUserId());
|
||||
@ -270,7 +275,19 @@ public class OrderApi {
|
||||
// return new Result(ResultUtil.ERROR, ResultUtil.ERROR_MSG);
|
||||
// }
|
||||
} else {
|
||||
wisdOeder.setStatus(status);
|
||||
// wisdOeder.setStatus(status);
|
||||
wisdOeder.setAfterSalesStatus(status);
|
||||
String logisticsJson = wisdOeder.getLogistics();
|
||||
ObjectMapper objectMapper = new ObjectMapper();
|
||||
List<PackageDto> packages = objectMapper.readValue(logisticsJson, new TypeReference<List<PackageDto>>() {
|
||||
});
|
||||
for (PackageDto pack : packages) {
|
||||
if (pack.getId().equals(packageId)) {
|
||||
pack.setAfterSalesStatus(status);
|
||||
}
|
||||
}
|
||||
String newLogisticsJson = objectMapper.writeValueAsString(packages);
|
||||
wisdOeder.setLogistics(newLogisticsJson);
|
||||
if (status == 61) {
|
||||
wisdOeder.setOrderRefundType(1);
|
||||
} else if (status == 62) {
|
||||
@ -292,7 +309,8 @@ public class OrderApi {
|
||||
@PostMapping("submitSales")
|
||||
public Result submitSales(Long orderId, String orderRefundNumber, String orderRefundImage, String orderRefundInstructions, String orderRefundName) {
|
||||
WisdOeder wisdOeder = orderService.getById(orderId);
|
||||
wisdOeder.setStatus(64);
|
||||
// wisdOeder.setStatus(64);
|
||||
wisdOeder.setAfterSalesStatus(64);
|
||||
wisdOeder.setOrderRefundImage(orderRefundImage);
|
||||
wisdOeder.setOrderRefundInstructions(orderRefundInstructions);
|
||||
wisdOeder.setOrderRefundNumber(orderRefundNumber);
|
||||
@ -345,10 +363,10 @@ public class OrderApi {
|
||||
queryWrapper.eq("is_deleted", 0);
|
||||
if (status != 0) {
|
||||
if (status == 6) {
|
||||
queryWrapper.and(wrapper -> wrapper.eq("status", status).or().eq("status", 61).or().eq("status", 62).or().eq("status", 63).or().eq("status", 64).or().eq("status", 65).or().eq("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));
|
||||
queryWrapper.orderByDesc("create_time");
|
||||
} else {
|
||||
queryWrapper.eq("status", status);
|
||||
queryWrapper.and(wrapper -> wrapper.eq("after_sales_status", 66).or().isNull("after_sales_status")).and(wrapper -> wrapper.eq("status", status));
|
||||
queryWrapper.orderByDesc("create_time");
|
||||
}
|
||||
} else {
|
||||
|
||||
@ -243,12 +243,14 @@ public class OrderController {
|
||||
if (order == null) {
|
||||
return new Result(ResultUtil.ERROR, ResultUtil.ERROR_MSG);
|
||||
}
|
||||
if (!order.getStatus().equals(64)) {
|
||||
if (!order.getAfterSalesStatus().equals(64)) {
|
||||
return new Result(ResultUtil.ERROR, "该状态无法发货");
|
||||
}
|
||||
order.setOrderRefundMerchantsName(logisticsName);
|
||||
order.setOrderRefundMerchantsNum(logisticsNum);
|
||||
order.setStatus(65);
|
||||
// TODO:
|
||||
// order.setStatus(65);
|
||||
order.setAfterSalesStatus(65);
|
||||
order.setOrderRefundMerchantsTime(new Date());
|
||||
Boolean flag = orderService.saveOrUpdate(order);
|
||||
if (flag) {
|
||||
@ -293,11 +295,13 @@ public class OrderController {
|
||||
if (orderId == null || type == null) {
|
||||
return new ModelAndView("sys/error");
|
||||
}
|
||||
WisdOeder order = orderService.getById(orderId);
|
||||
//type 1 一级弹出层 2二级弹出层
|
||||
ModelAndView modelAndView = new ModelAndView("pages/order/order_refund_remarke");
|
||||
modelAndView.addObject("orderId", orderId);
|
||||
modelAndView.addObject("type", type);
|
||||
modelAndView.addObject("agree", agree);
|
||||
modelAndView.addObject("packages", order.getLogistics() == null ? "[]" : order.getLogistics());
|
||||
return modelAndView;
|
||||
}
|
||||
|
||||
@ -311,26 +315,30 @@ public class OrderController {
|
||||
if (order == null) {
|
||||
return new Result(ResultUtil.ERROR, ResultUtil.ERROR_MSG);
|
||||
}
|
||||
if (!order.getStatus().equals(61) && !order.getStatus().equals(62) && !order.getStatus().equals(64)) {
|
||||
if (!order.getAfterSalesStatus().equals(61) && !order.getAfterSalesStatus().equals(62) && !order.getAfterSalesStatus().equals(64)) {
|
||||
return new Result(ResultUtil.ERROR, "该状态无法完成");
|
||||
}
|
||||
order.setOrderRefundRemarke(orderRefundRemarke);
|
||||
order.setOrderRefundRemarkeTime(new Date());
|
||||
WisdIntegrlRoles wisdIntegrlRoles = integralRolesService.getById(1);
|
||||
if (agree == 1) {
|
||||
order.setStatus(63);
|
||||
// TODO：
|
||||
//order.setStatus(63);
|
||||
order.setAfterSalesStatus(63);
|
||||
Calendar calendar2 = Calendar.getInstance();
|
||||
SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||
calendar2.add(Calendar.DATE, wisdIntegrlRoles.getOrderRefundTime());
|
||||
String three_days_after = sdf2.format(calendar2.getTime());
|
||||
order.setOrderRefundTimes(three_days_after);
|
||||
} else if (agree == 2) {
|
||||
order.setStatus(66);
|
||||
// TODO: 拒绝退换货后订单回到**状态
|
||||
order.setStatus(3);
|
||||
order.setAfterSalesStatus(66);
|
||||
order.setOrderRefundMerchantsTime(new Date());
|
||||
}
|
||||
Boolean flag = orderService.updateById(order);
|
||||
if (flag) {
|
||||
if (order.getStatus() == 63) {
|
||||
if (order.getAfterSalesStatus() == 63) {
|
||||
redisService.set("{'orderNumber':" + order.getOrderNumber() + ",'status':'63'}", "{'orderNumber':" + order.getOrderNumber() + ",'status':'63'}", wisdIntegrlRoles.getOrderRefundTime() * 24 * 60 * 60 * 1000);
|
||||
}
|
||||
// redisService.set ( "{'orderNumber':" + order.getOrderNumber() + ",'status':'65'}", "{'orderNumber':" + order.getOrderNumber() + ",'status':'65'}" , 900000 );
|
||||
@ -344,7 +352,9 @@ public class OrderController {
|
||||
@ResponseBody
|
||||
public Result nodelivery(Long orderId) {
|
||||
WisdOeder order = orderService.getById(orderId);
|
||||
order.setStatus(66);
|
||||
// TODO: 拒绝退换货后订单回到**状态
|
||||
order.setStatus(3);
|
||||
order.setAfterSalesStatus(66);
|
||||
order.setOrderRefundMerchantsTime(new Date());
|
||||
Boolean flag = orderService.saveOrUpdate(order);
|
||||
if (flag) {
|
||||
@ -406,7 +416,9 @@ public class OrderController {
|
||||
Map<String, Object> map = WxPayUtil.tuikuan(wisdOeder.getOrderActualPay().doubleValue(), wisdOeder.getOrderNumber(), wisdOeder.getOrderRefundNum());
|
||||
if (map.get("code").equals(1)) {
|
||||
wisdOeder.setOrderRefundType(3);
|
||||
wisdOeder.setStatus(65);
|
||||
// TODO：
|
||||
//wisdOeder.setStatus(65);
|
||||
wisdOeder.setAfterSalesStatus(65);
|
||||
wisdOeder.setOrderRefundMerchantsTime(new Date());
|
||||
Boolean flag = orderService.saveOrUpdate(wisdOeder);
|
||||
if (flag) {
|
||||
@ -420,7 +432,9 @@ public class OrderController {
|
||||
return new Result(ResultUtil.ERROR, ResultUtil.ERROR_MSG);
|
||||
}
|
||||
}
|
||||
wisdOeder.setStatus(65);
|
||||
// TODO：
|
||||
//wisdOeder.setStatus(65);
|
||||
wisdOeder.setAfterSalesStatus(65);
|
||||
wisdOeder.setOrderRefundMerchantsTime(new Date());
|
||||
Boolean flag = orderService.saveOrUpdate(wisdOeder);
|
||||
if (flag) {
|
||||
@ -436,7 +450,8 @@ public class OrderController {
|
||||
public Result nodeliveryStatus(Long orderId) {
|
||||
WisdOeder wisdOeder = orderService.getById(orderId);
|
||||
// FIXME: 拒绝退货后修改状态
|
||||
wisdOeder.setStatus(2);
|
||||
wisdOeder.setStatus(3);
|
||||
wisdOeder.setAfterSalesStatus(66);
|
||||
Boolean flag = orderService.saveOrUpdate(wisdOeder);
|
||||
if (flag) {
|
||||
return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_MSG);
|
||||
@ -449,7 +464,9 @@ public class OrderController {
|
||||
@ResponseBody
|
||||
public Result deliveryMoney(Long orderId) {
|
||||
WisdOeder order = orderService.getById(orderId);
|
||||
order.setStatus(65);
|
||||
// TODO：
|
||||
//order.setStatus(65);
|
||||
order.setAfterSalesStatus(65);
|
||||
order.setOrderRefundMerchantsTime(new Date());
|
||||
if (order.getOrderRefundType() == 2) {
|
||||
if (order.getOrderPayWay() == 4) {
|
||||
@ -532,7 +549,9 @@ public class OrderController {
|
||||
@ResponseBody
|
||||
public Result refund(Long orderId) {
|
||||
WisdOeder order = orderService.getById(orderId);
|
||||
order.setStatus(66);
|
||||
// TODO: 拒绝退换货后订单回到**状态
|
||||
order.setStatus(3);
|
||||
order.setAfterSalesStatus(66);
|
||||
order.setOrderRefundMerchantsTime(new Date());
|
||||
Boolean flag = orderService.saveOrUpdate(order);
|
||||
if (flag) {
|
||||
@ -546,7 +565,9 @@ public class OrderController {
|
||||
@ResponseBody
|
||||
public Result refundno(Long orderId) {
|
||||
WisdOeder order = orderService.getById(orderId);
|
||||
order.setStatus(66);
|
||||
// TODO: 拒绝退换货后订单回到**状态
|
||||
order.setStatus(3);
|
||||
order.setAfterSalesStatus(66);
|
||||
order.setOrderRefundMerchantsTime(new Date());
|
||||
Boolean flag = orderService.saveOrUpdate(order);
|
||||
if (flag) {
|
||||
@ -840,17 +861,17 @@ public class OrderController {
|
||||
cell2.setCellValue("已完成");
|
||||
} else if (dataList.get(i).getStatus().equals(5)) {
|
||||
cell2.setCellValue("已取消");
|
||||
} else if (dataList.get(i).getStatus().equals(61)) {
|
||||
} else if (dataList.get(i).getAfterSalesStatus().equals(61)) {
|
||||
cell2.setCellValue("申请换货");
|
||||
} else if (dataList.get(i).getStatus().equals(62)) {
|
||||
} else if (dataList.get(i).getAfterSalesStatus().equals(62)) {
|
||||
cell2.setCellValue("申请退款");
|
||||
} else if (dataList.get(i).getStatus().equals(63)) {
|
||||
} else if (dataList.get(i).getAfterSalesStatus().equals(63)) {
|
||||
cell2.setCellValue("退换货确认");
|
||||
} else if (dataList.get(i).getStatus().equals(64)) {
|
||||
} else if (dataList.get(i).getAfterSalesStatus().equals(64)) {
|
||||
cell2.setCellValue("退换货物流信息提交");
|
||||
} else if (dataList.get(i).getStatus().equals(65)) {
|
||||
} else if (dataList.get(i).getAfterSalesStatus().equals(65)) {
|
||||
cell2.setCellValue("退换货完成");
|
||||
} else if (dataList.get(i).getStatus().equals(66)) {
|
||||
} else if (dataList.get(i).getAfterSalesStatus().equals(66)) {
|
||||
cell2.setCellValue("退换货失败");
|
||||
}
|
||||
|
||||
|
||||
@ -8,5 +8,6 @@ import java.util.List;
|
||||
public class PackageDto {
|
||||
private Long id;
|
||||
private List<GoodsDeDto> goods;
|
||||
private Integer afterSalesStatus;
|
||||
private String logisticsNumber;
|
||||
}
|
||||
|
||||
@ -119,6 +119,11 @@ public class WisdOeder implements Serializable {
|
||||
* 状态（1待支付 2代发货/待核销 3待收货 4已完成/已核销 5已取消 61申请换货 62 申请退款 63退换货确认 64退换货物流信息提交 65退换货完成 66 退换货失败 ）
|
||||
*/
|
||||
private Integer status;
|
||||
|
||||
/**
|
||||
* 状态（61申请换货 62申请退款 63退换货确认 64退换货物流信息提交 65退换货完成 66退换货失败）
|
||||
*/
|
||||
private Integer afterSalesStatus;
|
||||
/**
|
||||
* 支付时间
|
||||
*/
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
package com.wisdo.mmining.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
@ -13,7 +12,6 @@ import com.wisdo.mmining.result.ResultUtil;
|
||||
import com.wisdo.mmining.service.*;
|
||||
import com.wisdo.mmining.util.excel.ExcelUntils;
|
||||
import com.wisdo.mmining.utils.QRCodeUtil;
|
||||
import org.apache.shiro.SecurityUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.context.annotation.Lazy;
|
||||
import org.springframework.stereotype.Service;
|
||||
@ -48,7 +46,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, WisdOeder> implem
|
||||
private UserCartService userCartService;
|
||||
@Autowired
|
||||
private RedisService redisService;
|
||||
@Autowired @Lazy
|
||||
@Autowired
|
||||
@Lazy
|
||||
private ProfitsService profitsService;
|
||||
@Autowired
|
||||
private PackageService packageService;
|
||||
@ -67,6 +66,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, WisdOeder> implem
|
||||
@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) {
|
||||
QueryWrapper<WisdOeder> queryWrapper = new QueryWrapper<>();
|
||||
queryWrapper.and(wrap -> wrap.eq("after_sales_status", 66).or().isNull("after_sales_status"));
|
||||
if (orderNumber != null && !"".equals(orderNumber)) {
|
||||
queryWrapper.like("order_number", orderNumber);
|
||||
}
|
||||
@ -144,12 +144,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, WisdOeder> implem
|
||||
queryWrapper.eq("order_pick", 1);
|
||||
}
|
||||
if (status != null && status != 0) {
|
||||
queryWrapper.eq("status",status);
|
||||
queryWrapper.eq("after_sales_status", status);
|
||||
} else {
|
||||
queryWrapper.and(wrapper -> wrapper.eq("status", 61).or().eq("status", 62).or().eq("status", 63).or().eq("status", 64).or().eq("status", 65).or().eq("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));
|
||||
}
|
||||
queryWrapper.orderByDesc("create_time");
|
||||
queryWrapper.orderByAsc("status");
|
||||
queryWrapper.orderByAsc("after_sales_status");
|
||||
Page<WisdOeder> p = new Page<>(page, num);
|
||||
IPage<WisdOeder> wisdCompanyIPage = orderMapper.selectPage(p, queryWrapper);
|
||||
return wisdCompanyIPage;
|
||||
@ -361,7 +361,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, WisdOeder> implem
|
||||
queryWrapper.eq("order_number", orderNumber);
|
||||
WisdOeder wisdOeder = orderMapper.selectOne(queryWrapper);
|
||||
if (wisdOeder.getStatus() == 63) {
|
||||
wisdOeder.setStatus(66);
|
||||
//wisdOeder.setStatus(66);
|
||||
wisdOeder.setAfterSalesStatus(66);
|
||||
orderMapper.updateById(wisdOeder);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#开发环境
|
||||
spring:
|
||||
datasource:
|
||||
url: jdbc:mysql://192.168.0.145:3306/wisdo?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
|
||||
url: jdbc:mysql://192.168.0.233: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: root
|
||||
|
||||
@ -88,11 +88,13 @@
|
||||
</div>
|
||||
下单时间：
|
||||
<div class="layui-inline layui-show-xs-block">
|
||||
<input type="datetime" name="createTimeStart" id="createTimeStart" lay-verify="datetime" placeholder="yyyy-MM-dd HH:mm:ss" autocomplete="off" class="layui-input">
|
||||
<input type="datetime" name="createTimeStart" id="createTimeStart" lay-verify="datetime"
|
||||
placeholder="yyyy-MM-dd HH:mm:ss" autocomplete="off" class="layui-input">
|
||||
</div>
|
||||
-
|
||||
<div class="layui-inline layui-show-xs-block">
|
||||
<input type="datetime" name="createTimeEnd" id="createTimeEnd" lay-verify="datetime" placeholder="yyyy-MM-dd HH:mm:ss" autocomplete="off" class="layui-input">
|
||||
<input type="datetime" name="createTimeEnd" id="createTimeEnd" lay-verify="datetime"
|
||||
placeholder="yyyy-MM-dd HH:mm:ss" autocomplete="off" class="layui-input">
|
||||
</div>
|
||||
<div class="layui-inline layui-show-xs-block">
|
||||
<a class="layui-btn" data-type="reload"><i class="layui-icon"></i></a>
|
||||
@ -251,22 +253,22 @@
|
||||
title: '订单状态',
|
||||
width: 120,
|
||||
templet: function (item) {
|
||||
if (item.status == 61) {
|
||||
if (item.afterSalesStatus == 61) {
|
||||
return '<span class="layui-badge layui-bg-green" style="margin-top: 5px">申请换货</span>';
|
||||
}
|
||||
if (item.status == 62) {
|
||||
if (item.afterSalesStatus == 62) {
|
||||
return '<span class="layui-badge layui-bg-cyan" style="margin-top: 5px">申请退款</span>';
|
||||
}
|
||||
if (item.status == 63) {
|
||||
if (item.afterSalesStatus == 63) {
|
||||
return '<span class="layui-badge layui-bg-orange" style="margin-top: 5px">退换货确认</span>';
|
||||
}
|
||||
if (item.status == 64) {
|
||||
if (item.afterSalesStatus == 64) {
|
||||
return '<span class="layui-badge layui-bg-red" style="margin-top: 5px">退换货物流信息提交</span>';
|
||||
}
|
||||
if (item.status == 65) {
|
||||
if (item.afterSalesStatus == 65) {
|
||||
return '<span class="layui-badge layui-bg-black" style="margin-top: 5px">退换货完成</span>';
|
||||
}
|
||||
if (item.status == 66) {
|
||||
if (item.afterSalesStatus == 66) {
|
||||
return '<span class="layui-badge layui-bg-error" style="margin-top: 5px">退换货失败</span>';
|
||||
}
|
||||
}
|
||||
@ -278,14 +280,16 @@
|
||||
},
|
||||
{
|
||||
fixed: 'right', align: 'center', width: 250, title: '操作', templet: function (item) {
|
||||
if (item.status == 61 && (item.orderRefundType == 1 || item.orderRefundType == 2)) {
|
||||
if (item.afterSalesStatus == 61 && (item.orderRefundType == 1 || 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="delivery">同意换货</button><button class="layui-btn layui-btn-sm layui-btn-danger" lay-event="nodeliverys">拒绝换货</button>';
|
||||
} else if (item.status == 62 && (item.orderRefundType == 1 || item.orderRefundType == 2)) {
|
||||
} else if (item.afterSalesStatus == 62 && (item.orderRefundType == 1 || 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="delivery">同意退款</button><button class="layui-btn layui-btn-sm layui-btn-danger" lay-event="nodeliverys">拒绝退款</button>';
|
||||
} else if (item.status == 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>';
|
||||
} else if (item.status == 64 && (item.orderRefundType == 1 || item.orderRefundType == 2)) {
|
||||
} else if (item.afterSalesStatus == 64 && (item.orderRefundType == 1 || 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 if (item.afterSalesStatus == 63 && (item.orderRefundType == 1 || 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="deliveryReplacedGoods">换货发货</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>';
|
||||
}
|
||||
@ -430,7 +434,7 @@
|
||||
} else if (layEvent === 'edit') { //编辑
|
||||
admin.openMax(root + '/order/find?id=' + data.id, '[ 详情 ]');
|
||||
} else if (layEvent === 'delivery') {
|
||||
if (data.status != 61 && data.status != 62) {
|
||||
if (data.afterSalesStatus != 61 && data.afterSalesStatus != 62) {
|
||||
$.message({
|
||||
message: "该状态无法确认",
|
||||
type: "error"
|
||||
@ -445,7 +449,7 @@
|
||||
, offset: '20%'
|
||||
});
|
||||
} else if (layEvent === 'nodeliverys') {
|
||||
if (data.status != 61 && data.status != 62 && data.status != 64) {
|
||||
if (data.afterSalesStatus != 61 && data.afterSalesStatus != 62 && data.afterSalesStatus != 64) {
|
||||
$.message({
|
||||
message: "该状态无法驳回",
|
||||
type: "error"
|
||||
@ -460,7 +464,7 @@
|
||||
, offset: '20%'
|
||||
});
|
||||
} else if (layEvent === 'nodelivery') {
|
||||
if (data.status != 64) {
|
||||
if (data.afterSalesStatus != 64) {
|
||||
$.message({
|
||||
message: "该状态无法拒绝退换货",
|
||||
type: "error"
|
||||
@ -490,7 +494,7 @@
|
||||
// ,offset: '20%'
|
||||
// });
|
||||
} else if (layEvent === 'deliveryMoney') {
|
||||
if (data.status != 64) {
|
||||
if (data.afterSalesStatus != 64) {
|
||||
$.message({
|
||||
message: "该状态无法完成退换货",
|
||||
type: "error"
|
||||
@ -523,7 +527,7 @@
|
||||
})
|
||||
}
|
||||
} else if (layEvent === 'deliveryStatus') {
|
||||
if (data.status != 62) {
|
||||
if (data.afterSalesStatus != 62) {
|
||||
$.message({
|
||||
message: "该状态无法完成退款",
|
||||
type: "error"
|
||||
@ -546,7 +550,7 @@
|
||||
}
|
||||
})
|
||||
} else if (layEvent === 'nodeliveryStatus') {
|
||||
if (data.status != 62) {
|
||||
if (data.afterSalesStatus != 62) {
|
||||
$.message({
|
||||
message: "该状态无法拒绝退款",
|
||||
type: "error"
|
||||
@ -569,6 +573,10 @@
|
||||
}
|
||||
})
|
||||
}
|
||||
// 替换货发货
|
||||
else if (layEvent === 'deliveryReplacedGoods') {
|
||||
// TODO:
|
||||
}
|
||||
});
|
||||
|
||||
//拒绝退换货
|
||||
|
||||
@ -7,31 +7,51 @@
|
||||
<title>56集品后台管理系统</title>
|
||||
<meta name="renderer" content="webkit">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
|
||||
<meta name="viewport"
|
||||
content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
|
||||
<link rel="stylesheet" href="${root}/static/core/css/form.css" media="all">
|
||||
<script src="${root}/static/core/js/base/tailwindcss.js"></script>
|
||||
<script>
|
||||
const packages = ${packages};
|
||||
</script>
|
||||
</head>
|
||||
<body style="background: white">
|
||||
<div class="layui-fluid">
|
||||
<div id="root"></div>
|
||||
<script type="text/babel">
|
||||
const App = () => {
|
||||
return <div>
|
||||
{packages.map((_package, index) => _package).filter(el => el.after)}
|
||||
</div>
|
||||
}
|
||||
const container = document.getElementById("root")
|
||||
const rootApp = ReactDOM.createRoot(container);
|
||||
rootApp.render(<App/>);
|
||||
</script>
|
||||
<%--<div class="layui-fluid">
|
||||
<div class="layui-row">
|
||||
<form class="layui-form" id="formData" lay-filter="formData">
|
||||
<input type="hidden" id="type" value="${type}">
|
||||
<input type="hidden" id="orderId" name="orderId" value="${orderId}">
|
||||
<input type="hidden" id="agree" name="agree" value="${agree}">
|
||||
|
||||
<div class="layui-form-item formItem">
|
||||
<label for="orderRefundRemarke" class="layui-form-label">备注</label>
|
||||
<div class="layui-input-block">
|
||||
<textarea style="height: 250px" type="text" id="orderRefundRemarke" name="orderRefundRemarke" lay-verify="required" autocomplete="off" class="layui-input"></textarea>
|
||||
<textarea style="height: 250px" type="text" id="orderRefundRemarke" name="orderRefundRemarke"
|
||||
lay-verify="required" autocomplete="off" class="layui-input"></textarea>
|
||||
</div>
|
||||
</div>
|
||||
<div class="layui-form-item formItem">
|
||||
<label class="layui-form-label"></label>
|
||||
<button class="layui-btn layui-btn-primary layui-btn-sm subBtn" style="width: 165px;margin-top: 23px;" lay-filter="add" lay-submit="">提交</button>
|
||||
<button class="layui-btn layui-btn-primary layui-btn-sm subBtn" style="width: 165px;margin-top: 23px;"
|
||||
lay-filter="add" lay-submit="">提交
|
||||
</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>--%>
|
||||
</body>
|
||||
<script>
|
||||
<%--<script>
|
||||
layui.use(['layer', 'form'], function () {
|
||||
var form = layui.form
|
||||
|
||||
@ -73,5 +93,5 @@
|
||||
return false;
|
||||
});
|
||||
})
|
||||
</script>
|
||||
</script>--%>
|
||||
</html>
|
||||
|
||||
Reference in New Issue
Block a user