无关风月
2024-12-27 175b87906745d1592825b87a158ae8627c28343a
核算订单
2个文件已修改
4个文件已添加
177 ■■■■■ 已修改文件
manage/src/main/java/com/jilongda/manage/controller/TOrderAccountingController.java 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
manage/src/main/java/com/jilongda/manage/mapper/TOrderGoodsMapper.java 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
manage/src/main/java/com/jilongda/manage/model/TOrderGoods.java 77 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
manage/src/main/java/com/jilongda/manage/service/TOrderGoodsService.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
manage/src/main/java/com/jilongda/manage/service/impl/TOrderGoodsServiceImpl.java 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
manage/src/main/java/com/jilongda/manage/vo/TOrderAccountVO.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
manage/src/main/java/com/jilongda/manage/controller/TOrderAccountingController.java
@@ -15,6 +15,7 @@
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import java.math.BigDecimal;
import java.util.List;
/**
@@ -39,6 +40,8 @@
    private TAppUserService appUserService;
    @Autowired
    private TOptometryDetailService optometryDetailService;
    @Autowired
    private TOrderGoodsService orderGoodsService;
    @ApiOperation(value = "核算订单分页列表")
    @PostMapping(value = "/pageList")
    public ApiResult<PageInfo<TOrderVO>> pageList(@RequestBody TOrderAccountingQuery query) {
@@ -68,11 +71,18 @@
        List<TOptometryDetail> list = optometryDetailService.lambdaQuery().eq(TOptometryDetail::getOrderId, id)
                .eq(TOptometryDetail::getType, 1).list();
        res.setOptometryDetails(list);
//        res.setOrderGoods();
//        res.setStoreName();
//        res.setOrderMoney();
//        res.setCouponMoney();
//        res.setPayMoney();
        List<TOrderGoods> orderGoods = orderGoodsService.lambdaQuery()
                .eq(TOrderGoods::getOrderId, id).list();
        BigDecimal bigDecimal = new BigDecimal("0");
        for (TOrderGoods orderGood : orderGoods) {
            bigDecimal =bigDecimal.add(orderGood.getGoodsMoney());
        }
        res.setOrderGoods(orderGoods);
        TStore byId1 = storeService.getById(byId.getStoreId());
        res.setStoreName(byId1.getName());
        res.setOrderMoney(bigDecimal);
        res.setCouponMoney(byId.getCouponMoney());
        res.setPayMoney(byId.getPayMoney());
//        res.setPayType();
//        res.setRealPayMoney();
//        res.setCommission();
manage/src/main/java/com/jilongda/manage/mapper/TOrderGoodsMapper.java
New file
@@ -0,0 +1,24 @@
package com.jilongda.manage.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.jilongda.common.basic.PageInfo;
import com.jilongda.manage.model.TAppUser;
import com.jilongda.manage.model.TOrderGoods;
import com.jilongda.manage.query.TAppUserQuery;
import com.jilongda.manage.vo.TAppUserVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
 * <p>
 * 用户表 Mapper 接口
 * </p>
 *
 * @author 无关风月
 * @since 2024-12-09
 */
public interface TOrderGoodsMapper extends BaseMapper<TOrderGoods> {
}
manage/src/main/java/com/jilongda/manage/model/TOrderGoods.java
New file
@@ -0,0 +1,77 @@
package com.jilongda.manage.model;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.jilongda.common.pojo.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.models.auth.In;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
 * <p>
 * 销售订单表
 * </p>
 *
 * @author 无关风月
 * @since 2024-12-09
 */
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("t_order_goods")
@ApiModel(value="TOrderGoods对象", description="销售订单商品详情表")
public class TOrderGoods extends BaseModel {
    private static final long serialVersionUID = 1L;
    @ApiModelProperty(value = "主键id")
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;
    @ApiModelProperty(value = "订单id")
    @TableField("orderId")
    private Integer orderId;
    @ApiModelProperty(value = "色号")
    @TableField("color")
    private String color;
    @ApiModelProperty(value = "镜片右 球镜+柱镜 逗号拼接 字段为空 客户自带")
    @TableField("rLens")
    private String rLens;
    @ApiModelProperty(value = "镜片左 球镜+柱镜 逗号拼接 字段为空 客户自带")
    @TableField("lLens")
    private String lLens;
    @ApiModelProperty(value = "1球 2非球面 3双非")
    @TableField("type")
    private Integer type;
    @ApiModelProperty(value = "折射率")
    @TableField("refractiveIndex")
    private String refractiveIndex;
    @ApiModelProperty(value = "品牌名称")
    @TableField("brandName")
    private String brandName;
    @ApiModelProperty(value = "镜片-系列名称")
    @TableField("seriesName")
    private String seriesName;
    @ApiModelProperty(value = "镜架-型号名称")
    @TableField("modelName")
    private String modelName;
    @ApiModelProperty(value = "商品价格")
    @TableField("goodsMoney")
    private BigDecimal goodsMoney;
}
manage/src/main/java/com/jilongda/manage/service/TOrderGoodsService.java
New file
@@ -0,0 +1,20 @@
package com.jilongda.manage.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.jilongda.common.basic.PageInfo;
import com.jilongda.manage.model.TAppUser;
import com.jilongda.manage.model.TOrderGoods;
import com.jilongda.manage.query.TAppUserQuery;
import com.jilongda.manage.vo.TAppUserVO;
/**
 * <p>
 * 用户表 服务类
 * </p>
 *
 * @author 无关风月
 * @since 2024-12-09
 */
public interface TOrderGoodsService extends IService<TOrderGoods> {
}
manage/src/main/java/com/jilongda/manage/service/impl/TOrderGoodsServiceImpl.java
New file
@@ -0,0 +1,33 @@
package com.jilongda.manage.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jilongda.common.basic.PageInfo;
import com.jilongda.manage.mapper.TAppUserMapper;
import com.jilongda.manage.mapper.TOrderGoodsMapper;
import com.jilongda.manage.mapper.TOrderMapper;
import com.jilongda.manage.model.TAppUser;
import com.jilongda.manage.model.TOrder;
import com.jilongda.manage.model.TOrderGoods;
import com.jilongda.manage.query.TAppUserQuery;
import com.jilongda.manage.service.TAppUserService;
import com.jilongda.manage.service.TOrderGoodsService;
import com.jilongda.manage.vo.TAppUserVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
 * <p>
 * 用户表 服务实现类
 * </p>
 *
 * @author 无关风月
 * @since 2024-12-09
 */
@Service
public class TOrderGoodsServiceImpl extends ServiceImpl<TOrderGoodsMapper, TOrderGoods> implements TOrderGoodsService {
}
manage/src/main/java/com/jilongda/manage/vo/TOrderAccountVO.java
@@ -2,6 +2,7 @@
import com.jilongda.manage.model.TOptometryDetail;
import com.jilongda.manage.model.TOrder;
import com.jilongda.manage.model.TOrderGoods;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.models.auth.In;
@@ -28,7 +29,7 @@
    @ApiModelProperty(value = "配镜处方")
    private List<TOptometryDetail> optometryDetails;
    @ApiModelProperty(value = "商品核算")
    private List<TOrderGoodsVO> orderGoods;
    private List<TOrderGoods> orderGoods;
    @ApiModelProperty(value = "门店名称")
    private String storeName;
    @ApiModelProperty(value = "商品小计")