winter 10 месяцев назад
Родитель
Сommit
c824006b38
3 измененных файлов: 9 добавлений и 5 удалений
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/mapper/WxAllBillMapper.java
  2. +3
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
  3. +5
    -1
      mallinkService/src/main/resources/mapper/WxAllBillMapper.xml

+ 1
- 1
mallinkService/src/main/java/com/iformall/mapper/WxAllBillMapper.java Просмотреть файл

@@ -37,7 +37,7 @@ public interface WxAllBillMapper extends CommonMapper<WxAllBill, Long> {
Integer countValidBillCountByRentHuiSuan(WxAllBill wxBillRent);
void deleteByRentReveneuSales(WxAllBill wxBillRent);
void setIsDel(@Param("tenantId")String tenantId, @Param("list")List<Long> ids, @Param("isDel")Integer isDel,@Param("oldIsDel")Integer oldIsDel);
void setIsDel(@Param("tenantId")String tenantId, @Param("list")List<Long> ids, @Param("isDel")Integer isDel,@Param("oldIsDel")Integer oldIsDel,@Param("remark")String remark);
void setIsJoinRenevue(@Param("tenantId")String tenantId, @Param("isJoinRenevue")Integer isJoinRenevue, @Param("feesId")Long feesId,@Param("rentContractId")Long rentContractId);
void updatePreviewStatus(WxAllBill record);


+ 3
- 3
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java Просмотреть файл

@@ -1040,19 +1040,19 @@ public class WxRentContractServiceImpl implements WxRentContractService {
createNewBill = false;
needpay = uneedPay.toPlainString();
//此处取高的比提成高,如果之前有将参与取高的账单设置为已删除,则需要恢复
wxAllBillMapper.setIsDel(rentcontract.getTenantId(),dto.getBillIds(),EnumYesOrNo.NO.getCode(),EnumYesOrNo.YES.getCode());
wxAllBillMapper.setIsDel(rentcontract.getTenantId(),dto.getBillIds(),EnumYesOrNo.NO.getCode(),EnumYesOrNo.YES.getCode(),"");
}else {
//取高比扣点低
if (null != dto.getBillIds() && dto.getBillIds().size() > 0 ) {
//如果提成的比参与取高的款项高,将这些参与取高的账单设置为已删除
wxAllBillMapper.setIsDel(rentcontract.getTenantId(),dto.getBillIds(),EnumYesOrNo.YES.getCode(),null);
wxAllBillMapper.setIsDel(rentcontract.getTenantId(),dto.getBillIds(),EnumYesOrNo.YES.getCode(),null,"录入销售额取高,该账单已删除");
}
}
}else {
//无取高费用
if (null != dto.getBillIds() && dto.getBillIds().size() > 0 ) {
//如果提成的比参与取高的款项高,将这些参与取高的账单设置为已删除
wxAllBillMapper.setIsDel(rentcontract.getTenantId(),dto.getBillIds(),EnumYesOrNo.YES.getCode(),null);
wxAllBillMapper.setIsDel(rentcontract.getTenantId(),dto.getBillIds(),EnumYesOrNo.YES.getCode(),null,"录入销售额取高,该账单已删除");
}
}
sb.append("取高后总金额为:["+needpay+"].");


+ 5
- 1
mallinkService/src/main/resources/mapper/WxAllBillMapper.xml Просмотреть файл

@@ -366,7 +366,11 @@
</delete>
<update id="setIsDel" parameterType="HashMap">
update wx_all_bill set is_del = #{isDel} where id in
update wx_all_bill set is_del = #{isDel}
<if test=" null != remark">
, bill_remark = #{remark}
</if>
where id in
<foreach collection="list" item="item" index="index" separator=",">
(#{item})
</foreach>


Загрузка…
Отмена
Сохранить