winter 1 год назад
Родитель
Сommit
801d11fd33
4 измененных файлов: 11 добавлений и 7 удалений
  1. +2
    -5
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java
  2. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxFinanceReceive.java
  3. +3
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java
  4. +3
    -1
      mallinkService/src/main/resources/mapper/WxFinanceReceiveMapper.xml

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

@@ -248,11 +248,8 @@ public class WxFinanceController extends BaseController {
if (receive.getStatus().intValue() != EnumFinanceReceiveStatus.NORMAL.getCode().intValue()) {
return new ResultData(Result.ERROR,"该状态不允许操作");
}
Map<Integer,EnumFinanceReceiveType> tmap = new HashMap<Integer,EnumFinanceReceiveType>();
for (EnumFinanceReceiveType t : EnumFinanceReceiveType.values()) {
tmap.put(t.getCode(), t);
}
return new ResultData(tmap);
wxFinanceService.invalidReceive(record, getUser());
return new ResultData();
}
}

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

@@ -109,6 +109,9 @@ public class WxFinanceReceive extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value = "remark", name = "remark")
private String remark;
@io.swagger.annotations.ApiModelProperty(value = "是否已打印", name = "isPrint")
private Integer isPrint;
@TableField(exist = false)
private List<WxBillBaseEntity> bills;
@TableField(exist = false)


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

@@ -661,7 +661,9 @@ public class WxFinanceServiceImpl implements WxFinanceService {

@Override
public void invalidReceive(WxFinanceReceive record, MallUserInfo user) {
//收款作废,如果是预收款,冲抵的收款单如何处理
//收款作废
//主收款单作废
}




+ 3
- 1
mallinkService/src/main/resources/mapper/WxFinanceReceiveMapper.xml Просмотреть файл

@@ -20,11 +20,12 @@
<result column="merchant_id" jdbcType="BIGINT" property="merchantId"/>
<result column="remark" jdbcType="VARCHAR" property="remark"/>
<result column="fees_id" jdbcType="BIGINT" property="feesId"/>
<result column="is_print" jdbcType="INTEGER" property="isPrint"/>
</resultMap>

<sql id="allColumns">
`id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`receive_money`,`set_off_money`,`use_money`,`status`,`type`,`money_detail`,
`create_by`,`create_by_name`,`update_by`,`update_by_name`,`merchant_id`,`remark`,`feesId`
`create_by`,`create_by_name`,`update_by`,`update_by_name`,`merchant_id`,`remark`,`feesId`,`is_print`
</sql>

<sql id="dynamicWhereConditions">
@@ -42,6 +43,7 @@
<if test=" null != createTimeBegin ">and `create_time` &gt;= #{createTimeBegin}</if>
<if test=" null != createTimeEnd ">and `create_time` &lt;= #{createTimeEnd}</if>
<if test=" null != feesId ">and `fees_id` = #{feesId}</if>
<if test=" null != isPrint ">and `is_print` = #{isPrint}</if>
<if test=" null != merchantIdList ">
and merchantId in
<foreach collection="merchantIdList" index="index" item="midItem" open="(" separator="," close=")">


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