From f5afab020b1cdc18813d6b14632807600b02d61e Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 16 Mar 2021 18:35:19 +0800 Subject: [PATCH] coupons --- .../iformall/controller/datatower/DataTowerController.java | 2 +- .../db/migration/V202102260001__wx_rent_contract.sql | 7 +++++++ .../main/java/com/iformall/service/DataTowerService.java | 2 +- .../com/iformall/service/impl/DataTowerServiceImpl.java | 2 +- .../src/main/java/com/iformall/sms/wiwide/WiwideUtil.java | 4 ++-- .../src/main/java/com/iformall/utils/HttpUtil.java | 7 ++++--- 6 files changed, 16 insertions(+), 8 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/DataTowerController.java b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/DataTowerController.java index 9e1d2b002..b75deafd0 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/DataTowerController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/DataTowerController.java @@ -119,7 +119,7 @@ public class DataTowerController extends BaseController { @ApiOperation("调取图片") @GetMapping("/getWiWidePic") @SystemControllerLog(description = "数据塔台-获取图片") - public String getWiWidePic(String type,String id) { + public byte[] getWiWidePic(String type,String id) { logger.debug("[" + getIpAddr() + "] DataTowerController::getWiWidePic"); if(StringUtils.isBlank(type) || StringUtils.isBlank(id)){ return null; diff --git a/mallinkAdmin/src/main/resources/db/migration/V202102260001__wx_rent_contract.sql b/mallinkAdmin/src/main/resources/db/migration/V202102260001__wx_rent_contract.sql index 5274b9f7e..4bbfc8eb1 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V202102260001__wx_rent_contract.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V202102260001__wx_rent_contract.sql @@ -6,6 +6,13 @@ ADD COLUMN `other_rent_price_info` json COMMENT '其他租金单价' AFTER `rent --单店铺 +update wx_rent_contract set cashtype_lsit = '[{"label": "一般押金", "value": "0", "disabled": true}, {"label": "合同保证金", "value": "1", "disabled": false}, {"label": "质量保证金", "value": "2", "disabled": false}]', cashtype_content_lsit = concat('[{"value": "',ROUND(deposit/100,2),'", "deposit": "1"}]') +where (LENGTH(shop_name) - LENGTH( REPLACE (shop_name, ',',''))) <= 1 + + + + + --多店铺合铺 --多店铺分铺 \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/service/DataTowerService.java b/mallinkService/src/main/java/com/iformall/service/DataTowerService.java index 66b172d99..52ba82318 100644 --- a/mallinkService/src/main/java/com/iformall/service/DataTowerService.java +++ b/mallinkService/src/main/java/com/iformall/service/DataTowerService.java @@ -23,5 +23,5 @@ public interface DataTowerService { ResultData queryWiWideDataUrl(TenantEntity tenantInfo, String url, Map params); - String getWiWidePic(TenantEntity tenantInfo, String type, String id); + byte[] getWiWidePic(TenantEntity tenantInfo, String type, String id); } 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 49171c358..bf69f8cf2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java @@ -960,7 +960,7 @@ public class DataTowerServiceImpl implements DataTowerService { } @Override - public String getWiWidePic(TenantEntity tenantEntity, String type, String id) { + public byte[] getWiWidePic(TenantEntity tenantEntity, String type, String id) { WxWiWideInfo wiWideInfo = new WxWiWideInfo(); wiWideInfo.updateTenantInfo(tenantEntity); List list = wxWiwideInfoMapper.findList(wiWideInfo); 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 820b28027..b472f553e 100644 --- a/mallinkService/src/main/java/com/iformall/sms/wiwide/WiwideUtil.java +++ b/mallinkService/src/main/java/com/iformall/sms/wiwide/WiwideUtil.java @@ -221,7 +221,7 @@ public class WiwideUtil implements SMSExcutor { return data; } - public static String getWiWidePic(String url,String sign, String type, String id) { + public static byte[] getWiWidePic(String url,String sign, String type, String id) { return HttpUtil.doWiwidePicGet(url+"/api/reports/pictures/get_picture?type="+type+"&id="+id,sign); } @@ -243,7 +243,7 @@ public class WiwideUtil implements SMSExcutor { String sign = WiwideEntry.encrypt(wiWideInfo); - String s = HttpUtil.doWiwidePicGet("http://140.143.33.245" + "/api/reports/pictures/get_picture?type=pic&id=b3b30445674bb49840e64c2f8b0be347", sign); + byte[] s = HttpUtil.doWiwidePicGet("http://140.143.33.245" + "/api/reports/pictures/get_picture?type=pic&id=b3b30445674bb49840e64c2f8b0be347", sign); System.out.println(s); // Map param = new HashMap<>(); diff --git a/mallinkService/src/main/java/com/iformall/utils/HttpUtil.java b/mallinkService/src/main/java/com/iformall/utils/HttpUtil.java index 6a919807e..de6434945 100644 --- a/mallinkService/src/main/java/com/iformall/utils/HttpUtil.java +++ b/mallinkService/src/main/java/com/iformall/utils/HttpUtil.java @@ -83,7 +83,7 @@ public class HttpUtil { * get请求 * @return */ - public static String doWiwidePicGet(String url, String signature) { + public static byte[] doWiwidePicGet(String url, String signature) { try { CloseableHttpClient client = HttpClients.createDefault(); //发送get请求 @@ -95,9 +95,10 @@ public class HttpUtil { /**请求发送成功,并得到响应**/ if (response.getStatusLine().getStatusCode() == HttpStatus.SC_OK) { /**读取服务器返回过来的json字符串数据**/ - String strResult = EntityUtils.toString(response.getEntity()); - return strResult; + byte[] bytes = EntityUtils.toByteArray(response.getEntity()); + + return bytes; } } catch (IOException e) {