Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charg...

puzhibing

2024-08-23 b394788e74cd40bcffda59574ad566553a3919ea

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TShoppingOrderController.java

@@ -1,9 +1,22 @@
package com.ruoyi.order.controller;
import java.math.BigDecimal;
import java.time.LocalDateTime;


import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.dto.ExchangeDto;
import com.ruoyi.common.core.utils.OrderCodeUtil;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.order.api.model.TExchangeOrder;
import com.ruoyi.order.api.model.TShoppingOrder;
import com.ruoyi.order.dto.*;
import com.ruoyi.order.service.TShoppingOrderService;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.List;

/**
 * <p>
@@ -17,6 +30,105 @@
@RestController
@RequestMapping("/t-shopping-order")
public class TShoppingOrderController {
	
   @Resource
   private TShoppingOrderService shoppingOrderService;
	
	
   @GetMapping("/getMyShoppingOrderList")
   @ApiOperation(value = "获取购买订单列表", tags = {"小程序-商城购买订单"})
   public AjaxResult<List<MyShoppingOrderList>> getMyShoppingOrderList(GetMyShoppingOrderList query){
      List<MyShoppingOrderList> list = shoppingOrderService.getMyShoppingOrderList(query);
      return AjaxResult.success(list);
   }
	
	
	
   @GetMapping("/getMyShoppingOrderInfo/{id}")
   @ApiOperation(value = "获取购买订单详情", tags = {"小程序-商城购买订单"})
   public AjaxResult<MyShoppingOrderInfo> getMyShoppingOrderInfo(@PathVariable String id){
      MyShoppingOrderInfo info = shoppingOrderService.getMyShoppingOrderInfo(id);
      return AjaxResult.success(info);
   }
	
	
	
   @PutMapping("/confirmReceipt/{id}")
   @ApiOperation(value = "确认收货操作", tags = {"小程序-商城购买订单"})
   public AjaxResult confirmReceipt(@PathVariable String id){
      TShoppingOrder shoppingOrder = shoppingOrderService.getById(id);
      if(shoppingOrder.getStatus() == 3){
         return AjaxResult.error("不能重复确认收货");
      }
      if(shoppingOrder.getStatus() == 1){
         return AjaxResult.error("订单还未发货呢");
      }
      if(shoppingOrder.getStatus() == 4){
         return AjaxResult.error("订单已取消，不允许操作。");
      }
      shoppingOrder.setStatus(3);
      shoppingOrderService.updateById(shoppingOrder);
      return AjaxResult.success();
   }
	
	
   @PutMapping("/cancelOrder/{id}")
   @ApiOperation(value = "取消订单操作", tags = {"小程序-商城购买订单"})
   public AjaxResult cancelOrder(@PathVariable String id){
      return shoppingOrderService.cancelOrder(id);
   }
	
	
	
   @ResponseBody
   @GetMapping(value = "/getNoInvoicedOrder")
   @ApiOperation(value = "获取未开票的订单数据", tags = {"小程序-充电发票"})
   public AjaxResult<List<MyShoppingOrderList>> getNoInvoicedOrder(GetNoInvoicedOrder query){
      List<MyShoppingOrderList> list = shoppingOrderService.getNoInvoicedOrder(query);
      return AjaxResult.success(list);
   }

//   @PostMapping("/create")
//   public R<Long> shopCreate(@RequestBody ExchangeDto exchangeDto){
//      TShoppingOrder shoppingOrder = new TShoppingOrder();
//      shoppingOrder.setCode(OrderCodeUtil.getOrderCode("GW"));
//      shoppingOrder.setAppUserId(exchangeDto.getUserId());
//      shoppingOrder.setOrderType(exchangeDto.getGoodType());
//      if (exchangeDto.getGoodType()==1) {
//         shoppingOrder.setGoodsId(exchangeDto.getGoodId());
//      }else {
//         shoppingOrder.setCouponId(exchangeDto.getGoodId());
//      }
//      shoppingOrder.setPurchaseQuantity(exchangeDto.getNum());
//      shoppingOrder.setAppUserAddressId(Long.valueOf(exchangeDto.getAddressId()));
//      shoppingOrder.setOrderAmount(new BigDecimal("0"));
//      shoppingOrder.setAppCouponId(0L);
//      shoppingOrder.setCouponDiscountAmount(new BigDecimal("0"));
//      shoppingOrder.setVipDiscount(new BigDecimal("0"));
//      shoppingOrder.setVipDiscountAmount(new BigDecimal("0"));
//      shoppingOrder.setPaymentAmount(new BigDecimal("0"));
//      shoppingOrder.setPaymentStatus(0);
//      shoppingOrder.setPaymentType(0);
//      shoppingOrder.setSerialNumber("");
//      shoppingOrder.setRemark("");
//      shoppingOrder.setStatus(0);
//      shoppingOrder.setExpressCompany("");
//      shoppingOrder.setExpressNumber("");
//      shoppingOrder.setConsignerId(0);
//      shoppingOrder.setConsignerTime(LocalDateTime.now());
//      shoppingOrder.setReceivingTime(LocalDateTime.now());
//      shoppingOrder.setCancellationTime(LocalDateTime.now());
//      shoppingOrder.setCancellationId(0);
//      shoppingOrder.setRefundCode("");
//      shoppingOrder.setRefundAmount(new BigDecimal("0"));
//      shoppingOrder.setRefundStatus(0);
//      shoppingOrder.setRefundSerialNumber("");
//      shoppingOrder.setRefundTime(LocalDateTime.now());
//      shoppingOrder.setCreateTime(LocalDateTime.now());
//      shoppingOrder.setDelFlag(false);
//
//
//
//   }
}