winter 2 лет назад
Родитель
Сommit
ba0428868a
5 измененных файлов: 39 добавлений и 16 удалений
  1. +13
    -6
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxSettleMerchantController.java
  2. +5
    -1
      mallinkAdmin/src/main/resources/db/migration/V20240300001_settle.sql
  3. +11
    -3
      mallinkService/src/main/java/com/iformall/domain/po/WxSettleMerchant.java
  4. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxSettleMerchantServiceImpl.java
  5. +8
    -4
      mallinkService/src/main/resources/mapper/WxSettleMerchantMapper.xml

+ 13
- 6
mallinkAdmin/src/main/java/com/iformall/controller/market/WxSettleMerchantController.java Просмотреть файл

@@ -24,7 +24,10 @@ import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;


import java.math.BigDecimal;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;


import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
@@ -106,8 +109,8 @@ public class WxSettleMerchantController extends BaseController {
} }
@ApiOperation("计算周期性费用") @ApiOperation("计算周期性费用")
@GetMapping("/calcute")
public ResultData calcutePeriodicity(@ModelAttribute WxSettleMerchant wxSettleMerchant) {
@PostMapping("/calcute")
public ResultData calcutePeriodicity(@RequestBody WxSettleMerchant wxSettleMerchant) {
return new ResultData(wxSettleMerchantService.getMapDetail(wxSettleMerchant,true)); return new ResultData(wxSettleMerchantService.getMapDetail(wxSettleMerchant,true));
} }


@@ -168,8 +171,10 @@ public class WxSettleMerchantController extends BaseController {
} }
all = all + _np + _bmf + _omf; all = all + _np + _bmf + _omf;
} }
return new ResultData(all);
Map retMap = new HashMap();
retMap.put("rent", rent);
retMap.put("money", new BigDecimal(all).divide(new BigDecimal(100)).setScale(2,BigDecimal.ROUND_HALF_UP));
return new ResultData(retMap);
} }
@ApiOperation("查询物业租金") @ApiOperation("查询物业租金")
@@ -207,8 +212,10 @@ public class WxSettleMerchantController extends BaseController {
} }
all = all + _np; all = all + _np;
} }
return new ResultData(all);
Map retMap = new HashMap();
retMap.put("property", property);
retMap.put("money", new BigDecimal(all).divide(new BigDecimal(100)).setScale(2,BigDecimal.ROUND_HALF_UP));
return new ResultData(retMap);
} }
} }

+ 5
- 1
mallinkAdmin/src/main/resources/db/migration/V20240300001_settle.sql Просмотреть файл

@@ -28,7 +28,11 @@ CREATE TABLE `wx_settle_merchant` (
`cash_rate` decimal(10,3) DEFAULT NULL COMMENT '现金扣款费率', `cash_rate` decimal(10,3) DEFAULT NULL COMMENT '现金扣款费率',
`cash_money` decimal(10,3) DEFAULT NULL COMMENT '现金结算金额', `cash_money` decimal(10,3) DEFAULT NULL COMMENT '现金结算金额',
`rent_money` decimal(10,3) DEFAULT NULL COMMENT '租金费用', `rent_money` decimal(10,3) DEFAULT NULL COMMENT '租金费用',
`rent_contract_money` decimal(10,3) DEFAULT NULL COMMENT '物业管理费',
`rent_contract_id` bigint(20) DEFAULT NULL COMMENT '租赁合同编号',
`rent_contract_number` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '租赁合同自有编号',
`property_money` decimal(10,3) DEFAULT NULL COMMENT '物业管理费',
`property_contract_id` bigint(20) DEFAULT NULL COMMENT '物业合同编号',
`property_contract_number` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '物业合同自有编号',
`employee_manage_money` decimal(10,3) DEFAULT NULL COMMENT '员工管理费', `employee_manage_money` decimal(10,3) DEFAULT NULL COMMENT '员工管理费',
`sales_slip_money` decimal(10,3) DEFAULT NULL COMMENT '小票费用', `sales_slip_money` decimal(10,3) DEFAULT NULL COMMENT '小票费用',
`salary` decimal(10,3) DEFAULT NULL COMMENT '工资', `salary` decimal(10,3) DEFAULT NULL COMMENT '工资',


+ 11
- 3
mallinkService/src/main/java/com/iformall/domain/po/WxSettleMerchant.java Просмотреть файл

@@ -68,9 +68,17 @@ public class WxSettleMerchant extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value = "现金结算金额", name = "cashMoney") @io.swagger.annotations.ApiModelProperty(value = "现金结算金额", name = "cashMoney")
private BigDecimal cashMoney; private BigDecimal cashMoney;
@io.swagger.annotations.ApiModelProperty(value = "租金费用", name = "rentMoney") @io.swagger.annotations.ApiModelProperty(value = "租金费用", name = "rentMoney")
private BigDecimal rentMoney;
@io.swagger.annotations.ApiModelProperty(value = "物业管理费", name = "rentContractMoney")
private BigDecimal rentContractMoney;
private BigDecimal rentMoney;
@io.swagger.annotations.ApiModelProperty(value = "租金合同编号", name = "rentContractId")
private Long rentContractId;
@io.swagger.annotations.ApiModelProperty(value = "租金合同自编编号", name = "rentContractNumber")
private String rentContractNumber;
@io.swagger.annotations.ApiModelProperty(value = "物业管理费", name = "propertyContractMoney")
private BigDecimal propertyMoney;
@io.swagger.annotations.ApiModelProperty(value = "物业合同编号", name = "propertyContractId")
private Long propertyContractId;
@io.swagger.annotations.ApiModelProperty(value = "物业合同自编编号", name = "propertyContractNumber")
private String propertyContractNumber;
@io.swagger.annotations.ApiModelProperty(value = "员工管理费", name = "employeeManageMoney") @io.swagger.annotations.ApiModelProperty(value = "员工管理费", name = "employeeManageMoney")
private BigDecimal employeeManageMoney; private BigDecimal employeeManageMoney;
@io.swagger.annotations.ApiModelProperty(value = "小票费用", name = "salesSlipMoney") @io.swagger.annotations.ApiModelProperty(value = "小票费用", name = "salesSlipMoney")


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

@@ -90,7 +90,7 @@ public class WxSettleMerchantServiceImpl implements WxSettleMerchantService{
valueMap.put("rentMoney", handleExcelData(record.getRentMoney())); valueMap.put("rentMoney", handleExcelData(record.getRentMoney()));
valueMap.put("rentContractMoney", handleExcelData(record.getRentContractMoney()));
valueMap.put("propertyMoney", handleExcelData(record.getPropertyMoney()));
valueMap.put("employeeManageMoney", handleExcelData(record.getEmployeeManageMoney())); valueMap.put("employeeManageMoney", handleExcelData(record.getEmployeeManageMoney()));
valueMap.put("salesSlipMoney", handleExcelData(record.getSalesSlipMoney())); valueMap.put("salesSlipMoney", handleExcelData(record.getSalesSlipMoney()));
valueMap.put("salary", handleExcelData(record.getSalary())); valueMap.put("salary", handleExcelData(record.getSalary()));
@@ -102,7 +102,7 @@ public class WxSettleMerchantServiceImpl implements WxSettleMerchantService{
record.setPointsMoney(calcuteByMoneyAndRate(totalSaleMoney,record.getPointsRate())); record.setPointsMoney(calcuteByMoneyAndRate(totalSaleMoney,record.getPointsRate()));
} }
valueMap.put("pointsMoney", handleExcelData(record.getPointsMoney())); valueMap.put("pointsMoney", handleExcelData(record.getPointsMoney()));
BigDecimal totalTempMoney = calcuteAdd(record.getRentMoney(),record.getRentContractMoney(),record.getEmployeeManageMoney(),record.getSalesSlipMoney(),
BigDecimal totalTempMoney = calcuteAdd(record.getRentMoney(),record.getPropertyMoney(),record.getEmployeeManageMoney(),record.getSalesSlipMoney(),
record.getSalary(),record.getEarnestMoney(),record.getOtherMoney(),record.getLastRemaining(),record.getPointsMoney()); record.getSalary(),record.getEarnestMoney(),record.getOtherMoney(),record.getLastRemaining(),record.getPointsMoney());
valueMap.put("totalTempMoney", totalTempMoney); valueMap.put("totalTempMoney", totalTempMoney);


+ 8
- 4
mallinkService/src/main/resources/mapper/WxSettleMerchantMapper.xml Просмотреть файл

@@ -31,7 +31,11 @@
<result column="cash_rate" jdbcType="DECIMAL" property="cashRate" /> <result column="cash_rate" jdbcType="DECIMAL" property="cashRate" />
<result column="cash_money" jdbcType="DECIMAL" property="cashMoney" /> <result column="cash_money" jdbcType="DECIMAL" property="cashMoney" />
<result column="rent_money" jdbcType="DECIMAL" property="rentMoney" /> <result column="rent_money" jdbcType="DECIMAL" property="rentMoney" />
<result column="rent_contract_money" jdbcType="DECIMAL" property="rentContractMoney" />
<result column="rent_contract_id" jdbcType="BIGINT" property="rentContractId" />
<result column="rent_contract_number" jdbcType="VARCHAR" property="rentContractNumber" />
<result column="property_money" jdbcType="DECIMAL" property="propertyMoney" />
<result column="property_contract_id" jdbcType="BIGINT" property="propertyContractId" />
<result column="property_contract_number" jdbcType="VARCHAR" property="propertyContractNumber" />
<result column="employee_manage_money" jdbcType="DECIMAL" property="employeeManageMoney" /> <result column="employee_manage_money" jdbcType="DECIMAL" property="employeeManageMoney" />
<result column="sales_slip_money" jdbcType="DECIMAL" property="salesSlipMoney" /> <result column="sales_slip_money" jdbcType="DECIMAL" property="salesSlipMoney" />
<result column="salary" jdbcType="DECIMAL" property="salary" /> <result column="salary" jdbcType="DECIMAL" property="salary" />
@@ -56,9 +60,9 @@
`id`,`tenant_id`,`parent_tenant_id`,`create_date`,`update_date`,`merchant_id`,`begin_time`,`end_time`,`total_money`, `id`,`tenant_id`,`parent_tenant_id`,`create_date`,`update_date`,`merchant_id`,`begin_time`,`end_time`,`total_money`,
`actual_money`,`card_sale_money`,`card_rate`,`card_money`,`zfb_sale_money`,`zfb_rate`,`zfb_money`,`union_sale_money`,`union_rate`, `actual_money`,`card_sale_money`,`card_rate`,`card_money`,`zfb_sale_money`,`zfb_rate`,`zfb_money`,`union_sale_money`,`union_rate`,
`union_money`,`wx_sale_money`,`wx_rate`,`wx_money`,`erase_zero_sale_money`,`erase_zero_rate`,`erase_zero_money`,`cash_sale_money`, `union_money`,`wx_sale_money`,`wx_rate`,`wx_money`,`erase_zero_sale_money`,`erase_zero_rate`,`erase_zero_money`,`cash_sale_money`,
`cash_rate`,`cash_money`,`rent_money`,`rent_contract_money`,`employee_manage_money`,`sales_slip_money`,`salary`,`earnest_money`,
`other_money`,`last_remaining`,`points_rate`,`points_money`,`merchant_name`,`merchant_code`,`merchant_person`,`merchant_phone`,
`account_name`,`account_bank`,`account_number`,`create_by`,`update_by`,`is_del`
`cash_rate`,`cash_money`,`rent_money`,`rent_contract_id`,`rent_contract_number`,`property_money`,`property_contract_id`,`property_contract_number`,
`employee_manage_money`,`sales_slip_money`,`salary`,`earnest_money`,`other_money`,`last_remaining`,`points_rate`,`points_money`,
`merchant_name`,`merchant_code`,`merchant_person`,`merchant_phone`,`account_name`,`account_bank`,`account_number`,`create_by`,`update_by`,`is_del`
</sql> </sql>


<sql id="dynamicWhereConditions"> <sql id="dynamicWhereConditions">


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