bug修改

无关风月

2025-01-10 2c258c39133435fa0e6e6da85d503982fd5a967d

 manage/src/main/java/com/jilongda/manage/controller/TOrderAftersalesController.java

@@ -5,6 +5,7 @@
import com.jilongda.common.basic.PageInfo;
import com.jilongda.common.constants.WarehousingConstant;
import com.jilongda.common.utils.CodeGenerateUtils;
import com.jilongda.common.utils.TimeUtils;
import com.jilongda.manage.authority.model.SecUser;
import com.jilongda.manage.authority.service.SecUserService;
import com.jilongda.manage.model.*;
@@ -16,6 +17,7 @@
import com.jilongda.manage.vo.TOrderAftersalesVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
@@ -67,6 +69,11 @@
    @ApiOperation(value = "订单售后添加")
    @PostMapping(value = "/add")
    public ApiResult<String> add(@RequestBody TOrderAftersales dto) {
        List<TOrderAftersales> list = orderAftersalesService.lambdaQuery()
                .eq(TOrderAftersales::getOrderId, dto.getOrderId()).list();
        if (!list.isEmpty()){
            return ApiResult.failed("该订单已售后,不可再次操作!");
        }
        dto.setCode(WarehousingConstant.ASTER_SALES+ CodeGenerateUtils.generateVolumeSn());
        orderAftersalesService.save(dto);
        return ApiResult.success();
@@ -74,31 +81,37 @@
    @ApiOperation(value = "订单售后详情")
    @GetMapping(value = "/detail")
    public ApiResult<TOrderAftersalesDetailVO> detail(Integer id) {
        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("yyyy-MM-dd");
        TOrderAftersales byId = orderAftersalesService.getById(id);
        TOrder byId1 = orderService.getById(byId.getOrderId());
        TStore byId2 = tStoreService.getById(byId1.getStoreId());
        SecUser byId3 = secUserService.getById(byId.getSysId());
        TOptometrist byId5 = tOptometristService.getById(byId.getOptometristId());
        TOrderAftersales orderAftersales = orderAftersalesService.getById(id);
        TOrder order = orderService.getById(orderAftersales.getOrderId());
        TStore store = tStoreService.getById(order.getStoreId());
        SecUser sysUser = secUserService.getById(orderAftersales.getSysId());
        TOptometrist optometrist = tOptometristService.getById(orderAftersales.getOptometristId());
        TOrderAftersalesDetailVO res = new TOrderAftersalesDetailVO();
        res.setOrderId(byId1.getId());
        if (byId1.getUserId()!=null){
            TAppUser byId4 = appUserService.getById(byId1);
        BeanUtils.copyProperties(orderAftersales,res);
        res.setOrderId(order.getId());
        if (order.getUserId()!=null){
            TAppUser byId4 = appUserService.getById(order.getUserId());
            if (byId4!=null){
                res.setPhone(byId4.getPhone());
                res.setName(byId4.getName());
                res.setRealName(byId4.getRealName());
            }
        }else{
            res.setPhone(order.getPhone());
            res.setRealName(order.getRealName());
        }
        res.setStoreName(byId2.getName());
        res.setOptometristName(byId5.getName());
        res.setSalesUser(byId3.getNickName());
        res.setOrderTime(simpleDateFormat.format(byId1.getCreateTime()));
        res.setAfterSalesTime(simpleDateFormat1.format(byId.getCreateTime()));
        List<TOrderGoods> list = goodsService.lambdaQuery().eq(TOrderGoods::getOrderId, byId1.getId()).list();
        res.setStoreName(store.getName());
        if (optometrist!=null){
            res.setOptometristName(optometrist.getName());
        }
        res.setSalesUser(sysUser.getNickName());
        res.setOrderTime(TimeUtils.localDateTimeToString(order.getCreateTime()));
        res.setAfterSalesTime(TimeUtils.localDateTimeToString(orderAftersales.getCreateTime()));
        List<TOrderGoods> list = goodsService.lambdaQuery().eq(TOrderGoods::getOrderId, order.getId()).list();
        res.setGoodsList(list);
        res.setOrderMoney(byId1.getOrderMoney());
        res.setCouponMoney(byId1.getCouponMoney());
        res.setPayMoney(byId1.getPayMoney());
        res.setOrderMoney(order.getOrderMoney());
        res.setCouponMoney(order.getCouponMoney());
        res.setPayMoney(order.getPayMoney());
        return ApiResult.success(res);
    }