diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java b/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java index 6b05e395b..12a1a50eb 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java @@ -81,7 +81,7 @@ public class KwMeterController extends BaseController { return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); if (kwMeter.getBoxId() == null) return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); - if (kwMeter.getAddress() == null) + if (kwMeter.getId() == null) return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); KwBox kwBox = kwBoxService.getById(kwMeter.getBoxId()); diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java index 31236e152..75517e14f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java @@ -148,6 +148,10 @@ public class WxCouponOrderBVo extends WxCouponOrder{ @io.swagger.annotations.ApiModelProperty(value="商户列表",name="merchantVoList") private List merchantVoList; + /**发券渠道信息*/ + @io.swagger.annotations.ApiModelProperty(value="商户列表",name="channelType") + private Integer channelType; + @Transient private Date startDate; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index fe070bdd6..dfb5ecf37 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -225,10 +225,6 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService bill.setPropertyContractId(record.getId()); bill.setCreatetime(date); bill.setTenantId(record.getTenantId()); - if (bill.getReceivePay().equals(0L)) { - bill.setStatus(EnumBillRentStatus.PAID.getCode()); - bill.setPayDate(date); - } bill.setOwe(bill.getReceivePay()); bill.setNeedPay(bill.getNeedPay()); bill.setUpdatetime(date); @@ -242,6 +238,10 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService bill.setIsDel(EnumDelStatus.NOT_DEL.getCode()); bill.setShopId(record.getShopId()); setExpiredDay(bill,Calendar.MONTH,record.getReceivePeriod()); + if (bill.getReceivePay().equals(0L)) { + bill.setStatus(EnumBillRentStatus.PAID.getCode()); + bill.setPayDate(date); + } count++; } wxBillPropertyMapper.insertBills(record.getPreviewBillRentList()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index b5e827eb3..770fbab6d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -459,10 +459,6 @@ public class WxRentContractServiceImpl implements WxRentContractService { bill.setRentContractId(record.getId()); bill.setCreatetime(date); bill.setTenantId(record.getTenantId()); - if (bill.getReceivePay().equals(0L)) { - bill.setStatus(EnumBillRentStatus.PAID.getCode()); - bill.setPayDate(date); - } bill.setOwe(bill.getReceivePay()); bill.setNeedPay(bill.getNeedPay()); bill.setUpdatetime(date); @@ -475,8 +471,11 @@ public class WxRentContractServiceImpl implements WxRentContractService { bill.setPay(0L); bill.setIsDel(EnumDelStatus.NOT_DEL.getCode()); bill.setShopId(record.getShopId()); - bill.setShopInfo(record.getRentInfo()); setExpiredDay(bill,Calendar.MONTH,record.getReceivePeriod()); + if (bill.getReceivePay().equals(0L)) { + bill.setStatus(EnumBillRentStatus.PAID.getCode()); + bill.setPayDate(date); + } count++; } wxBillRentMapper.insertBills(record.getPreviewBillRentList()); diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index 1d5a54d9f..198826595 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -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, (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 - 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 @@ -601,6 +601,7 @@ from wx_merchant_b_user bu inner join wx_merchant m on bu.merchant_id=m.id where bu.tenant_id = #{tenantId} ) 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