Quellcode durchsuchen

[账单][修改][修改滞纳金]

release_toaliyun_real
luozukai vor 6 Jahren
Ursprung
Commit
0e2fe48359
5 geänderte Dateien mit 18 neuen und 11 gelöschten Zeilen
  1. +5
    -5
      mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java
  2. +3
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java
  3. +2
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
  4. +4
    -2
      mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml
  5. +4
    -2
      mallinkService/src/main/resources/mapper/WxBillRentMapper.xml

+ 5
- 5
mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java Datei anzeigen

@@ -86,6 +86,8 @@ public class WxFlowServiceImpl implements WxFlowService {
private WxCouponMapper wxCouponMapper; private WxCouponMapper wxCouponMapper;
@Autowired @Autowired
private WxCouponService wxCouponService; private WxCouponService wxCouponService;
@Autowired
private WxRentContractMapper wxRentContractMapper;


/** /**
* 获取流程key * 获取流程key
@@ -113,7 +115,6 @@ public class WxFlowServiceImpl implements WxFlowService {
Long businessId = Long.parseLong(mapInfo.get("businessId").toString()); Long businessId = Long.parseLong(mapInfo.get("businessId").toString());
Integer flowType = (Integer)mapInfo.get("flowType"); Integer flowType = (Integer)mapInfo.get("flowType");
List<Map<String,Object>> variables = (List)mapInfo.get("variables"); List<Map<String,Object>> variables = (List)mapInfo.get("variables");
Boolean supplement = (Boolean)mapInfo.get("supplement");
Integer contractType = 0; Integer contractType = 0;
String str = (String)getVariableByKey(variables,"contractType"); String str = (String)getVariableByKey(variables,"contractType");
Integer operateType = (Integer)getVariableByKey(variables,"approvalType"); Integer operateType = (Integer)getVariableByKey(variables,"approvalType");
@@ -141,8 +142,9 @@ public class WxFlowServiceImpl implements WxFlowService {
rent.setBusinessType(flowType); rent.setBusinessType(flowType);
wxRentContractService.updateApplyStatus(rent); wxRentContractService.updateApplyStatus(rent);


// 如果审批完成,而且是补录直接改为已签约状态(普通需要绑定商户才是已签约)
if(supplement!=null && supplement && EnumRentContractAppStatus.FINISH.getCode().intValue() == applyStatus.intValue()) {
//如果审批完成,而且是补录直接改为已签约状态(普通需要绑定商户才是已签约)
WxRentContract record = wxRentContractMapper.selectByPrimaryKey(businessId);
if(record.getMerchantId()!=null && EnumRentContractAppStatus.FINISH.getCode().intValue() == applyStatus.intValue()) {
wxRentContractService.updateRentContractStatus(businessId); wxRentContractService.updateRentContractStatus(businessId);
} }
}else if(EnumFlowContractType.PROPERTY.getCode().equals(contractType) || EnumFlowContractType.PROPERTY_POINT.getCode().equals(contractType)){ }else if(EnumFlowContractType.PROPERTY.getCode().equals(contractType) || EnumFlowContractType.PROPERTY_POINT.getCode().equals(contractType)){
@@ -325,7 +327,6 @@ public class WxFlowServiceImpl implements WxFlowService {
Long businessId = Long.parseLong(params.get("businessId").toString()); Long businessId = Long.parseLong(params.get("businessId").toString());
Integer flowType = getIngeter(params.get("businessType")); Integer flowType = getIngeter(params.get("businessType"));
List<Map<String,Object>> variables = (List)params.get("variables"); List<Map<String,Object>> variables = (List)params.get("variables");
Boolean supplement = (Boolean)params.get("supplement");


WxFlowModel flowModel = getModelByType(flowType,tenantId); WxFlowModel flowModel = getModelByType(flowType,tenantId);
if(flowModel== null || StringUtils.isBlank(flowModel.getFlowId())){ if(flowModel== null || StringUtils.isBlank(flowModel.getFlowId())){
@@ -343,7 +344,6 @@ public class WxFlowServiceImpl implements WxFlowService {
map.put("businessId",businessId+""); map.put("businessId",businessId+"");
map.put("flowType",flowType); map.put("flowType",flowType);
map.put("variables",variables); map.put("variables",variables);
map.put("supplement",supplement);
map.put("taskAssignee",flowModel.getFlow()); map.put("taskAssignee",flowModel.getFlow());
setSignAssignee(map,flowModel.getFlow()); setSignAssignee(map,flowModel.getFlow());
map.put("tenantId",tenantId); map.put("tenantId",tenantId);


+ 3
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java Datei anzeigen

@@ -451,7 +451,9 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
wxPropertyContractMapper.updateByPrimaryKeySelective(wxPropertyContract); wxPropertyContractMapper.updateByPrimaryKeySelective(wxPropertyContract);
//建立账单 //建立账单
if (record.getMerchantId() != null if (record.getMerchantId() != null
&& record.getReceivePeriod() != null && record.getPrice() > 0) {
&& record.getReceivePeriod() != null &&
record.getPrice() > 0 &&
record.getDeposit() > 0) {
//预览账单改为正式,并写入商户id //预览账单改为正式,并写入商户id
updatePropertyPreviewBill(record); updatePropertyPreviewBill(record);
} }


+ 2
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java Datei anzeigen

@@ -1461,7 +1461,8 @@ public class WxRentContractServiceImpl implements WxRentContractService {
if (record != null && if (record != null &&
record.getMerchantId() != null && record.getMerchantId() != null &&
record.getReceivePeriod() != null && record.getReceivePeriod() != null &&
record.getPrice() > 0) {
record.getPrice() > 0 &&
record.getDeposit() > 0) {
//预览账单改为正式,并写入商户id //预览账单改为正式,并写入商户id
WxBillRent billRent = new WxBillRent(); WxBillRent billRent = new WxBillRent();
billRent.setRentContractId(id); billRent.setRentContractId(id);


+ 4
- 2
mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml Datei anzeigen

@@ -138,8 +138,10 @@
</select> </select>


<update id="updateNotPaidStatus" parameterType="hashmap"> <update id="updateNotPaidStatus" parameterType="hashmap">
update wx_bill_property set status=#{notPaid},expired_day=DATEDIFF(now(),receive_date)
where tenant_id=#{tenantId} and status!=#{paid} and status != 6 and DATEDIFF(now(),receive_date)>0
update wx_bill_property b set b.status=#{notPaid},b.expired_day=
DATEDIFF(now(), date_add(b.receive_date,interval(select late_pay_day from wx_rent_contract where id = b.`property_contract_id`) day))
where b.tenant_id=#{tenantId} and b.status!=#{paid} and b.status!=6 and
DATEDIFF(now(), date_add(b.receive_date,interval(select late_pay_day from wx_rent_contract where id = b.`property_contract_id`) day)) >0
</update> </update>


<update id="updateWaitPayStatus" parameterType="hashmap"> <update id="updateWaitPayStatus" parameterType="hashmap">


+ 4
- 2
mallinkService/src/main/resources/mapper/WxBillRentMapper.xml Datei anzeigen

@@ -146,8 +146,10 @@
</select> </select>


<update id="updateNotPaidStatus" parameterType="hashmap"> <update id="updateNotPaidStatus" parameterType="hashmap">
update wx_bill_rent set status=#{notPaid},expired_day=DATEDIFF(now(),receive_date)
where tenant_id=#{tenantId} and status!=#{paid} and status!=6 and DATEDIFF(now(),receive_date)>0
update wx_bill_rent b set b.status=#{notPaid},b.expired_day=
DATEDIFF(now(), date_add(b.receive_date,interval(select late_pay_day from wx_rent_contract where id = b.`rent_contract_id`) day))
where b.tenant_id=#{tenantId} and b.status!=#{paid} and b.status!=6 and
DATEDIFF(now(), date_add(b.receive_date,interval(select late_pay_day from wx_rent_contract where id = b.`rent_contract_id`) day)) >0
</update> </update>


<update id="updateWaitPayStatus" parameterType="hashmap"> <update id="updateWaitPayStatus" parameterType="hashmap">


Laden…
Abbrechen
Speichern