沈静伟 преди 4 години
родител
ревизия
7c7ea2aaac

+ 1 - 1
src/dsb/com/cnd3b/restcontroller/customer/tagents/tagents.java

@@ -181,7 +181,7 @@ public class tagents extends Controller {
      * @throws P2Exception
      */
     public String apply_cooperation() throws P2Exception {
-        long tcooperationagentsid = content.getLong("tcooperationagentsid");//合作商ID
+        long tcooperationagentsid = content.getLong("tcooperationagentsid");//提供方合作商ID
         if (tcooperationagentsid == tagentsid) {
             return getErrReturnObject().setErrMsg("无法和自己建立合作关系!").toString();
         }

+ 1 - 0
src/dsb/com/cnd3b/restcontroller/publicmethod/homepage/homepage.java

@@ -116,6 +116,7 @@ public class homepage extends Controller {
         RowsMap map = getAttachmentUrl("tagents", rows.toArrayList("tagentsid"));
         for (Row row : rows) {
             row.put("attinfos", map.get(row.getString("tagentsid")));
+            row.put("saleprodclass", JSONArray.parseArray(row.getString("saleprodclass")));
         }
         return getSucReturnObject().setData(rows).saveToDataPool(10).toString();
     }

+ 3 - 3
src/dsb/com/cnd3b/service/DataStatusChange.java

@@ -37,9 +37,9 @@ public class DataStatusChange extends BaseClass implements Runnable {
         try {
             DBConnect dbConnect = new DBConnect();
             ArrayList<String> list = new ArrayList<>();
-            list.add("update tactivity set fstatus='已结束' where convert(varchar(10),fenddate,120)<convert(varchar(10),getdate())");
-            list.add("update tactivity set fstatus='未开始' where convert(varchar(10),fbegdate,120)>convert(varchar(10),getdate())");
-            list.add("update tactivity set fstatus='活动中' where convert(varchar(10),fenddate,120)>=convert(varchar(10),getdate()) and convert(varchar(10),fbegdate,120)<=convert(varchar(10),getdate())");
+            list.add("update tactivity set fstatus='已结束' where convert(varchar(10),fenddate,120)<convert(varchar(10),getdate(),120)");
+            list.add("update tactivity set fstatus='未开始' where convert(varchar(10),fbegdate,120)>convert(varchar(10),getdate(),120)");
+            list.add("update tactivity set fstatus='活动中' where convert(varchar(10),fenddate,120)>=convert(varchar(10),getdate(),120) and convert(varchar(10),fbegdate,120)<=convert(varchar(10),getdate(),120)");
             dbConnect.runSqlUpdate(list);
         } catch (Exception e) {
             e.printStackTrace();

+ 1 - 1
src/dsb/com/cnd3b/utility/Sms.java

@@ -22,7 +22,7 @@ public class Sms extends BaseClass {
     }
 
     public void sendOutMsg(String phone, String msg) {
-        msg = "【多三边】您好,您的验证码是" + msg;
+        msg = "【布万家】您好,您的验证码是" + msg;
         sendout(msg, phone);
     }
 

+ 2 - 2
src/dsb/com/cnd3b/utility/wechatpay/apppay/apppay.java

@@ -32,7 +32,7 @@ public class apppay extends BaseClass {
          */
         APPCreateOrderRequest order = new APPCreateOrderRequest();
         order.setAppid(parameter.appid);
-        order.setBody("多三边-使用年费");
+        order.setBody("布万家-使用年费");
         order.setMch_id(parameter.mch_id);
         order.setNotify_url(parameter.notify_url);
         order.setOut_trade_no(out_trade_no);
@@ -63,7 +63,7 @@ public class apppay extends BaseClass {
          */
         APPCreateOrderRequest order = new APPCreateOrderRequest();
         order.setAppid(parameter.appid);
-        order.setBody("多三边-账户充值");
+        order.setBody("布万家-账户充值");
         order.setMch_id(parameter.mch_id);
         order.setNotify_url(parameter.notify_url);
         order.setOut_trade_no(out_trade_no);

+ 1 - 1
src/dsb/com/cnd3b/utility/wechatpay/jsapipay/jsapipay.java

@@ -34,7 +34,7 @@ public class jsapipay extends BaseClass {
          */
         JSCreateOrderRequest order = new JSCreateOrderRequest();
         order.setAppid(parameter.appid);
-        order.setBody("多三边-账户充值");
+        order.setBody("布万家-账户充值");
         order.setMch_id(parameter.mch_id);
         order.setNotify_url(parameter.notify_url);
         order.setOpenid(wechat_openid);

+ 2 - 2
src/dsb/com/cnd3b/utility/wechatpay/nativepay/nativepay.java

@@ -58,7 +58,7 @@ public class nativepay extends BaseClass {
             }
             reqdata.put("amount", amount);
             reqdata.put("mchid", parameter.mchId);
-            reqdata.put("description", "多三边-使用年费");//description
+            reqdata.put("description", "布万家-使用年费");//description
             reqdata.put("notify_url", parameter.notify_url);//通知地址
             reqdata.put("out_trade_no", out_trade_no);//商户订单号
             reqdata.put("appid", parameter.appid);
@@ -118,7 +118,7 @@ public class nativepay extends BaseClass {
             }
             reqdata.put("amount", amount);
             reqdata.put("mchid", parameter.mchId);
-            reqdata.put("description", "多三边-账户充值");//description
+            reqdata.put("description", "布万家-账户充值");//description
             reqdata.put("notify_url", parameter.notify_url);//通知地址
             reqdata.put("out_trade_no", out_trade_no);//商户订单号
             reqdata.put("appid", parameter.appid);