diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java index dcb8009f4..abc2b2005 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java +++ b/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 tmap = new HashMap(); - for (EnumFinanceReceiveType t : EnumFinanceReceiveType.values()) { - tmap.put(t.getCode(), t); - } - return new ResultData(tmap); + wxFinanceService.invalidReceive(record, getUser()); + return new ResultData(); } } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxFinanceReceive.java b/mallinkService/src/main/java/com/iformall/domain/po/WxFinanceReceive.java index 818516cd7..9d838b373 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxFinanceReceive.java +++ b/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 bills; @TableField(exist = false) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java index 287ca7c95..fba1429bf 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java +++ b/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) { - //收款作废,如果是预收款,冲抵的收款单如何处理 + //收款作废 + //主收款单作废 + } diff --git a/mallinkService/src/main/resources/mapper/WxFinanceReceiveMapper.xml b/mallinkService/src/main/resources/mapper/WxFinanceReceiveMapper.xml index 31ebc10b4..18243310a 100644 --- a/mallinkService/src/main/resources/mapper/WxFinanceReceiveMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxFinanceReceiveMapper.xml @@ -20,11 +20,12 @@ + `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` @@ -42,6 +43,7 @@ and `create_time` >= #{createTimeBegin} and `create_time` <= #{createTimeEnd} and `fees_id` = #{feesId} + and `is_print` = #{isPrint} and merchantId in