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

[修改][结算单][修改结算单]

release_toaliyun_real
luozukai 6 лет назад
Родитель
Сommit
199e756172
3 измененных файлов: 16 добавлений и 13 удалений
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/enums/EnumMsgRecordStatus.java
  2. +4
    -1
      mallinkService/src/main/java/com/iformall/mq/impl/RabbitMqMessageProducer.java
  3. +11
    -11
      mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java

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

@@ -8,7 +8,7 @@ public enum EnumMsgRecordStatus {
SEND_SUCC(1, "发送成功"),
CONSUME_SUCC(2, "消费成功"),
CONSUME_FAIL(3, "消费失败"),
SEND_FAIL(4, "发送失败"),
;

public static EnumMsgRecordStatus getEnum(Integer code) {


+ 4
- 1
mallinkService/src/main/java/com/iformall/mq/impl/RabbitMqMessageProducer.java Просмотреть файл

@@ -1,6 +1,7 @@
package com.iformall.mq.impl;

import com.iformall.domain.po.msg.BaseMsg;
import com.iformall.enums.EnumMsgRecordStatus;
import com.iformall.mapper.WxMsgRecordMapper;
import com.iformall.mq.MQConfig;
import com.iformall.mq.MqBaseProducer;
@@ -49,7 +50,9 @@ public class RabbitMqMessageProducer implements MqBaseProducer , RabbitTemplate.
if(ack){
System.out.println();
}else{

BaseMsg data = new BaseMsg();
data.setMsgStatus(EnumMsgRecordStatus.SEND_FAIL.getCode());
wxMsgRecordMapper.update(data);
}
}



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

@@ -169,7 +169,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
if(EnumBillRentStatus.PAID.getCode().equals(status)){
WxBillRent dbBill = wxBillRentMapper.selectByPrimaryKey(wxBillRent.getId());
if(dbBill!=null) {
wxBillRent.setPay(dbBill.getOwe());
wxBillRent.setPay(wxBillRent.getPay()+ dbBill.getOwe());
wxBillRent.setPayDate(new Date());
addBillAction(bill.getBillId(), dbBill.getOwe());
}
@@ -186,7 +186,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
if(EnumBillRentStatus.PAID.getCode().equals(status)){
WxBillDeposit dbBill = wxBillDepositMapper.selectByPrimaryKey(wxBillRent.getId());
if(dbBill!=null) {
wxBillRent.setPay(dbBill.getReceivePay()); //押金是ReceivePay
wxBillRent.setPay(dbBill.getPay()+dbBill.getReceivePay() ); //押金是ReceivePay
wxBillRent.setPayDate(new Date());
wxBillRent.setStatus(EnumBillRentStatus.RETURN.getCode());
addBillAction(bill.getBillId(), dbBill.getOwe());
@@ -204,7 +204,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
if(EnumBillRentStatus.PAID.getCode().equals(status)){
WxBillOtherDeposit dbBill = wxBillOtherDepositMapper.selectByPrimaryKey(wxBillRent.getId());
if(dbBill!=null) {
wxBillOtherDeposit.setPay(dbBill.getReceivePay());
wxBillOtherDeposit.setPay(dbBill.getPay()+ dbBill.getReceivePay());
wxBillOtherDeposit.setPayDate(new Date());
wxBillOtherDeposit.setStatus(EnumBillRentStatus.RETURN.getCode());
addBillAction(bill.getBillId(), dbBill.getOwe());
@@ -222,7 +222,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
if(EnumBillRentStatus.PAID.getCode().equals(status)){
WxBillPropertyDeposit dbBill = wxBillPropertyDepositMapper.selectByPrimaryKey(wxBillRent.getId());
if(dbBill!=null) {
propertyDeposit.setPay(dbBill.getReceivePay());
propertyDeposit.setPay(dbBill.getPay()+ dbBill.getReceivePay());
propertyDeposit.setPayDate(new Date());
propertyDeposit.setStatus(EnumBillRentStatus.RETURN.getCode());
addBillAction(bill.getBillId(), dbBill.getOwe());
@@ -241,7 +241,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
if(EnumBillRentStatus.PAID.getCode().equals(status)){
WxBillProperty dbBill = wxBillPropertyMapper.selectByPrimaryKey(wxBillRent.getId());
if(dbBill!=null) {
wxBillRent.setPay(dbBill.getOwe());
wxBillRent.setPay(dbBill.getPay()+dbBill.getOwe());
wxBillRent.setPayDate(new Date());
addBillAction(bill.getBillId(), dbBill.getOwe());
}
@@ -258,7 +258,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
if(EnumBillRentStatus.PAID.getCode().equals(status)){
WxBillPropertyDeposit dbBill = wxBillPropertyDepositMapper.selectByPrimaryKey(wxBillRent.getId());
if(dbBill!=null) {
propertyDeposit.setPay(dbBill.getReceivePay());
propertyDeposit.setPay(dbBill.getPay()+dbBill.getReceivePay());
propertyDeposit.setPayDate(new Date());
propertyDeposit.setStatus(EnumBillRentStatus.RETURN.getCode());
addBillAction(bill.getBillId(), dbBill.getOwe());
@@ -276,7 +276,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
if(EnumBillRentStatus.PAID.getCode().equals(status)){
WxBillOther dbBill = wxBillOtherMapper.selectByPrimaryKey(wxBillRent.getId());
if(dbBill!=null) {
wxBillRent.setPay(dbBill.getOwe());
wxBillRent.setPay(dbBill.getPay()+dbBill.getOwe());
wxBillRent.setPayDate(new Date());
addBillAction(bill.getBillId(), dbBill.getOwe());
}
@@ -293,7 +293,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
if(EnumBillRentStatus.PAID.getCode().equals(status)){
WxBillOtherDeposit dbBill = wxBillOtherDepositMapper.selectByPrimaryKey(wxBillRent.getId());
if(dbBill!=null) {
wxBillRent.setPay(dbBill.getReceivePay());
wxBillRent.setPay(dbBill.getPay()+dbBill.getReceivePay());
wxBillRent.setPayDate(new Date());
wxBillRent.setStatus(EnumBillRentStatus.RETURN.getCode());
addBillAction(bill.getBillId(), dbBill.getOwe());
@@ -319,7 +319,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
if(EnumBillRentStatus.PAID.getCode().equals(status)){
WxBillOtherDeposit dbBill = wxBillOtherDepositMapper.selectByPrimaryKey(wxBillRent.getId());
if(dbBill!=null) {
wxBillRent.setPay(dbBill.getReceivePay());
wxBillRent.setPay(dbBill.getPay()+dbBill.getReceivePay());
wxBillRent.setPayDate(new Date());
wxBillRent.setStatus(EnumBillRentStatus.RETURN.getCode());
addBillAction(bill.getBillId(), dbBill.getOwe());
@@ -337,7 +337,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
if(EnumBillRentStatus.PAID.getCode().equals(status)){
WxBillDaily dbBill = wxBillDailyMapper.selectByPrimaryKey(wxBillDaily.getId());
if(dbBill!=null) {
wxBillDaily.setPay(dbBill.getOwe());
wxBillDaily.setPay(dbBill.getPay()+dbBill.getOwe());
wxBillDaily.setPayDate(new Date());
addBillAction(bill.getBillId(), dbBill.getOwe());
}
@@ -354,7 +354,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
if(EnumBillRentStatus.PAID.getCode().equals(status)){
WxBillOther dbBill = wxBillOtherMapper.selectByPrimaryKey(wxBillRent.getId());
if(dbBill!=null) {
wxBillRent.setPay(dbBill.getOwe());
wxBillRent.setPay(dbBill.getPay()+dbBill.getOwe());
wxBillRent.setPayDate(new Date());
addBillAction(bill.getBillId(), dbBill.getOwe());
}


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