diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java index c8c10cc45..8fc7215a3 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java @@ -57,9 +57,23 @@ public class WxRentContract extends TenantEntity { @TableField(exist = false) private String priceStr; + public String getPriceStr() { + if(price!=null) { + priceStr = new BigDecimal(price).divide(new BigDecimal(100)).toString(); + } + return priceStr; + } + @TableField(exist = false) private String depositStr; + public String getDepositStr() { + if(deposit!=null) { + depositStr = new BigDecimal(deposit).divide(new BigDecimal(100)).toString(); + } + return depositStr; + } + @TableField(exist = false) @SortColumn(column = "allPeriod") private Integer allPeriod; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java index 39a1038cc..a0d6d2cb0 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java @@ -780,6 +780,7 @@ public class DataTowerServiceImpl implements DataTowerService { datamap.put("token", getWiwideToken(wiWideInfo)); datamap.put("url", wiwideUrl); datamap.put("capability", wiWideInfo.getCapability()); + datamap.put("oldPlat", wiWideInfo.getOldPlat()); } return datamap; } @@ -798,6 +799,7 @@ public class DataTowerServiceImpl implements DataTowerService { datamap.put("sign", WiwideEntry.encrypt(wiWideInfo)); datamap.put("url", wiwideUrl); datamap.put("capability", wiWideInfo.getCapability()); + datamap.put("oldPlat", wiWideInfo.getOldPlat()); } return datamap; } diff --git a/mallinkService/src/main/java/com/iformall/sms/wiwide/WiwideUtil.java b/mallinkService/src/main/java/com/iformall/sms/wiwide/WiwideUtil.java index f8776cb87..0bf2ff8f7 100644 --- a/mallinkService/src/main/java/com/iformall/sms/wiwide/WiwideUtil.java +++ b/mallinkService/src/main/java/com/iformall/sms/wiwide/WiwideUtil.java @@ -225,8 +225,8 @@ public class WiwideUtil implements SMSExcutor { Map params = new HashMap<>(2); params.put("username", "lianhua"); params.put("password", "widash1234"); - String token = HttpUtil.doPost("http://140.143.33.245/api/user/auth", params); - System.out.println(token); + String token = HttpUtil.doPost("http://vap.vision.wiwide.com/api/user/auth", params); + System.out.println(DataUtil.unicodeToUtf8(token)); } } diff --git a/mallinkService/src/main/java/com/iformall/utils/DataUtil.java b/mallinkService/src/main/java/com/iformall/utils/DataUtil.java index 400effeb7..8127f28e4 100644 --- a/mallinkService/src/main/java/com/iformall/utils/DataUtil.java +++ b/mallinkService/src/main/java/com/iformall/utils/DataUtil.java @@ -255,4 +255,69 @@ public final class DataUtil { } return k; } + + public static String unicodeToUtf8(String theString) { + char aChar; + int len = theString.length(); + StringBuffer outBuffer = new StringBuffer(len); + for (int x = 0; x < len;) { + aChar = theString.charAt(x++); + if (aChar == '\\') { + aChar = theString.charAt(x++); + if (aChar == 'u') { + // Read the xxxx + int value = 0; + for (int i = 0; i < 4; i++) { + aChar = theString.charAt(x++); + switch (aChar) { + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + value = (value << 4) + aChar - '0'; + break; + case 'a': + case 'b': + case 'c': + case 'd': + case 'e': + case 'f': + value = (value << 4) + 10 + aChar - 'a'; + break; + case 'A': + case 'B': + case 'C': + case 'D': + case 'E': + case 'F': + value = (value << 4) + 10 + aChar - 'A'; + break; + default: + throw new IllegalArgumentException( + "Malformed \\uxxxx encoding."); + } + } + outBuffer.append((char) value); + } else { + if (aChar == 't') + aChar = '\t'; + else if (aChar == 'r') + aChar = '\r'; + else if (aChar == 'n') + aChar = '\n'; + else if (aChar == 'f') + aChar = '\f'; + outBuffer.append(aChar); + } + } else + outBuffer.append(aChar); + } + return outBuffer.toString(); + } } \ No newline at end of file