This commit is contained in:
linfso 2024-12-27 10:57:25 +08:00
parent a384c0c5ff
commit ff5ce573b1
2 changed files with 27 additions and 5 deletions

View File

@ -19,12 +19,11 @@ import com.xdadan.erp.common.core.domain.entity.SysUser;
import com.xdadan.erp.common.core.redis.RedissonService;
import com.xdadan.erp.common.enums.BusinessType;
import com.xdadan.erp.common.utils.DateUtils;
import com.xdadan.erp.common.utils.NoticeUtils;
import com.xdadan.erp.common.utils.SecurityUtils;
import com.xdadan.erp.emis.domain.EmisCountry;
import com.xdadan.erp.emis.domain.EmisPrintTpl;
import com.xdadan.erp.emis.domain.EmisSite;
import com.xdadan.erp.emis.domain.EmisWaybill;
import com.xdadan.erp.emis.domain.*;
import com.xdadan.erp.emis.domain.exception.EmisBizError;
import com.xdadan.erp.emis.domain.stat.BillPayStatInfo;
import com.xdadan.erp.emis.domain.vo.AddressParseResult;
import com.xdadan.erp.emis.service.*;
import com.xdadan.erp.emis.service.kefu.RL7moorService;
@ -39,6 +38,7 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
@ -1057,6 +1057,21 @@ public class EmisCommonController extends EmisBaseController
*/
@GetMapping("/autoDoGenerateNotifyTrigger")
public AjaxResult autoDoSendNotifyTrigger() {
// 0.催款,有超期回款的5分钟催一次
EmisSettleBill emisSettleBill=new EmisSettleBill();
emisSettleBill.getParams().put("isHasExpirePay",1);
List<BillPayStatInfo> listExpireNoPayStatInfo = emisSettleBillService.selectBillPayStatInfoList(emisSettleBill);
if(!CollectionUtils.isEmpty(listExpireNoPayStatInfo)){
for (BillPayStatInfo item:listExpireNoPayStatInfo) {
String salesmen=item.getSalesmen();
String billMonth=item.getBillMonth();
String msg="超期未回款,尽快处理,超期月份:"+billMonth+",金额:"+item.getExpiredNoRecdPayMoney()+"元";
NoticeUtils.outSendNoticeToInner(msg,msg,"/ruyERj/BillPaybackSumList",salesmen,3);
}
}
// 1.销售开票统计通知

View File

@ -141,7 +141,7 @@
ROUND(sum(allowance_money),2) as totalAllowanceMoney,
ROUND(sum(deduction_money-other_money),2) as totalDeductionMoney,
ROUND(sum(other_money),2) as totalOtherMoney
from emis_settle_bill a
from emis_settle_bill a
<where>
a.del_flag='0'
<if test="salesmen != null and salesmen!='' "> and a.salesmen = #{salesmen}</if>
@ -259,6 +259,13 @@
group by salesmen,bill_month
) tbe on tba.salesmen=tbe.salesmen and tba.billMonth=tbe.billMonth
where 1=1
<!-- 超期回款 -->
<if test="params.isHasExpirePay != null and params.isHasExpirePay=1 ">
and tba.expiredNoRecdPayMoney <![CDATA[ >= ]]> 0
</if>
</select>