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

[账单][修改][导入数据]

release_toaliyun_real
gongbiao 7 лет назад
Родитель
Сommit
7939108925
5 измененных файлов: 18 добавлений и 3 удалений
  1. +2
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxBillPropertyMapper.java
  2. +2
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java
  3. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java
  4. +6
    -0
      mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml
  5. +6
    -1
      mallinkService/src/main/resources/mapper/WxBillRentMapper.xml

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

@@ -4,6 +4,7 @@ import com.iformall.common.CommonMapper;
import com.iformall.domain.po.WxBillProperty;
import com.iformall.domain.po.WxPropertyContract;
import com.iformall.domain.po.WxRentContract;

import java.util.List;
import java.util.Map;

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

void insertBills(List<WxBillProperty> resultList);

WxBillProperty selectBillOne(WxBillProperty propertyQuery);
}

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

@@ -41,4 +41,6 @@ public interface WxBillRentMapper extends CommonMapper<WxBillRent, Long> {

void updateBills(@Param("bills") List<WxBillRent> resultList);

WxBillRent selectBillOne(WxBillRent rentQuery);

}

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

@@ -967,7 +967,7 @@ public class WxBillAllServiceImpl implements WxBillAllService {
rentQuery.setRentShopType(EnumRentShopType.POINT.getCode());
}
rentQuery.setIsPreview(EnumIsPreview.NO.getCode());
WxBillRent rent = wxBillRentMapper.selectOne(rentQuery);
WxBillRent rent = wxBillRentMapper.selectBillOne(rentQuery);
if (rent != null && !rent.getStatus().equals(EnumBillRentStatus.PAID.getCode())) {
long pay = new BigDecimal(bill.getPayStr()).multiply(new BigDecimal(100)).longValueExact();
if (rent.getOwe() <= pay) {
@@ -992,7 +992,7 @@ public class WxBillAllServiceImpl implements WxBillAllService {
propertyQuery.setRentShopType(EnumRentShopType.POINT.getCode());
}
propertyQuery.setIsPreview(EnumIsPreview.NO.getCode());
WxBillProperty property = wxBillPropertyMapper.selectOne(propertyQuery);
WxBillProperty property = wxBillPropertyMapper.selectBillOne(propertyQuery);
if (property != null && !property.getStatus().equals(EnumBillRentStatus.PAID.getCode())) {
long pay = new BigDecimal(bill.getPayStr()).multiply(new BigDecimal(100)).longValueExact();
if (property.getOwe() <= pay) {


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

@@ -217,6 +217,12 @@
where id = #{item.id}
</foreach>
</update>
<select id="selectBillOne" parameterType="com.iformall.domain.po.WxBillProperty">
select * from wx_bill_rent where tenant_id#{tenantId} and merchant_id=#{merchantId}
AND rent_shop_type = #{rentShopType} AND is_preview = #{isPreview}
AND date_format(starttime,'%Y-%m-%d 00:00:00.0') = #{starttime} AND date_format(endtime,'%Y-%m-%d 00:00:00.0') = #{endtime}
</select>

</mapper>


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

@@ -216,7 +216,12 @@
where id = #{item.id}
</foreach>
</update>

<select id="selectBillOne" parameterType="com.iformall.domain.po.WxBillRent">
select * from wx_bill_rent where tenant_id#{tenantId} and merchant_id=#{merchantId}
AND rent_shop_type = #{rentShopType} AND is_preview = #{isPreview}
AND date_format(starttime,'%Y-%m-%d 00:00:00.0') = #{starttime} AND date_format(endtime,'%Y-%m-%d 00:00:00.0') = #{endtime}
</select>

</mapper>


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