修改查询飞手团队发的订单

release-service/src/main/java/com/mmc/csf/release/controller/BackRequirementsController.java

@@ -4,6 +4,7 @@ import com.mmc.csf.common.util.web.ResultBody;
 import com.mmc.csf.infomation.dto.ServiceOrderFormDTO;
 import com.mmc.csf.infomation.dto.ServiceOrderFormDetailsDTO;
 import com.mmc.csf.infomation.qo.ServiceOrderQO;
+import com.mmc.csf.release.entity.requirements.OrderAmountDetailDO;
 import com.mmc.csf.release.model.group.Page;
 import com.mmc.csf.release.service.BackRequirementsService;
 import io.swagger.annotations.*;
@@ -41,5 +42,25 @@ public class BackRequirementsController extends BaseController {
         return backRequirementsService.serviceOrderFormDetails(requirementsInfoId, this.getUserLoginInfoFromRedis(request));
     }
 
+    @ApiOperation(value = "后台管理——订单金额明细")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    @GetMapping("getOrderAmountDetails")
+    public ResultBody getOrderAmountDetails( @ApiParam(value = "需求发布id", required = true) @RequestParam Integer requirementsInfoId) {
+        return backRequirementsService.getOrderAmountDetails(requirementsInfoId);
+    }
+
+    @ApiOperation(value = "后台订单——修改金额明细")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    @PostMapping("updateOrderAmountDetails")
+    public ResultBody updateOrderAmountDetails(@RequestBody OrderAmountDetailDO orderAmountDetailDO) {
+        return backRequirementsService.updateOrderAmountDetails(orderAmountDetailDO);
+    }
+
+    @ApiOperation(value = "后台订单——新增金额明细")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    @PostMapping("insertOrderAmountDetails")
+    public ResultBody insertOrderAmountDetails(@RequestBody OrderAmountDetailDO orderAmountDetailDO) {
+        return backRequirementsService.insertOrderAmountDetails(orderAmountDetailDO);
+    }
 
 }

release-service/src/main/java/com/mmc/csf/release/dao/OrderAmountDetailDao.java

+package com.mmc.csf.release.dao;
+
+import com.mmc.csf.release.entity.requirements.OrderAmountDetailDO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+* @author Admin
+* @description 针对表【order_amount_detail】的数据库操作Mapper
+* @createDate 2023-11-27 18:55:19
+* @Entity com.mmc.csf.release.entity.requirements.OrderAmountDetailDO
+*/
+@Mapper
+public interface OrderAmountDetailDao {
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(OrderAmountDetailDO record);
+
+    int insertSelective(OrderAmountDetailDO record);
+
+    List<OrderAmountDetailDO> selectByPrimaryKey(Integer requirementsInfoId);
+
+    int updateByPrimaryKeySelective(OrderAmountDetailDO record);
+
+    int updateByPrimaryKey(OrderAmountDetailDO record);
+
+}

release-service/src/main/java/com/mmc/csf/release/entity/requirements/OrderAmountDetailDO.java

+package com.mmc.csf.release.entity.requirements;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 
+ * @TableName order_amount_detail
+ */
+public class OrderAmountDetailDO implements Serializable {
+    /**
+     * 
+     */
+    private Integer id;
+
+    /**
+     * 订单id
+     */
+    @ApiModelProperty(value = "订单id")
+    private Integer requirementsInfoId;
+
+    /**
+     * 每天的工资
+     */
+    @ApiModelProperty(value = "每天的工资")
+    private BigDecimal dailyWage;
+
+    /**
+     * 节日补贴
+     */
+    @ApiModelProperty(value = "节日补贴")
+    private BigDecimal subsidyFestival;
+
+    /**
+     * 租房补贴
+     */
+    @ApiModelProperty(value = "租房补贴")
+    private BigDecimal rentalSubsidy;
+
+    /**
+     * 交通补贴
+     */
+    @ApiModelProperty(value = "交通补贴")
+    private BigDecimal trafficSubsidy;
+
+    /**
+     * 高温补贴
+     */
+    @ApiModelProperty(value = "高温补贴")
+    private BigDecimal highTemperatureSubsidy;
+
+    /**
+     * 结算比例
+     */
+    @ApiModelProperty(value = "结算比例")
+    private BigDecimal settleAccountsProportion;
+
+    /**
+     * 实际工资 上边加一起乘以结算比例
+     */
+    @ApiModelProperty(value = "实际工资")
+    private BigDecimal realWages;
+
+    /**
+     * 工作的时间
+     */
+    @ApiModelProperty(value = "工作时间")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date workDate;
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * 
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * 
+     */
+    public Integer getRequirementsInfoId() {
+        return requirementsInfoId;
+    }
+
+    /**
+     * 
+     */
+    public void setRequirementsInfoId(Integer requirementsInfoId) {
+        this.requirementsInfoId = requirementsInfoId;
+    }
+
+    /**
+     * 每天的工资
+     */
+    public BigDecimal getDailyWage() {
+        return dailyWage;
+    }
+
+    /**
+     * 每天的工资
+     */
+    public void setDailyWage(BigDecimal dailyWage) {
+        this.dailyWage = dailyWage;
+    }
+
+    /**
+     * 节日补贴
+     */
+    public BigDecimal getSubsidyFestival() {
+        return subsidyFestival;
+    }
+
+    /**
+     * 节日补贴
+     */
+    public void setSubsidyFestival(BigDecimal subsidyFestival) {
+        this.subsidyFestival = subsidyFestival;
+    }
+
+    /**
+     * 租房补贴
+     */
+    public BigDecimal getRentalSubsidy() {
+        return rentalSubsidy;
+    }
+
+    /**
+     * 租房补贴
+     */
+    public void setRentalSubsidy(BigDecimal rentalSubsidy) {
+        this.rentalSubsidy = rentalSubsidy;
+    }
+
+    /**
+     * 交通补贴
+     */
+    public BigDecimal getTrafficSubsidy() {
+        return trafficSubsidy;
+    }
+
+    /**
+     * 交通补贴
+     */
+    public void setTrafficSubsidy(BigDecimal trafficSubsidy) {
+        this.trafficSubsidy = trafficSubsidy;
+    }
+
+    /**
+     * 高温补贴
+     */
+    public BigDecimal getHighTemperatureSubsidy() {
+        return highTemperatureSubsidy;
+    }
+
+    /**
+     * 高温补贴
+     */
+    public void setHighTemperatureSubsidy(BigDecimal highTemperatureSubsidy) {
+        this.highTemperatureSubsidy = highTemperatureSubsidy;
+    }
+
+    /**
+     * 结算比例
+     */
+    public BigDecimal getSettleAccountsProportion() {
+        return settleAccountsProportion;
+    }
+
+    /**
+     * 结算比例
+     */
+    public void setSettleAccountsProportion(BigDecimal settleAccountsProportion) {
+        this.settleAccountsProportion = settleAccountsProportion;
+    }
+
+    /**
+     * 实际工资 上边加一起乘以结算比例
+     */
+    public BigDecimal getRealWages() {
+        return realWages;
+    }
+
+    /**
+     * 实际工资 上边加一起乘以结算比例
+     */
+    public void setRealWages(BigDecimal realWages) {
+        this.realWages = realWages;
+    }
+
+    /**
+     * 工作的时间
+     */
+    public Date getWorkDate() {
+        return workDate;
+    }
+
+    /**
+     * 工作的时间
+     */
+    public void setWorkDate(Date workDate) {
+        this.workDate = workDate;
+    }
+
+    @Override
+    public boolean equals(Object that) {
+        if (this == that) {
+            return true;
+        }
+        if (that == null) {
+            return false;
+        }
+        if (getClass() != that.getClass()) {
+            return false;
+        }
+        OrderAmountDetailDO other = (OrderAmountDetailDO) that;
+        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
+            && (this.getRequirementsInfoId() == null ? other.getRequirementsInfoId() == null : this.getRequirementsInfoId().equals(other.getRequirementsInfoId()))
+            && (this.getDailyWage() == null ? other.getDailyWage() == null : this.getDailyWage().equals(other.getDailyWage()))
+            && (this.getSubsidyFestival() == null ? other.getSubsidyFestival() == null : this.getSubsidyFestival().equals(other.getSubsidyFestival()))
+            && (this.getRentalSubsidy() == null ? other.getRentalSubsidy() == null : this.getRentalSubsidy().equals(other.getRentalSubsidy()))
+            && (this.getTrafficSubsidy() == null ? other.getTrafficSubsidy() == null : this.getTrafficSubsidy().equals(other.getTrafficSubsidy()))
+            && (this.getHighTemperatureSubsidy() == null ? other.getHighTemperatureSubsidy() == null : this.getHighTemperatureSubsidy().equals(other.getHighTemperatureSubsidy()))
+            && (this.getSettleAccountsProportion() == null ? other.getSettleAccountsProportion() == null : this.getSettleAccountsProportion().equals(other.getSettleAccountsProportion()))
+            && (this.getRealWages() == null ? other.getRealWages() == null : this.getRealWages().equals(other.getRealWages()))
+            && (this.getWorkDate() == null ? other.getWorkDate() == null : this.getWorkDate().equals(other.getWorkDate()));
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
+        result = prime * result + ((getRequirementsInfoId() == null) ? 0 : getRequirementsInfoId().hashCode());
+        result = prime * result + ((getDailyWage() == null) ? 0 : getDailyWage().hashCode());
+        result = prime * result + ((getSubsidyFestival() == null) ? 0 : getSubsidyFestival().hashCode());
+        result = prime * result + ((getRentalSubsidy() == null) ? 0 : getRentalSubsidy().hashCode());
+        result = prime * result + ((getTrafficSubsidy() == null) ? 0 : getTrafficSubsidy().hashCode());
+        result = prime * result + ((getHighTemperatureSubsidy() == null) ? 0 : getHighTemperatureSubsidy().hashCode());
+        result = prime * result + ((getSettleAccountsProportion() == null) ? 0 : getSettleAccountsProportion().hashCode());
+        result = prime * result + ((getRealWages() == null) ? 0 : getRealWages().hashCode());
+        result = prime * result + ((getWorkDate() == null) ? 0 : getWorkDate().hashCode());
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", requirementsInfoId=").append(requirementsInfoId);
+        sb.append(", dailyWage=").append(dailyWage);
+        sb.append(", subsidyFestival=").append(subsidyFestival);
+        sb.append(", rentalSubsidy=").append(rentalSubsidy);
+        sb.append(", trafficSubsidy=").append(trafficSubsidy);
+        sb.append(", highTemperatureSubsidy=").append(highTemperatureSubsidy);
+        sb.append(", settleAccountsProportion=").append(settleAccountsProportion);
+        sb.append(", realWages=").append(realWages);
+        sb.append(", workDate=").append(workDate);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}
\ No newline at end of file

release-service/src/main/java/com/mmc/csf/release/service/BackRequirementsService.java

@@ -4,6 +4,7 @@ import com.mmc.csf.common.util.page.PageResult;
 import com.mmc.csf.common.util.web.ResultBody;
 import com.mmc.csf.infomation.qo.ServiceOrderQO;
 import com.mmc.csf.release.auth.dto.LoginSuccessDTO;
+import com.mmc.csf.release.entity.requirements.OrderAmountDetailDO;
 
 /**
  * @Author small
@@ -14,4 +15,26 @@ public interface BackRequirementsService {
     PageResult serviceOrderFormList(ServiceOrderQO param, LoginSuccessDTO userLoginInfoFromRedis);
 
     ResultBody serviceOrderFormDetails(Integer requirementsInfoId, LoginSuccessDTO userLoginInfoFromRedis);
+
+    /**
+     * 根据订单id获取到这个订单的金额具体明细
+     * @param requirementsInfoId 订单id
+     * @return {@link ResultBody}
+     */
+    ResultBody getOrderAmountDetails(Integer requirementsInfoId);
+
+    /**
+     * 修改
+     * @param orderAmountDetailDO
+     * @return {@link ResultBody}
+     */
+    ResultBody updateOrderAmountDetails(OrderAmountDetailDO orderAmountDetailDO);
+
+
+    /**
+     * 添加
+     * @param orderAmountDetailDO
+     * @return {@link ResultBody}
+     */
+    ResultBody insertOrderAmountDetails(OrderAmountDetailDO orderAmountDetailDO);
 }

release-service/src/main/java/com/mmc/csf/release/service/impl/BackRequirementsServiceImpl.java

@@ -8,7 +8,9 @@ import com.mmc.csf.infomation.qo.ServiceOrderQO;
 import com.mmc.csf.infomation.vo.RequireEveryStatusVO;
 import com.mmc.csf.release.auth.dto.LoginSuccessDTO;
 import com.mmc.csf.release.dao.BackRequirementsDao;
+import com.mmc.csf.release.dao.OrderAmountDetailDao;
 import com.mmc.csf.release.dao.RequirementsDao;
+import com.mmc.csf.release.entity.requirements.OrderAmountDetailDO;
 import com.mmc.csf.release.entity.requirements.ServiceOrderFormDO;
 import com.mmc.csf.release.entity.requirements.ServiceOrderFormDetailsDO;
 import com.mmc.csf.release.feign.UserAppApi;
@@ -35,6 +37,9 @@ public class BackRequirementsServiceImpl implements BackRequirementsService {
     @Autowired
     private UserAppApi userAppApi;
 
+    @Autowired
+    private OrderAmountDetailDao orderAmountDetailDao;
+
     @Override
     public PageResult serviceOrderFormList(ServiceOrderQO param, LoginSuccessDTO userLoginInfoFromRedis) {
 
@@ -85,4 +90,21 @@ public class BackRequirementsServiceImpl implements BackRequirementsService {
 
         return ResultBody.success(requireEveryStatusVO);
     }
+
+    @Override
+    public ResultBody getOrderAmountDetails(Integer requirementsInfoId) {
+        return ResultBody.success(orderAmountDetailDao.selectByPrimaryKey(requirementsInfoId));
+    }
+
+    @Override
+    public ResultBody updateOrderAmountDetails(OrderAmountDetailDO orderAmountDetailDO) {
+        orderAmountDetailDao.updateByPrimaryKeySelective(orderAmountDetailDO);
+        return ResultBody.success();
+    }
+
+    @Override
+    public ResultBody insertOrderAmountDetails(OrderAmountDetailDO orderAmountDetailDO) {
+        orderAmountDetailDao.insertSelective(orderAmountDetailDO);
+        return ResultBody.success();
+    }
 }

release-service/src/main/resources/mapper/requirements/OrderAmountDetailDao.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mmc.csf.release.dao.OrderAmountDetailDao">
+
+    <resultMap id="BaseResultMap" type="com.mmc.csf.release.entity.requirements.OrderAmountDetailDO">
+            <id property="id" column="id" jdbcType="INTEGER"/>
+            <result property="requirementsInfoId" column="requirements_info_id" jdbcType="INTEGER"/>
+            <result property="dailyWage" column="daily_wage" jdbcType="DECIMAL"/>
+            <result property="subsidyFestival" column="subsidy_festival" jdbcType="DECIMAL"/>
+            <result property="rentalSubsidy" column="rental_subsidy" jdbcType="DECIMAL"/>
+            <result property="trafficSubsidy" column="traffic_subsidy" jdbcType="DECIMAL"/>
+            <result property="highTemperatureSubsidy" column="high_temperature_subsidy" jdbcType="DECIMAL"/>
+            <result property="settleAccountsProportion" column="settle_accounts_proportion" jdbcType="DECIMAL"/>
+            <result property="realWages" column="real_wages" jdbcType="DECIMAL"/>
+            <result property="workDate" column="work_date" jdbcType="TIMESTAMP"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,requirements_info_id,daily_wage,
+        subsidy_festival,rental_subsidy,traffic_subsidy,
+        high_temperature_subsidy,settle_accounts_proportion,real_wages,
+        work_date,create_time,update_time
+    </sql>
+
+
+
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+        delete from order_amount_detail
+        where  id = #{id,jdbcType=INTEGER} 
+    </delete>
+    <select id="selectByPrimaryKey" resultType="com.mmc.csf.release.entity.requirements.OrderAmountDetailDO">
+        select
+        <include refid="Base_Column_List" />
+        from order_amount_detail
+        where  requirements_info_id = #{id,jdbcType=INTEGER}
+    </select>
+    <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.mmc.csf.release.entity.requirements.OrderAmountDetailDO" useGeneratedKeys="true">
+        insert into order_amount_detail
+        ( id,requirements_info_id,daily_wage
+        ,subsidy_festival,rental_subsidy,traffic_subsidy
+        ,high_temperature_subsidy,settle_accounts_proportion,real_wages
+        ,work_date,create_time
+        )
+        values (#{id,jdbcType=INTEGER},#{requirementsInfoId,jdbcType=INTEGER},#{dailyWage,jdbcType=DECIMAL}
+        ,#{subsidyFestival,jdbcType=DECIMAL},#{rentalSubsidy,jdbcType=DECIMAL},#{trafficSubsidy,jdbcType=DECIMAL}
+        ,#{highTemperatureSubsidy,jdbcType=DECIMAL},#{settleAccountsProportion,jdbcType=DECIMAL},#{realWages,jdbcType=DECIMAL}
+        ,#{workDate,jdbcType=TIMESTAMP},NOW())
+    </insert>
+    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.mmc.csf.release.entity.requirements.OrderAmountDetailDO" useGeneratedKeys="true">
+        insert into order_amount_detail
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+                <if test="id != null">id,</if>
+                <if test="requirementsInfoId != null">requirements_info_id,</if>
+                <if test="dailyWage != null">daily_wage,</if>
+                <if test="subsidyFestival != null">subsidy_festival,</if>
+                <if test="rentalSubsidy != null">rental_subsidy,</if>
+                <if test="trafficSubsidy != null">traffic_subsidy,</if>
+                <if test="highTemperatureSubsidy != null">high_temperature_subsidy,</if>
+                <if test="settleAccountsProportion != null">settle_accounts_proportion,</if>
+                <if test="realWages != null">real_wages,</if>
+                <if test="workDate != null">work_date,</if>
+                create_time
+
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+                <if test="id != null">#{id,jdbcType=INTEGER},</if>
+                <if test="requirementsInfoId != null">#{requirementsInfoId,jdbcType=INTEGER},</if>
+                <if test="dailyWage != null">#{dailyWage,jdbcType=DECIMAL},</if>
+                <if test="subsidyFestival != null">#{subsidyFestival,jdbcType=DECIMAL},</if>
+                <if test="rentalSubsidy != null">#{rentalSubsidy,jdbcType=DECIMAL},</if>
+                <if test="trafficSubsidy != null">#{trafficSubsidy,jdbcType=DECIMAL},</if>
+                <if test="highTemperatureSubsidy != null">#{highTemperatureSubsidy,jdbcType=DECIMAL},</if>
+                <if test="settleAccountsProportion != null">#{settleAccountsProportion,jdbcType=DECIMAL},</if>
+                <if test="realWages != null">#{realWages,jdbcType=DECIMAL},</if>
+                <if test="workDate != null">#{workDate,jdbcType=TIMESTAMP},</if>
+                NOW()
+        </trim>
+    </insert>
+    <update id="updateByPrimaryKeySelective" parameterType="com.mmc.csf.release.entity.requirements.OrderAmountDetailDO">
+        update order_amount_detail
+        <set>
+                <if test="requirementsInfoId != null">
+                    requirements_info_id = #{requirementsInfoId,jdbcType=INTEGER},
+                </if>
+                <if test="dailyWage != null">
+                    daily_wage = #{dailyWage,jdbcType=DECIMAL},
+                </if>
+                <if test="subsidyFestival != null">
+                    subsidy_festival = #{subsidyFestival,jdbcType=DECIMAL},
+                </if>
+                <if test="rentalSubsidy != null">
+                    rental_subsidy = #{rentalSubsidy,jdbcType=DECIMAL},
+                </if>
+                <if test="trafficSubsidy != null">
+                    traffic_subsidy = #{trafficSubsidy,jdbcType=DECIMAL},
+                </if>
+                <if test="highTemperatureSubsidy != null">
+                    high_temperature_subsidy = #{highTemperatureSubsidy,jdbcType=DECIMAL},
+                </if>
+                <if test="settleAccountsProportion != null">
+                    settle_accounts_proportion = #{settleAccountsProportion,jdbcType=DECIMAL},
+                </if>
+                <if test="realWages != null">
+                    real_wages = #{realWages,jdbcType=DECIMAL},
+                </if>
+                <if test="workDate != null">
+                    work_date = #{workDate,jdbcType=TIMESTAMP},
+                </if>
+                    update_time = NOW()
+        </set>
+        where   id = #{id,jdbcType=INTEGER} 
+    </update>
+    <update id="updateByPrimaryKey" parameterType="com.mmc.csf.release.entity.requirements.OrderAmountDetailDO">
+        update order_amount_detail
+        set 
+            requirements_info_id =  #{requirementsInfoId,jdbcType=INTEGER},
+            daily_wage =  #{dailyWage,jdbcType=DECIMAL},
+            subsidy_festival =  #{subsidyFestival,jdbcType=DECIMAL},
+            rental_subsidy =  #{rentalSubsidy,jdbcType=DECIMAL},
+            traffic_subsidy =  #{trafficSubsidy,jdbcType=DECIMAL},
+            high_temperature_subsidy =  #{highTemperatureSubsidy,jdbcType=DECIMAL},
+            settle_accounts_proportion =  #{settleAccountsProportion,jdbcType=DECIMAL},
+            real_wages =  #{realWages,jdbcType=DECIMAL},
+            work_date =  #{workDate,jdbcType=TIMESTAMP},
+            create_time =  #{createTime,jdbcType=TIMESTAMP},
+            update_time =  #{updateTime,jdbcType=TIMESTAMP}
+        where   id = #{id,jdbcType=INTEGER} 
+    </update>
+</mapper>