From 2e653ded98558b57bfc8bcbb2693873d0df4cfb2 Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 16 Mar 2021 15:42:27 +0800 Subject: [PATCH] coupons --- .../datatower/DataTowerController.java | 11 ++++++ .../src/main/resources/application-prod.yml | 2 +- .../V202102260001__wx_rent_contract.sql | 9 ++++- .../src/main/resources/application-prod.yml | 2 +- .../src/main/resources/application-prod.yml | 2 +- .../src/main/resources/application-prod.yml | 2 +- .../src/main/resources/application-prod.yml | 2 +- .../src/main/resources/application-prod.yml | 2 +- .../src/main/resources/application-prod.yml | 2 +- .../src/main/resources/application-prod.yml | 2 +- .../iformall/service/DataTowerService.java | 2 ++ .../service/impl/DataTowerServiceImpl.java | 18 ++++++++++ .../com/iformall/sms/wiwide/WiwideUtil.java | 36 ++++++++++++++----- .../java/com/iformall/utils/HttpUtil.java | 33 +++++++++++++++-- .../src/main/resources/application-prod.yml | 2 +- .../src/main/resources/application-prod.yml | 2 +- 16 files changed, 107 insertions(+), 22 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 9e395738d..9e1d2b002 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/DataTowerController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/DataTowerController.java @@ -116,4 +116,15 @@ public class DataTowerController extends BaseController { return dataTowerService.queryWiWideDataUrl(getTenantInfo(),requrl,params); } + @ApiOperation("调取图片") + @GetMapping("/getWiWidePic") + @SystemControllerLog(description = "数据塔台-获取图片") + public String getWiWidePic(String type,String id) { + logger.debug("[" + getIpAddr() + "] DataTowerController::getWiWidePic"); + if(StringUtils.isBlank(type) || StringUtils.isBlank(id)){ + return null; + } + return dataTowerService.getWiWidePic(getTenantInfo(),type,id); + } + } diff --git a/mallinkAdmin/src/main/resources/application-prod.yml b/mallinkAdmin/src/main/resources/application-prod.yml index ccf85c8ad..31844244b 100644 --- a/mallinkAdmin/src/main/resources/application-prod.yml +++ b/mallinkAdmin/src/main/resources/application-prod.yml @@ -58,7 +58,7 @@ spring: # EMAIL mail: host: smtp.exmail.qq.com - username: sysadministor@iformall.com # 登陆密码sysAdmin1231 + username: sysadministor@iformall.com # 登陆密码sysAd1231 password: SWqPekCEmhUYuYCd # 授权密码 properties: mail: 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 fdc8524fa..5274b9f7e 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 @@ -1,4 +1,11 @@ ALTER TABLE `wx_rent_contract` ADD COLUMN `cashtype_content_lsit` json COMMENT '押金明细' AFTER `deposit`, ADD COLUMN `cashtype_lsit` json COMMENT '押金明细' AFTER `cashtype_content_lsit`, -ADD COLUMN `other_rent_price_info` json COMMENT '其他租金单价' AFTER `rent_price`; \ No newline at end of file +ADD COLUMN `other_rent_price_info` json COMMENT '其他租金单价' AFTER `rent_price`; + + +--单店铺 + +--多店铺合铺 + +--多店铺分铺 \ No newline at end of file diff --git a/mallinkBApi/src/main/resources/application-prod.yml b/mallinkBApi/src/main/resources/application-prod.yml index a875686d6..20610be76 100644 --- a/mallinkBApi/src/main/resources/application-prod.yml +++ b/mallinkBApi/src/main/resources/application-prod.yml @@ -57,7 +57,7 @@ spring: # EMAIL mail: host: smtp.exmail.qq.com - username: sysadministor@iformall.com # 登陆密码sysAdmin1231 + username: sysadministor@iformall.com # 登陆密码sysAd1231 password: SWqPekCEmhUYuYCd # 授权密码 properties: mail: diff --git a/mallinkCApi/src/main/resources/application-prod.yml b/mallinkCApi/src/main/resources/application-prod.yml index 86d1a247c..dafffffc1 100644 --- a/mallinkCApi/src/main/resources/application-prod.yml +++ b/mallinkCApi/src/main/resources/application-prod.yml @@ -57,7 +57,7 @@ spring: # EMAIL mail: host: smtp.exmail.qq.com - username: sysadministor@iformall.com # 登陆密码sysAdmin1231 + username: sysadministor@iformall.com # 登陆密码sysAd1231 password: SWqPekCEmhUYuYCd # 授权密码 properties: mail: diff --git a/mallinkCallback/src/main/resources/application-prod.yml b/mallinkCallback/src/main/resources/application-prod.yml index abb57e289..1c0037dea 100644 --- a/mallinkCallback/src/main/resources/application-prod.yml +++ b/mallinkCallback/src/main/resources/application-prod.yml @@ -58,7 +58,7 @@ spring: # EMAIL mail: host: smtp.exmail.qq.com - username: sysadministor@iformall.com # 登陆密码sysAdmin1231 + username: sysadministor@iformall.com # 登陆密码sysAd1231 password: SWqPekCEmhUYuYCd # 授权密码 properties: mail: diff --git a/mallinkMQConsumer/src/main/resources/application-prod.yml b/mallinkMQConsumer/src/main/resources/application-prod.yml index 864a64001..3abf60474 100644 --- a/mallinkMQConsumer/src/main/resources/application-prod.yml +++ b/mallinkMQConsumer/src/main/resources/application-prod.yml @@ -57,7 +57,7 @@ spring: # EMAIL mail: host: smtp.exmail.qq.com - username: sysadministor@iformall.com # 登陆密码sysAdmin1231 + username: sysadministor@iformall.com # 登陆密码sysAd1231 password: SWqPekCEmhUYuYCd # 授权密码 properties: mail: diff --git a/mallinkPosApi/src/main/resources/application-prod.yml b/mallinkPosApi/src/main/resources/application-prod.yml index 14a620ae0..809c256f4 100644 --- a/mallinkPosApi/src/main/resources/application-prod.yml +++ b/mallinkPosApi/src/main/resources/application-prod.yml @@ -56,7 +56,7 @@ spring: # EMAIL mail: host: smtp.exmail.qq.com - username: sysadministor@iformall.com # 登陆密码sysAdmin1231 + username: sysadministor@iformall.com # 登陆密码sysAd1231 password: SWqPekCEmhUYuYCd # 授权密码 properties: mail: diff --git a/mallinkPublicApi/src/main/resources/application-prod.yml b/mallinkPublicApi/src/main/resources/application-prod.yml index cb6c367fc..13a16ccef 100644 --- a/mallinkPublicApi/src/main/resources/application-prod.yml +++ b/mallinkPublicApi/src/main/resources/application-prod.yml @@ -57,7 +57,7 @@ spring: # EMAIL mail: host: smtp.exmail.qq.com - username: sysadministor@iformall.com # 登陆密码sysAdmin1231 + username: sysadministor@iformall.com # 登陆密码sysAd1231 password: SWqPekCEmhUYuYCd # 授权密码 properties: mail: diff --git a/mallinkSchedule/src/main/resources/application-prod.yml b/mallinkSchedule/src/main/resources/application-prod.yml index c2663d1dc..86488cb6a 100644 --- a/mallinkSchedule/src/main/resources/application-prod.yml +++ b/mallinkSchedule/src/main/resources/application-prod.yml @@ -57,7 +57,7 @@ spring: # EMAIL mail: host: smtp.exmail.qq.com - username: sysadministor@iformall.com # 登陆密码sysAdmin1231 + username: sysadministor@iformall.com # 登陆密码sysAd1231 password: SWqPekCEmhUYuYCd # 授权密码 properties: mail: diff --git a/mallinkService/src/main/java/com/iformall/service/DataTowerService.java b/mallinkService/src/main/java/com/iformall/service/DataTowerService.java index eeee6eb3f..66b172d99 100644 --- a/mallinkService/src/main/java/com/iformall/service/DataTowerService.java +++ b/mallinkService/src/main/java/com/iformall/service/DataTowerService.java @@ -22,4 +22,6 @@ public interface DataTowerService { ResultData queryCustomerData(TenantEntity tenantEntity, Map params); ResultData queryWiWideDataUrl(TenantEntity tenantInfo, String url, Map params); + + String 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 2f89d1dfd..49171c358 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java @@ -959,6 +959,24 @@ public class DataTowerServiceImpl implements DataTowerService { } } + @Override + public String getWiWidePic(TenantEntity tenantEntity, String type, String id) { + WxWiWideInfo wiWideInfo = new WxWiWideInfo(); + wiWideInfo.updateTenantInfo(tenantEntity); + List list = wxWiwideInfoMapper.findList(wiWideInfo); + if (list.isEmpty()){ + return null; + } + wiWideInfo = list.get(0); + String wiwideUrl = wiWideInfo.getWiwideUrl(); + WiwideSercret wiwideSercret = getWiwideSercret(wiWideInfo); + if(wiwideSercret == null){ + return null; + } + String sign = WiwideEntry.encrypt(wiWideInfo); + return WiwideUtil.getWiWidePic(wiwideUrl,sign,type,id); + } + public TreeMap getTimeTreeMap() { TreeMap timemap = new TreeMap(); timemap.put("06:00", 0); 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 e4864f914..820b28027 100644 --- a/mallinkService/src/main/java/com/iformall/sms/wiwide/WiwideUtil.java +++ b/mallinkService/src/main/java/com/iformall/sms/wiwide/WiwideUtil.java @@ -24,6 +24,7 @@ public class WiwideUtil implements SMSExcutor { private static final String addTemplateUrl = "https://webapp.wiwide.com/apisms/addtemplate"; private static final String smsSendUrl = "https://webapp.wiwide.com/apisms/send"; + @Override public String sendMsg(String secret, String bid, String publickey, String phone, String signature, String msg, String notifyUrl, String verifysms, Integer modelId, String templateParam, String templateCode, String outId) { return sendMsg(secret, bid, publickey, phone, signature, msg, notifyUrl, @@ -219,6 +220,10 @@ public class WiwideUtil implements SMSExcutor { String data = HttpUtil.doPostWiwideNew(url, sign, params); return data; } + + public static String getWiWidePic(String url,String sign, String type, String id) { + return HttpUtil.doWiwidePicGet(url+"/api/reports/pictures/get_picture?type="+type+"&id="+id,sign); + } public static void main(String[] args) { Map params = new HashMap<>(2); @@ -237,16 +242,29 @@ public class WiwideUtil implements SMSExcutor { wiWideInfo.setWiwideKey(secretKey); String sign = WiwideEntry.encrypt(wiWideInfo); - Map param = new HashMap<>(); - param.put("pageStart",1); - param.put("pageSize",10); - param.put("key",0); - param.put("value",""); - param.put("placeStatus",0); - - String s = queryDataNew("http://140.143.33.245" + "/api/place/place", sign, param); - System.out.println(DataUtil.unicodeToUtf8(s)); + String 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<>(); +// param.put("type","pic"); +// param.put("id","b3b30445674bb49840e64c2f8b0be347"); +// +// +// +// String s = queryDataNew("http://140.143.33.245" + "/api/reports/pictures/get_picture", sign, param); +// System.out.println(DataUtil.unicodeToUtf8(s)); + +// Map param = new HashMap<>(); +// param.put("pageStart",1); +// param.put("pageSize",10); +// param.put("key",0); +// param.put("value",""); +// param.put("placeStatus",0); +// +// +// String s = queryDataNew("http://140.143.33.245" + "/api/place/place", sign, param); +// System.out.println(DataUtil.unicodeToUtf8(s)); } } diff --git a/mallinkService/src/main/java/com/iformall/utils/HttpUtil.java b/mallinkService/src/main/java/com/iformall/utils/HttpUtil.java index 957397c63..6a919807e 100644 --- a/mallinkService/src/main/java/com/iformall/utils/HttpUtil.java +++ b/mallinkService/src/main/java/com/iformall/utils/HttpUtil.java @@ -79,6 +79,35 @@ public class HttpUtil { return null; } + /** + * get请求 + * @return + */ + public static String doWiwidePicGet(String url, String signature) { + try { + CloseableHttpClient client = HttpClients.createDefault(); + //发送get请求 + HttpGet request = new HttpGet(url); + request.setHeader("Cookie", "Signature="+signature); + + HttpResponse response = client.execute(request); + + /**请求发送成功,并得到响应**/ + if (response.getStatusLine().getStatusCode() == HttpStatus.SC_OK) { + /**读取服务器返回过来的json字符串数据**/ + String strResult = EntityUtils.toString(response.getEntity()); + + return strResult; + } + } + catch (IOException e) { + logger.error(e.getMessage()); + throw new RuntimeException(e); + } + + return null; + } + /** * post请求(用于key-value格式的参数) * @param url @@ -212,7 +241,7 @@ public class HttpUtil { * @param params * @return */ - public static String doPostWiwideNew(String url, String cookie, Map params){ + public static String doPostWiwideNew(String url, String signature, Map params){ //CookieStore store= new BasicCookieStore(); //HttpClients.custom().setDefaultCookieStore(store).build(); @@ -229,7 +258,7 @@ public class HttpUtil { request.setURI(new URI(url)); request.setHeader("Content-Type", "application/x-www-form-urlencoded"); request.setHeader("Accept-Charset", "utf-8"); - request.setHeader("Cookie", "Signature="+cookie); + request.setHeader("Cookie", "Signature="+signature); //设置参数 List nvps = new ArrayList(); diff --git a/mallinkSysAdmin/src/main/resources/application-prod.yml b/mallinkSysAdmin/src/main/resources/application-prod.yml index 3cf2ecd0b..8c7c9ffd1 100644 --- a/mallinkSysAdmin/src/main/resources/application-prod.yml +++ b/mallinkSysAdmin/src/main/resources/application-prod.yml @@ -57,7 +57,7 @@ spring: # EMAIL mail: host: smtp.exmail.qq.com - username: sysadministor@iformall.com # 登陆密码sysAdmin1231 + username: sysadministor@iformall.com # 登陆密码sysAd1231 password: SWqPekCEmhUYuYCd # 授权密码 properties: mail: diff --git a/mallinkWebSocketServer/src/main/resources/application-prod.yml b/mallinkWebSocketServer/src/main/resources/application-prod.yml index 90d7a6f40..1f45ac813 100644 --- a/mallinkWebSocketServer/src/main/resources/application-prod.yml +++ b/mallinkWebSocketServer/src/main/resources/application-prod.yml @@ -57,7 +57,7 @@ spring: # EMAIL mail: host: smtp.exmail.qq.com - username: sysadministor@iformall.com # 登陆密码sysAdmin1231 + username: sysadministor@iformall.com # 登陆密码sysAd1231 password: SWqPekCEmhUYuYCd # 授权密码 properties: mail: