事务bug修复
This commit is contained in:
@@ -1,9 +1,10 @@
|
|||||||
package com.quinn.controller.wx;
|
package com.quinn.controller.wx;
|
||||||
|
|
||||||
import com.quinn.pojo.User;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
import javax.servlet.http.HttpServletRequest;
|
import javax.servlet.http.HttpServletRequest;
|
||||||
|
|
||||||
|
@Transactional
|
||||||
public class BaseWxController {
|
public class BaseWxController {
|
||||||
|
|
||||||
protected String getLoginUserId(HttpServletRequest request){
|
protected String getLoginUserId(HttpServletRequest request){
|
||||||
|
|||||||
@@ -7,7 +7,6 @@ import com.quinn.pojo.AccBill;
|
|||||||
import com.quinn.pojo.AccSetting;
|
import com.quinn.pojo.AccSetting;
|
||||||
import com.quinn.service.AccBillService;
|
import com.quinn.service.AccBillService;
|
||||||
import com.quinn.service.AccSettingService;
|
import com.quinn.service.AccSettingService;
|
||||||
import org.springframework.util.CollectionUtils;
|
|
||||||
import org.springframework.web.bind.annotation.PathVariable;
|
import org.springframework.web.bind.annotation.PathVariable;
|
||||||
import org.springframework.web.bind.annotation.PostMapping;
|
import org.springframework.web.bind.annotation.PostMapping;
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
import org.springframework.web.bind.annotation.RequestMapping;
|
||||||
@@ -212,7 +211,7 @@ public class WxBillController extends BaseWxController{
|
|||||||
if (AccSettingType.OWE_SETTING.equals(settingType)){
|
if (AccSettingType.OWE_SETTING.equals(settingType)){
|
||||||
isOwe = true;
|
isOwe = true;
|
||||||
}
|
}
|
||||||
accSettingService.updateBalance(accBill.getAccount(),AccBillType.EXPEND.equals(billType) && !isOwe ? -money : money);
|
accSettingService.updateBalance(accBill.getAccount(),(AccBillType.EXPEND.equals(billType) && !isOwe) || AccBillType.REPAYMENT.equals(billType) ? -money : money);
|
||||||
if (AccBillType.REPAYMENT.equals(billType) || AccBillType.TRANSFER.equals(billType)){
|
if (AccBillType.REPAYMENT.equals(billType) || AccBillType.TRANSFER.equals(billType)){
|
||||||
accSettingService.updateBalance(accBill.getFromAccount(),-money);
|
accSettingService.updateBalance(accBill.getFromAccount(),-money);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user