| @@ -37,4 +37,8 @@ public class WxMerchantSubsidyVo extends WxMerchantSubsidy { | |||||
| @io.swagger.annotations.ApiModelProperty(value="持有人手机",name="phone") | @io.swagger.annotations.ApiModelProperty(value="持有人手机",name="phone") | ||||
| private String phone; | private String phone; | ||||
| @io.swagger.annotations.ApiModelProperty(value="0正常1冻结",name="freeze") | |||||
| private Integer freeze; | |||||
| } | } | ||||
| @@ -6,8 +6,8 @@ package com.iformall.enums; | |||||
| public enum EnumSettleStatus { | public enum EnumSettleStatus { | ||||
| //0待确认1未清算结余金额2结算完成 | //0待确认1未清算结余金额2结算完成 | ||||
| DEF(0, "待确认"), | DEF(0, "待确认"), | ||||
| NOT_FINISH(1, "未清算结余金额"), | |||||
| FINISH(2, "结算完成"), | |||||
| NOT_FINISH(7, "未清算结余金额"), | |||||
| FINISH(3, "结算完成"), | |||||
| ; | ; | ||||
| public static EnumSettleStatus getEnum(Integer code) { | public static EnumSettleStatus getEnum(Integer code) { | ||||
| @@ -827,7 +827,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||||
| if(bill != null){ | if(bill != null){ | ||||
| cellList.add(bill.getBillName()); | cellList.add(bill.getBillName()); | ||||
| cellList.add(bill.getReceivePay()); | |||||
| cellList.add(new BigDecimal(bill.getReceivePay()).divide(new BigDecimal(100), 2, BigDecimal.ROUND_HALF_UP).toString()); | |||||
| }else{ | }else{ | ||||
| cellList.add(""); | cellList.add(""); | ||||
| cellList.add(""); | cellList.add(""); | ||||
| @@ -836,7 +836,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||||
| WxBillSettleBill payBill = i>wxBillSettle.getPayBillIds().size()-1?null:wxBillSettle.getPayBillIds().get(i); | WxBillSettleBill payBill = i>wxBillSettle.getPayBillIds().size()-1?null:wxBillSettle.getPayBillIds().get(i); | ||||
| if(payBill != null){ | if(payBill != null){ | ||||
| cellList.add(payBill.getBillName()); | cellList.add(payBill.getBillName()); | ||||
| cellList.add(payBill.getReceivePay()); | |||||
| cellList.add(new BigDecimal(payBill.getReceivePay()).divide(new BigDecimal(100), 2, BigDecimal.ROUND_HALF_UP).toString()); | |||||
| }else{ | }else{ | ||||
| cellList.add(""); | cellList.add(""); | ||||
| cellList.add(""); | cellList.add(""); | ||||
| @@ -163,6 +163,9 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { | |||||
| if (record.getFlowParams() == null || record.getFlowParams().size() == 0) { | if (record.getFlowParams() == null || record.getFlowParams().size() == 0) { | ||||
| record.setStatus(EnumSettleStatus.NOT_FINISH.getCode()); | record.setStatus(EnumSettleStatus.NOT_FINISH.getCode()); | ||||
| //选择的账单改为已结清 | |||||
| } | } | ||||
| if (record.getId() == null) { | if (record.getId() == null) { | ||||
| record.setId(idWorker.nextId()); | record.setId(idWorker.nextId()); | ||||
| @@ -93,9 +93,7 @@ | |||||
| <if test=" null != rentShopType ">and br.`rent_shop_type` = #{rentShopType}</if> | <if test=" null != rentShopType ">and br.`rent_shop_type` = #{rentShopType}</if> | ||||
| <if test=" null != payWay ">and br.`pay_way` = #{payWay}</if> | <if test=" null != payWay ">and br.`pay_way` = #{payWay}</if> | ||||
| <if test=" null != comments and ''!=comments">and br.`comments` like concat('%',#{comments},'%')</if> | <if test=" null != comments and ''!=comments">and br.`comments` like concat('%',#{comments},'%')</if> | ||||
| <if test=" null != starttime and null!=endtime ">and br.`receive_date` between #{starttime} and #{endtime} | |||||
| </if> | |||||
| <if test=" null != starttime and null!=endtime ">and br.`receive_date` between #{starttime} and #{endtime}</if> | |||||
| </where> | </where> | ||||
| <if test=" null != sortColumns"> order by ${sortColumns} </if> | <if test=" null != sortColumns"> order by ${sortColumns} </if> | ||||
| <if test=" null == sortColumns"> order by id desc </if> | <if test=" null == sortColumns"> order by id desc </if> | ||||
| @@ -139,6 +139,7 @@ | |||||
| <result column="nick_name" jdbcType="VARCHAR" property="nickName" /> | <result column="nick_name" jdbcType="VARCHAR" property="nickName" /> | ||||
| <result column="phone" jdbcType="VARCHAR" property="phone" /> | <result column="phone" jdbcType="VARCHAR" property="phone" /> | ||||
| <result column="freeze" property="freeze" /> | |||||
| </resultMap> | </resultMap> | ||||
| <sql id="allVoColumns"> | <sql id="allVoColumns"> | ||||