小程序

无关风月

2024-12-30 9d680fadb1dc21bc40e0fa73181447daffce72e9

小程序

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

@@ -1,6 +1,7 @@
package com.jilongda.manage.controller;


import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.jilongda.common.basic.ApiResult;
import com.jilongda.common.basic.PageInfo;
import com.jilongda.manage.authority.model.SecUser;
@@ -21,6 +22,7 @@

import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;

/**
@@ -105,27 +107,23 @@
        res.setOrderMoney(goodsMoney);
        res.setCouponMoney(byId.getCouponMoney());
        res.setPayMoney(byId.getPayMoney());
        res.setPayType(byId.getPayTypeName());
        res.setRealPayMoney(byId.getPayMoney());
        SecFeeItems one1 = feeItemsService.lambdaQuery().eq(SecFeeItems::getName, byId.getPayTypeName())
        SecFeeItems one1 = feeItemsService.lambdaQuery().eq(SecFeeItems::getId, byId.getItemsId())
                .one();
        BigDecimal percent = one1.getPercent();
        BigDecimal bigDecimal1 = byId.getPayMoney().multiply(percent).setScale(2, BigDecimal.ROUND_DOWN);
        res.setCommission(bigDecimal1);
        if (byId.getIsAccounting()==1){
            res.setProfitMoney(byId.getPayMoney().subtract(bigDecimal1).subtract(constConfirm));
            res.setProfitRating(res.getProfitMoney().divide(byId.getPayMoney(),2, BigDecimal.ROUND_DOWN));
        }
        res.setPayType(one1.getName());
        res.setProfitMoney(byId.getProfitMoney());
        res.setProfitRating(byId.getProfitRating());
        return ApiResult.success(res);
    }
    @Autowired
    private TOrderItemsService orderItemsService;
    @ApiOperation(value = "确认核算操作")
    @GetMapping(value = "/confirm")
    public ApiResult confirm(@RequestBody AccountDetailDTO dto) {
        List<TOrderGoods> list = dto.getList();
        orderGoodsService.updateBatchById(list);
        TOrder byId = orderService.getById(dto.getId());
        byId.setPayTypeName(dto.getPayTypeName());
        byId.setPayTypeName(dto.getPayTypeName());
        byId.setConfirmPayType(dto.getPayTypeName());
        byId.setPayMoney(dto.getPayMoney());
        byId.setCommissionMoney(dto.getCommission());
        byId.setIsAccounting(1);
@@ -133,7 +131,13 @@
        SecUser byId1 = secUserService.getById(userId);
        byId.setAccountingName(byId1.getNickName());
        byId.setAccountingTime(LocalDateTime.now());
        byId.setProfitRating(dto.getProfitRating());
        byId.setProfitMoney(dto.getProfitMoney());
        orderService.updateById(byId);
        boolean remove = orderItemsService
                .remove(new LambdaQueryWrapper<TOrderItems>()
                        .eq(TOrderItems::getOrderId, dto.getId()));
        orderItemsService.saveBatch(dto.getListItems());
        return ApiResult.success();
    }
}

 manage/src/main/java/com/jilongda/manage/dto/AccountDetailDTO.java

@@ -1,8 +1,6 @@
package com.jilongda.manage.dto;

import com.jilongda.manage.model.TInventory;
import com.jilongda.manage.model.TInventoryFrameDetail;
import com.jilongda.manage.model.TOrderGoods;
import com.jilongda.manage.model.*;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -27,4 +25,6 @@
    private BigDecimal profitMoney;
    @ApiModelProperty(value = "毛利率")
    private BigDecimal profitRating;
    @ApiModelProperty(value = "实收方式")
    private List<TOrderItems> listItems;
}

 manage/src/main/java/com/jilongda/manage/mapper/TOrderItemsMapper.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.TOrderAftersales;
import com.jilongda.manage.model.TOrderItems;
import com.jilongda.manage.query.TOrderAftersalesQuery;
import com.jilongda.manage.vo.TOrderAftersalesVO;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * <p>
 * 订单售后表 Mapper 接口
 * </p>
 *
 * @author 无关风月
 * @since 2024-12-09
 */
public interface TOrderItemsMapper extends BaseMapper<TOrderItems> {


}

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

@@ -156,12 +156,18 @@
    @ApiModelProperty(value = "用户性别 1男2女")
    @TableField("gender")
    private Integer gender;
    @ApiModelProperty(value = "收费项id")
    @TableField("itemsId")
    private Integer itemsId;
    @ApiModelProperty(value = "微信昵称")
    @TableField("name")
    private String name;
    @ApiModelProperty(value = "支付方式")
    @TableField("payTypeName")
    private String payTypeName;
    @ApiModelProperty(value = "确认结算后的支付方式和金额")
    @TableField("confirmPayType")
    private String confirmPayType;
    @ApiModelProperty(value = "手续费扣除")
    @TableField("commission")
    private BigDecimal commission;
@@ -174,4 +180,5 @@
    @ApiModelProperty(value = "验光来源 1=外部验光 2=门店修改 3=客户自改")
    @TableField("profitRating")
    private Integer optometrySource;

}

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

New file
@@ -0,0 +1,50 @@
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 lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.validator.constraints.Length;

import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.math.BigDecimal;

/**
 * <p>
 * 镜架/镜片品牌表
 * </p>
 *
 * @author 无关风月
 * @since 2024-12-09
 */
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("t_order_items")
@ApiModel(value="TOrderItems对象", description="订单收费方式记录")
public class TOrderItems implements Serializable {

    private static final long serialVersionUID = 1L;

    @ApiModelProperty(value = "主键id")
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;

    @ApiModelProperty(value = "收费项id")
    @TableField("itemsId")
    private Integer itemsId;

    @ApiModelProperty(value = "金额")
    @TableField("money")
    private BigDecimal money;
    @ApiModelProperty(value = "订单id")
    @TableField("orderId")
    private Integer orderId;


}

 manage/src/main/java/com/jilongda/manage/service/TOrderItemsService.java

New file
@@ -0,0 +1,21 @@
package com.jilongda.manage.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.jilongda.common.basic.PageInfo;
import com.jilongda.manage.model.TCouponReceive;
import com.jilongda.manage.model.TOrderItems;
import com.jilongda.manage.query.TAppUserCouponQuery;
import com.jilongda.manage.vo.TAppUserCouponVO;

/**
 * <p>
 * 优惠券 服务类
 * </p>
 *
 * @author 无关风月
 * @since 2024-12-09
 */
public interface TOrderItemsService extends IService<TOrderItems> {


}

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

New file
@@ -0,0 +1,36 @@
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.common.utils.TimeUtils;
import com.jilongda.manage.authority.mapper.SecUserMapper;
import com.jilongda.manage.authority.model.SecUser;
import com.jilongda.manage.mapper.*;
import com.jilongda.manage.model.*;
import com.jilongda.manage.query.TOrderQuery;
import com.jilongda.manage.service.TOrderItemsService;
import com.jilongda.manage.service.TOrderService;
import com.jilongda.manage.vo.TOrderListVO;
import com.jilongda.manage.vo.TOrderVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;

import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.List;

/**
 * <p>
 * 销售订单表 服务实现类
 * </p>
 *
 * @author 无关风月
 * @since 2024-12-09
 */
@Service
public class TOrderItemsServiceImpl extends ServiceImpl<TOrderItemsMapper, TOrderItems> implements TOrderItemsService {


}

 manage/src/main/java/com/jilongda/manage/vo/TOrderAccountVO.java

@@ -1,5 +1,6 @@
package com.jilongda.manage.vo;

import com.baomidou.mybatisplus.annotation.TableField;
import com.jilongda.manage.model.TOptometryDetail;
import com.jilongda.manage.model.TOrder;
import com.jilongda.manage.model.TOrderGoods;
@@ -28,6 +29,8 @@
    private String realName;
    @ApiModelProperty(value = "用户信息-性别 1男2女")
    private Integer gender;
    @ApiModelProperty(value = "收费项id")
    private Integer itemsId;

    @ApiModelProperty(value = "配镜处方")
    private List<TOptometryDetail> optometryDetails;
@@ -43,6 +46,8 @@
    private BigDecimal payMoney;
    @ApiModelProperty(value = "支付方式")
    private String payType;
    @ApiModelProperty(value = "确认核算后的支付方式和支付金额")
    private String confirmPayType;
    @ApiModelProperty(value = "实收金额")
    private BigDecimal realPayMoney;
    @ApiModelProperty(value = "手续费扣除")