Просмотр исходного кода

[合同优化][添加][完善合同优化需求]

release_toaliyun_real
luozukai 7 лет назад
Родитель
Сommit
52fdea7165
12 измененных файлов: 3 добавлений и 64 удалений
  1. +0
    -12
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java
  2. +0
    -13
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java
  3. +0
    -1
      mallinkService/src/main/java/com/iformall/mapper/WxBillPropertyMapper.java
  4. +0
    -1
      mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java
  5. +0
    -6
      mallinkService/src/main/java/com/iformall/service/WxBillPropertyService.java
  6. +0
    -7
      mallinkService/src/main/java/com/iformall/service/WxBillRentService.java
  7. +0
    -5
      mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java
  8. +0
    -6
      mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java
  9. +1
    -0
      mallinkService/src/main/java/com/iformall/service/msg/impl/SendEmailServiceImpl.java
  10. +2
    -6
      mallinkService/src/main/resources/mapper/WxBillAllMapper.xml
  11. +0
    -4
      mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml
  12. +0
    -3
      mallinkService/src/main/resources/mapper/WxBillRentMapper.xml

+ 0
- 12
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java Просмотреть файл

@@ -113,16 +113,4 @@ public class WxBillPropertyController extends BaseController {
return wxBillPropertyService.updateLatePayStatus(wxBillProperty);
}

/**
* 批量修改到账日期
* @param wxBillProperty
* @return
*/
@PostMapping("updateReceiveDatePatch")
@SystemControllerLog(description = "批量修改到账日期")
public ResultData updateReceiveDatePatch(@RequestBody WxBillProperty wxBillProperty) {
logger.debug("[" + getIpAddr() + "] WxBillRentController::updateReceiveDatePatch");
wxBillPropertyService.updateReceiveDatePatch(wxBillProperty);
return new ResultData();
}
}

+ 0
- 13
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java Просмотреть файл

@@ -103,7 +103,6 @@ public class WxBillRentController extends BaseController {
return new ResultData(Result.SUCCESS, "查询成功", wxBillRentService.detail(id));
}


@PostMapping("updateRevenue")
@SystemControllerLog(description = "租赁押金账单-更新营业额")
public ResultData updateRevenue(@RequestBody WxBillRent wxBillRent) {
@@ -119,16 +118,4 @@ public class WxBillRentController extends BaseController {
return wxBillRentService.updateLatePayStatus(wxBillRent);
}


/**
* 批量修改到账日期
* @param wxBillRent
* @return
*/
@PostMapping("updateReceiveDatePatch")
@SystemControllerLog(description = "批量修改到账日期")
public ResultData updateReceiveDatePatch(@RequestBody WxBillRent wxBillRent) {
logger.debug("[" + getIpAddr() + "] WxBillRentController::updateReceiveDatePatch");
return wxBillRentService.updateReceiveDatePatch(wxBillRent);
}
}

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

@@ -38,5 +38,4 @@ public interface WxBillPropertyMapper extends CommonMapper<WxBillProperty, Long>

Long oweBillCount(Long contractId);

void updateReceiveDatePatch(WxBillProperty record);
}

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

@@ -36,5 +36,4 @@ public interface WxBillRentMapper extends CommonMapper<WxBillRent, Long> {

Long oweBillCount(Long contractId);

void updateReceiveDatePatch(WxBillRent record);
}

+ 0
- 6
mallinkService/src/main/java/com/iformall/service/WxBillPropertyService.java Просмотреть файл

@@ -58,10 +58,4 @@ public interface WxBillPropertyService {

ResultData updateLatePayStatus(WxBillProperty wxBillProperty);

/**
* 批量修改到账日期
* @param record
* @return
*/
void updateReceiveDatePatch(WxBillProperty record);
}

+ 0
- 7
mallinkService/src/main/java/com/iformall/service/WxBillRentService.java Просмотреть файл

@@ -57,11 +57,4 @@ public interface WxBillRentService {


ResultData updateLatePayStatus(WxBillRent wxBillRent);

/**
* 批量修改到账日期
* @param record
* @return
*/
ResultData updateReceiveDatePatch(WxBillRent record);
}

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

@@ -235,9 +235,4 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService {
return new ResultData(Result.SUCCESS, "滞纳金结单成功", record);
}


@Override
public void updateReceiveDatePatch(WxBillProperty record) {
wxBillPropertyMapper.updateReceiveDatePatch(record);
}
}

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

@@ -271,10 +271,4 @@ public class WxBillRentServiceImpl implements WxBillRentService {
}
return new ResultData(Result.SUCCESS, "滞纳金结单成功", record);
}

@Override
public ResultData updateReceiveDatePatch(WxBillRent record) {
wxBillRentMapper.updateReceiveDatePatch(record);
return new ResultData(Result.SUCCESS, "修改成功", record);
}
}

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

@@ -48,6 +48,7 @@ public class SendEmailServiceImpl implements MsgSendService {
WxMsgValidationcodeModel msgModel = new WxMsgValidationcodeModel();
msgModel.setTenantId(mailMsg.getTenantId());
msgModel.setType(mailMsg.getModelId());
msgModel.setModelId(mailMsg.getModelId());
List<WxMsgValidationcodeModel> modelList = wxMsgValidationcodeModelMapper.findList(msgModel);
if(CollectionUtils.isEmpty(modelList)){
throw new Exception("模板id:"+mailMsg.getModelId()+"不存在");


+ 2
- 6
mallinkService/src/main/resources/mapper/WxBillAllMapper.xml Просмотреть файл

@@ -495,7 +495,7 @@
<select id="getOweBillAsPage" parameterType="com.iformall.domain.vo.WxBillAll" resultType="hashmap">
select bill.tenant_id tenantId,bill.merchant_id merchantId,m.name merchantName,bill.bill_type billType,
m.link_phone managerPhone,m.`link_person` manager,m.email,
bill.receive_date receiveDate,DATEDIFF(now(),bill.receive_date) expiredDay,mb.building_name building,mf.floor_name floor,
bill.receive_date receiveDate,DATEDIFF(now(),bill.receive_date) expiredDay,

round(bill.rentOwe/100,2) rentOwe,
round(bill.propertyOwe/100,2) propertyOwe,
@@ -517,7 +517,7 @@
round(bill.propertyReceivePay/100,2) propertyReceivePay,
round(bill.depositReceivePay/100,2) depositReceivePay,
round(bill.otherReceivePay/100,2) otherReceivePay,
round((bill.rentOwe+bill.propertyOwe+bill.depositOwe+bill.otherOwe)/100,2) totalReceivePay
round((bill.rentReceivePay+bill.propertyReceivePay+bill.depositReceivePay+bill.otherReceivePay)/100,2) totalReceivePay
</otherwise>
</choose>

@@ -583,10 +583,6 @@

) bill
left join wx_merchant m on bill.merchant_id=m.id
left join wx_merchant_shop ms on ms.`merchant_id` = m.id
left join wx_shop ws on ms.`shop_id` = ws.id
left join wx_mall_building mb on ws.building = mb.id
left join wx_mall_floor mf on ws.floor = mf.id
where m.status=1 and m.tenant_id = #{tenantId}
<if test=" null != month and ''!=month">
and date_format(bill.receive_date,'%Y-%m')=#{month}


+ 0
- 4
mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml Просмотреть файл

@@ -179,9 +179,5 @@
select count(br.id) from wx_bill_property br,wx_property_contract c
where c.id = br.property_contract_id and br.status = 1 and c.id = #{contractId}
</select>

<update id="updateReceiveDatePatch" parameterType="com.iformall.domain.po.WxBillProperty">
update wx_bill_property set receive_date =#{receiveDate} where property_contract_id = #{propertyContractId}
</update>
</mapper>


+ 0
- 3
mallinkService/src/main/resources/mapper/WxBillRentMapper.xml Просмотреть файл

@@ -179,9 +179,6 @@
and br.status = 1 and c.id = #{contractId}
</select>

<update id="updateReceiveDatePatch" parameterType="com.iformall.domain.po.WxBillRent">
update wx_bill_rent set receive_date =#{receiveDate} where rent_contract_id = #{rentContractId}
</update>


</mapper>


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