| @@ -1671,7 +1671,7 @@ public class WxOrderServiceImpl implements WxOrderService { | |||||
| msg.setModelId(temp.getId()); | msg.setModelId(temp.getId()); | ||||
| Map<String,String> map = new HashMap<>(); | Map<String,String> map = new HashMap<>(); | ||||
| map.put("优惠券名称",coupon.getTitle()); | map.put("优惠券名称",coupon.getTitle()); | ||||
| map.put("剩余时间",dateFormat.format(couponOrder.getExpiredTime())); | |||||
| map.put("剩余时间","至"+ dateFormat.format(couponOrder.getExpiredTime())); | |||||
| map.put("备注","你的优惠券已到账!请立即使用"); | map.put("备注","你的优惠券已到账!请立即使用"); | ||||
| if(EnumCouponType.COUPON_TINGCHE.getCode().equals(couponOrder.getCouponType()) | if(EnumCouponType.COUPON_TINGCHE.getCode().equals(couponOrder.getCouponType()) | ||||
| || EnumCouponType.COUPON_CREDIT_PARK.getCode().equals(couponOrder.getCouponType())){ | || EnumCouponType.COUPON_CREDIT_PARK.getCode().equals(couponOrder.getCouponType())){ | ||||
| @@ -170,12 +170,14 @@ public class WxShopServiceImpl implements WxShopService { | |||||
| @Override | @Override | ||||
| public long findCount(WxShop wxShop) { | public long findCount(WxShop wxShop) { | ||||
| TenantEntity tenantEntity = wxShop; | TenantEntity tenantEntity = wxShop; | ||||
| logger.info("---------tenantId="+tenantEntity.getTenantId()+"-----parentTenantId="+tenantEntity.getParentTenantId()); | |||||
| long count = 0l; | long count = 0l; | ||||
| List<TenantEntity> tenantEntitys = wxMallService.getTenantEntitys(tenantEntity); | List<TenantEntity> tenantEntitys = wxMallService.getTenantEntitys(tenantEntity); | ||||
| for (TenantEntity te:tenantEntitys) { | for (TenantEntity te:tenantEntitys) { | ||||
| wxShop.updateTenantInfo(te); | wxShop.updateTenantInfo(te); | ||||
| count += wxShopMapper.findCount(wxShop); | count += wxShopMapper.findCount(wxShop); | ||||
| } | } | ||||
| logger.info("---------tenantId="+tenantEntity.getTenantId()+"-----parentTenantId="+tenantEntity.getParentTenantId()); | |||||
| wxShop.updateTenantInfo(tenantEntity); | wxShop.updateTenantInfo(tenantEntity); | ||||
| return count; | return count; | ||||
| } | } | ||||