修改

xuhy

2024-12-30 42e9b2c97a3f20518cd4db6d6057ac554c6f6ad8

修改

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

@@ -175,8 +175,15 @@
            orderGood.setOrderId(dto.getId());
            if (StringUtils.hasLength(orderGood.getSeriesName())){
                // 镜片
                orderGood.setRLens(orderGood.getRightLens());
                orderGood.setLLens(orderGood.getLeftLens());
                String rLens = orderGood.getRLens();
                String[] split = rLens.split(",");
                String[] split = null;
                if(StringUtils.hasLength(rLens)){
                    split = rLens.split(",");
                }else {
                    split = orderGood.getLLens().split(",");
                }
                TBrand one1 = brandService.lambdaQuery().eq(TBrand::getName, orderGood.getBrandName())
                        .eq(TBrand::getType, 2).one();
                TLensSeries one2 = lensSeriesService.lambdaQuery().eq(TLensSeries::getName, orderGood.getSeriesName())

 manage/src/main/java/com/jilongda/manage/model/TOrderGoods.java

@@ -45,7 +45,6 @@
    private String color;

    @ApiModelProperty(value = "镜片右 球镜+柱镜 逗号拼接 字段为空 客户自带")
    @NotBlank(message = "")
    @TableField("rLens")
    private String rLens;

@@ -88,5 +87,11 @@
    @ApiModelProperty(value = "核算成本价")
    @TableField("constConfirm")
    private BigDecimal constConfirm;
    @ApiModelProperty(value = "镜片右 球镜+柱镜")
    @TableField(exist = false)
    private String rightLens;

    @ApiModelProperty(value = "镜片左 球镜+柱镜")
    @TableField(exist = false)
    private String leftLens;
}

 manage/src/main/java/com/jilongda/manage/service/impl/TOrderServiceImpl.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.jilongda.common.basic.PageInfo;
import com.jilongda.common.utils.TimeUtils;
import com.jilongda.manage.authority.mapper.SecUserMapper;
import com.jilongda.manage.authority.model.SecUser;
import com.jilongda.manage.mapper.TAppUserMapper;
@@ -117,7 +118,7 @@
            }
            tOrderListVO.setCouponMoney(tOrder.getCouponMoney());
            tOrderListVO.setOrderMoney(tOrder.getOrderMoney());
            tOrderListVO.setOrderTime(simpleDateFormat.format(tOrder.getCreateTime()));
            tOrderListVO.setOrderTime(TimeUtils.localDateTimeToString(tOrder.getCreateTime()));
            res.add(tOrderListVO);
        }
        pageInfo.setRecords(res);