| @@ -81,7 +81,7 @@ public class KwMeterController extends BaseController { | |||||
| return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); | return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); | ||||
| if (kwMeter.getBoxId() == null) | if (kwMeter.getBoxId() == null) | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); | return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); | ||||
| if (kwMeter.getAddress() == null) | |||||
| if (kwMeter.getId() == null) | |||||
| return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); | return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); | ||||
| KwBox kwBox = kwBoxService.getById(kwMeter.getBoxId()); | KwBox kwBox = kwBoxService.getById(kwMeter.getBoxId()); | ||||
| @@ -148,6 +148,10 @@ public class WxCouponOrderBVo extends WxCouponOrder{ | |||||
| @io.swagger.annotations.ApiModelProperty(value="商户列表",name="merchantVoList") | @io.swagger.annotations.ApiModelProperty(value="商户列表",name="merchantVoList") | ||||
| private List<WxMerchantVo> merchantVoList; | private List<WxMerchantVo> merchantVoList; | ||||
| /**发券渠道信息*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="商户列表",name="channelType") | |||||
| private Integer channelType; | |||||
| @Transient | @Transient | ||||
| private Date startDate; | private Date startDate; | ||||
| @@ -225,10 +225,6 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService | |||||
| bill.setPropertyContractId(record.getId()); | bill.setPropertyContractId(record.getId()); | ||||
| bill.setCreatetime(date); | bill.setCreatetime(date); | ||||
| bill.setTenantId(record.getTenantId()); | bill.setTenantId(record.getTenantId()); | ||||
| if (bill.getReceivePay().equals(0L)) { | |||||
| bill.setStatus(EnumBillRentStatus.PAID.getCode()); | |||||
| bill.setPayDate(date); | |||||
| } | |||||
| bill.setOwe(bill.getReceivePay()); | bill.setOwe(bill.getReceivePay()); | ||||
| bill.setNeedPay(bill.getNeedPay()); | bill.setNeedPay(bill.getNeedPay()); | ||||
| bill.setUpdatetime(date); | bill.setUpdatetime(date); | ||||
| @@ -242,6 +238,10 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService | |||||
| bill.setIsDel(EnumDelStatus.NOT_DEL.getCode()); | bill.setIsDel(EnumDelStatus.NOT_DEL.getCode()); | ||||
| bill.setShopId(record.getShopId()); | bill.setShopId(record.getShopId()); | ||||
| setExpiredDay(bill,Calendar.MONTH,record.getReceivePeriod()); | setExpiredDay(bill,Calendar.MONTH,record.getReceivePeriod()); | ||||
| if (bill.getReceivePay().equals(0L)) { | |||||
| bill.setStatus(EnumBillRentStatus.PAID.getCode()); | |||||
| bill.setPayDate(date); | |||||
| } | |||||
| count++; | count++; | ||||
| } | } | ||||
| wxBillPropertyMapper.insertBills(record.getPreviewBillRentList()); | wxBillPropertyMapper.insertBills(record.getPreviewBillRentList()); | ||||
| @@ -459,10 +459,6 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| bill.setRentContractId(record.getId()); | bill.setRentContractId(record.getId()); | ||||
| bill.setCreatetime(date); | bill.setCreatetime(date); | ||||
| bill.setTenantId(record.getTenantId()); | bill.setTenantId(record.getTenantId()); | ||||
| if (bill.getReceivePay().equals(0L)) { | |||||
| bill.setStatus(EnumBillRentStatus.PAID.getCode()); | |||||
| bill.setPayDate(date); | |||||
| } | |||||
| bill.setOwe(bill.getReceivePay()); | bill.setOwe(bill.getReceivePay()); | ||||
| bill.setNeedPay(bill.getNeedPay()); | bill.setNeedPay(bill.getNeedPay()); | ||||
| bill.setUpdatetime(date); | bill.setUpdatetime(date); | ||||
| @@ -475,8 +471,11 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| bill.setPay(0L); | bill.setPay(0L); | ||||
| bill.setIsDel(EnumDelStatus.NOT_DEL.getCode()); | bill.setIsDel(EnumDelStatus.NOT_DEL.getCode()); | ||||
| bill.setShopId(record.getShopId()); | bill.setShopId(record.getShopId()); | ||||
| bill.setShopInfo(record.getRentInfo()); | |||||
| setExpiredDay(bill,Calendar.MONTH,record.getReceivePeriod()); | setExpiredDay(bill,Calendar.MONTH,record.getReceivePeriod()); | ||||
| if (bill.getReceivePay().equals(0L)) { | |||||
| bill.setStatus(EnumBillRentStatus.PAID.getCode()); | |||||
| bill.setPayDate(date); | |||||
| } | |||||
| count++; | count++; | ||||
| } | } | ||||
| wxBillRentMapper.insertBills(record.getPreviewBillRentList()); | wxBillRentMapper.insertBills(record.getPreviewBillRentList()); | ||||
| @@ -575,7 +575,7 @@ | |||||
| where m.id = cm.merchant_id and cm.product_id=co.coupon_id and cm.status = 0) else '[多商户通用]' end) as merchant_name, | where m.id = cm.merchant_id and cm.product_id=co.coupon_id and cm.status = 0) else '[多商户通用]' end) as merchant_name, | ||||
| (case when com.mc = 1 then (select m.id from wx_merchant m, | (case when com.mc = 1 then (select m.id from wx_merchant m, | ||||
| wx_coupon_merchant cm where m.id = cm.merchant_id and cm.product_id = co.coupon_id | wx_coupon_merchant cm where m.id = cm.merchant_id and cm.product_id = co.coupon_id | ||||
| and cm.status = 0) else 0 end) as merchant_id,cu.phone,bu.verify_merchant_name | |||||
| and cm.status = 0) else 0 end) as merchant_id,cu.phone,bu.verify_merchant_name,cal.channel_type | |||||
| </sql> | </sql> | ||||
| <sql id="allAdminCouponOrderDetailColumns"> | <sql id="allAdminCouponOrderDetailColumns"> | ||||
| @@ -601,6 +601,7 @@ | |||||
| from wx_merchant_b_user bu inner join wx_merchant m on bu.merchant_id=m.id | from wx_merchant_b_user bu inner join wx_merchant m on bu.merchant_id=m.id | ||||
| where bu.tenant_id = #{tenantId} | where bu.tenant_id = #{tenantId} | ||||
| ) bu on bu.bu_id = co.b_user_id | ) bu on bu.bu_id = co.b_user_id | ||||
| left join wx_coupon_action_log cal on co.id = cal.coupon_order_id and co.coupon_id = cal.coupon_id | |||||
| where 1=1 | where 1=1 | ||||
| <choose> | <choose> | ||||
| <when test=" null != couponType"> | <when test=" null != couponType"> | ||||