Merge remote-tracking branch 'origin/test' into test

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/StudentInstrumentDao.java

@@ -31,4 +31,11 @@ public interface StudentInstrumentDao extends BaseDAO<Long, StudentInstrument> {
      * @return
      */
     List<StudentInstrument> getListByEndTime(@Param("startTime") Date startTime, @Param("endTime") Date endTime);
+
+    /**
+     * 获取学生乐器信息
+     * @param orderId
+     * @return
+     */
+    StudentInstrument getByOrderId(Long orderId);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/StudentInstrument.java

@@ -61,10 +61,16 @@ public class StudentInstrument {
     /**
      * 对应订单id
      */
-    @ApiModelProperty(value = "订单id")
+    @ApiModelProperty(value = "原订单id")
     private Long orderId;
 
     /**
+     * 对应订单id
+     */
+    @ApiModelProperty(value = "更改后订单id")
+    private Long changeOrderId;
+
+    /**
      * 操作人
      */
     @ApiModelProperty(value = "操作人")
@@ -274,4 +280,12 @@ public class StudentInstrument {
     public void setOperation(Integer operation) {
         this.operation = operation;
     }
+
+    public Long getChangeOrderId() {
+        return changeOrderId;
+    }
+
+    public void setChangeOrderId(Long changeOrderId) {
+        this.changeOrderId = changeOrderId;
+    }
 }

mec-biz/src/main/java/com/ym/mec/biz/service/StudentGoodsSellService.java

@@ -5,6 +5,7 @@ import com.ym.mec.biz.dal.dto.StudentGoodsSellDto;
 import com.ym.mec.biz.dal.dto.StudentPaymentOrderDto;
 import com.ym.mec.biz.dal.entity.StudentGoodsSell;
 import com.ym.mec.biz.dal.entity.StudentInstrument;
+import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
 import com.ym.mec.biz.dal.page.GoodsSellQueryInfo;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.BaseService;
@@ -51,6 +52,6 @@ public interface StudentGoodsSellService extends BaseService<Integer, StudentGoo
      * 将购买的乐器加入学生乐器列表
      * @return
      */
-    List<StudentInstrument> saveStudentInstrument(String orderNo);
+    List<StudentInstrument> saveStudentInstrument(StudentPaymentOrder order);
 
 }

mec-biz/src/main/java/com/ym/mec/biz/service/StudentInstrumentService.java

@@ -4,6 +4,7 @@ import com.ym.mec.biz.dal.dto.MaintenancePayDto;
 import com.ym.mec.biz.dal.entity.StudentInstrument;
 
 import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
+import com.ym.mec.biz.dal.entity.SubjectChange;
 import com.ym.mec.common.service.BaseService;
 
 import java.math.BigDecimal;
@@ -54,4 +55,12 @@ public interface StudentInstrumentService extends BaseService<Long, StudentInstr
      */
     StudentInstrument updateStudentInstrument(StudentInstrument studentInstrument);
 
+
+    /**
+     * 乐器更换更新乐器信息
+     * @param subjectChange
+     * @return
+     */
+    Boolean subjectChangeUpdateInstrument(SubjectChange subjectChange);
+
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SellOrderServiceImpl.java

@@ -57,6 +57,7 @@ public class SellOrderServiceImpl extends BaseServiceImpl<Integer, SellOrder> im
             balance = BigDecimal.ZERO;
         }
         StudentPaymentOrder order = studentPaymentOrderDao.get(orderId);
+        BigDecimal totalActualAmount = order.getActualAmount() == null ? BigDecimal.ZERO : order.getActualAmount();
         MusicGroup musicGroup = new MusicGroup();
         if (StringUtils.isNotBlank(musicGroupId)) {
             musicGroup = musicGroupDao.get(musicGroupId);
@@ -74,8 +75,14 @@ public class SellOrderServiceImpl extends BaseServiceImpl<Integer, SellOrder> im
             }
         }
 
+        //已分配的商品余额
         BigDecimal hasRouteBalance = BigDecimal.ZERO;
+        //已分配的商品现金
+        BigDecimal hasRouteActualAmount= BigDecimal.ZERO;
+        //商品占用的的余额
         BigDecimal goodsTotalBalance = totalAmount.compareTo(BigDecimal.ZERO) <= 0 ? BigDecimal.ZERO : goodsTotalPrice.multiply(balance).divide(totalAmount, 2, BigDecimal.ROUND_DOWN);
+        //商品占用的总现金
+        BigDecimal goodsTotalActualAmount = totalAmount.compareTo(BigDecimal.ZERO) <= 0 ? BigDecimal.ZERO : goodsTotalPrice.multiply(totalActualAmount).divide(totalAmount, 2, BigDecimal.ROUND_DOWN);
         AccountType accountType = sysPaymentConfigService.checkAccountType(PaymentChannelEnum.valueOf(order.getPaymentChannel()), order.getMerNos());
 
         List<SellOrder> sellOrderList = goodsService.subtractStock(goodsIds, accountType);
@@ -91,12 +98,19 @@ public class SellOrderServiceImpl extends BaseServiceImpl<Integer, SellOrder> im
             }
             goodsPrice = nowGoods.getDiscountPrice();
 
+            //当前商品占用的总余额
             BigDecimal goodsBalance = goodsTotalPrice.compareTo(BigDecimal.ZERO) <= 0 ? BigDecimal.ZERO :
                     goodsTotalBalance.multiply(goodsPrice).divide(goodsTotalPrice, 2, BigDecimal.ROUND_DOWN);
+            //当前商品占用的总现金
+            BigDecimal goodsActualAmount = goodsTotalPrice.compareTo(BigDecimal.ZERO) <= 0 ? BigDecimal.ZERO :
+                    goodsTotalActualAmount.multiply(goodsPrice).divide(goodsTotalPrice, 2, BigDecimal.ROUND_DOWN);
+
             if (i == goodsNum) {
                 goodsBalance = goodsTotalBalance.subtract(hasRouteBalance);
+                goodsActualAmount = goodsTotalActualAmount.subtract(hasRouteActualAmount);
             }
             hasRouteBalance = hasRouteBalance.add(goodsBalance);
+            hasRouteActualAmount = hasRouteActualAmount.add(hasRouteActualAmount);
             i++;
 
             int complementGoodsNum = nowGoods.getComplementGoodsIdList() == null ? 1 : nowGoods.getComplementGoodsIdList().split(",").length;
@@ -121,21 +135,21 @@ public class SellOrderServiceImpl extends BaseServiceImpl<Integer, SellOrder> im
                 BigDecimal sellOrderActualAmount = BigDecimal.ZERO;
                 BigDecimal sellOrderBalance = BigDecimal.ZERO;
                 if (complementPrice.compareTo(BigDecimal.ZERO) > 0) {
-                    sellOrderActualAmount = complementGoodsPrice.get(sellOrder.getGoodsId()).multiply(new BigDecimal(sellOrder.getNum())).multiply(goodsPrice).divide(complementPrice, 2, BigDecimal.ROUND_DOWN);
+                    sellOrderActualAmount = complementGoodsPrice.get(sellOrder.getGoodsId()).multiply(new BigDecimal(sellOrder.getNum())).multiply(goodsActualAmount).divide(complementPrice, 2, BigDecimal.ROUND_DOWN);
                     sellOrderBalance = complementGoodsPrice.get(sellOrder.getGoodsId()).multiply(new BigDecimal(sellOrder.getNum())).multiply(goodsBalance).divide(complementPrice, 2, BigDecimal.ROUND_DOWN);
                 }
 
                 complementGoodsNum = complementGoodsNum - sellOrder.getNum();
                 if (complementGoodsNum <= 0) {
-                    sellOrderActualAmount = goodsPrice.subtract(hasRouteSellOrderActualAmount);
+                    sellOrderActualAmount = goodsActualAmount.subtract(hasRouteSellOrderActualAmount);
                     sellOrderBalance = goodsBalance.subtract(hasRouteSellOrderBalance);
                 }
                 hasRouteSellOrderActualAmount = hasRouteSellOrderActualAmount.add(sellOrderActualAmount);
                 hasRouteSellOrderBalance = hasRouteSellOrderBalance.add(sellOrderBalance);
 
-                sellOrder.setExpectAmount(sellOrderActualAmount);
+                sellOrder.setExpectAmount(sellOrderActualAmount.add(sellOrderBalance));
                 sellOrder.setBalanceAmount(sellOrderBalance);
-                sellOrder.setActualAmount(sellOrderActualAmount.subtract(sellOrderBalance));
+                sellOrder.setActualAmount(sellOrderActualAmount);
                 sellOrder.setOrganId(order.getOrganId());
                 sellOrder.setCooperationOrganId(musicGroup.getCooperationOrganId());
                 sellOrder.setTransNo(order.getTransNo());

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentGoodsSellServiceImpl.java

@@ -12,6 +12,7 @@ import com.ym.mec.biz.dal.dto.StudentPaymentOrderDto;
 import com.ym.mec.biz.dal.entity.Goods;
 import com.ym.mec.biz.dal.entity.StudentGoodsSell;
 import com.ym.mec.biz.dal.entity.StudentInstrument;
+import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
 import com.ym.mec.biz.dal.page.GoodsSellQueryInfo;
 import com.ym.mec.biz.service.StudentGoodsSellService;
 import com.ym.mec.common.dal.BaseDAO;
@@ -110,8 +111,8 @@ public class StudentGoodsSellServiceImpl extends BaseServiceImpl<Integer, Studen
     }
 
     @Override
-    public List<StudentInstrument> saveStudentInstrument(String orderNo) {
-        StudentGoodsSell studentGoodsSell = studentGoodsSellDao.findByOrderNo(orderNo);
+    public List<StudentInstrument> saveStudentInstrument(StudentPaymentOrder order) {
+        StudentGoodsSell studentGoodsSell = studentGoodsSellDao.findByOrderNo(order.getOrderNo());
         List<GoodsSellDto> goodsSellDtos = JSONObject.parseArray(studentGoodsSell.getGoodsJson(), GoodsSellDto.class);
         List<Integer> goodsIds = new ArrayList<>();
         for (GoodsSellDto goodsSellDto : goodsSellDtos) {
@@ -134,6 +135,8 @@ public class StudentGoodsSellServiceImpl extends BaseServiceImpl<Integer, Studen
             studentInstrument.setGoodsBrand(goods.getBrand());
             studentInstrument.setSpecification(goods.getSpecification());
             studentInstrument.setGoodsImg(goods.getImage());
+            studentInstrument.setOrderId(order.getId());
+            studentInstrument.setChangeOrderId(order.getId());
             studentInstrument.setStatus(0);
             studentInstruments.add(studentInstrument);
         }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentInstrumentServiceImpl.java

@@ -276,7 +276,7 @@ public class StudentInstrumentServiceImpl extends BaseServiceImpl<Long, StudentI
         List<StudentPaymentOrderDetail> orderDetails = studentPaymentOrderDetailDao.getOrderDetailByType(order.getId(), orderDetailTypes);
         List<StudentPaymentOrderDetail> orderDetails4Instruments = orderDetails.stream()
                 .filter(e -> e.getType().equals(OrderDetailTypeEnum.MUSICAL))
-                .filter(e -> KitGroupPurchaseTypeEnum.GROUP.equals(e.getKitGroupPurchaseType())).collect(Collectors.toList());
+                .collect(Collectors.toList());
         if (orderDetails4Instruments.size() <= 0) {
             return false;
         }
@@ -300,6 +300,8 @@ public class StudentInstrumentServiceImpl extends BaseServiceImpl<Long, StudentI
         studentInstrument.setOrganId(order.getOrganId());
         studentInstrument.setGoodsId(goodsId);
         studentInstrument.setStatus(maintenanceStatus);
+        studentInstrument.setOrderId(order.getId());
+        studentInstrument.setChangeOrderId(order.getId());
         studentInstrument.setStartTime(startTime);
         studentInstrument.setEndTime(endTime);
         addStudentInstrument(studentInstrument);
@@ -342,4 +344,29 @@ public class StudentInstrumentServiceImpl extends BaseServiceImpl<Long, StudentI
         studentInstrumentDao.update(studentInstrument);
         return studentInstrument;
     }
+
+    @Override
+    public Boolean subjectChangeUpdateInstrument(SubjectChange subjectChange) {
+        if (subjectChange == null || subjectChange.getChangeMusical() == null ||
+                KitGroupPurchaseTypeEnum.OWNED.equals(subjectChange.getKitGroupPurchaseType())) {
+            return false;
+        }
+        StudentInstrument studentInstrument = studentInstrumentDao.getByOrderId(subjectChange.getOriginalOrderId().longValue());
+
+        if (studentInstrument == null) {
+            studentInstrument = new StudentInstrument();
+            studentInstrument.setStudentId(subjectChange.getStudentId());
+            studentInstrument.setOrganId(subjectChange.getOrganId());
+            studentInstrument.setOrderId(subjectChange.getOrderId().longValue());
+            studentInstrument.setStatus(0);
+        }
+        studentInstrument.setChangeOrderId(subjectChange.getOrderId().longValue());
+        studentInstrument.setGoodsId(subjectChange.getChangeMusical());
+        if (studentInstrument.getId() == null) {
+            addStudentInstrument(studentInstrument);
+            return true;
+        }
+        updateStudentInstrument(studentInstrument);
+        return true;
+    }
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentRegistrationServiceImpl.java

@@ -149,6 +149,8 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
     private GroupEventSource groupEventSource;
     @Autowired
     private WebFeignService webFeignService;
+    @Autowired
+    private StudentService studentService;
 
     @Override
     public BaseDAO<Long, StudentRegistration> getDAO() {
@@ -330,21 +332,8 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         studentRegistration.setMusicGroupStatus(StudentMusicGroupStatusEnum.APPLY);
 
         Organization organization = organizationDao.get(studentRegistration.getOrganId());
-        if(organization.getGradeType().equals(GradeTypeEnum.SIX_PLUS)){
-            for (SixPlusGradeEnum value : SixPlusGradeEnum.values()) {
-                if(value.getCode().equals(studentRegistration.getCurrentGradeNum())){
-                    studentRegistration.setCurrentGrade(value.getDesc());
-                    break;
-                }
-            }
-        }else {
-            for (FivePlusGradeEnum value : FivePlusGradeEnum.values()) {
-                if(value.getCode().equals(studentRegistration.getCurrentGradeNum())){
-                    studentRegistration.setCurrentGrade(value.getDesc());
-                    break;
-                }
-            }
-        }
+        String studentGrade = studentService.getStudentGrade(organization.getGradeType(), studentRegistration.getCurrentGradeNum());
+        studentRegistration.setCurrentGrade(studentGrade);
 
         if (hasReg != null) {
             studentRegistration.setMusicGroupStatus(StudentMusicGroupStatusEnum.APPLY);
@@ -430,7 +419,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                 studentPaymentOrderDetail4goodsGroup.setPaymentOrderId(studentPaymentOrder.getId());
                 studentPaymentOrderDetail4goodsGroup.setKitGroupPurchaseType(goodsGroup.getKitGroupPurchaseType());
                 studentPaymentOrderDetailList.add(studentPaymentOrderDetail4goodsGroup);
-                if (OrderDetailTypeEnum.MUSICAL.equals(type) && KitGroupPurchaseTypeEnum.GROUP.equals(goodsGroup.getKitGroupPurchaseType())) {
+                if (OrderDetailTypeEnum.MUSICAL.equals(type)) {
                     maintenanceGoodsId = goodsGroup.getGoodsIdList();
                 }
             }
@@ -456,7 +445,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         }
         if (buyMaintenance) {
             if ("".equals(maintenanceGoodsId)) {
-                throw new BizException("团购乐器才能购买乐保，请核查");
+                throw new BizException("有乐器才能购买乐保，请核查");
             }
             BigDecimal maintenancePrice = new BigDecimal(sysConfigDao.findConfigValue("maintenance_price"));
             StudentPaymentOrderDetail maintenanceOrderDetail = new StudentPaymentOrderDetail();
@@ -555,7 +544,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                 studentPaymentOrderDetail4goodsGroup.setPaymentOrderId(studentPaymentOrder.getId());
                 studentPaymentOrderDetail4goodsGroup.setKitGroupPurchaseType(goodsGroup.getKitGroupPurchaseType());
                 studentPaymentOrderDetailList.add(studentPaymentOrderDetail4goodsGroup);
-                if (OrderDetailTypeEnum.MUSICAL.equals(type) && KitGroupPurchaseTypeEnum.GROUP.equals(goodsGroup.getKitGroupPurchaseType())) {
+                if (OrderDetailTypeEnum.MUSICAL.equals(type)) {
                     maintenanceGoodsId = goodsGroup.getGoodsIdList();
                 }
             }
@@ -581,7 +570,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         }
         if (buyMaintenance) {
             if ("".equals(maintenanceGoodsId)) {
-                throw new BizException("团购乐器才能购买乐保，请核查");
+                throw new BizException("有乐器才能购买乐保，请核查");
             }
             BigDecimal maintenancePrice = new BigDecimal(sysConfigDao.findConfigValue("maintenance_price"));
             StudentPaymentOrderDetail maintenanceOrderDetail = new StudentPaymentOrderDetail();
@@ -1035,7 +1024,10 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
             List<StudentPaymentOrderDetail> orderDetails = studentPaymentOrderDetailService.getOrderDetail(studentPaymentOrder.getId());
 
             List<StudentPaymentOrderDetail> allDetails = studentPaymentOrderDetailDao.getOrderDetailByOrderId(studentPaymentOrder.getId());
-            BigDecimal courseFee = allDetails.stream().filter(o -> !o.getType().getCode().equals("MUSICAL")).filter(o -> !o.getType().getCode().equals("ACCESSORIES")).map(o -> o.getPrice().subtract(o.getRemitFee() == null ? BigDecimal.ZERO : o.getRemitFee()))
+            BigDecimal courseFee = allDetails.stream().filter(o -> !o.getType().getCode().equals("MUSICAL"))
+                    .filter(o -> !o.getType().getCode().equals("ACCESSORIES"))
+                    .filter(o -> !o.getType().getCode().equals("MAINTENANCE"))
+                    .map(o -> o.getPrice().subtract(o.getRemitFee() == null ? BigDecimal.ZERO : o.getRemitFee()))
                     .reduce(BigDecimal.ZERO, BigDecimal::add);
 
             //累加充值金额
@@ -1396,6 +1388,9 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         student.setParentsName(studentRegistration.getParentsName());
         student.setIdCardNo(studentRegistration.getIdCardNo());
         student.setGender(studentRegistration.getGender());
+        Organization organization = organizationDao.get(studentRegistration.getOrganId());
+        String studentGrade = studentService.getStudentGrade(organization.getGradeType(), studentRegistration.getCurrentGradeNum());
+        studentRegistration.setCurrentGrade(studentGrade);
         update(studentRegistration);
         studentRegistrationDao.updateUser(student.getUserId(),student.getName(), student.getParentsName(), student.getIdCardNo(), student.getGender(),studentRegistration.getCertificateType());
         //更新年级信息

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentRepairServiceImpl.java

@@ -736,7 +736,7 @@ public class StudentRepairServiceImpl extends BaseServiceImpl<Integer, StudentRe
             paymentDetail.setUserId(userId);
             sysUserCashAccountDetailService.insert(paymentDetail);
             //将购买的乐器加入学生乐器列表
-            studentGoodsSellService.saveStudentInstrument(studentPaymentOrder.getOrderNo());
+            studentGoodsSellService.saveStudentInstrument(studentPaymentOrder);
             //购买的商品加入销售列表
             saveSellOrder(studentPaymentOrder.getOrderNo());
         } else if (studentPaymentOrder.getStatus() == DealStatusEnum.CLOSE || studentPaymentOrder.getStatus() == DealStatusEnum.FAILED) {
@@ -1051,7 +1051,7 @@ public class StudentRepairServiceImpl extends BaseServiceImpl<Integer, StudentRe
                 List<Goods> goods = JSONObject.parseArray(repairInfo.getGoodsJson(), Goods.class);
                 List<Integer> goodsIds = goods.stream().map(Goods::getId).collect(Collectors.toList());
                 if (goodsIds.size() > 0) {
-                    sellOrderService.addSellOrder(studentPaymentOrder.getId(), null, goodsIds, studentPaymentOrder.getExpectAmount(), studentPaymentOrder.getBalancePaymentAmount());
+                    sellOrderService.addSellOrder(studentPaymentOrder.getId(), null, goodsIds, studentPaymentOrder.getExpectAmount().add(repairInfo.getExemptionAmount()), studentPaymentOrder.getBalancePaymentAmount());
                 }
             }
 

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SubjectChangeServiceImpl.java

@@ -68,6 +68,8 @@ public class SubjectChangeServiceImpl extends BaseServiceImpl<Integer, SubjectCh
     private SellOrderService sellOrderService;
     @Autowired
     private GoodsService goodsService;
+    @Autowired
+    private StudentInstrumentService studentInstrumentService;
 
     private final Logger logger = LoggerFactory.getLogger(this.getClass());
 
@@ -300,6 +302,8 @@ public class SubjectChangeServiceImpl extends BaseServiceImpl<Integer, SubjectCh
                 //添加新订单
                 this.addSellOrder(studentPaymentOrder.getId(), subjectChange.getMusicGroupId(), goodsIdList, BigDecimal.ZERO, BigDecimal.ZERO, subjectChange.getKitGroupPurchaseType());
             }
+            //乐保处理
+            studentInstrumentService.subjectChangeUpdateInstrument(subjectChange);
         }
         return subjectChange;
     }
@@ -491,6 +495,9 @@ public class SubjectChangeServiceImpl extends BaseServiceImpl<Integer, SubjectCh
                 this.addSellOrder(studentPaymentOrder.getId(), subjectChange.getMusicGroupId(), goodsIdList, studentPaymentOrder.getExpectAmount(), studentPaymentOrder.getBalancePaymentAmount(), subjectChange.getKitGroupPurchaseType());
             }
 
+            //乐保处理
+            studentInstrumentService.subjectChangeUpdateInstrument(subjectChange);
+
             //插入交易明细
             BigDecimal amount = studentPaymentOrder.getActualAmount();
             SysUserCashAccount cashAccount = sysUserCashAccountService.get(userId);

mec-biz/src/main/resources/config/mybatis/StudentInstrumentMapper.xml

@@ -14,6 +14,7 @@
         <result column="start_time_" property="startTime"/>
         <result column="end_time_" property="endTime"/>
         <result column="order_id_" property="organId"/>
+        <result column="change_order_id_" property="changeOrderId"/>
         <result column="operation_" property="operation"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time" property="updateTime"/>
@@ -40,11 +41,11 @@
         <!--@mbg.generated-->
         insert into student_instrument
         (student_id_,organ_id_,goods_id_,goods_category_id_,goods_category_name_,goods_name_,goods_brand_,specification_,goods_img_,
-        order_id_,operation_, start_time_, end_time_, create_time_, update_time
+        status_,order_id_,change_order_id_,operation_, start_time_, end_time_, create_time_, update_time
         )
         values
         (#{studentId},#{organId},#{goodsId},#{goodsCategoryId},#{goodsCategoryName},#{goodsName},#{goodsBrand},#{specification},#{goodsImg},
-        #{organId},#{operation},#{status}, #{startTime}, #{endTime}, NOW(), NOW()
+        #{status},#{orderId},#{changeOrderId},#{operation}, #{startTime}, #{endTime}, NOW(), NOW()
         )
     </insert>
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.StudentInstrument">
@@ -84,15 +85,16 @@
             <if test="endTime != null">
                 end_time_ = #{endTime},
             </if>
+            <if test="changeOrderId != null">
+                change_order_id_ = #{changeOrderId},
+            </if>
             <if test="createTime != null">
                 create_time_ = #{createTime},
             </if>
-            <if test="updateTime != null">
-                update_time = #{updateTime},
-            </if>
             <if test="delFlag != null">
                 del_flag_ = #{delFlag},
             </if>
+            update_time = NOW(),
         </set>
         where id_ = #{id}
     </update>
@@ -153,11 +155,11 @@
     <insert id="batchAdd" parameterType="java.util.List" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
         insert into student_instrument
         (student_id_,organ_id_,goods_id_,goods_category_id_,goods_category_name_,goods_name_,goods_brand_,specification_,goods_img_,
-        status_, start_time_, end_time_, create_time_, update_time)
+        order_id_,change_order_id_,status_, start_time_, end_time_, create_time_, update_time)
         VALUE
         <foreach collection="studentInstruments" item="item" separator=",">
             (#{item.studentId},#{item.organId},#{item.goodsId},#{item.goodsCategoryId},#{item.goodsCategoryName},#{item.goodsName},#{item.goodsBrand},#{item.specification},#{item.goodsImg},
-            #{item.status}, #{item.startTime},
+            #{item.orderId},#{item.changeOrderId},#{item.status}, #{item.startTime},
             #{item.endTime}, NOW(), NOW())
         </foreach>
     </insert>
@@ -171,8 +173,17 @@
     </update>
     <select id="getListByEndTime" resultMap="StudentInstrument">
         <![CDATA[
-        SELECT * FROM student_instrument WHERE end_time_ >= #{startTime} AND end_time_ <= #{endTime}
-     ]]>
+        SELECT *
+        FROM student_instrument
+        WHERE end_time_ >= #{startTime}
+          AND end_time_ <= #{endTime}
+        ]]>
+    </select>
+
+    <select id="getByOrderId" resultMap="StudentInstrument">
+        SELECT *
+        FROM student_instrument
+        WHERE change_order_id_ = #{orderId}
     </select>
 
 </mapper>

mec-web/src/main/java/com/ym/mec/web/controller/StudentInstrumentController.java

@@ -80,13 +80,6 @@ public class StudentInstrumentController extends BaseController {
         if (studentInstrument.getStudentId() == null) {
             return failed("学生id不能为空");
         }
-        if (studentInstrument.getStartTime() != null) {
-            studentInstrument.setStartTime(DateUtil.trunc(studentInstrument.getStartTime()));
-        }
-
-        if (studentInstrument.getEndTime() != null) {
-            studentInstrument.setEndTime(DateUtil.getLastTimeWithDay(studentInstrument.getEndTime()));
-        }
         studentInstrument.setOperation(sysUser.getId());
         SysUser student = sysUserFeignService.queryUserById(studentInstrument.getStudentId());
         studentInstrument.setOrganId(student.getOrganId());
@@ -137,7 +130,7 @@ public class StudentInstrumentController extends BaseController {
     @ApiOperation(value = "删除学生乐器信息")
     @PostMapping("/del")
     @PreAuthorize("@pcs.hasPermissions('studentInstrument/del')")
-    public HttpResponseResult<StudentInstrument> update(Long id, Integer studentId) {
+    public HttpResponseResult<StudentInstrument> del(Long id, Integer studentId) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed("用户信息获取失败");