无关风月
2024-12-27 260e327bc3924be326ce81cedffcbecb23aaf522
文件上传
6个文件已修改
2个文件已添加
124 ■■■■■ 已修改文件
manage/src/main/java/com/jilongda/manage/controller/TOrderAccountingController.java 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
manage/src/main/java/com/jilongda/manage/mapper/TOrderAccountingMapper.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
manage/src/main/java/com/jilongda/manage/model/TOrder.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
manage/src/main/java/com/jilongda/manage/query/TOrderAccountingQuery.java 32 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
manage/src/main/java/com/jilongda/manage/service/TOrderAccountingService.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
manage/src/main/java/com/jilongda/manage/service/impl/TOrderAccountingServiceImpl.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
manage/src/main/java/com/jilongda/manage/vo/TOrderVO.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
manage/src/main/resources/mapping/TOrderAccountingMapper.xml 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
manage/src/main/java/com/jilongda/manage/controller/TOrderAccountingController.java
@@ -1,6 +1,20 @@
package com.jilongda.manage.controller;
import com.jilongda.common.basic.ApiResult;
import com.jilongda.common.basic.PageInfo;
import com.jilongda.manage.model.TLineUp;
import com.jilongda.manage.query.TLineUpQuery;
import com.jilongda.manage.query.TOrderAccountingQuery;
import com.jilongda.manage.service.TOrderAccountingService;
import com.jilongda.manage.service.TOrderService;
import com.jilongda.manage.service.TStoreService;
import com.jilongda.manage.vo.TOrderVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -14,8 +28,20 @@
 * @since 2024-12-09
 */
@RestController
@Api(tags = "订单核算")
@RequestMapping("/t-order-accounting")
public class TOrderAccountingController {
    @Autowired
    private TStoreService storeService;
    @Autowired
    private TOrderService orderService;
    @Autowired
    private TOrderAccountingService orderAccountingService;
    @ApiOperation(value = "核算订单分页列表")
    @PostMapping(value = "/pageList")
    public ApiResult<PageInfo<TOrderVO>> pageList(@RequestBody TOrderAccountingQuery query) {
        PageInfo<TOrderVO> res = orderAccountingService.pageList(query);
        return ApiResult.success(res);
    }
}
manage/src/main/java/com/jilongda/manage/mapper/TOrderAccountingMapper.java
@@ -1,7 +1,15 @@
package com.jilongda.manage.mapper;
import com.jilongda.common.basic.PageInfo;
import com.jilongda.manage.model.TLineUp;
import com.jilongda.manage.model.TOrderAccounting;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.jilongda.manage.query.TLineUpQuery;
import com.jilongda.manage.query.TOrderAccountingQuery;
import com.jilongda.manage.vo.TOrderVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
 * <p>
@@ -12,5 +20,5 @@
 * @since 2024-12-09
 */
public interface TOrderAccountingMapper extends BaseMapper<TOrderAccounting> {
    List<TOrderVO> pageList(@Param("query")TOrderAccountingQuery query, @Param("pageInfo")PageInfo<TOrderVO> pageInfo);
}
manage/src/main/java/com/jilongda/manage/model/TOrder.java
@@ -141,6 +141,17 @@
    @ApiModelProperty(value = "核算时间")
    @TableField("accountingTime")
    private LocalDateTime accountingTime;
    @ApiModelProperty(value = "手动添加订单-用户姓名")
    @TableField("realName")
    private String realName;
    @ApiModelProperty(value = "手动添加订单-用户手机号")
    @TableField("phone")
    private String phone;
    @ApiModelProperty(value = "手动添加订单-用户年龄")
    @TableField("age")
    private Integer age;
    @ApiModelProperty(value = "手动添加订单-用户性别 1男2女")
    @TableField("gender")
    private Integer gender;
}
manage/src/main/java/com/jilongda/manage/query/TOrderAccountingQuery.java
New file
@@ -0,0 +1,32 @@
package com.jilongda.manage.query;
import com.jilongda.common.pojo.BasePage;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
@Data
@ApiModel(value = "核算订单查询参数")
public class TOrderAccountingQuery extends BasePage {
    @ApiModelProperty(value = "微信昵称")
    private String name;
    @ApiModelProperty(value = "手机号")
    private String phone;
    @ApiModelProperty(value = "下单起始时间 2022-11-11")
    private String startTime;
    @ApiModelProperty(value = "下单结束时间 2023-11-11")
    private String endTime;
    @ApiModelProperty(value = "姓名")
    private String realName;
    @ApiModelProperty(value = "金额范围起始")
    private BigDecimal startMoney;
    @ApiModelProperty(value = "金额范围结束")
    private BigDecimal endMoney;
    @ApiModelProperty(value = "核算状态 不传查全部 1是 2否")
    private Integer isAccounting;
    @ApiModelProperty(value = "门店id")
    private Integer storeId;
}
manage/src/main/java/com/jilongda/manage/service/TOrderAccountingService.java
@@ -1,7 +1,10 @@
package com.jilongda.manage.service;
import com.jilongda.common.basic.PageInfo;
import com.jilongda.manage.model.TOrderAccounting;
import com.baomidou.mybatisplus.extension.service.IService;
import com.jilongda.manage.query.TOrderAccountingQuery;
import com.jilongda.manage.vo.TOrderVO;
/**
 * <p>
@@ -13,4 +16,6 @@
 */
public interface TOrderAccountingService extends IService<TOrderAccounting> {
    PageInfo<TOrderVO> pageList(TOrderAccountingQuery query);
}
manage/src/main/java/com/jilongda/manage/service/impl/TOrderAccountingServiceImpl.java
@@ -1,10 +1,16 @@
package com.jilongda.manage.service.impl;
import com.jilongda.common.basic.PageInfo;
import com.jilongda.manage.model.TLineUp;
import com.jilongda.manage.model.TOrderAccounting;
import com.jilongda.manage.mapper.TOrderAccountingMapper;
import com.jilongda.manage.query.TOrderAccountingQuery;
import com.jilongda.manage.service.TOrderAccountingService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jilongda.manage.vo.TOrderVO;
import org.springframework.stereotype.Service;
import java.util.List;
/**
 * <p>
@@ -17,4 +23,11 @@
@Service
public class TOrderAccountingServiceImpl extends ServiceImpl<TOrderAccountingMapper, TOrderAccounting> implements TOrderAccountingService {
    @Override
    public PageInfo<TOrderVO> pageList(TOrderAccountingQuery query) {
        PageInfo<TOrderVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        List<TOrderVO> list=this.baseMapper.pageList(query, pageInfo);
        pageInfo.setRecords(list);
        return pageInfo;
    }
}
manage/src/main/java/com/jilongda/manage/vo/TOrderVO.java
New file
@@ -0,0 +1,18 @@
package com.jilongda.manage.vo;
import com.jilongda.manage.model.TModel;
import com.jilongda.manage.model.TOrder;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@Data
@ApiModel(value = "镜架型号VO")
public class TOrderVO extends TOrder {
    @ApiModelProperty(value = "微信名称")
    private String name;
    @ApiModelProperty(value = "店铺名称")
    private String storeName;
}
manage/src/main/resources/mapping/TOrderAccountingMapper.xml
@@ -28,5 +28,10 @@
    <sql id="Base_Column_List">
        id, code, orderId, rLens, lLens, frame, createTime, updateTime, createBy, updateBy, isDelete, commission, rLensProfit, lLensProfit, frameProfit, payMoney, profitMoney, profitRating
    </sql>
    <select id="pageList" resultType="com.jilongda.manage.vo.TOrderVO">
        select t1.* from
                        t_order t1
        left join
    </select>
</mapper>