Przeglądaj źródła

修改佣金比例

Yansen 1 rok temu
rodzic
commit
39f6a81980
23 zmienionych plików z 120 dodań i 51 usunięć
  1. 1
    1
      house-admin/src/main/java/com/yincheng/jcjy/huiju/admin/web/declaration/entity/DeclarationVo.java
  2. 1
    1
      house-admin/src/main/resources/config.properties
  3. 6
    3
      house-admin/src/main/resources/njfc.xml
  4. 4
    2
      house-admin/src/main/webapp/webpage/customer/personal/customer.jsp
  5. 11
    0
      house-admin/src/main/webapp/webpage/renting/roomInfoView.jsp
  6. 32
    20
      house-wap-web/src/main/java/com/yincheng/jcjy/huiju/controller/weixin/WeixinAuthApiUtils.java
  7. 6
    2
      house-wap-web/src/main/java/com/yincheng/jcjy/huiju/controller/weixin/WeixinController.java
  8. 2
    2
      house-wap-web/src/main/resources/static/js/commonData.js
  9. 1
    1
      house-wap-web/src/main/resources/templates/building/buildingDetails.html
  10. 39
    2
      house-wap-web/src/main/resources/templates/index/index.html
  11. 2
    2
      house-wap-web/src/main/resources/templates/rent/oldHouseDetails.html
  12. 2
    2
      house-wap-web/src/main/resources/templates/room/oldHouseDetails.html
  13. 1
    1
      house-web/src/main/resources/static/js/common.js
  14. 2
    2
      house-web/src/main/resources/templates/building/buildingDetails.html
  15. 1
    1
      house-web/src/main/resources/templates/cms/detail.html
  16. 1
    1
      house-web/src/main/resources/templates/cms/index.html
  17. 1
    1
      house-web/src/main/resources/templates/cms/list.html
  18. 1
    1
      house-web/src/main/resources/templates/cms/recommendArticleInfoList.html
  19. 1
    1
      house-web/src/main/resources/templates/footer.html
  20. 1
    1
      house-web/src/main/resources/templates/header.html
  21. 1
    1
      house-web/src/main/resources/templates/index/contactUs.html
  22. 1
    1
      house-web/src/main/resources/templates/index/index.html
  23. 2
    2
      house-web/src/main/resources/templates/index/synopsis.html

+ 1
- 1
house-admin/src/main/java/com/yincheng/jcjy/huiju/admin/web/declaration/entity/DeclarationVo.java Wyświetl plik

75
 
75
 
76
     private String roleName;
76
     private String roleName;
77
 
77
 
78
-    /**佣金*/
78
+    /***/
79
     private Double servicePrice;
79
     private Double servicePrice;
80
     /**实收金额*/
80
     /**实收金额*/
81
     private Double receivePrice;
81
     private Double receivePrice;

+ 1
- 1
house-admin/src/main/resources/config.properties Wyświetl plik

31
 
31
 
32
 #redis
32
 #redis
33
 redis.port=6379
33
 redis.port=6379
34
-redis.password=jingcheng123
34
+redis.password=yansen@123
35
 
35
 
36
 # �Խ��ѷ��˺�
36
 # �Խ��ѷ��˺�
37
 keyId=10360
37
 keyId=10360

+ 6
- 3
house-admin/src/main/resources/njfc.xml Wyświetl plik

49
         <property name="env" value="prod" />
49
         <property name="env" value="prod" />
50
         <property name="channel" value="njzhmj" />
50
         <property name="channel" value="njzhmj" />
51
         <property name="clientId" value="njzhmj" />
51
         <property name="clientId" value="njzhmj" />
52
-        <property name="clientSecret" value="29ea8347ff5f49988d26b29be6867ee3" />
52
+<!--        <property name="clientSecret" value="29ea8347ff5f49988d26b29be6867ee3" />-->
53
+        <property name="clientSecret" value="d1e23f950330447d8307ceb1d0a075d9" />
53
         <property name="grantType" value="password" />
54
         <property name="grantType" value="password" />
54
         <property name="companyName" value="南京智慧美佳科技服务有限公司" />
55
         <property name="companyName" value="南京智慧美佳科技服务有限公司" />
55
         <property name="publicKey">
56
         <property name="publicKey">
56
-            <value type="java.lang.String"><![CDATA[MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvXWIyhLMP3XI02rVuNrG3BosIFN9HUs55j23xwKHve2s7jNdvVkFz6V+zGhQNOriXfkP9Euv/fxIC7lJZsZWPOeNfNo1dize8bybMKuWHPE9h74OHU8nNa8u/9cWzFRJEc+h3iLt1rqVQdk44sqdgWMtQxU4x1dmPWKfVcESS91JfDkeCz+1b3V3R4oLkXeoM0C5PhXEMcAPNfiZARxO4imBQ/vosfYxwW+XPHd5L1L3XF+W40c4ZDFQFKwZnNmtMV+8Nm0s9N8IRPFxBdPHiNi9Utq8ltbTGtz2jHnnIHvrcS6oaHXKLuAdOXc7ejGR99DYRRHbMYR5OStzCw3EkwIDAQAB]]></value>
57
+<!--            <value type="java.lang.String"><![CDATA[MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvXWIyhLMP3XI02rVuNrG3BosIFN9HUs55j23xwKHve2s7jNdvVkFz6V+zGhQNOriXfkP9Euv/fxIC7lJZsZWPOeNfNo1dize8bybMKuWHPE9h74OHU8nNa8u/9cWzFRJEc+h3iLt1rqVQdk44sqdgWMtQxU4x1dmPWKfVcESS91JfDkeCz+1b3V3R4oLkXeoM0C5PhXEMcAPNfiZARxO4imBQ/vosfYxwW+XPHd5L1L3XF+W40c4ZDFQFKwZnNmtMV+8Nm0s9N8IRPFxBdPHiNi9Utq8ltbTGtz2jHnnIHvrcS6oaHXKLuAdOXc7ejGR99DYRRHbMYR5OStzCw3EkwIDAQAB]]></value>-->
58
+            <value type="java.lang.String"><![CDATA[MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhKGNnPUluITuLZgcMj84fXYgPlkkkBg4dKS8OK0ZL9XDrnqQgcASH7pcmODvg3vg/wfhjFsAdi4E5SL3BTm/o8X6CH6DM/+4odK0uDjHzUMbHS850SLSp0fSgSSdTFfu6v6hGMdFYplkiu6hME6i0DA/QfkymC7Ss4+iD+8qicY1mOjr1kSkJx/s5Idu0P1q/JaQDTJ4T91hkstxVAQYxOPk/2Q36FY16igh8+V66hlqXqMDIT99m/Gedbf+hJwpywNXCSvaWXYansPgjA+GKTRuywvGkLpD7i16qMxcNdov98pKJIQVPliY7z3eSjyHjpaFsqr/7x1IOyJkCt7eswIDAQAB]]></value>
57
         </property>
59
         </property>
58
         <property name="privateKey">
60
         <property name="privateKey">
59
-            <value type="java.lang.String"><![CDATA[MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC2WRE42HRCaVyr6oXuF0HUg20W8Nj14wRfj20NeDpJObRvDrFJFvGbsmUlF33gvOnmlE3IIujKVAl8IfXIl4TDRlsCbMaNdCLQvixzB6pkiFZtkxcuhMGYC31A9UKWXjLfi3sweBRpZvUrcSFaO2mtgyFzIIUPW55IU2qzUrck7Itczw4pW1D1j1HcZNirJvCc/Z1oxWlpUP8ImRSNppoNsjkm9mm4hvM/aCOI6KdDDOo1MHPsKy45seSpqNUa7qfIgMX+wnGIl15f+PXDegseoU8O+ojY2WsIA8F8Oxdl6Wa7lQKuXvManbyOLxx6AfZOCggI4e0haCsH13MqD8dbAgMBAAECggEAYKGumLtMUO1Y6Nntg5Dbl+zV4LRdpWBarvFozxyJdsiXr8rPdHYuL15Ib3GViYVTRpgM6CRnzODf7eJpR5XUC0+7ZvuR9OA4mvpMv+CuEXyWoJa0UDiWByb/h27xjJH6z7Aw5iycVIb1IcJf9FtL02GMVmBDYzIgHR/niYQp/exe1Z4UOtKXTyhjTlN3LxlgkShnnTpeAAM5oUOFr29QdhfOpCapLmcfCS8r9IqQWpHM1VGY/5hdzTZ46IZNDuEWW0641yRraTKhbDdDwkaCiPwCeHET0TR53e2etrodj911ooq0/sadXhylN3flQlvIPHjWqU5MpjAGlXRD4uD9cQKBgQDrIXHSXsztMjR3t4DlOswHJSYjj3XV+RwwvsyhVUtSjm9K/PRgO5X4NGGE6v6r1N/BTTuoHD3WSxpZcKuveK0tTYYKX7W0NpqAUDdfD99cie+CD5zJS3smqql/TaosAcQg/LSCYtbzL9Z7KNrUHgawdl3xsnrwka9FhihfCEzJTwKBgQDGiE/v5+56oVi9lUAjXKfAVUsYGGw51PIz50Cr3iQdR5AlI3AjMNbgTFy4kL7LnN03elvbceuQabApnwp2XmGT+02c7cdyWACXuEU1RetnoUA+r9Hx9Dzh8S1oYGsePM4805ZdlKuwkZZcNhJsZwBH48hPdn07p6Te66y9TlnGNQKBgQCz7QXSe2TJZY+sxKlHwHR8SzsiHxeGw3eE/ZxNIJ3g8MnNUkAWm8IpCrxNIB39k4odu2IZRHM1Voc1Rfi679dlQVt++LpsyxPzeG7GubiscYjrt9K8XpxAfHvzxJSh1EAnFflzhPsDYOn5mMvLYaawxgMhfviAupqq0vx1rD5GFQKBgGFYGQniyPXsAt0CP26XUdFmgOmRoA9DMHbunrEmvMJ2gmETXTqECff0uUnt/v9LLNS09DFHTF+E0tG1n6WmZWXvxIB7vl18dN3vhk+2ttQbJqsV/nUKcoe+f6s8C4nJ+r2saX/9E6oB2J3iDWqFnoehUmhUCtejPZ3oJMy1jCM5AoGAWadoTB16DQ4xEWKCd6eyJn2EdK2mnvWiVanU/dOwJmEk0xr9pSN/tMNUqUFB8KwtlnF7DFku5wErhdxCbGEATyeW5L3tzBi+R8GEXDTY6bmb9E4VNdkf+mU1zowOpRWZSy9O37bLNrg3eXjC3SMxCmdQ82C1EVumX7u21PPKKLw=]]></value>
61
+<!--            <value type="java.lang.String"><![CDATA[MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC2WRE42HRCaVyr6oXuF0HUg20W8Nj14wRfj20NeDpJObRvDrFJFvGbsmUlF33gvOnmlE3IIujKVAl8IfXIl4TDRlsCbMaNdCLQvixzB6pkiFZtkxcuhMGYC31A9UKWXjLfi3sweBRpZvUrcSFaO2mtgyFzIIUPW55IU2qzUrck7Itczw4pW1D1j1HcZNirJvCc/Z1oxWlpUP8ImRSNppoNsjkm9mm4hvM/aCOI6KdDDOo1MHPsKy45seSpqNUa7qfIgMX+wnGIl15f+PXDegseoU8O+ojY2WsIA8F8Oxdl6Wa7lQKuXvManbyOLxx6AfZOCggI4e0haCsH13MqD8dbAgMBAAECggEAYKGumLtMUO1Y6Nntg5Dbl+zV4LRdpWBarvFozxyJdsiXr8rPdHYuL15Ib3GViYVTRpgM6CRnzODf7eJpR5XUC0+7ZvuR9OA4mvpMv+CuEXyWoJa0UDiWByb/h27xjJH6z7Aw5iycVIb1IcJf9FtL02GMVmBDYzIgHR/niYQp/exe1Z4UOtKXTyhjTlN3LxlgkShnnTpeAAM5oUOFr29QdhfOpCapLmcfCS8r9IqQWpHM1VGY/5hdzTZ46IZNDuEWW0641yRraTKhbDdDwkaCiPwCeHET0TR53e2etrodj911ooq0/sadXhylN3flQlvIPHjWqU5MpjAGlXRD4uD9cQKBgQDrIXHSXsztMjR3t4DlOswHJSYjj3XV+RwwvsyhVUtSjm9K/PRgO5X4NGGE6v6r1N/BTTuoHD3WSxpZcKuveK0tTYYKX7W0NpqAUDdfD99cie+CD5zJS3smqql/TaosAcQg/LSCYtbzL9Z7KNrUHgawdl3xsnrwka9FhihfCEzJTwKBgQDGiE/v5+56oVi9lUAjXKfAVUsYGGw51PIz50Cr3iQdR5AlI3AjMNbgTFy4kL7LnN03elvbceuQabApnwp2XmGT+02c7cdyWACXuEU1RetnoUA+r9Hx9Dzh8S1oYGsePM4805ZdlKuwkZZcNhJsZwBH48hPdn07p6Te66y9TlnGNQKBgQCz7QXSe2TJZY+sxKlHwHR8SzsiHxeGw3eE/ZxNIJ3g8MnNUkAWm8IpCrxNIB39k4odu2IZRHM1Voc1Rfi679dlQVt++LpsyxPzeG7GubiscYjrt9K8XpxAfHvzxJSh1EAnFflzhPsDYOn5mMvLYaawxgMhfviAupqq0vx1rD5GFQKBgGFYGQniyPXsAt0CP26XUdFmgOmRoA9DMHbunrEmvMJ2gmETXTqECff0uUnt/v9LLNS09DFHTF+E0tG1n6WmZWXvxIB7vl18dN3vhk+2ttQbJqsV/nUKcoe+f6s8C4nJ+r2saX/9E6oB2J3iDWqFnoehUmhUCtejPZ3oJMy1jCM5AoGAWadoTB16DQ4xEWKCd6eyJn2EdK2mnvWiVanU/dOwJmEk0xr9pSN/tMNUqUFB8KwtlnF7DFku5wErhdxCbGEATyeW5L3tzBi+R8GEXDTY6bmb9E4VNdkf+mU1zowOpRWZSy9O37bLNrg3eXjC3SMxCmdQ82C1EVumX7u21PPKKLw=]]></value>-->
62
+            <value type="java.lang.String"><![CDATA[MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCEoY2c9SW4hO4tmBwyPzh9diA+WSSQGDh0pLw4rRkv1cOuepCBwBIfulyY4O+De+D/B+GMWwB2LgTlIvcFOb+jxfoIfoMz/7ih0rS4OMfNQxsdLznRItKnR9KBJJ1MV+7q/qEYx0VimWSK7qEwTqLQMD9B+TKYLtKzj6IP7yqJxjWY6OvWRKQnH+zkh27Q/Wr8lpANMnhP3WGSy3FUBBjE4+T/ZDfoVjXqKCHz5XrqGWpeowMhP32b8Z51t/6EnCnLA1cJK9pZdhqew+CMD4YpNG7LC8aQukPuLXqozFw12i/3ykokhBU+WJjvPd5KPIeOloWyqv/vHUg7ImQK3t6zAgMBAAECggEAByI9YLTa24ri2Lb2xUkbO7xPzaqzycBTwQpfSVkeIrGHvem/vgrbrrMyadKnb1YJaw48dnUqmDCveLehu7k4cpGiejR70B8wChwwNjxvmr3CRpaUsIgD9pVpYCLdBw8vvZoGhjOpqrz/aG2fY97G6RW/QUgrDX5vPNM770l460IXJS8yrKmH4xfT0D8R07CpL8Ol8CzTx+g0CNV1Bu6X2M9ACGpeKrSo2N8FWd5smqXFgsIjSNcdrWOfTzW2X68ejNKaiJPDDJs6SQstRPVAtxC8VRPMMEzqhe9sFvWiUBWWygvgONH/V2O4Ldw2E7dAsTIZTQtATPp/+t3uEA1XiQKBgQDBpFJ+ogUBaCD4j5VQHPMk4ePCnjon9tECAx9wen5MUFAvkQPqXyNB0JyfMekbzHbn4crv5kmgrkpTURgGkq1F6eQGf1dON8B4/rsci1VaAqEIQacuw25rQoAKIxfq9GKEgb2khLIQqbpoizuh9gTDKiXufRYTlLA0LqMygGjQPwKBgQCvV4yh8Hmx86tMWM2oRVNXuJhjj3Myci1r55V//HuAiK/TYGc7hRJzTHbL+Ir4kLd8kQ8e/zv69UHcClVXWCbwX/xIro5+BA8KHI0QZMPtho1YBoPNUZwb29TMzMBVPkd039B+pa/fcQcW7hyHt9WMus4YLeqFpWN+tP3IT1DUjQKBgQCH8g8gbCrLdAlBt7wBxHFHAXdfGKqHiBXwLbUSyEyG0xOYcVyoXCZqfESY1vdq1r7byH8qsSgbsIDpwVL2ul7/aFb34MqwVR/BUkSWo5NGX/Yhz8XJZNbOYp91fnG6N9w6XsN/DtHcNOxznNw+tnNdeOesaRDoqkiSOfPE7rWnDQKBgDCSBejN3kgHAYpyhvV3zrBb+AqMMBLnQeHEEsuTOvrN4jahW7dHE2dQ5Q93V7enDsy4ugGSHiFUUtwLGLzLNG4diJrxj5MkuK3KXuENqKBhR0H8/AGh+6ZT7MyWYyi5yb18Shrq9p7khlw5tTl7GPKUxIY6Id7Hg5oTtMEKB4/5AoGAV2SfmB11Sxg6h3eFZfKgyDqbFXTY200lUW2ljIVjQf813KYrCLhNoGVWl5phIJefpp+Dvk8hYkTVowSkfz+K8f4/MXKY/nXE4878WJB7QLHk8hX8b00QtrEewKjyI+VMPYEy44NoTTTirGKNj0RjaA3zRpVa+wSqq5ZBnBK+RmM=]]></value>
60
         </property>
63
         </property>
61
         <property name="apiAddrs">
64
         <property name="apiAddrs">
62
             <map>
65
             <map>

+ 4
- 2
house-admin/src/main/webapp/webpage/customer/personal/customer.jsp Wyświetl plik

411
             <li>
411
             <li>
412
                 <span>客户归属<em>*</em>:</span>
412
                 <span>客户归属<em>*</em>:</span>
413
                 <div class="input-icon right">
413
                 <div class="input-icon right">
414
-                    <input readonly type="text" id="belongName" value="${customer.belongName}"  maxlength="10" style="height: 40px"/>
414
+                    <input readonly type="text" id="belongName" value="${customer.belongName}"  maxlength="90" style="height: 40px"/>
415
                     <input type="hidden" name="customerBelong" id="customerBelong"   value="${customer.customerBelong}"  maxlength="10"/>
415
                     <input type="hidden" name="customerBelong" id="customerBelong"   value="${customer.customerBelong}"  maxlength="10"/>
416
                     <shiro:hasPermission name="customer:personal:adjustBelong">
416
                     <shiro:hasPermission name="customer:personal:adjustBelong">
417
                         <button type="button" class="btn btn-warning" onclick="showModel(1)" style="height: 40px">
417
                         <button type="button" class="btn btn-warning" onclick="showModel(1)" style="height: 40px">
690
 <script src="${webRoot}/static/global/plugins/tagator/js/select2.min.js"></script>
690
 <script src="${webRoot}/static/global/plugins/tagator/js/select2.min.js"></script>
691
 <script type="text/javascript">
691
 <script type="text/javascript">
692
 	$(function(){
692
 	$(function(){
693
-		$('#customerForm').validate();
693
+		$('#customerForm').validate({
694
+            debug: true
695
+        });
694
 
696
 
695
         initDistrict("025","${customer.purposeDistrict}");
697
         initDistrict("025","${customer.purposeDistrict}");
696
         initBussines("${customer.purposeDistrict}","${customer.purposeBusiness}");
698
         initBussines("${customer.purposeDistrict}","${customer.purposeBusiness}");

+ 11
- 0
house-admin/src/main/webapp/webpage/renting/roomInfoView.jsp Wyświetl plik

980
             return;
980
             return;
981
         }
981
         }
982
 
982
 
983
+        if (deleteType == 'auth') {
984
+            url = webRoot + '/roomInfo/deleteByAuthId';
985
+            deleteReason = "删除委托书,删除原因:" + deleteReason;
986
+        }
987
+
983
         if (deleteType == 'key') {
988
         if (deleteType == 'key') {
984
             url = webRoot + '/renting/deleteByKeyId';
989
             url = webRoot + '/renting/deleteByKeyId';
985
             deleteReason = "删除钥匙,删除原因:" + deleteReason;
990
             deleteReason = "删除钥匙,删除原因:" + deleteReason;
992
             dataType: 'json',
997
             dataType: 'json',
993
             success: function (result) {
998
             success: function (result) {
994
                 if (result.code == "0") {
999
                 if (result.code == "0") {
1000
+                    if (deleteType == 'auth') {
1001
+                        $("#roomAuthLi").click();
1002
+                    }
995
                     if (deleteType == 'key') {
1003
                     if (deleteType == 'key') {
996
                         $("#roomKeyLi").click();
1004
                         $("#roomKeyLi").click();
997
                     }
1005
                     }
999
                     alert("删除成功")
1007
                     alert("删除成功")
1000
                 }
1008
                 }
1001
                 if (result.code == "1") {
1009
                 if (result.code == "1") {
1010
+                    if (deleteType == 'auth') {
1011
+                        $("#roomAuthLi").click();
1012
+                    }
1002
                     if (deleteType == 'key') {
1013
                     if (deleteType == 'key') {
1003
                         $("#roomKeyLi").click();
1014
                         $("#roomKeyLi").click();
1004
                     }
1015
                     }

+ 32
- 20
house-wap-web/src/main/java/com/yincheng/jcjy/huiju/controller/weixin/WeixinAuthApiUtils.java Wyświetl plik

1
 package com.yincheng.jcjy.huiju.controller.weixin;
1
 package com.yincheng.jcjy.huiju.controller.weixin;
2
 
2
 
3
+import com.github.sd4324530.fastweixin.api.JsAPI;
3
 import com.github.sd4324530.fastweixin.api.config.ApiConfig;
4
 import com.github.sd4324530.fastweixin.api.config.ApiConfig;
5
+import org.springframework.beans.factory.annotation.Value;
6
+import org.springframework.stereotype.Component;
4
 
7
 
5
 
8
 
6
 /**
9
 /**
8
  *
11
  *
9
  * @author 0neBean
12
  * @author 0neBean
10
  */
13
  */
14
+
15
+@Component
11
 public class WeixinAuthApiUtils {
16
 public class WeixinAuthApiUtils {
12
 
17
 
13
-    // 订阅号  appId
14
-    protected static final String APPID = "wx1349bc8f3fd86df2";
15
-     // 订阅号 app secret
16
-    private static final String SECRET = "80fb2f08e57a3db3c1a760f6931175c2";
18
+//    // 订阅号  appId
19
+//    protected static final String APPID = "wx1349bc8f3fd86df2";
20
+//     // 订阅号 app secret
21
+//    private static final String SECRET = "80fb2f08e57a3db3c1a760f6931175c2";
22
+
23
+    @Value("${weixin.appid}")
24
+    private String APPID;
25
+
26
+    @Value("${weixin.secret}")
27
+    private String SECRET;
17
 
28
 
18
     //微信配置实例
29
     //微信配置实例
19
-    private ApiConfig apiConfig;
20
-    //单例锁
21
-    private static Integer LOCK = 0;
30
+    private ApiConfig apiConfig = null;
22
 
31
 
23
-    private static WeixinAuthApiUtils self;
32
+    private JsAPI jsAPI = null;
24
 
33
 
25
-    //单例构造器
26
-    public static WeixinAuthApiUtils getInstance() {
27
-        if (null == self)
28
-            self = new WeixinAuthApiUtils();
29
-        return self;
34
+    //获取单例的微信配置文件类
35
+    public ApiConfig getApiConfig() {
36
+        if (null == apiConfig) {
37
+            apiConfig = new ApiConfig(APPID, SECRET, true);
38
+        }
39
+
40
+        return apiConfig;
30
     }
41
     }
31
 
42
 
43
+    public String getAPPID() {
44
+        return APPID;
45
+    }
32
 
46
 
33
-    //获取单例的微信配置文件类
34
-    public ApiConfig getConfigInstance() {
35
-        synchronized (LOCK) {
36
-            if (apiConfig == null) {
37
-                apiConfig = new ApiConfig(APPID, SECRET, true);
38
-            }
39
-            return apiConfig;
47
+    public JsAPI getJsAPI() {
48
+        if (null == jsAPI) {
49
+            jsAPI = new JsAPI(getApiConfig());
40
         }
50
         }
51
+
52
+        return jsAPI;
41
     }
53
     }
42
 }
54
 }

+ 6
- 2
house-wap-web/src/main/java/com/yincheng/jcjy/huiju/controller/weixin/WeixinController.java Wyświetl plik

3
 import com.alibaba.fastjson.JSONObject;
3
 import com.alibaba.fastjson.JSONObject;
4
 import com.github.sd4324530.fastweixin.api.JsAPI;
4
 import com.github.sd4324530.fastweixin.api.JsAPI;
5
 import com.github.sd4324530.fastweixin.api.response.GetSignatureResponse;
5
 import com.github.sd4324530.fastweixin.api.response.GetSignatureResponse;
6
+import org.springframework.beans.factory.annotation.Autowired;
6
 import org.springframework.stereotype.Controller;
7
 import org.springframework.stereotype.Controller;
7
 import org.springframework.web.bind.annotation.RequestMapping;
8
 import org.springframework.web.bind.annotation.RequestMapping;
8
 import org.springframework.web.bind.annotation.ResponseBody;
9
 import org.springframework.web.bind.annotation.ResponseBody;
18
 @RequestMapping("/weixin")
19
 @RequestMapping("/weixin")
19
 public class WeixinController {
20
 public class WeixinController {
20
 
21
 
22
+    @Autowired
23
+    WeixinAuthApiUtils weixinAuthApiUtils;
24
+
21
     /**
25
     /**
22
      * js初始化
26
      * js初始化
23
      * @param url
27
      * @param url
27
     @ResponseBody
31
     @ResponseBody
28
     public String initWxJsConfig(String url)
32
     public String initWxJsConfig(String url)
29
     {
33
     {
30
-        JsAPI jsapi = new JsAPI(WeixinAuthApiUtils.getInstance().getConfigInstance());
34
+        JsAPI jsapi = weixinAuthApiUtils.getJsAPI();
31
         long timestame = System.currentTimeMillis() / 1000;
35
         long timestame = System.currentTimeMillis() / 1000;
32
         String nonceStr = UUID.randomUUID().toString().replaceAll("-", "");
36
         String nonceStr = UUID.randomUUID().toString().replaceAll("-", "");
33
         GetSignatureResponse res = jsapi.getSignature(nonceStr, timestame, url);
37
         GetSignatureResponse res = jsapi.getSignature(nonceStr, timestame, url);
36
         obj.put("noncestr", res.getNoncestr());
40
         obj.put("noncestr", res.getNoncestr());
37
         obj.put("signature", res.getSignature());
41
         obj.put("signature", res.getSignature());
38
         obj.put("timestamp", res.getTimestamp());
42
         obj.put("timestamp", res.getTimestamp());
39
-        obj.put("appId", WeixinAuthApiUtils.APPID);
43
+        obj.put("appId", weixinAuthApiUtils.getAPPID());
40
         return obj.toString();
44
         return obj.toString();
41
     }
45
     }
42
 
46
 

+ 2
- 2
house-wap-web/src/main/resources/static/js/commonData.js Wyświetl plik

37
 
37
 
38
 //主导航数据
38
 //主导航数据
39
 var mainHideNavJSON={
39
 var mainHideNavJSON={
40
-	tel:'400-928-1818',
40
+	tel:'400-828-9555',
41
 	list:[{
41
 	list:[{
42
         value:'首页',
42
         value:'首页',
43
         aUrl:'/index'
43
         aUrl:'/index'
57
 }
57
 }
58
 
58
 
59
 var mainHideNavForBrokerJSON={
59
 var mainHideNavForBrokerJSON={
60
-    tel:'400-928-1818',
60
+    tel:'400-828-9555',
61
     list:[{
61
     list:[{
62
         value:'首页',
62
         value:'首页',
63
         aUrl:'/index'
63
         aUrl:'/index'

+ 1
- 1
house-wap-web/src/main/resources/templates/building/buildingDetails.html Wyświetl plik

454
 	</script>
454
 	</script>
455
 
455
 
456
 	<div class="subFooter">
456
 	<div class="subFooter">
457
-		<span class="centerLabel">官方热线:400-928-1818</span>
457
+		<span class="centerLabel">官方热线:400-828-9555</span>
458
 	</div>
458
 	</div>
459
 
459
 
460
 </div>
460
 </div>

+ 39
- 2
house-wap-web/src/main/resources/templates/index/index.html Wyświetl plik

15
 	<script src="/js/commonData.js" type="text/javascript" charset="utf-8"></script>
15
 	<script src="/js/commonData.js" type="text/javascript" charset="utf-8"></script>
16
 	<script src="/js/common.js" type="text/javascript" charset="utf-8"></script>
16
 	<script src="/js/common.js" type="text/javascript" charset="utf-8"></script>
17
 	<script src="/js/vant.js" type="text/javascript" charset="utf-8"></script>
17
 	<script src="/js/vant.js" type="text/javascript" charset="utf-8"></script>
18
+	<script src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
18
 </head>
19
 </head>
19
 
20
 
20
 <body class="flex-v">
21
 <body class="flex-v">
69
             methods: {
70
             methods: {
70
                 alertItem:function (url) {
71
                 alertItem:function (url) {
71
                     this.$dialog.alert({
72
                     this.$dialog.alert({
72
-                        message: '当前页面正在维护中,欢迎致电咨询:400-928-1818'
73
+                        message: '当前页面正在维护中,欢迎致电咨询:400-828-9555'
73
                     })
74
                     })
74
                 }
75
                 }
75
 			}
76
 			}
295
             mounted:function(){
296
             mounted:function(){
296
                 this.$nextTick(function(){
297
                 this.$nextTick(function(){
297
                     indexListVue.getList();	//获取列表信息
298
                     indexListVue.getList();	//获取列表信息
299
+
300
+					// 2023年2月20日 yansen  微信分享
301
+					// this.getWxInfo();
298
                 })
302
                 })
299
             },
303
             },
300
             methods:{
304
             methods:{
385
                 },
389
                 },
386
                 newHouseSlide:function (aIndex) {	//新房切换
390
                 newHouseSlide:function (aIndex) {	//新房切换
387
                     mySwiper1.slideTo(aIndex,300);
391
                     mySwiper1.slideTo(aIndex,300);
388
-                }
392
+                },
393
+
394
+				getWxInfo:function(){
395
+					var _that=this;
396
+					$.ajax({
397
+						url:'/weixin/init',
398
+						type:'post',
399
+						data:{url:window.location.href},
400
+						success:function (res) {
401
+							res=JSON.parse(res);
402
+							wx.config({
403
+								debug: false,
404
+								appId: res.appId,
405
+								timestamp: res.timestamp,
406
+								nonceStr: res.noncestr,
407
+								signature: res.signature,
408
+								jsApiList: ['onMenuShareAppMessage','onMenuShareTimeline']
409
+							});
410
+							wx.ready(function () {
411
+								wx.onMenuShareAppMessage({
412
+									title: '荟居住 绘生活',
413
+									desc: '买房、卖房、租房找荟居,佣金仅收0.5%',
414
+									link: window.location.href,
415
+									imgUrl: 'https://jingcheng-resourceplat.oss-cn-shanghai.aliyuncs.com/qrLogo.png',
416
+								});
417
+								wx.onMenuShareTimeline({
418
+									title:'荟居住 绘生活',
419
+									link: window.location.href,
420
+									imgUrl: 'https://jingcheng-resourceplat.oss-cn-shanghai.aliyuncs.com/qrLogo.png',
421
+								});
422
+							})
423
+						}
424
+					})
425
+				},
389
             }
426
             }
390
         })
427
         })
391
 
428
 

+ 2
- 2
house-wap-web/src/main/resources/templates/rent/oldHouseDetails.html Wyświetl plik

188
                             wx.ready(function () {
188
                             wx.ready(function () {
189
                                 wx.onMenuShareAppMessage({
189
                                 wx.onMenuShareAppMessage({
190
                                     title: '荟居住 绘生活',
190
                                     title: '荟居住 绘生活',
191
-                                    desc: '买房、卖房、租房找荟居,佣金仅收1%',
191
+                                    desc: '买房、卖房、租房找荟居,佣金仅收0.5%',
192
                                     link: window.location.href,
192
                                     link: window.location.href,
193
                                     imgUrl: 'https://jingcheng-resourceplat.oss-cn-shanghai.aliyuncs.com/qrLogo.png',
193
                                     imgUrl: 'https://jingcheng-resourceplat.oss-cn-shanghai.aliyuncs.com/qrLogo.png',
194
                                 });
194
                                 });
665
 </script>
665
 </script>
666
 
666
 
667
 <div class="detailsFooter flex-h">
667
 <div class="detailsFooter flex-h">
668
-	<!--<span><a href="tel:400-928-1818">400-928-1818</a></span>-->
668
+	<!--<span><a href="tel:400-828-9555">400-828-9555</a></span>-->
669
 	<a onclick="openBrokerPopUp()"><em>咨询经纪人</em></a>
669
 	<a onclick="openBrokerPopUp()"><em>咨询经纪人</em></a>
670
 </div>
670
 </div>
671
 
671
 

+ 2
- 2
house-wap-web/src/main/resources/templates/room/oldHouseDetails.html Wyświetl plik

159
                             wx.ready(function () {
159
                             wx.ready(function () {
160
                                 wx.onMenuShareAppMessage({
160
                                 wx.onMenuShareAppMessage({
161
                                     title: '荟居住 绘生活',
161
                                     title: '荟居住 绘生活',
162
-                                    desc: '买房、卖房、租房找荟居,佣金仅收1%',
162
+                                    desc: '买房、卖房、租房找荟居,佣金仅收0.5%',
163
                                     link: window.location.href,
163
                                     link: window.location.href,
164
                                     imgUrl: 'https://jingcheng-resourceplat.oss-cn-shanghai.aliyuncs.com/qrLogo.png',
164
                                     imgUrl: 'https://jingcheng-resourceplat.oss-cn-shanghai.aliyuncs.com/qrLogo.png',
165
                                 });
165
                                 });
561
 </script>
561
 </script>
562
 
562
 
563
 <div class="detailsFooter flex-h">
563
 <div class="detailsFooter flex-h">
564
-	<!--<span><a href="tel:400-928-1818">400-928-1818</a></span>-->
564
+	<!--<span><a href="tel:400-828-9555">400-828-9555</a></span>-->
565
 	<a onclick="openBrokerPopUp()"><em>咨询经纪人</em></a>
565
 	<a onclick="openBrokerPopUp()"><em>咨询经纪人</em></a>
566
 </div>
566
 </div>
567
 
567
 

+ 1
- 1
house-web/src/main/resources/static/js/common.js Wyświetl plik

46
 						'<a>'+
46
 						'<a>'+
47
 							'<img src="/images/service.png" width="100%" alt="">'+
47
 							'<img src="/images/service.png" width="100%" alt="">'+
48
 							'<span>客服</span>'+
48
 							'<span>客服</span>'+
49
-							'<div style="left: -160px;"><span>400-928-1818</span></div>'+
49
+							'<div style="left: -160px;"><span>400-828-9555</span></div>'+
50
 						'</a>'+
50
 						'</a>'+
51
 					'</li>'+
51
 					'</li>'+
52
 					'<li>'+
52
 					'<li>'+

+ 2
- 2
house-web/src/main/resources/templates/building/buildingDetails.html Wyświetl plik

507
             <div class="listRight" style="padding-bottom: 5px;">
507
             <div class="listRight" style="padding-bottom: 5px;">
508
                 <div class="listRightTop">
508
                 <div class="listRightTop">
509
                     <img th:src="@{/images/subLogo.png}" alt=""/>
509
                     <img th:src="@{/images/subLogo.png}" alt=""/>
510
-                    <span>400-928-1818</span>
510
+                    <span>400-828-9555</span>
511
                 </div>
511
                 </div>
512
             </div>
512
             </div>
513
         </div>
513
         </div>
625
             <div class="listRight" style="padding-bottom: 5px;">
625
             <div class="listRight" style="padding-bottom: 5px;">
626
                 <div class="listRightTop">
626
                 <div class="listRightTop">
627
                     <img th:src="@{/images/subLogo.png}" alt=""/>
627
                     <img th:src="@{/images/subLogo.png}" alt=""/>
628
-                    <span>400-928-1818</span>
628
+                    <span>400-828-9555</span>
629
                 </div>
629
                 </div>
630
             </div>
630
             </div>
631
         </div>
631
         </div>

+ 1
- 1
house-web/src/main/resources/templates/cms/detail.html Wyświetl plik

90
             <div class="contentRight">
90
             <div class="contentRight">
91
                 <div class="listRightTop">
91
                 <div class="listRightTop">
92
                     <img src="/images/subLogo.png" alt=""/>
92
                     <img src="/images/subLogo.png" alt=""/>
93
-                    <span>400-928-1818</span>
93
+                    <span>400-828-9555</span>
94
                 </div>
94
                 </div>
95
                 <span class="marginTop">最新资讯</span>
95
                 <span class="marginTop">最新资讯</span>
96
                 <ul>
96
                 <ul>

+ 1
- 1
house-web/src/main/resources/templates/cms/index.html Wyświetl plik

209
             <div class="contentRight">
209
             <div class="contentRight">
210
                 <div class="listRightTop">
210
                 <div class="listRightTop">
211
                     <img src="/images/subLogo.png" alt=""/>
211
                     <img src="/images/subLogo.png" alt=""/>
212
-                    <span>400-928-1818</span>
212
+                    <span>400-828-9555</span>
213
                 </div>
213
                 </div>
214
                 <span class="marginTop">最新资讯</span>
214
                 <span class="marginTop">最新资讯</span>
215
                 <ul>
215
                 <ul>

+ 1
- 1
house-web/src/main/resources/templates/cms/list.html Wyświetl plik

97
             <div class="contentRight">
97
             <div class="contentRight">
98
                 <div class="listRightTop">
98
                 <div class="listRightTop">
99
                     <img src="/images/subLogo.png" alt=""/>
99
                     <img src="/images/subLogo.png" alt=""/>
100
-                    <span>400-928-1818</span>
100
+                    <span>400-828-9555</span>
101
                 </div>
101
                 </div>
102
                 <span class="marginTop">最新资讯</span>
102
                 <span class="marginTop">最新资讯</span>
103
                 <ul>
103
                 <ul>

+ 1
- 1
house-web/src/main/resources/templates/cms/recommendArticleInfoList.html Wyświetl plik

8
     <div class="listRight">
8
     <div class="listRight">
9
         <div class="listRightTop">
9
         <div class="listRightTop">
10
             <img th:src="@{/images/subLogo.png}" alt=""/>
10
             <img th:src="@{/images/subLogo.png}" alt=""/>
11
-            <span>400-928-1818</span>
11
+            <span>400-828-9555</span>
12
         </div>
12
         </div>
13
         <ul>
13
         <ul>
14
             <li><h2>最新资讯</h2></li>
14
             <li><h2>最新资讯</h2></li>

+ 1
- 1
house-web/src/main/resources/templates/footer.html Wyświetl plik

69
                 <!--<li><a>加入我们</a></li>-->
69
                 <!--<li><a>加入我们</a></li>-->
70
                 <li><a href="http://www.ycdc.com">友情链接</a></li>
70
                 <li><a href="http://www.ycdc.com">友情链接</a></li>
71
             </ul>
71
             </ul>
72
-            <p>客服电话:400-928-1818</p>
72
+            <p>客服电话:400-828-9555</p>
73
         </div>
73
         </div>
74
         <div class="footerBottom">
74
         <div class="footerBottom">
75
             <p> 南京荟盛行房产经纪有限公司 | 网络经营许可证 <span style="color: #9d9d9d;cursor:pointer; font-size: 14px;" onclick="window.open('http://www.beian.miit.gov.cn/');">苏ICP备16051505号-1</span> | © Copyright©2010-2018 </p>
75
             <p> 南京荟盛行房产经纪有限公司 | 网络经营许可证 <span style="color: #9d9d9d;cursor:pointer; font-size: 14px;" onclick="window.open('http://www.beian.miit.gov.cn/');">苏ICP备16051505号-1</span> | © Copyright©2010-2018 </p>

+ 1
- 1
house-web/src/main/resources/templates/header.html Wyświetl plik

35
                 <span>/</span>
35
                 <span>/</span>
36
                 <a>注册</a>
36
                 <a>注册</a>
37
             </li>
37
             </li>
38
-            <li>热线电话:400-928-1818</li>
38
+            <li>热线电话:400-828-9555</li>
39
         </ul>
39
         </ul>
40
     </div>
40
     </div>
41
 </div>
41
 </div>

+ 1
- 1
house-web/src/main/resources/templates/index/contactUs.html Wyświetl plik

153
                 <!--<li><a href="http://www.huiju360.com.cn/article/5">加入我们</a></li>-->
153
                 <!--<li><a href="http://www.huiju360.com.cn/article/5">加入我们</a></li>-->
154
                 <li><a href="http://www.ycdc.com">友情链接</a></li>
154
                 <li><a href="http://www.ycdc.com">友情链接</a></li>
155
             </ul>
155
             </ul>
156
-            <p>客服电话:400-928-1818</p>
156
+            <p>客服电话:400-828-9555</p>
157
         </div>
157
         </div>
158
         <div class="footerBottom">
158
         <div class="footerBottom">
159
             <p> 南京荟盛行房产经纪有限公司 | 网络经营许可证 <span style="color: #9d9d9d;cursor:pointer; font-size: 14px;" onclick="jump();">苏ICP备16051505号-1</span> | © Copyright©2010-2018 </p>
159
             <p> 南京荟盛行房产经纪有限公司 | 网络经营许可证 <span style="color: #9d9d9d;cursor:pointer; font-size: 14px;" onclick="jump();">苏ICP备16051505号-1</span> | © Copyright©2010-2018 </p>

+ 1
- 1
house-web/src/main/resources/templates/index/index.html Wyświetl plik

500
                 <!--<li><a href="http://www.huiju360.com.cn/article/5">加入我们</a></li>-->
500
                 <!--<li><a href="http://www.huiju360.com.cn/article/5">加入我们</a></li>-->
501
                 <li><a href="http://www.ycdc.com">友情链接</a></li>
501
                 <li><a href="http://www.ycdc.com">友情链接</a></li>
502
             </ul>
502
             </ul>
503
-            <p>客服电话:400-928-1818</p>
503
+            <p>客服电话:400-828-9555</p>
504
         </div>
504
         </div>
505
         <div class="footerBottom">
505
         <div class="footerBottom">
506
             <p> 南京荟盛行房产经纪有限公司 | 网络经营许可证 <span style="color: #9d9d9d;cursor:pointer; font-size: 14px;" onclick="jump();">苏ICP备16051505号-1</span> | © Copyright©2010-2018 </p>
506
             <p> 南京荟盛行房产经纪有限公司 | 网络经营许可证 <span style="color: #9d9d9d;cursor:pointer; font-size: 14px;" onclick="jump();">苏ICP备16051505号-1</span> | © Copyright©2010-2018 </p>

+ 2
- 2
house-web/src/main/resources/templates/index/synopsis.html Wyświetl plik

106
                     <span class="last">
106
                     <span class="last">
107
                         荟居,让您买房省钱、省心、省力。专业的服务给您放心、愉悦、舒适。让您全程享受高品质的购房体验。展望未来,任重道远,荟居将携更多合作伙伴,开拓进取,自强求实,打造低佣金·高服务的全方位房屋买卖一体化平台,并且将公司的品牌与品质提升到一个新的高度。
107
                         荟居,让您买房省钱、省心、省力。专业的服务给您放心、愉悦、舒适。让您全程享受高品质的购房体验。展望未来,任重道远,荟居将携更多合作伙伴,开拓进取,自强求实,打造低佣金·高服务的全方位房屋买卖一体化平台,并且将公司的品牌与品质提升到一个新的高度。
108
                     </span>
108
                     </span>
109
-                    <span class="last">联系电话:4009281818</span>
109
+                    <span class="last">联系电话:400-828-9555</span>
110
                 </div>
110
                 </div>
111
             </div>
111
             </div>
112
         </div>
112
         </div>
123
                 <!--<li><a href="http://www.huiju360.com.cn/article/5">加入我们</a></li>-->
123
                 <!--<li><a href="http://www.huiju360.com.cn/article/5">加入我们</a></li>-->
124
                 <li><a href="http://www.ycdc.com">友情链接</a></li>
124
                 <li><a href="http://www.ycdc.com">友情链接</a></li>
125
             </ul>
125
             </ul>
126
-            <p>客服电话:400-928-1818</p>
126
+            <p>客服电话:400-828-9555</p>
127
         </div>
127
         </div>
128
         <div class="footerBottom">
128
         <div class="footerBottom">
129
             <p> 南京荟盛行房产经纪有限公司 | 网络经营许可证 <span style="color: #9d9d9d;cursor:pointer; font-size: 14px;" onclick="jump();">苏ICP备16051505号-1</span> | © Copyright©2010-2018 </p>
129
             <p> 南京荟盛行房产经纪有限公司 | 网络经营许可证 <span style="color: #9d9d9d;cursor:pointer; font-size: 14px;" onclick="jump();">苏ICP备16051505号-1</span> | © Copyright©2010-2018 </p>