diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java index 48a7f548f..da383b1e8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java @@ -126,13 +126,16 @@ public class WxBusinessServiceImpl implements WxBusinessService { List billRentList = wxPropertyContractService.buildProperty(new WxMerchant(),userid,dbRent, EnumIsPreview.YES.getCode(), false); businessSumMoney = businessSumMoney.add(new BigDecimal(billRentList.get(0).getReceivePay())); } - - if(e.get("area") == null || "0".equals(e.get("area").toString())){ + logger.info("业态分析>>>>>>>>>>>>>>>>>>商铺面积:" + e.get("area").toString()); + if (e.get("area") == null || "0".equals(e.get("area").toString()) || + "0.0".equals(e.get("area").toString())) { e.put("rent",0); }else { BigDecimal area = new BigDecimal(e.get("area").toString()); - BigDecimal areaRatio = businessSumMoney.divide(area, 2, BigDecimal.ROUND_HALF_UP).divide(new BigDecimal(100), 2, BigDecimal.ROUND_HALF_UP); - e.put("rent", areaRatio.toBigInteger()); + if (area.longValue() > 0) { + BigDecimal areaRatio = businessSumMoney.divide(area, 2, BigDecimal.ROUND_HALF_UP).divide(new BigDecimal(100), 2, BigDecimal.ROUND_HALF_UP); + e.put("rent", areaRatio.toBigInteger()); + } } }); return resultList; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingReceiverServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingReceiverServiceImpl.java index 3364d4fc5..9e3434863 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingReceiverServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingReceiverServiceImpl.java @@ -318,15 +318,15 @@ public class WxProfitSharingReceiverServiceImpl implements WxProfitSharingReceiv logger.error(ErrorCode.PROFIT_SHARING_RECEIVER_DEL_FAILED.getMessage()); return new ResultData(ErrorCode.PROFIT_SHARING_RECEIVER_DEL_FAILED.getCode(), "verifyNotifyHMAC"); } + } - receiver.setStatus(EnumProfitSharingReceiverStatus.PROFIT_SHARING_RECEIVER_STATUS_INVALID.getCode()); - receiver.setUpdateTime(new Date()); - wxProfitSharingReceiverMapper.updateByPrimaryKeySelective(receiver); + receiver.setStatus(EnumProfitSharingReceiverStatus.PROFIT_SHARING_RECEIVER_STATUS_INVALID.getCode()); + receiver.setUpdateTime(new Date()); + wxProfitSharingReceiverMapper.updateByPrimaryKeySelective(receiver); - //发送短信 - if (send.equals(EnumMsgSend.MSG_SEND_IMMEDIATELY.getCode())) { - sendMsgByType(EnumMsgModel.DELETE_SHARING_ACCOUNT_NOTIFY_MERCHANT.getCode(), receiver.getMerchantId(), receiver.getReceiverAccount(), receiver.getTenantId()); - } + //发送短信 + if (send.equals(EnumMsgSend.MSG_SEND_IMMEDIATELY.getCode())) { + sendMsgByType(EnumMsgModel.DELETE_SHARING_ACCOUNT_NOTIFY_MERCHANT.getCode(), receiver.getMerchantId(), receiver.getReceiverAccount(), receiver.getTenantId()); } return new ResultData(); } diff --git a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml index 42360c9f4..5836eea59 100644 --- a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml @@ -814,7 +814,7 @@ and tt.tenant_id = #{tenantId} and tt.id = #{merchantId} - and tt.name like concat('%', #{merchantName},'%') + and tt.name like concat('%', #{merchantName},'%') and tt.rent_shop_type = #{rentShopType} order by ${sortColumns}