|
|
|
@ -4,13 +4,19 @@ import java.io.IOException; |
|
|
|
import java.util.List; |
|
|
|
import javax.servlet.http.HttpServletResponse; |
|
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers; |
|
|
|
import com.baomidou.mybatisplus.extension.api.R; |
|
|
|
import com.cyl.h5.pojo.vo.H5OrderVO; |
|
|
|
import com.cyl.h5.service.H5OrderService; |
|
|
|
import com.cyl.manager.oms.domain.Order; |
|
|
|
import com.cyl.manager.oms.mapper.OrderMapper; |
|
|
|
import com.cyl.manager.oms.service.OrderService; |
|
|
|
import com.ruoyi.applet.service.IApiMallOrderService; |
|
|
|
import com.ruoyi.applet.service.IMallOrderService; |
|
|
|
import com.ruoyi.common.utils.StringUtils; |
|
|
|
import com.ruoyi.model.service.IAppletUsersService; |
|
|
|
import com.ruoyi.model.domain.AppletOrderDateFrequency; |
|
|
|
import com.ruoyi.model.domain.AppletOrderItem; |
|
|
|
import com.ruoyi.model.service.*; |
|
|
|
import org.springframework.security.access.prepost.PreAuthorize; |
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.web.bind.annotation.GetMapping; |
|
|
|
@ -26,7 +32,6 @@ import com.ruoyi.common.core.controller.BaseController; |
|
|
|
import com.ruoyi.common.core.domain.AjaxResult; |
|
|
|
import com.ruoyi.common.enums.BusinessType; |
|
|
|
import com.ruoyi.model.domain.AppletOrder; |
|
|
|
import com.ruoyi.model.service.IAppletOrderService; |
|
|
|
import com.ruoyi.common.utils.poi.ExcelUtil; |
|
|
|
import com.ruoyi.common.core.page.TableDataInfo; |
|
|
|
|
|
|
|
@ -51,10 +56,18 @@ public class AppletOrderController extends BaseController |
|
|
|
private OrderService service; |
|
|
|
@Autowired |
|
|
|
private IAppletUsersService appletUsersService; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
private IApiMallOrderService apiMallOrderService; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
private IAppletOrderItemService appletOrderItemService; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
private IAppletOrderDateFrequencyService appletOrderDateFrequencyService; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
private OrderMapper orderMapper; |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
* 查询订单信息列表 |
|
|
|
@ -143,14 +156,67 @@ public class AppletOrderController extends BaseController |
|
|
|
return toAjax(appletOrderService.updateAppletOrder(appletOrder)); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 修改接单人员 |
|
|
|
*/ |
|
|
|
@PreAuthorize("@ss.hasPermi('model:AppletOrder:edit')") |
|
|
|
@Log(title = "订单信息", businessType = BusinessType.UPDATE) |
|
|
|
@PutMapping("/orderTaker") |
|
|
|
public AjaxResult editOrderTaker(String id, Long userId) |
|
|
|
{ |
|
|
|
AppletOrder order = appletOrderService.getById(id); |
|
|
|
if (order != null){ |
|
|
|
AppletOrderItem orderItem = appletOrderItemService.lambdaQuery() |
|
|
|
.eq(AppletOrderItem::getOrderId, order.getOrderId()).one(); |
|
|
|
|
|
|
|
if (orderItem != null){ |
|
|
|
orderItem.setUserId(userId); |
|
|
|
appletOrderItemService.updateById(orderItem); |
|
|
|
} |
|
|
|
|
|
|
|
List<AppletOrderDateFrequency> frequency = appletOrderDateFrequencyService.lambdaQuery() |
|
|
|
.eq(AppletOrderDateFrequency::getOrderId, order.getOrderId()).list(); |
|
|
|
|
|
|
|
for (AppletOrderDateFrequency dateFrequency : frequency) { |
|
|
|
dateFrequency.setMasterId(userId); |
|
|
|
appletOrderDateFrequencyService.updateById(dateFrequency); |
|
|
|
} |
|
|
|
|
|
|
|
Order omsOrder = orderMapper.selectById(order.getOrderId()); |
|
|
|
if (omsOrder != null){ |
|
|
|
omsOrder.setAcceptAppUserId(userId); |
|
|
|
orderMapper.updateById(omsOrder); |
|
|
|
} |
|
|
|
|
|
|
|
order.setUserId(userId); |
|
|
|
appletOrderService.updateById(order); |
|
|
|
} |
|
|
|
|
|
|
|
return AjaxResult.success(); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 删除订单信息 |
|
|
|
*/ |
|
|
|
@PreAuthorize("@ss.hasPermi('model:AppletOrder:remove')") |
|
|
|
@Log(title = "订单信息", businessType = BusinessType.DELETE) |
|
|
|
@DeleteMapping("/{ids}") |
|
|
|
@DeleteMapping("/{ids}") |
|
|
|
public AjaxResult remove(@PathVariable Long[] ids) |
|
|
|
{ |
|
|
|
return toAjax(appletOrderService.deleteAppletOrderByIds(ids)); |
|
|
|
for (Long id : ids) { |
|
|
|
AppletOrder order = appletOrderService.getById(id); |
|
|
|
if (order != null){ |
|
|
|
//取消日订单 |
|
|
|
appletOrderItemService.remove(Wrappers.<AppletOrderItem>lambdaQuery() |
|
|
|
.eq(AppletOrderItem::getOrderId, order.getOrderId())); |
|
|
|
|
|
|
|
//取消日订单 |
|
|
|
appletOrderDateFrequencyService.remove(Wrappers.<AppletOrderDateFrequency>lambdaQuery() |
|
|
|
.eq(AppletOrderDateFrequency::getOrderId, order.getOrderId())); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
int i = appletOrderService.deleteAppletOrderByIds(ids); |
|
|
|
return toAjax(i); |
|
|
|
} |
|
|
|
} |
