diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTradeDaily.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTradeDaily.java index 3efa0c751..c666d7d89 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTradeDaily.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTradeDaily.java @@ -85,5 +85,10 @@ public class WxMerchantTradeDaily extends TenantEntity { @TableField(exist = false) private Long ignoreId; + + @TableField(exist = false) + private Long buildingId; + @TableField(exist = false) + private Long floorId; } diff --git a/mallinkService/src/main/java/com/iformall/service/WxShopService.java b/mallinkService/src/main/java/com/iformall/service/WxShopService.java index bca27efeb..d66db1a8d 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxShopService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxShopService.java @@ -105,5 +105,7 @@ public interface WxShopService { List findMerchantShopVoList(TenantEntity tenantEntity,Long merchantId); WxShop getShopByShopNumber(TenantEntity tenantEntity,String shopNumber); + + List getShopIds(WxShop wxShop); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java index be14e8b66..fde185ac5 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java @@ -11,9 +11,11 @@ import com.iformall.domain.po.*; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxMerchantTradeDailyVo; import com.iformall.enums.EnumTradeDailyDateType; +import com.iformall.enums.EnumYesOrNo; import com.iformall.exception.MallinkException; import com.iformall.mapper.WxMerchantTradeDailyHistoryMapper; import com.iformall.mapper.WxMerchantTradeDailyMapper; +import com.iformall.mapper.WxShopMapper; import com.iformall.service.*; import com.iformall.utils.DateUtils; import org.slf4j.Logger; @@ -182,10 +184,13 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ } private void handleQueryParam(WxMerchantTradeDaily record) { - if (!StringUtils.isBlank(record.getMerchantName())) { + //楼层楼座 + List floorMids = wxMerchantService.getFloorBuildMerchantIds(record, null, record.getBuildingId(), record.getFloorId(), EnumYesOrNo.NO.getCode(), EnumYesOrNo.NO.getCode()); + if (null != floorMids || StringUtils.isNotBlank(record.getMerchantName())) { WxMerchant m = new WxMerchant(); m.updateTenantInfo(record); m.setName(StringUtils.trimToNull(record.getMerchantName())); + m.setIds(floorMids); List merchantIdList = wxMerchantService.findIdList(m); if (null != merchantIdList && merchantIdList.size() > 0 ) { record.setMerchantIdList(merchantIdList); @@ -468,6 +473,7 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ if (merchant == null) return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND); WxMerchantTradeDaily wxMerchantTradeDaily = new WxMerchantTradeDaily(); + wxMerchantTradeDaily.updateTenantInfo(merchant); wxMerchantTradeDaily.setMerchantId(merchantId); String startTime = DateUtils.getTimeBefore(29, new Date()); String endTime = DateUtils.getSystemTime("yyyy-MM-dd"); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java index ba2a77275..f8f94e90f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java @@ -214,7 +214,9 @@ public class WxMsgCallbackServiceImpl implements WxMsgCallbackService { WxMsgCallback wxMsgCallback = new WxMsgCallback(); wxMsgCallback.setBatchNo(param.get("biz_id")); wxMsgCallback.setPhone(param.get("phone_number")); - if("true".equalsIgnoreCase(success)){ + String smsSize = param.get("sms_size");//是否计算条数 + boolean isSuccess = false; + if("true".equalsIgnoreCase(success) || ("false".equalsIgnoreCase(success) && StringUtils.isNotBlank(smsSize))){ wxMsgCallback.setStatus(EnumMsgSendStatus.MSG_SEND_SUCCESS.getCode()); if(StringUtils.isNotBlank(param.get("out_id"))){ WxCouponPassword couponPassword = new WxCouponPassword(); @@ -223,13 +225,14 @@ public class WxMsgCallbackServiceImpl implements WxMsgCallbackService { couponPassword.setUpdateDate(new Date()); wxCouponPasswordMapper.updateById(couponPassword); } + isSuccess = true; }else{ wxMsgCallback.setStatus(EnumMsgSendStatus.MSG_SEND_FAIL.getCode()); } wxMsgCallback.setStatusMsg(param.get("err_msg")); wxMsgCallbackMapper.updateByBatchNo(wxMsgCallback); //失败回滚 回滚数量 - if (!"true".equalsIgnoreCase(success)) { + if (!isSuccess) { String redisKey = Constant.cache_aliyun_msg+wxMsgCallback.getBatchNo()+":"+wxMsgCallback.getPhone(); Integer msgCached = RedisCacheUtils.getCacheInteger(redisTemplate, redisKey); if (null != msgCached && 1== msgCached) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java index 5462cd159..38a33fd3d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java @@ -708,4 +708,9 @@ public class WxShopServiceImpl implements WxShopService { } return null; } + + @Override + public List getShopIds(WxShop wxShop) { + return wxShopMapper.findIdList(wxShop); + } }