Parcourir la source

fix

release_toaliyun_real
winter il y a 1 an
Parent
révision
4fb3c5ec60
2 fichiers modifiés avec 14 ajouts et 10 suppressions
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java
  2. +13
    -9
      mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java

+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java Voir le fichier

@@ -263,7 +263,7 @@ public class WxFinanceController extends BaseController {
@ApiOperation("增加临时费用") @ApiOperation("增加临时费用")
@PostMapping("createTempFees") @PostMapping("createTempFees")
public ResultData saveAdvance(@RequestBody WxAllBill record) {
public ResultData createTempFees(@RequestBody WxAllBill record) {
record.updateTenantInfo(getTenantInfo()); record.updateTenantInfo(getTenantInfo());
if (StringUtils.isBlank(record.getReceivePay())) { if (StringUtils.isBlank(record.getReceivePay())) {
return new ResultData(Result.ERROR,"请填写金额"); return new ResultData(Result.ERROR,"请填写金额");


+ 13
- 9
mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java Voir le fichier

@@ -362,7 +362,7 @@ public class WxFinanceServiceImpl implements WxFinanceService {
if (null == shopId) { if (null == shopId) {
shopId = be.getShopId(); shopId = be.getShopId();
} }
if (shopId != be.getShopId()) {
if (shopId.longValue() != be.getShopId().longValue()) {
throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(),"多个房源合并收款不能冲抵"); throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(),"多个房源合并收款不能冲抵");
} }
} }
@@ -1223,13 +1223,17 @@ public class WxFinanceServiceImpl implements WxFinanceService {
WxAllBill advanceBill = new WxAllBill(); WxAllBill advanceBill = new WxAllBill();
advanceBill.updateTenantInfo(record); advanceBill.updateTenantInfo(record);
advanceBill.setShopId(wxShop.getId()); advanceBill.setShopId(wxShop.getId());
WxShopUsers su = new WxShopUsers();
su.updateTenantInfo(record);
su.setShopId(wxShop.getId());
su.setStatus(EnumShopUsersStatus.LIVE.getCode());
WxShopUsers wsu = wxShopService.getOneShopUsers(su);
if (null != wsu) {
advanceBill.setCusName(wsu.getName());
if (StringUtils.isNotBlank(record.getCusName())) {
advanceBill.setCusName(record.getCusName());
}else {
WxShopUsers su = new WxShopUsers();
su.updateTenantInfo(record);
su.setShopId(wxShop.getId());
su.setStatus(EnumShopUsersStatus.LIVE.getCode());
WxShopUsers wsu = wxShopService.getOneShopUsers(su);
if (null != wsu) {
advanceBill.setCusName(wsu.getName());
}
} }
advanceBill.setNeedPay(record.getReceivePay()); advanceBill.setNeedPay(record.getReceivePay());
advanceBill.setReceivePay(receivePay); advanceBill.setReceivePay(receivePay);
@@ -1237,7 +1241,7 @@ public class WxFinanceServiceImpl implements WxFinanceService {
advanceBill.setUseMoney("0"); advanceBill.setUseMoney("0");
advanceBill.setBillType(billType.getCode()); advanceBill.setBillType(billType.getCode());
//advanceBill.setPayWay(); //advanceBill.setPayWay();
advanceBill.setPayDate(new Date());
//advanceBill.setPayDate(new Date());
advanceBill.setStarttime(starttime); advanceBill.setStarttime(starttime);
advanceBill.setEndtime(endtime); advanceBill.setEndtime(endtime);
advanceBill.setReceiveDate(starttime); advanceBill.setReceiveDate(starttime);


Chargement…
Annuler
Enregistrer