经销商端最新消息提醒优化调整

src/custom/restcontroller/sale/cashbill/cashbill.java

@@ -4,6 +4,7 @@ import beans.clear.ClearData;
 import beans.data.BatchDeleteErr;
 import beans.datacontrllog.DataContrlLog;
 import beans.datateam.DataTeam;
+import beans.remind.Remind;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.sun.xml.internal.xsom.impl.Ref;
@@ -645,7 +646,7 @@ public class cashbill extends Controller {
         //SQLFactory sqlFactoryquery = new SQLFactory(this, "信用额度调整单状态查询");
         //sqlFactoryquery.addParameter("siteid", siteid);
         //sqlFactoryquery.addParameter_in("sa_creditbillids", stringArray);
-        Rows rows = dbConnect.runSqlQuery("select sa_cashbillid,sys_enterpriseid,sa_accountclassid,status,billno,amount,type,ownerid from sa_cashbill where sa_cashbillid ='" + sa_cashbillid + "' and  siteid='" + siteid + "'");
+        Rows rows = dbConnect.runSqlQuery("select t1.sa_cashbillid,t1.sys_enterpriseid,t1.sa_accountclassid,t1.status,t1.billno,t1.amount,t1.type,t1.ownerid,t2.accountname,t1.remarks from sa_cashbill t1 left join sa_accountclass t2 on t1.sa_accountclassid=t2.sa_accountclassid and t1.siteid=t2.siteid where t1.sa_cashbillid ='" + sa_cashbillid + "' and  t1.siteid='" + siteid + "'");
         for (Row row : rows) {
             if (row.getString("status").equals("审核")) {
                 return getErrReturnObject().setErrMsg("单号为：【" + row.getString("billno") + "】的收支凭证已审核，无法再次审核")
@@ -723,6 +724,16 @@ public class cashbill extends Controller {
         sqlFactoryupdate.addParameter("checkby", username);
         sqlList.add(sqlFactoryupdate.getSQL());
         dbConnect.runSqlUpdate(sqlList);
+        if (!rows.isEmpty()) {
+            long type = rows.get(0).getLong("type");
+            if(type==1){
+                String message = "您的【"+rows.get(0).getString("accountname")+"】账户已收入【"+rows.get(0).getBigDecimal("amount")+"】元！";
+                sendMsg(message, sa_cashbillid, rows.get(0).getLong("sys_enterpriseid"));
+            }else{
+                String message = "您的【"+rows.get(0).getString("accountname")+"】账户已支出【"+rows.get(0).getBigDecimal("amount")+"】元，【备注："+rows.get(0).getString("remarks")+"】！！";
+                sendMsg(message, sa_cashbillid, rows.get(0).getLong("sys_enterpriseid"));
+            }
+        }
         return getSucReturnObject().toString();
     }
 
@@ -1198,4 +1209,18 @@ public class cashbill extends Controller {
 
         return titleMap;
     }
+
+    public void sendMsg(String content, Long sa_cashbillid, Long sys_enterpriseid) throws YosException {
+
+        ArrayList<Long> userList = getEnterpriseHrs(sys_enterpriseid).toArrayList("userid", new ArrayList<>());
+        Remind remind = new Remind(this);
+        remind.setTitle("收支凭证消息");
+        remind.setContent(content);
+        remind.setType("应用");
+        remind.setObjectid(sa_cashbillid);
+        remind.setObjectname("sa_cashbill");
+        remind.setTouserid(userList);
+        remind.sendByDialogMsg().createSys_message();
+    }
+
 }

src/custom/restcontroller/webmanage/lsak3/stockbill/stockbill.java

@@ -4,6 +4,7 @@ import beans.accountbalance.Accountbalance;
 import beans.accountbalance.CashbillEntity;
 import beans.datacontrllog.DataContrlLog;
 import beans.parameter.Parameter;
+import beans.remind.Remind;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import common.Controller;
@@ -127,7 +128,7 @@ public class stockbill extends Controller {
                      rows = dbConnect.runSqlQuery("select * from plm_item  where siteid='lsa1986' and itemno in('')");
                 }
                 RowsMap itemRowsMap =rows.toRowsMap("itemno");
-                Rows distiptchRows = dbConnect.runSqlQuery("select t2.price,t1.sa_dispatch_itemsid,t1.sa_orderitemsid,t2.sa_orderid from sa_dispatch_items t1 inner join sa_orderitems t2 on t1.sa_orderitemsid=t2.sa_orderitemsid and t1.siteid=t2.siteid inner join sa_dispatch t3 on t1.sa_dispatchid=t3.sa_dispatchid and t1.siteid=t3.siteid  where t3.status in('审核','复核','关闭') and  t1.siteid='lsa1986' and  t1.sa_dispatch_itemsid in "+sa_dispatch_itemsids.toString().replace("[", "(").replace("]", ")"));
+                Rows distiptchRows = dbConnect.runSqlQuery("select t2.price,t1.sa_dispatch_itemsid,t1.sa_orderitemsid,t2.sa_orderid,t3.sys_enterpriseid,t4.sonum,t5.itemno,t5.itemname from sa_dispatch_items t1 inner join sa_orderitems t2 on t1.sa_orderitemsid=t2.sa_orderitemsid and t1.siteid=t2.siteid inner join sa_dispatch t3 on t1.sa_dispatchid=t3.sa_dispatchid and t1.siteid=t3.siteid left join sa_order t4 on t2.sa_orderid=t4.sa_orderid and t2.siteid=t4.siteid left join plm_item t5 on t1.itemid=t5.itemid and t1.siteid=t5.siteid where t3.status in('审核','复核','关闭') and  t1.siteid='lsa1986' and  t1.sa_dispatch_itemsid in "+sa_dispatch_itemsids.toString().replace("[", "(").replace("]", ")"));
                 RowsMap distiptchRowsMap =distiptchRows.toRowsMap("sa_dispatch_itemsid");
 
                 Rows aftersalesmagRows = dbConnect.runSqlQuery("select t1.price,t1.sa_aftersalesmag_itemsid,t1.sa_orderitemsid,t2.sa_orderid from sa_aftersalesmag_items t1 inner join sa_orderitems t2 on t1.sa_orderitemsid=t2.sa_orderitemsid and t1.siteid=t2.siteid  where  t1.siteid='lsa1986' and  t1.sa_aftersalesmag_itemsid in "+sa_dispatch_itemsids.toString().replace("[", "(").replace("]", ")"));
@@ -167,12 +168,16 @@ public class stockbill extends Controller {
                             sqlFactorydetail.addParameter("sa_orderitemsid", distiptchRowsMap.get(sainvoicedetailid).get(0).getLong("sa_orderitemsid"));
                             sqlFactorydetail.addParameter("sa_orderid", distiptchRowsMap.get(sainvoicedetailid).get(0).getLong("sa_orderid"));
                             System.out.println(amountTotal);
+                            //您的订单【XXX】商品【XXX】工厂已发货，出库单号【XXX】
+                            String message = "您的订单【"+ distiptchRowsMap.get(sainvoicedetailid).get(0).getString("sonum")+"】商品【"+distiptchRowsMap.get(sainvoicedetailid).get(0).getString("itemname")+"】工厂已发货，出库单号【"+fbillnum+"】！";
+                            sendMsg(message, st_stockbillid, distiptchRowsMap.get(sainvoicedetailid).get(0).getLong("sys_enterpriseid"));
                         }else{
                             sqlFactorydetail.addParameter("price", 0);
                             sqlFactorydetail.addParameter("amount", 0);
                             sqlFactorydetail.addParameter("sa_orderitemsid", 0);
                             sqlFactorydetail.addParameter("sa_orderid", 0);
                         }
+
                         /**
                          * 更新发货单数量
                          */
@@ -398,4 +403,17 @@ public class stockbill extends Controller {
         }
         return null;
     }
+
+    public void sendMsg(String content, Long st_stockbillid, Long sys_enterpriseid) throws YosException {
+
+        ArrayList<Long> userList = getEnterpriseHrs(sys_enterpriseid).toArrayList("userid", new ArrayList<>());
+        Remind remind = new Remind(this);
+        remind.setTitle("销售出库单消息");
+        remind.setContent(content);
+        remind.setType("应用");
+        remind.setObjectid(st_stockbillid);
+        remind.setObjectname("st_stockbill");
+        remind.setTouserid(userList);
+        remind.sendByDialogMsg().createSys_message();
+    }
 }

src/custom/restcontroller/webmanage/sale/aftersalesmag/aftersalesmag.java

@@ -490,8 +490,11 @@ public class aftersalesmag extends Controller {
         dbConnect.runSqlUpdate(sqlList);
         String type=rows.get(0).getString("type");
         Long sys_enterpriseid = rows.get(0).getLong("sys_enterpriseid");
+        Rows aftersalesmagrows = dbConnect.runSqlQuery(
+                "select t1.sa_aftersalesmagid,t1.sa_accountclassid,t2.accountname,t1.returnamount from sa_aftersalesmag t1 left join sa_accountclass t2 on t1.sa_accountclassid=t2.sa_accountclassid and t1.siteid=t2.siteid  where t1.sa_aftersalesmagid ='"
+                        + sa_aftersalesmagid + "' and  t1.siteid='" + siteid + "'");
         if(type.equals("退货单")){
-            String message = "您的退货单"+rows.get(0).getString("billno")+"已复核，退款已打入您的账户，请及时查收！";
+            String message = "您的返退申请单"+rows.get(0).getString("billno")+"已复核，，您的【"+aftersalesmagrows.get(0).getString("accountname")+"】账户已收入【"+aftersalesmagrows.get(0).getString("returnamount")+"】元！";
             sendMsg(message, sa_aftersalesmagid, sys_enterpriseid);
         }
 

src/custom/restcontroller/webmanage/sale/order/Order.java

@@ -1302,7 +1302,7 @@ public class Order extends Controller {
             }
         }
 
-        String message = "您的订单【" + sonum + "】 金额为【" + amount + "】 已提交！";
+        String message = "您的订单【" + sonum + "】已提交 ，您的资金账户已支出【" + amount + "】！";
 
         sqlList.add("update sa_order set sa_accountclassinfos='" + accountclassinfos + "' where sa_orderid=" + sa_orderid + " and siteid='" + siteid + "'");
         sqlList.add(getOrderSubmitSql(sa_orderid, status, freightstatus));
@@ -1478,7 +1478,7 @@ public class Order extends Controller {
                 }
             }
         }
-        String message = "您的订单" + sonum + "已审核，请及时查看！";
+        String message = "您的订单【" + sonum + "】已审核！";
 
         sqlList.add(getOrderCheckSql(sa_orderid, reviewtype));
 
@@ -1725,7 +1725,7 @@ public class Order extends Controller {
 
         sqlList.addAll(returnPayBill(row, "订单退回", "由" + sonum + "订单退回时自动产生"));
 
-        String message = "您的订单【" + sonum + "】 金额为【" + amount + "】 已退回，退回原因【" + content.getStringValue("backreason") + "】，请注意查看";
+        String message = "您的订单【" + sonum + "】已退回，退款金额为【" + amount + "】 已转入到您的资金账户";
 
         sqlList.add(DataContrlLog.createLog(this, "sa_order", sa_orderid, "订单退回", "订单退回成功，金额：" + amount).getSQL());
         dbConnect.runSqlUpdate(sqlList);

src/custom/restcontroller/webmanage/sale/paybill/Paybill.java

@@ -18,6 +18,7 @@ import common.data.Row;
 import common.data.Rows;
 import common.data.SQLFactory;
 import restcontroller.R;
+import restcontroller.webmanage.executorService.Executor;
 
 import java.io.IOException;
 import java.math.BigDecimal;
@@ -241,7 +242,7 @@ public class Paybill extends Controller {
         ArrayList<String> sqlList = new ArrayList<>();
         Long sa_paybillid = content.getLong("sa_paybillid");
         Rows rows = dbConnect.runSqlQuery("select sys_enterpriseid,status,billno,remarks from sa_paybill where siteid='" + siteid + "' and sa_paybillid=" + sa_paybillid);
-        Rows accountclassRows = dbConnect.runSqlQuery("select sa_accountclassid,amount from sa_paybilldetail where siteid='" + siteid + "' and amount>0 and sa_paybillid=" + sa_paybillid);
+        Rows accountclassRows = dbConnect.runSqlQuery("select t1.sa_accountclassid,t1.amount,t2.accountname from sa_paybilldetail t1 left join  sa_accountclass t2 on  t1.sa_accountclassid=t2.sa_accountclassid and t1.siteid=t2.siteid where t1.siteid='" + siteid + "' and t1.amount>0 and t1.sa_paybillid=" + sa_paybillid);
         if (rows.isEmpty()) {
             return getErrReturnObject().setErrMsg("未选择打款凭证").toString();
         }
@@ -266,23 +267,27 @@ public class Paybill extends Controller {
             BigDecimal amount = row.getBigDecimal("amount");
             CashbillEntity cashbillEntity = new CashbillEntity(amount, remarks, "打款凭证", billno, "sa_paybill", sa_paybillid, "货款", "");
             sqlList.addAll(Accountbalance.createCashbillIncome(this, sys_enterpriseid, row.getLong("sa_accountclassid"), cashbillEntity, false));
+            dbConnect.runSqlUpdate(sqlList);
+
+            String message = "您的打款凭证已审核通过，【"+row.getString("accountname")+"】账户已成功充值【"+amount+"】元";
+            sendMsg(message, sa_paybillid, sys_enterpriseid);
         }
         dbConnect.runSqlUpdate(sqlList);
         return getSucReturnObject().toString();
     }
 
-//    public void sendMsg(String content, Long sa_paybillid, Long sys_enterpriseid) throws YosException {
-//
-//        ArrayList<Long> userList = getEnterpriseHrs(sys_enterpriseid).toArrayList("userid", new ArrayList<>());
-//        Remind remind = new Remind(this);
-//        remind.setTitle("打款消息");
-//        remind.setContent(content);
-//        remind.setType("应用");
-//        remind.setObjectid(sa_paybillid);
-//        remind.setObjectname("sa_paybill");
-//        remind.setTouserid(userList);
-//        remind.sendByDialogMsg().createSys_message();
-//    }
+    public void sendMsg(String content, Long sa_paybillid, Long sys_enterpriseid) throws YosException {
+
+        ArrayList<Long> userList = getEnterpriseHrs(sys_enterpriseid).toArrayList("userid", new ArrayList<>());
+        Remind remind = new Remind(this);
+        remind.setTitle("打款消息");
+        remind.setContent(content);
+        remind.setType("应用");
+        remind.setObjectid(sa_paybillid);
+        remind.setObjectname("sa_paybill");
+        remind.setTouserid(userList);
+        remind.sendByDialogMsg().createSys_message();
+    }
 
     @API(title = "详情", apiversion = R.ID20221226153404.v1.class)
     public String queryById() throws YosException {
@@ -305,6 +310,12 @@ public class Paybill extends Controller {
         sqlFactory.addParameter("siteid", siteid);
         sqlFactory.addParameter("sa_paybillid", sa_paybillid);
         dbConnect.runSqlUpdate(sqlFactory.getSQL());
+        Rows rows =dbConnect.runSqlQuery("select * from sa_paybill where siteid='"+siteid+"' and  sa_paybillid="+sa_paybillid);
+        if(!rows.isEmpty()){
+            String message = "您的打款凭证【"+rows.get(0).getString("billno")+"】已退回!";
+            sendMsg(message, sa_paybillid, sys_enterpriseid);
+        }
+
         return getSucReturnObject().toString();
     }