From 97d21abce9d0604cc695413d6ff6ec25a3ad5d25 Mon Sep 17 00:00:00 2001 From: = <=> Date: Sat, 28 Aug 2021 22:31:44 +0800 Subject: [PATCH] =?UTF-8?q?'=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/cweb/config/AuthConfig.java | 1 + .../cweb/controller/HighTestController.java | 3 +- .../controller/HighUserCardController.java | 138 +++ .../cweb/controller/SmsContentController.java | 16 +- .../com/hai/common/exception/ErrorCode.java | 2 + .../java/com/hai/common/security/DesUtil.java | 3 +- .../java/com/hai/config/CommonSysConfig.java | 28 + .../config/HuiLianTongUnionCardConfig.java | 157 ++-- .../java/com/hai/dao/HighOrderMapper.java | 63 +- .../com/hai/dao/HighOrderSqlProvider.java | 42 + .../java/com/hai/dao/HighUserCardMapper.java | 117 +++ .../com/hai/dao/HighUserCardMapperExt.java | 7 + .../com/hai/dao/HighUserCardSqlProvider.java | 304 ++++++ .../main/java/com/hai/entity/HighOrder.java | 56 +- .../java/com/hai/entity/HighOrderExample.java | 190 ++++ .../java/com/hai/entity/HighUserCard.java | 200 ++++ .../com/hai/entity/HighUserCardExample.java | 863 ++++++++++++++++++ .../java/com/hai/enum_type/UserCardType.java | 32 + .../com/hai/service/HighUserCardService.java | 39 + .../service/impl/HighUserCardServiceImpl.java | 58 ++ .../resources/dev/commonConfig.properties | 4 + .../resources/pre/commonConfig.properties | 4 + .../prod-9401/commonConfig.properties | 4 + .../resources/prod/commonConfig.properties | 4 + 24 files changed, 2211 insertions(+), 124 deletions(-) create mode 100644 hai-cweb/src/main/java/com/cweb/controller/HighUserCardController.java create mode 100644 hai-service/src/main/java/com/hai/dao/HighUserCardMapper.java create mode 100644 hai-service/src/main/java/com/hai/dao/HighUserCardMapperExt.java create mode 100644 hai-service/src/main/java/com/hai/dao/HighUserCardSqlProvider.java create mode 100644 hai-service/src/main/java/com/hai/entity/HighUserCard.java create mode 100644 hai-service/src/main/java/com/hai/entity/HighUserCardExample.java create mode 100644 hai-service/src/main/java/com/hai/enum_type/UserCardType.java create mode 100644 hai-service/src/main/java/com/hai/service/HighUserCardService.java create mode 100644 hai-service/src/main/java/com/hai/service/impl/HighUserCardServiceImpl.java diff --git a/hai-cweb/src/main/java/com/cweb/config/AuthConfig.java b/hai-cweb/src/main/java/com/cweb/config/AuthConfig.java index 9f9be337..999e0d88 100644 --- a/hai-cweb/src/main/java/com/cweb/config/AuthConfig.java +++ b/hai-cweb/src/main/java/com/cweb/config/AuthConfig.java @@ -109,6 +109,7 @@ public class AuthConfig implements WebMvcConfigurer { .excludePathPatterns("/order/orderToH5Pay") .excludePathPatterns("/order/orderToPay") .excludePathPatterns("/test/*") + .excludePathPatterns("/highUserCard/*") .excludePathPatterns("/cmsContent/*") .excludePathPatterns("/highGas/*") .excludePathPatterns("/outRechargeOrder/*") diff --git a/hai-cweb/src/main/java/com/cweb/controller/HighTestController.java b/hai-cweb/src/main/java/com/cweb/controller/HighTestController.java index f418c399..da1b6528 100644 --- a/hai-cweb/src/main/java/com/cweb/controller/HighTestController.java +++ b/hai-cweb/src/main/java/com/cweb/controller/HighTestController.java @@ -222,7 +222,8 @@ public class HighTestController { @ApiOperation(value = "测试") public ResponseData test3() { try { - return ResponseMsgUtil.success(HuiLianTongUnionCardConfig.queryCardInfo()); + // return ResponseMsgUtil.success(HuiLianTongUnionCardConfig.resolveResponse("T3xbPEKEXV9+CbBw8D1B+N2jk8xwa55s0Bde48c49YDMmj1rv5nOrkawWt8fskSihNw0wugKUT1x\\nWjHhIN8af7NylRVfhJvbeja2Zjjxnwk3FEKgyvIvJnk3QgiY4aghqQcGKxDOlAxT/kjrkDd2ESu1\\nIWkpi+0HGnG3rKSL6+a1Nu7aW+rPHwXUOmHSgWFZFb9HhlfKI/jml3GhMZBWsZFirayyMMi8UKrd\\nYN7ANPEB/6uV9iVtpLF5Kz8M2+GpI0EqRhPFAH2u3Q/RSgW8ei2ZbOY9NnbkdwuOjU93wgJxdY1Y\\n93hvLYNe1i9QkSM1")); + return ResponseMsgUtil.success(HuiLianTongUnionCardConfig.queryCardByMobile("15185028745")); } catch (Exception e) { log.error("HighOrderController --> getOrderById() error!", e); return ResponseMsgUtil.exception(e); diff --git a/hai-cweb/src/main/java/com/cweb/controller/HighUserCardController.java b/hai-cweb/src/main/java/com/cweb/controller/HighUserCardController.java new file mode 100644 index 00000000..b9a60b6e --- /dev/null +++ b/hai-cweb/src/main/java/com/cweb/controller/HighUserCardController.java @@ -0,0 +1,138 @@ +package com.cweb.controller; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.hai.common.exception.ErrorCode; +import com.hai.common.exception.ErrorHelp; +import com.hai.common.exception.SysCode; +import com.hai.common.security.SessionObject; +import com.hai.common.security.UserCenter; +import com.hai.common.utils.RedisUtil; +import com.hai.common.utils.ResponseMsgUtil; +import com.hai.config.HuiLianTongUnionCardConfig; +import com.hai.entity.HighUserCard; +import com.hai.enum_type.UserCardType; +import com.hai.model.HighUserModel; +import com.hai.model.ResponseData; +import com.hai.service.HighUserCardService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.Objects; + +@Controller +@RequestMapping(value = "/highUserCard") +@Api(value = "订单接口") +public class HighUserCardController { + + private static Logger log = LoggerFactory.getLogger(HighUserCardController.class); + + @Resource + private UserCenter userCenter; + + @Resource + private HighUserCardService highUserCardService; + + @Resource + private RedisUtil redisUtil; + + + @RequestMapping(value = "/getUserCardList", method = RequestMethod.GET) + @ResponseBody + @ApiOperation(value = "获取用户卡号列表") + public ResponseData getUserCardList(@RequestParam(name = "type", required = false) Integer type, HttpServletRequest request) { + try { + // 用户 + SessionObject sessionObject = userCenter.getSessionObject(request); + HighUserModel userInfoModel = (HighUserModel) sessionObject.getObject(); + return ResponseMsgUtil.success(highUserCardService.getListByUser(userInfoModel.getHighUser().getId(),type)); + } catch (Exception e) { + log.error("HighUserCardController --> getUserCardList() error!", e); + return ResponseMsgUtil.exception(e); + } + } + + @RequestMapping(value = "/bindHuiLianTongCard", method = RequestMethod.POST) + @ResponseBody + @ApiOperation(value = "绑定汇联通工会卡") + public ResponseData bindHuiLianTongCard(@RequestBody JSONObject body, HttpServletRequest request) { + try { + if (body == null || StringUtils.isBlank(body.getString("cardNo"))) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, ""); + } + + // 用户 + SessionObject sessionObject = userCenter.getSessionObject(request); + HighUserModel userInfoModel = (HighUserModel) sessionObject.getObject(); + + if (highUserCardService.getDetailByUserCardNo(userInfoModel.getHighUser().getId(), body.getString("cardNo")) == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "已绑定此卡,请勿重复绑定"); + } + + HighUserCard userCard = new HighUserCard(); + userCard.setUserId(userInfoModel.getHighUser().getId()); + userCard.setCardNo(body.getString("cardNo")); + userCard.setType(UserCardType.type1.getType()); + highUserCardService.editCard(userCard); + + return ResponseMsgUtil.success("操作成功"); + + } catch (Exception e) { + log.error("HighUserCardController --> bindHuiLianTongCard() error!", e); + return ResponseMsgUtil.exception(e); + } + } + + @RequestMapping(value = "/getHuiLianTongCardByPhone", method = RequestMethod.GET) + @ResponseBody + @ApiOperation(value = "根据手机号获取汇联通工会卡列表") + public ResponseData getHuiLianTongCardByPhone(@RequestParam(name = "phone", required = true) String phone, + @RequestParam(name = "smsCode", required = true) String smsCode, + HttpServletRequest request) { + try { + // 用户 + SessionObject sessionObject = userCenter.getSessionObject(request); + HighUserModel userInfoModel = (HighUserModel) sessionObject.getObject(); + + // 获取手机号验证码 + String phoneSmsCode = (String) redisUtil.get(phone); + + // 验证码校验 + if (StringUtils.isNotBlank(phoneSmsCode) && Objects.equals(phoneSmsCode,smsCode)) { + // 验证码校验成功 + // 根据手机号查询卡号 + JSONObject jsonObject = HuiLianTongUnionCardConfig.queryCardByMobile(phone); + if(jsonObject.getString("respCode").equals("0000") && jsonObject.getString("respMessage").equals("ok")) { + JSONObject dataObject = HuiLianTongUnionCardConfig.resolveResponse(jsonObject.getString("data")); + JSONArray cards = dataObject.getJSONArray("cards"); + for (Object cardObject : cards) { + JSONObject card = (JSONObject)cardObject; + if (highUserCardService.getDetailByUserCardNo(userInfoModel.getHighUser().getId(), card.getString("cardNo")) != null) { + card.put("bindStatus", true); + } else { + card.put("bindStatus", false); + } + } + redisUtil.del(phone); + return ResponseMsgUtil.success(cards); + } else { + System.out.println(jsonObject); + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "查询失败"); + } + } + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "验证码错误"); + } catch (Exception e) { + log.error("HighUserCardController --> getHuiLianTongCardByPhone() error!", e); + return ResponseMsgUtil.exception(e); + } + } + + +} diff --git a/hai-cweb/src/main/java/com/cweb/controller/SmsContentController.java b/hai-cweb/src/main/java/com/cweb/controller/SmsContentController.java index ae441f6c..2f304084 100644 --- a/hai-cweb/src/main/java/com/cweb/controller/SmsContentController.java +++ b/hai-cweb/src/main/java/com/cweb/controller/SmsContentController.java @@ -1,22 +1,16 @@ package com.cweb.controller; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.hai.common.Base64Util; import com.hai.common.security.VerifyCode; import com.hai.common.security.VerifyCodeStorage; import com.hai.common.utils.DateUtil; import com.hai.common.utils.HttpsUtils; +import com.hai.common.utils.RedisUtil; import com.hai.common.utils.ResponseMsgUtil; -import com.hai.entity.BsCompany; -import com.hai.entity.SecRegion; import com.hai.model.ResponseData; -import com.hai.service.CommonService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import netscape.javascript.JSObject; -import org.bouncycastle.jcajce.provider.digest.SHA256; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Controller; @@ -40,6 +34,9 @@ public class SmsContentController { private static Logger log = LoggerFactory.getLogger(CmsContentController.class); + @Resource + private RedisUtil redisUtil; + @RequestMapping(value = "/sendSmsCode", method = RequestMethod.GET) @ApiOperation(value = "发送短信验证码") @ResponseBody @@ -65,8 +62,7 @@ public class SmsContentController { JSONObject object = HttpsUtils.doSmsPost("https://rtcsms.cn-north-1.myhuaweicloud.com:10743/sms/batchSendSms/v1", body,header); String code = object.getString("code"); if (code.equals("000000")) { - verifyCode = new VerifyCode(phone,smsCode); - VerifyCodeStorage.save(verifyCode); + redisUtil.set(phone,smsCode, 60*10); return ResponseMsgUtil.success("发送成功"); } return ResponseMsgUtil.success(object); @@ -81,7 +77,7 @@ public class SmsContentController { @ResponseBody public ResponseData getSmsCode(@RequestParam(value = "phone", required = true) String phone) { try { - return ResponseMsgUtil.success(VerifyCodeStorage.getDate(phone)); + return ResponseMsgUtil.success(redisUtil.get(phone)); } catch (Exception e) { log.error("CmsContentController --> getSmsCode() error!", e); return ResponseMsgUtil.exception(e); diff --git a/hai-service/src/main/java/com/hai/common/exception/ErrorCode.java b/hai-service/src/main/java/com/hai/common/exception/ErrorCode.java index b8b7ac01..1a5115ea 100644 --- a/hai-service/src/main/java/com/hai/common/exception/ErrorCode.java +++ b/hai-service/src/main/java/com/hai/common/exception/ErrorCode.java @@ -114,11 +114,13 @@ public enum ErrorCode { NOT_ENTER_USER_PAY_PWD("2131","未输入支付密码"), USER_PAY_PWD_ERROR("2132","支付密码错误"), + STATUS_ERROR("3000","状态错误"), ADD_DATA_ERROR("3001","增加数据失败"), UPDATE_DATA_ERROR("3002","修改数据失败"), DELETE_DATA_ERROR("3003","删除数据失败"), COMPETENCE_INSUFFICIENT("3004","权限不足"), + REQUEST_ERROR("3005","请求错误"), MSG_EVENT_NULL("2999","消息类型为空"), USE_VISIT_ILLEGAL("4001","用户身份错误"), diff --git a/hai-service/src/main/java/com/hai/common/security/DesUtil.java b/hai-service/src/main/java/com/hai/common/security/DesUtil.java index 64ccb4fd..e700d75c 100644 --- a/hai-service/src/main/java/com/hai/common/security/DesUtil.java +++ b/hai-service/src/main/java/com/hai/common/security/DesUtil.java @@ -252,7 +252,8 @@ public class DesUtil { /*String s = encode("中国", Charset.forName("UTF-8"),"12345678"); System.out.println(s);*/ //String data = "T3xbPEKEXV9+CbBw8D1B+N2jk8xwa55s0Bde48c49YDwYfnUdBVz6Kj4HS2oCA1TTiqJkCUIYa5ckMhJeByBCAMsqu21LmFjb/hdW0y1Tt0Wk5PqmO8FAg=="; - String data = "T3xbPEKEXV9+CbBw8D1B+N2jk8xwa55s0Bde48c49YBr4/b4yBwN2FIVZZn+Xg9KQTDoTCLu3YtByaWh7zPmdcpBr9FGARduhPrwSnYTFJ0VVVSK/UzPWdHN2YYd4yHGQRJ2HEr/1egt2JUHpWr0JA=="; + String data = "T3xbPEKEXV9+CbBw8D1B+N2jk8xwa55s0Bde48c49YDMmj1rv5nOrkawWt8fskSihNw0wugKUT1xWjHhIN8af7NylRVfhJvbeja2Zjjxnwk3FEKgyvIvJnk3QgiY4aghqQcGKxDOlAxT/kjrkDd2ESu1IWkpi+0HGnG3rKSL6+a1Nu7aW+rPHwXUOmHSgWFZFb9HhlfKI/jml3GhMZBWsZFirayyMMi8UKrdYN7ANPEB/6uV9iVtpLF5Kz8M2+GpI0EqRhPFAH2u3Q/RSgW8ei2ZbOY9NnbkdwuOjU93wgJxdY1Y93hvLYNe1i9QkSM1"; + String data1 = "T3xbPEKEXV9+CbBw8D1B+N2jk8xwa55s0Bde48c49YBr4/b4yBwN2FIVZZn+Xg9KQTDoTCLu3YtByaWh7zPmdcpBr9FGARduhPrwSnYTFJ0VVVSK/UzPWdHN2YYd4yHGQRJ2HEr/1egt2JUHpWr0JA=="; /* { "success": true, "message": "ok", diff --git a/hai-service/src/main/java/com/hai/config/CommonSysConfig.java b/hai-service/src/main/java/com/hai/config/CommonSysConfig.java index 4cf4b468..6cd33b97 100644 --- a/hai-service/src/main/java/com/hai/config/CommonSysConfig.java +++ b/hai-service/src/main/java/com/hai/config/CommonSysConfig.java @@ -27,6 +27,10 @@ public class CommonSysConfig { private String huiliantongAppkey; private String huiliantongAppsecret; + private String HuiLianTongUnionCardUrl; + private String HuiLianTongUnionCardAccessCode; + private String HuiLianTongUnionCardSignCode; + private String wx_cert; private String telApiKey; @@ -35,6 +39,30 @@ public class CommonSysConfig { private String telUrl; private String czOrderNotify; + public String getHuiLianTongUnionCardUrl() { + return HuiLianTongUnionCardUrl; + } + + public void setHuiLianTongUnionCardUrl(String huiLianTongUnionCardUrl) { + HuiLianTongUnionCardUrl = huiLianTongUnionCardUrl; + } + + public String getHuiLianTongUnionCardAccessCode() { + return HuiLianTongUnionCardAccessCode; + } + + public void setHuiLianTongUnionCardAccessCode(String huiLianTongUnionCardAccessCode) { + HuiLianTongUnionCardAccessCode = huiLianTongUnionCardAccessCode; + } + + public String getHuiLianTongUnionCardSignCode() { + return HuiLianTongUnionCardSignCode; + } + + public void setHuiLianTongUnionCardSignCode(String huiLianTongUnionCardSignCode) { + HuiLianTongUnionCardSignCode = huiLianTongUnionCardSignCode; + } + public String getHuiliantongAppNo() { return huiliantongAppNo; } diff --git a/hai-service/src/main/java/com/hai/config/HuiLianTongUnionCardConfig.java b/hai-service/src/main/java/com/hai/config/HuiLianTongUnionCardConfig.java index 80bf5ab5..68ee8f51 100644 --- a/hai-service/src/main/java/com/hai/config/HuiLianTongUnionCardConfig.java +++ b/hai-service/src/main/java/com/hai/config/HuiLianTongUnionCardConfig.java @@ -2,141 +2,130 @@ package com.hai.config; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.hai.common.exception.ErrorCode; +import com.hai.common.exception.ErrorHelp; +import com.hai.common.exception.SysCode; import com.hai.common.pay.util.MD5Util; import com.hai.common.security.DesUtil; +import com.hai.common.utils.DateUtil; import com.hai.common.utils.HttpsUtils; import org.apache.commons.collections4.MapUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.nio.charset.Charset; import java.util.*; /** - * 汇联通会员卡业务接口 + * 汇联通会员卡业务接口【贵州高速工会卡】 */ public class HuiLianTongUnionCardConfig { /** - * 获取token + * 根据手机号查询工会卡 + * @param phone * @return * @throws Exception */ - public static JSONObject queryCardByMobile() throws Exception { - // 签名码 - String signCode = "F8E91A3C"; - - Map map = new LinkedHashMap<>(); - map.put("accessCode", "6FCAE1470CEF465988351BB65ABAA8AE"); - map.put("requestId", new Date().getTime()); - map.put("method", "qgk/queryCardByMobile"); - - // 业务数据 + public static JSONObject queryCardByMobile(String phone) throws Exception { Map dataMap = new HashMap<>(); - dataMap.put("userMobile", "15185028745"); - - // 转换成json - String dataJson = JSONObject.toJSONString(dataMap); - System.out.println(dataJson); - - // DES加密 - map.put("data", DesUtil.encode(dataJson, Charset.forName("UTF-8"),signCode)); - System.out.println(MapUtils.getString(map,"data")); - - // 数据签名字符串 - String str = (MapUtils.getString(map,"accessCode")+signCode); - str +=(MapUtils.getString(map,"requestId")+signCode) ; - str += (MapUtils.getString(map,"method") + signCode); - str += (MapUtils.getString(map,"data") + signCode); - System.out.println(str); - - // MD5加密 - map.put("sign", MD5Util.MD5Encode(str, "UTF-8").toUpperCase()); - System.out.println(MapUtils.getString(map, "sign")); - return HttpsUtils.doPost("http://hltgz.com:4010/api/v2/execute.json", JSON.toJSONString(map)); + dataMap.put("userMobile", phone); + return request("qgk/queryCardByMobile", dataMap); } /** - * 获取token + * 查询卡信息 + * @param cardNo 工会卡号 * @return * @throws Exception */ - public static JSONObject queryBalance() throws Exception { - // 签名码 - String signCode = "F8E91A3C"; - - Map map = new LinkedHashMap<>(); - map.put("accessCode", "6FCAE1470CEF465988351BB65ABAA8AE"); - map.put("requestId", new Date().getTime()); - map.put("method", "qtk/queryBalance"); + public static JSONObject queryCardInfo(String cardNo) throws Exception { + Map dataMap = new HashMap<>(); + dataMap.put("cardNo", cardNo); + return request("qgk/queryCardInfo", dataMap); + } - // 业务数据 + /** + * 查询余额 + * @param cardNo 工会卡号 + * @return + * @throws Exception + */ + public static JSONObject queryBalance(String cardNo) throws Exception { Map dataMap = new HashMap<>(); dataMap.put("cardType", "ghk"); - dataMap.put("cardNo", "8800030115015107746"); - - // 转换成json - String dataJson = JSONObject.toJSONString(dataMap); - System.out.println(dataJson); - - // DES加密 - map.put("data", DesUtil.encode(dataJson, Charset.forName("UTF-8"),signCode)); - System.out.println(MapUtils.getString(map,"data")); - - // 数据签名字符串 - String str = (MapUtils.getString(map,"accessCode")+signCode); - str +=(MapUtils.getString(map,"requestId")+signCode) ; - str += (MapUtils.getString(map,"method") + signCode); - str += (MapUtils.getString(map,"data") + signCode); - System.out.println(str); + dataMap.put("cardNo", cardNo); + return request("qtk/queryBalance", dataMap); + } - // MD5加密 - map.put("sign", MD5Util.MD5Encode(str, "UTF-8").toUpperCase()); - System.out.println(MapUtils.getString(map, "sign")); - return HttpsUtils.doPost("http://hltgz.com:4010/api/v2/execute.json", JSON.toJSONString(map)); - // return null; + /** + * 根据业务类型查询消费记录 + * @param businessType 业务类型 1.卖中石化加油券的,固定填sinopec_oil_code 2.其他商品或服务的,固定填hisen_consume + * @param cardNo 工会卡号 + * @param page 页数 + * @param pageSize 每页条数 + * @param sdate 起始日期 yyyy-MM-dd格式 + * @param edate 截止日期 yyyy-MM-dd格式 + * @return + * @throws Exception + */ + public static JSONObject queryConsumptionRecordByBusiness(String businessType,String cardNo,Integer page,Integer pageSize,Long sdate,Long edate) throws Exception { + Map dataMap = new HashMap<>(); + dataMap.put("businessType", businessType); + dataMap.put("cardNo", cardNo); + dataMap.put("page", page); + dataMap.put("pageSize", pageSize); + if (sdate != null) { + dataMap.put("sdate", DateUtil.date2String(new Date(sdate), "yyyy-MM-dd")); + } + if (edate != null) { + dataMap.put("edate", DateUtil.date2String(new Date(edate), "yyyy-MM-dd")); + } + return request("qtk/queryConsumptionRecordByBusiness", dataMap); } + /** - * 获取token + * 会员卡业务请求 + * @param method 接口名称 + * @param param 业务参数 * @return * @throws Exception */ - public static JSONObject queryCardInfo() throws Exception { + private static JSONObject request(String method,Map param) throws Exception { // 签名码 - String signCode = "F8E91A3C"; + String signCode = CommonSysConst.getSysConfig().getHuiLianTongUnionCardSignCode(); Map map = new LinkedHashMap<>(); - map.put("accessCode", "6FCAE1470CEF465988351BB65ABAA8AE"); + map.put("accessCode", CommonSysConst.getSysConfig().getHuiLianTongUnionCardAccessCode()); map.put("requestId", new Date().getTime()); - map.put("method", "qgk/queryCardInfo"); - - // 业务数据 - Map dataMap = new HashMap<>(); - dataMap.put("cardNo", "8800030115015107746"); - - // 转换成json - String dataJson = JSONObject.toJSONString(dataMap); - System.out.println(dataJson); + map.put("method", method); // DES加密 - map.put("data", DesUtil.encode(dataJson, Charset.forName("UTF-8"),signCode)); - System.out.println(MapUtils.getString(map,"data")); + map.put("data", DesUtil.encode(JSONObject.toJSONString(param), Charset.forName("UTF-8"),signCode).replace("\\n", "")); // 数据签名字符串 String str = (MapUtils.getString(map,"accessCode")+signCode); str +=(MapUtils.getString(map,"requestId")+signCode) ; str += (MapUtils.getString(map,"method") + signCode); str += (MapUtils.getString(map,"data") + signCode); - System.out.println(str); // MD5加密 map.put("sign", MD5Util.MD5Encode(str, "UTF-8").toUpperCase()); - System.out.println(MapUtils.getString(map, "sign")); - return HttpsUtils.doPost("http://hltgz.com:4010/api/v2/execute.json", JSON.toJSONString(map)); - // return null; + return HttpsUtils.doPost(CommonSysConst.getSysConfig().getHuiLianTongUnionCardUrl(), JSON.toJSONString(map)); } - + /** + * 解析响应的参数 + * @param param 参数 + * @return + */ + public static JSONObject resolveResponse(String param) { + String data = param.replace("\\n", ""); + String decodeData = DesUtil.decode(CommonSysConst.getSysConfig().getHuiLianTongUnionCardSignCode(), data, Charset.forName("UTF-8")); + return JSONObject.parseObject(decodeData); + } } diff --git a/hai-service/src/main/java/com/hai/dao/HighOrderMapper.java b/hai-service/src/main/java/com/hai/dao/HighOrderMapper.java index 745bf8d0..a771d138 100644 --- a/hai-service/src/main/java/com/hai/dao/HighOrderMapper.java +++ b/hai-service/src/main/java/com/hai/dao/HighOrderMapper.java @@ -42,31 +42,33 @@ public interface HighOrderMapper extends HighOrderMapperExt { "insert into high_order (order_no, mem_discount_id, ", "mem_discount_name, mem_id, ", "mem_name, mem_phone, ", - "pay_model, pay_type, ", - "pay_gold, pay_price, ", - "pay_real_price, pay_serial_no, ", - "deduction_price, order_status, ", - "total_price, create_time, ", - "pay_time, cancel_time, ", - "cancel_remarks, finish_time, ", - "remarks, refund_time, ", - "refund_price, refund_content, ", - "refusal_refund_content, ext_1, ", - "ext_2, ext_3)", + "mem_card_id, mem_card_type, ", + "mem_card_no, pay_model, ", + "pay_type, pay_gold, ", + "pay_price, pay_real_price, ", + "pay_serial_no, deduction_price, ", + "order_status, total_price, ", + "create_time, pay_time, ", + "cancel_time, cancel_remarks, ", + "finish_time, remarks, ", + "refund_time, refund_price, ", + "refund_content, refusal_refund_content, ", + "ext_1, ext_2, ext_3)", "values (#{orderNo,jdbcType=VARCHAR}, #{memDiscountId,jdbcType=BIGINT}, ", "#{memDiscountName,jdbcType=VARCHAR}, #{memId,jdbcType=BIGINT}, ", "#{memName,jdbcType=VARCHAR}, #{memPhone,jdbcType=VARCHAR}, ", - "#{payModel,jdbcType=INTEGER}, #{payType,jdbcType=INTEGER}, ", - "#{payGold,jdbcType=INTEGER}, #{payPrice,jdbcType=DECIMAL}, ", - "#{payRealPrice,jdbcType=DECIMAL}, #{paySerialNo,jdbcType=VARCHAR}, ", - "#{deductionPrice,jdbcType=DECIMAL}, #{orderStatus,jdbcType=INTEGER}, ", - "#{totalPrice,jdbcType=DECIMAL}, #{createTime,jdbcType=TIMESTAMP}, ", - "#{payTime,jdbcType=TIMESTAMP}, #{cancelTime,jdbcType=TIMESTAMP}, ", - "#{cancelRemarks,jdbcType=VARCHAR}, #{finishTime,jdbcType=TIMESTAMP}, ", - "#{remarks,jdbcType=VARCHAR}, #{refundTime,jdbcType=TIMESTAMP}, ", - "#{refundPrice,jdbcType=DECIMAL}, #{refundContent,jdbcType=VARCHAR}, ", - "#{refusalRefundContent,jdbcType=VARCHAR}, #{ext1,jdbcType=VARCHAR}, ", - "#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" + "#{memCardId,jdbcType=BIGINT}, #{memCardType,jdbcType=INTEGER}, ", + "#{memCardNo,jdbcType=VARCHAR}, #{payModel,jdbcType=INTEGER}, ", + "#{payType,jdbcType=INTEGER}, #{payGold,jdbcType=INTEGER}, ", + "#{payPrice,jdbcType=DECIMAL}, #{payRealPrice,jdbcType=DECIMAL}, ", + "#{paySerialNo,jdbcType=VARCHAR}, #{deductionPrice,jdbcType=DECIMAL}, ", + "#{orderStatus,jdbcType=INTEGER}, #{totalPrice,jdbcType=DECIMAL}, ", + "#{createTime,jdbcType=TIMESTAMP}, #{payTime,jdbcType=TIMESTAMP}, ", + "#{cancelTime,jdbcType=TIMESTAMP}, #{cancelRemarks,jdbcType=VARCHAR}, ", + "#{finishTime,jdbcType=TIMESTAMP}, #{remarks,jdbcType=VARCHAR}, ", + "#{refundTime,jdbcType=TIMESTAMP}, #{refundPrice,jdbcType=DECIMAL}, ", + "#{refundContent,jdbcType=VARCHAR}, #{refusalRefundContent,jdbcType=VARCHAR}, ", + "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" }) @Options(useGeneratedKeys=true,keyProperty="id") int insert(HighOrder record); @@ -84,6 +86,9 @@ public interface HighOrderMapper extends HighOrderMapperExt { @Result(column="mem_id", property="memId", jdbcType=JdbcType.BIGINT), @Result(column="mem_name", property="memName", jdbcType=JdbcType.VARCHAR), @Result(column="mem_phone", property="memPhone", jdbcType=JdbcType.VARCHAR), + @Result(column="mem_card_id", property="memCardId", jdbcType=JdbcType.BIGINT), + @Result(column="mem_card_type", property="memCardType", jdbcType=JdbcType.INTEGER), + @Result(column="mem_card_no", property="memCardNo", jdbcType=JdbcType.VARCHAR), @Result(column="pay_model", property="payModel", jdbcType=JdbcType.INTEGER), @Result(column="pay_type", property="payType", jdbcType=JdbcType.INTEGER), @Result(column="pay_gold", property="payGold", jdbcType=JdbcType.INTEGER), @@ -112,10 +117,10 @@ public interface HighOrderMapper extends HighOrderMapperExt { @Select({ "select", "id, order_no, mem_discount_id, mem_discount_name, mem_id, mem_name, mem_phone, ", - "pay_model, pay_type, pay_gold, pay_price, pay_real_price, pay_serial_no, deduction_price, ", - "order_status, total_price, create_time, pay_time, cancel_time, cancel_remarks, ", - "finish_time, remarks, refund_time, refund_price, refund_content, refusal_refund_content, ", - "ext_1, ext_2, ext_3", + "mem_card_id, mem_card_type, mem_card_no, pay_model, pay_type, pay_gold, pay_price, ", + "pay_real_price, pay_serial_no, deduction_price, order_status, total_price, create_time, ", + "pay_time, cancel_time, cancel_remarks, finish_time, remarks, refund_time, refund_price, ", + "refund_content, refusal_refund_content, ext_1, ext_2, ext_3", "from high_order", "where id = #{id,jdbcType=BIGINT}" }) @@ -127,6 +132,9 @@ public interface HighOrderMapper extends HighOrderMapperExt { @Result(column="mem_id", property="memId", jdbcType=JdbcType.BIGINT), @Result(column="mem_name", property="memName", jdbcType=JdbcType.VARCHAR), @Result(column="mem_phone", property="memPhone", jdbcType=JdbcType.VARCHAR), + @Result(column="mem_card_id", property="memCardId", jdbcType=JdbcType.BIGINT), + @Result(column="mem_card_type", property="memCardType", jdbcType=JdbcType.INTEGER), + @Result(column="mem_card_no", property="memCardNo", jdbcType=JdbcType.VARCHAR), @Result(column="pay_model", property="payModel", jdbcType=JdbcType.INTEGER), @Result(column="pay_type", property="payType", jdbcType=JdbcType.INTEGER), @Result(column="pay_gold", property="payGold", jdbcType=JdbcType.INTEGER), @@ -169,6 +177,9 @@ public interface HighOrderMapper extends HighOrderMapperExt { "mem_id = #{memId,jdbcType=BIGINT},", "mem_name = #{memName,jdbcType=VARCHAR},", "mem_phone = #{memPhone,jdbcType=VARCHAR},", + "mem_card_id = #{memCardId,jdbcType=BIGINT},", + "mem_card_type = #{memCardType,jdbcType=INTEGER},", + "mem_card_no = #{memCardNo,jdbcType=VARCHAR},", "pay_model = #{payModel,jdbcType=INTEGER},", "pay_type = #{payType,jdbcType=INTEGER},", "pay_gold = #{payGold,jdbcType=INTEGER},", diff --git a/hai-service/src/main/java/com/hai/dao/HighOrderSqlProvider.java b/hai-service/src/main/java/com/hai/dao/HighOrderSqlProvider.java index 1455a8a5..8a9fd1a2 100644 --- a/hai-service/src/main/java/com/hai/dao/HighOrderSqlProvider.java +++ b/hai-service/src/main/java/com/hai/dao/HighOrderSqlProvider.java @@ -52,6 +52,18 @@ public class HighOrderSqlProvider { sql.VALUES("mem_phone", "#{memPhone,jdbcType=VARCHAR}"); } + if (record.getMemCardId() != null) { + sql.VALUES("mem_card_id", "#{memCardId,jdbcType=BIGINT}"); + } + + if (record.getMemCardType() != null) { + sql.VALUES("mem_card_type", "#{memCardType,jdbcType=INTEGER}"); + } + + if (record.getMemCardNo() != null) { + sql.VALUES("mem_card_no", "#{memCardNo,jdbcType=VARCHAR}"); + } + if (record.getPayModel() != null) { sql.VALUES("pay_model", "#{payModel,jdbcType=INTEGER}"); } @@ -156,6 +168,9 @@ public class HighOrderSqlProvider { sql.SELECT("mem_id"); sql.SELECT("mem_name"); sql.SELECT("mem_phone"); + sql.SELECT("mem_card_id"); + sql.SELECT("mem_card_type"); + sql.SELECT("mem_card_no"); sql.SELECT("pay_model"); sql.SELECT("pay_type"); sql.SELECT("pay_gold"); @@ -223,6 +238,18 @@ public class HighOrderSqlProvider { sql.SET("mem_phone = #{record.memPhone,jdbcType=VARCHAR}"); } + if (record.getMemCardId() != null) { + sql.SET("mem_card_id = #{record.memCardId,jdbcType=BIGINT}"); + } + + if (record.getMemCardType() != null) { + sql.SET("mem_card_type = #{record.memCardType,jdbcType=INTEGER}"); + } + + if (record.getMemCardNo() != null) { + sql.SET("mem_card_no = #{record.memCardNo,jdbcType=VARCHAR}"); + } + if (record.getPayModel() != null) { sql.SET("pay_model = #{record.payModel,jdbcType=INTEGER}"); } @@ -326,6 +353,9 @@ public class HighOrderSqlProvider { sql.SET("mem_id = #{record.memId,jdbcType=BIGINT}"); sql.SET("mem_name = #{record.memName,jdbcType=VARCHAR}"); sql.SET("mem_phone = #{record.memPhone,jdbcType=VARCHAR}"); + sql.SET("mem_card_id = #{record.memCardId,jdbcType=BIGINT}"); + sql.SET("mem_card_type = #{record.memCardType,jdbcType=INTEGER}"); + sql.SET("mem_card_no = #{record.memCardNo,jdbcType=VARCHAR}"); sql.SET("pay_model = #{record.payModel,jdbcType=INTEGER}"); sql.SET("pay_type = #{record.payType,jdbcType=INTEGER}"); sql.SET("pay_gold = #{record.payGold,jdbcType=INTEGER}"); @@ -382,6 +412,18 @@ public class HighOrderSqlProvider { sql.SET("mem_phone = #{memPhone,jdbcType=VARCHAR}"); } + if (record.getMemCardId() != null) { + sql.SET("mem_card_id = #{memCardId,jdbcType=BIGINT}"); + } + + if (record.getMemCardType() != null) { + sql.SET("mem_card_type = #{memCardType,jdbcType=INTEGER}"); + } + + if (record.getMemCardNo() != null) { + sql.SET("mem_card_no = #{memCardNo,jdbcType=VARCHAR}"); + } + if (record.getPayModel() != null) { sql.SET("pay_model = #{payModel,jdbcType=INTEGER}"); } diff --git a/hai-service/src/main/java/com/hai/dao/HighUserCardMapper.java b/hai-service/src/main/java/com/hai/dao/HighUserCardMapper.java new file mode 100644 index 00000000..5324b4ec --- /dev/null +++ b/hai-service/src/main/java/com/hai/dao/HighUserCardMapper.java @@ -0,0 +1,117 @@ +package com.hai.dao; + +import com.hai.entity.HighUserCard; +import com.hai.entity.HighUserCardExample; +import java.util.List; +import org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.DeleteProvider; +import org.apache.ibatis.annotations.Insert; +import org.apache.ibatis.annotations.InsertProvider; +import org.apache.ibatis.annotations.Options; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Result; +import org.apache.ibatis.annotations.Results; +import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.SelectProvider; +import org.apache.ibatis.annotations.Update; +import org.apache.ibatis.annotations.UpdateProvider; +import org.apache.ibatis.type.JdbcType; +import org.springframework.stereotype.Repository; + +/** + * + * 代码由工具生成,请勿修改!!! + * 如果需要扩展请在其父类进行扩展 + * + **/ +@Repository +public interface HighUserCardMapper extends HighUserCardMapperExt { + @SelectProvider(type=HighUserCardSqlProvider.class, method="countByExample") + long countByExample(HighUserCardExample example); + + @DeleteProvider(type=HighUserCardSqlProvider.class, method="deleteByExample") + int deleteByExample(HighUserCardExample example); + + @Delete({ + "delete from high_user_card", + "where id = #{id,jdbcType=BIGINT}" + }) + int deleteByPrimaryKey(Long id); + + @Insert({ + "insert into high_user_card (user_id, card_no, ", + "`type`, `status`, create_time, ", + "update_time, ext_1, ", + "ext_2, ext_3)", + "values (#{userId,jdbcType=BIGINT}, #{cardNo,jdbcType=VARCHAR}, ", + "#{type,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, ", + "#{updateTime,jdbcType=TIMESTAMP}, #{ext1,jdbcType=VARCHAR}, ", + "#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" + }) + @Options(useGeneratedKeys=true,keyProperty="id") + int insert(HighUserCard record); + + @InsertProvider(type=HighUserCardSqlProvider.class, method="insertSelective") + @Options(useGeneratedKeys=true,keyProperty="id") + int insertSelective(HighUserCard record); + + @SelectProvider(type=HighUserCardSqlProvider.class, method="selectByExample") + @Results({ + @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), + @Result(column="user_id", property="userId", jdbcType=JdbcType.BIGINT), + @Result(column="card_no", property="cardNo", jdbcType=JdbcType.VARCHAR), + @Result(column="type", property="type", jdbcType=JdbcType.INTEGER), + @Result(column="status", property="status", jdbcType=JdbcType.INTEGER), + @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP), + @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP), + @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR), + @Result(column="ext_2", property="ext2", jdbcType=JdbcType.VARCHAR), + @Result(column="ext_3", property="ext3", jdbcType=JdbcType.VARCHAR) + }) + List selectByExample(HighUserCardExample example); + + @Select({ + "select", + "id, user_id, card_no, `type`, `status`, create_time, update_time, ext_1, ext_2, ", + "ext_3", + "from high_user_card", + "where id = #{id,jdbcType=BIGINT}" + }) + @Results({ + @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), + @Result(column="user_id", property="userId", jdbcType=JdbcType.BIGINT), + @Result(column="card_no", property="cardNo", jdbcType=JdbcType.VARCHAR), + @Result(column="type", property="type", jdbcType=JdbcType.INTEGER), + @Result(column="status", property="status", jdbcType=JdbcType.INTEGER), + @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP), + @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP), + @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR), + @Result(column="ext_2", property="ext2", jdbcType=JdbcType.VARCHAR), + @Result(column="ext_3", property="ext3", jdbcType=JdbcType.VARCHAR) + }) + HighUserCard selectByPrimaryKey(Long id); + + @UpdateProvider(type=HighUserCardSqlProvider.class, method="updateByExampleSelective") + int updateByExampleSelective(@Param("record") HighUserCard record, @Param("example") HighUserCardExample example); + + @UpdateProvider(type=HighUserCardSqlProvider.class, method="updateByExample") + int updateByExample(@Param("record") HighUserCard record, @Param("example") HighUserCardExample example); + + @UpdateProvider(type=HighUserCardSqlProvider.class, method="updateByPrimaryKeySelective") + int updateByPrimaryKeySelective(HighUserCard record); + + @Update({ + "update high_user_card", + "set user_id = #{userId,jdbcType=BIGINT},", + "card_no = #{cardNo,jdbcType=VARCHAR},", + "`type` = #{type,jdbcType=INTEGER},", + "`status` = #{status,jdbcType=INTEGER},", + "create_time = #{createTime,jdbcType=TIMESTAMP},", + "update_time = #{updateTime,jdbcType=TIMESTAMP},", + "ext_1 = #{ext1,jdbcType=VARCHAR},", + "ext_2 = #{ext2,jdbcType=VARCHAR},", + "ext_3 = #{ext3,jdbcType=VARCHAR}", + "where id = #{id,jdbcType=BIGINT}" + }) + int updateByPrimaryKey(HighUserCard record); +} \ No newline at end of file diff --git a/hai-service/src/main/java/com/hai/dao/HighUserCardMapperExt.java b/hai-service/src/main/java/com/hai/dao/HighUserCardMapperExt.java new file mode 100644 index 00000000..51639f72 --- /dev/null +++ b/hai-service/src/main/java/com/hai/dao/HighUserCardMapperExt.java @@ -0,0 +1,7 @@ +package com.hai.dao; + +/** + * mapper扩展类 + */ +public interface HighUserCardMapperExt { +} \ No newline at end of file diff --git a/hai-service/src/main/java/com/hai/dao/HighUserCardSqlProvider.java b/hai-service/src/main/java/com/hai/dao/HighUserCardSqlProvider.java new file mode 100644 index 00000000..64f5adfb --- /dev/null +++ b/hai-service/src/main/java/com/hai/dao/HighUserCardSqlProvider.java @@ -0,0 +1,304 @@ +package com.hai.dao; + +import com.hai.entity.HighUserCard; +import com.hai.entity.HighUserCardExample.Criteria; +import com.hai.entity.HighUserCardExample.Criterion; +import com.hai.entity.HighUserCardExample; +import java.util.List; +import java.util.Map; +import org.apache.ibatis.jdbc.SQL; + +public class HighUserCardSqlProvider { + + public String countByExample(HighUserCardExample example) { + SQL sql = new SQL(); + sql.SELECT("count(*)").FROM("high_user_card"); + applyWhere(sql, example, false); + return sql.toString(); + } + + public String deleteByExample(HighUserCardExample example) { + SQL sql = new SQL(); + sql.DELETE_FROM("high_user_card"); + applyWhere(sql, example, false); + return sql.toString(); + } + + public String insertSelective(HighUserCard record) { + SQL sql = new SQL(); + sql.INSERT_INTO("high_user_card"); + + if (record.getUserId() != null) { + sql.VALUES("user_id", "#{userId,jdbcType=BIGINT}"); + } + + if (record.getCardNo() != null) { + sql.VALUES("card_no", "#{cardNo,jdbcType=VARCHAR}"); + } + + if (record.getType() != null) { + sql.VALUES("`type`", "#{type,jdbcType=INTEGER}"); + } + + if (record.getStatus() != null) { + sql.VALUES("`status`", "#{status,jdbcType=INTEGER}"); + } + + if (record.getCreateTime() != null) { + sql.VALUES("create_time", "#{createTime,jdbcType=TIMESTAMP}"); + } + + if (record.getUpdateTime() != null) { + sql.VALUES("update_time", "#{updateTime,jdbcType=TIMESTAMP}"); + } + + if (record.getExt1() != null) { + sql.VALUES("ext_1", "#{ext1,jdbcType=VARCHAR}"); + } + + if (record.getExt2() != null) { + sql.VALUES("ext_2", "#{ext2,jdbcType=VARCHAR}"); + } + + if (record.getExt3() != null) { + sql.VALUES("ext_3", "#{ext3,jdbcType=VARCHAR}"); + } + + return sql.toString(); + } + + public String selectByExample(HighUserCardExample example) { + SQL sql = new SQL(); + if (example != null && example.isDistinct()) { + sql.SELECT_DISTINCT("id"); + } else { + sql.SELECT("id"); + } + sql.SELECT("user_id"); + sql.SELECT("card_no"); + sql.SELECT("`type`"); + sql.SELECT("`status`"); + sql.SELECT("create_time"); + sql.SELECT("update_time"); + sql.SELECT("ext_1"); + sql.SELECT("ext_2"); + sql.SELECT("ext_3"); + sql.FROM("high_user_card"); + applyWhere(sql, example, false); + + if (example != null && example.getOrderByClause() != null) { + sql.ORDER_BY(example.getOrderByClause()); + } + + return sql.toString(); + } + + public String updateByExampleSelective(Map parameter) { + HighUserCard record = (HighUserCard) parameter.get("record"); + HighUserCardExample example = (HighUserCardExample) parameter.get("example"); + + SQL sql = new SQL(); + sql.UPDATE("high_user_card"); + + if (record.getId() != null) { + sql.SET("id = #{record.id,jdbcType=BIGINT}"); + } + + if (record.getUserId() != null) { + sql.SET("user_id = #{record.userId,jdbcType=BIGINT}"); + } + + if (record.getCardNo() != null) { + sql.SET("card_no = #{record.cardNo,jdbcType=VARCHAR}"); + } + + if (record.getType() != null) { + sql.SET("`type` = #{record.type,jdbcType=INTEGER}"); + } + + if (record.getStatus() != null) { + sql.SET("`status` = #{record.status,jdbcType=INTEGER}"); + } + + if (record.getCreateTime() != null) { + sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}"); + } + + if (record.getUpdateTime() != null) { + sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}"); + } + + if (record.getExt1() != null) { + sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}"); + } + + if (record.getExt2() != null) { + sql.SET("ext_2 = #{record.ext2,jdbcType=VARCHAR}"); + } + + if (record.getExt3() != null) { + sql.SET("ext_3 = #{record.ext3,jdbcType=VARCHAR}"); + } + + applyWhere(sql, example, true); + return sql.toString(); + } + + public String updateByExample(Map parameter) { + SQL sql = new SQL(); + sql.UPDATE("high_user_card"); + + sql.SET("id = #{record.id,jdbcType=BIGINT}"); + sql.SET("user_id = #{record.userId,jdbcType=BIGINT}"); + sql.SET("card_no = #{record.cardNo,jdbcType=VARCHAR}"); + sql.SET("`type` = #{record.type,jdbcType=INTEGER}"); + sql.SET("`status` = #{record.status,jdbcType=INTEGER}"); + sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}"); + sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}"); + sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}"); + sql.SET("ext_2 = #{record.ext2,jdbcType=VARCHAR}"); + sql.SET("ext_3 = #{record.ext3,jdbcType=VARCHAR}"); + + HighUserCardExample example = (HighUserCardExample) parameter.get("example"); + applyWhere(sql, example, true); + return sql.toString(); + } + + public String updateByPrimaryKeySelective(HighUserCard record) { + SQL sql = new SQL(); + sql.UPDATE("high_user_card"); + + if (record.getUserId() != null) { + sql.SET("user_id = #{userId,jdbcType=BIGINT}"); + } + + if (record.getCardNo() != null) { + sql.SET("card_no = #{cardNo,jdbcType=VARCHAR}"); + } + + if (record.getType() != null) { + sql.SET("`type` = #{type,jdbcType=INTEGER}"); + } + + if (record.getStatus() != null) { + sql.SET("`status` = #{status,jdbcType=INTEGER}"); + } + + if (record.getCreateTime() != null) { + sql.SET("create_time = #{createTime,jdbcType=TIMESTAMP}"); + } + + if (record.getUpdateTime() != null) { + sql.SET("update_time = #{updateTime,jdbcType=TIMESTAMP}"); + } + + if (record.getExt1() != null) { + sql.SET("ext_1 = #{ext1,jdbcType=VARCHAR}"); + } + + if (record.getExt2() != null) { + sql.SET("ext_2 = #{ext2,jdbcType=VARCHAR}"); + } + + if (record.getExt3() != null) { + sql.SET("ext_3 = #{ext3,jdbcType=VARCHAR}"); + } + + sql.WHERE("id = #{id,jdbcType=BIGINT}"); + + return sql.toString(); + } + + protected void applyWhere(SQL sql, HighUserCardExample example, boolean includeExamplePhrase) { + if (example == null) { + return; + } + + String parmPhrase1; + String parmPhrase1_th; + String parmPhrase2; + String parmPhrase2_th; + String parmPhrase3; + String parmPhrase3_th; + if (includeExamplePhrase) { + parmPhrase1 = "%s #{example.oredCriteria[%d].allCriteria[%d].value}"; + parmPhrase1_th = "%s #{example.oredCriteria[%d].allCriteria[%d].value,typeHandler=%s}"; + parmPhrase2 = "%s #{example.oredCriteria[%d].allCriteria[%d].value} and #{example.oredCriteria[%d].criteria[%d].secondValue}"; + parmPhrase2_th = "%s #{example.oredCriteria[%d].allCriteria[%d].value,typeHandler=%s} and #{example.oredCriteria[%d].criteria[%d].secondValue,typeHandler=%s}"; + parmPhrase3 = "#{example.oredCriteria[%d].allCriteria[%d].value[%d]}"; + parmPhrase3_th = "#{example.oredCriteria[%d].allCriteria[%d].value[%d],typeHandler=%s}"; + } else { + parmPhrase1 = "%s #{oredCriteria[%d].allCriteria[%d].value}"; + parmPhrase1_th = "%s #{oredCriteria[%d].allCriteria[%d].value,typeHandler=%s}"; + parmPhrase2 = "%s #{oredCriteria[%d].allCriteria[%d].value} and #{oredCriteria[%d].criteria[%d].secondValue}"; + parmPhrase2_th = "%s #{oredCriteria[%d].allCriteria[%d].value,typeHandler=%s} and #{oredCriteria[%d].criteria[%d].secondValue,typeHandler=%s}"; + parmPhrase3 = "#{oredCriteria[%d].allCriteria[%d].value[%d]}"; + parmPhrase3_th = "#{oredCriteria[%d].allCriteria[%d].value[%d],typeHandler=%s}"; + } + + StringBuilder sb = new StringBuilder(); + List oredCriteria = example.getOredCriteria(); + boolean firstCriteria = true; + for (int i = 0; i < oredCriteria.size(); i++) { + Criteria criteria = oredCriteria.get(i); + if (criteria.isValid()) { + if (firstCriteria) { + firstCriteria = false; + } else { + sb.append(" or "); + } + + sb.append('('); + List criterions = criteria.getAllCriteria(); + boolean firstCriterion = true; + for (int j = 0; j < criterions.size(); j++) { + Criterion criterion = criterions.get(j); + if (firstCriterion) { + firstCriterion = false; + } else { + sb.append(" and "); + } + + if (criterion.isNoValue()) { + sb.append(criterion.getCondition()); + } else if (criterion.isSingleValue()) { + if (criterion.getTypeHandler() == null) { + sb.append(String.format(parmPhrase1, criterion.getCondition(), i, j)); + } else { + sb.append(String.format(parmPhrase1_th, criterion.getCondition(), i, j,criterion.getTypeHandler())); + } + } else if (criterion.isBetweenValue()) { + if (criterion.getTypeHandler() == null) { + sb.append(String.format(parmPhrase2, criterion.getCondition(), i, j, i, j)); + } else { + sb.append(String.format(parmPhrase2_th, criterion.getCondition(), i, j, criterion.getTypeHandler(), i, j, criterion.getTypeHandler())); + } + } else if (criterion.isListValue()) { + sb.append(criterion.getCondition()); + sb.append(" ("); + List listItems = (List) criterion.getValue(); + boolean comma = false; + for (int k = 0; k < listItems.size(); k++) { + if (comma) { + sb.append(", "); + } else { + comma = true; + } + if (criterion.getTypeHandler() == null) { + sb.append(String.format(parmPhrase3, i, j, k)); + } else { + sb.append(String.format(parmPhrase3_th, i, j, k, criterion.getTypeHandler())); + } + } + sb.append(')'); + } + } + sb.append(')'); + } + } + + if (sb.length() > 0) { + sql.WHERE(sb.toString()); + } + } +} \ No newline at end of file diff --git a/hai-service/src/main/java/com/hai/entity/HighOrder.java b/hai-service/src/main/java/com/hai/entity/HighOrder.java index 635336f6..a1f33fba 100644 --- a/hai-service/src/main/java/com/hai/entity/HighOrder.java +++ b/hai-service/src/main/java/com/hai/entity/HighOrder.java @@ -50,13 +50,28 @@ public class HighOrder implements Serializable { */ private String memPhone; + /** + * 用户和卡号关系id + */ + private Long memCardId; + + /** + * 卡类型 + */ + private Integer memCardType; + + /** + * 卡号 + */ + private String memCardNo; + /** * 支付模式:1 金币,2 第三方平台,3 混合 */ private Integer payModel; /** - * 支付方式: 1:支付宝 2:微信 3:金币 + * 支付方式: 1:支付宝 2:微信 3:金币 4:汇联通工会卡 */ private Integer payType; @@ -155,6 +170,8 @@ public class HighOrder implements Serializable { private HighDiscount highDiscount; + private static final long serialVersionUID = 1L; + public List getHighChildOrderList() { return highChildOrderList; } @@ -171,7 +188,9 @@ public class HighOrder implements Serializable { this.highDiscount = highDiscount; } - private static final long serialVersionUID = 1L; + public static long getSerialVersionUID() { + return serialVersionUID; + } public Long getId() { return id; @@ -229,6 +248,30 @@ public class HighOrder implements Serializable { this.memPhone = memPhone; } + public Long getMemCardId() { + return memCardId; + } + + public void setMemCardId(Long memCardId) { + this.memCardId = memCardId; + } + + public Integer getMemCardType() { + return memCardType; + } + + public void setMemCardType(Integer memCardType) { + this.memCardType = memCardType; + } + + public String getMemCardNo() { + return memCardNo; + } + + public void setMemCardNo(String memCardNo) { + this.memCardNo = memCardNo; + } + public Integer getPayModel() { return payModel; } @@ -424,6 +467,9 @@ public class HighOrder implements Serializable { && (this.getMemId() == null ? other.getMemId() == null : this.getMemId().equals(other.getMemId())) && (this.getMemName() == null ? other.getMemName() == null : this.getMemName().equals(other.getMemName())) && (this.getMemPhone() == null ? other.getMemPhone() == null : this.getMemPhone().equals(other.getMemPhone())) + && (this.getMemCardId() == null ? other.getMemCardId() == null : this.getMemCardId().equals(other.getMemCardId())) + && (this.getMemCardType() == null ? other.getMemCardType() == null : this.getMemCardType().equals(other.getMemCardType())) + && (this.getMemCardNo() == null ? other.getMemCardNo() == null : this.getMemCardNo().equals(other.getMemCardNo())) && (this.getPayModel() == null ? other.getPayModel() == null : this.getPayModel().equals(other.getPayModel())) && (this.getPayType() == null ? other.getPayType() == null : this.getPayType().equals(other.getPayType())) && (this.getPayGold() == null ? other.getPayGold() == null : this.getPayGold().equals(other.getPayGold())) @@ -459,6 +505,9 @@ public class HighOrder implements Serializable { result = prime * result + ((getMemId() == null) ? 0 : getMemId().hashCode()); result = prime * result + ((getMemName() == null) ? 0 : getMemName().hashCode()); result = prime * result + ((getMemPhone() == null) ? 0 : getMemPhone().hashCode()); + result = prime * result + ((getMemCardId() == null) ? 0 : getMemCardId().hashCode()); + result = prime * result + ((getMemCardType() == null) ? 0 : getMemCardType().hashCode()); + result = prime * result + ((getMemCardNo() == null) ? 0 : getMemCardNo().hashCode()); result = prime * result + ((getPayModel() == null) ? 0 : getPayModel().hashCode()); result = prime * result + ((getPayType() == null) ? 0 : getPayType().hashCode()); result = prime * result + ((getPayGold() == null) ? 0 : getPayGold().hashCode()); @@ -497,6 +546,9 @@ public class HighOrder implements Serializable { sb.append(", memId=").append(memId); sb.append(", memName=").append(memName); sb.append(", memPhone=").append(memPhone); + sb.append(", memCardId=").append(memCardId); + sb.append(", memCardType=").append(memCardType); + sb.append(", memCardNo=").append(memCardNo); sb.append(", payModel=").append(payModel); sb.append(", payType=").append(payType); sb.append(", payGold=").append(payGold); diff --git a/hai-service/src/main/java/com/hai/entity/HighOrderExample.java b/hai-service/src/main/java/com/hai/entity/HighOrderExample.java index 050831a2..e62f805c 100644 --- a/hai-service/src/main/java/com/hai/entity/HighOrderExample.java +++ b/hai-service/src/main/java/com/hai/entity/HighOrderExample.java @@ -586,6 +586,196 @@ public class HighOrderExample { return (Criteria) this; } + public Criteria andMemCardIdIsNull() { + addCriterion("mem_card_id is null"); + return (Criteria) this; + } + + public Criteria andMemCardIdIsNotNull() { + addCriterion("mem_card_id is not null"); + return (Criteria) this; + } + + public Criteria andMemCardIdEqualTo(Long value) { + addCriterion("mem_card_id =", value, "memCardId"); + return (Criteria) this; + } + + public Criteria andMemCardIdNotEqualTo(Long value) { + addCriterion("mem_card_id <>", value, "memCardId"); + return (Criteria) this; + } + + public Criteria andMemCardIdGreaterThan(Long value) { + addCriterion("mem_card_id >", value, "memCardId"); + return (Criteria) this; + } + + public Criteria andMemCardIdGreaterThanOrEqualTo(Long value) { + addCriterion("mem_card_id >=", value, "memCardId"); + return (Criteria) this; + } + + public Criteria andMemCardIdLessThan(Long value) { + addCriterion("mem_card_id <", value, "memCardId"); + return (Criteria) this; + } + + public Criteria andMemCardIdLessThanOrEqualTo(Long value) { + addCriterion("mem_card_id <=", value, "memCardId"); + return (Criteria) this; + } + + public Criteria andMemCardIdIn(List values) { + addCriterion("mem_card_id in", values, "memCardId"); + return (Criteria) this; + } + + public Criteria andMemCardIdNotIn(List values) { + addCriterion("mem_card_id not in", values, "memCardId"); + return (Criteria) this; + } + + public Criteria andMemCardIdBetween(Long value1, Long value2) { + addCriterion("mem_card_id between", value1, value2, "memCardId"); + return (Criteria) this; + } + + public Criteria andMemCardIdNotBetween(Long value1, Long value2) { + addCriterion("mem_card_id not between", value1, value2, "memCardId"); + return (Criteria) this; + } + + public Criteria andMemCardTypeIsNull() { + addCriterion("mem_card_type is null"); + return (Criteria) this; + } + + public Criteria andMemCardTypeIsNotNull() { + addCriterion("mem_card_type is not null"); + return (Criteria) this; + } + + public Criteria andMemCardTypeEqualTo(Integer value) { + addCriterion("mem_card_type =", value, "memCardType"); + return (Criteria) this; + } + + public Criteria andMemCardTypeNotEqualTo(Integer value) { + addCriterion("mem_card_type <>", value, "memCardType"); + return (Criteria) this; + } + + public Criteria andMemCardTypeGreaterThan(Integer value) { + addCriterion("mem_card_type >", value, "memCardType"); + return (Criteria) this; + } + + public Criteria andMemCardTypeGreaterThanOrEqualTo(Integer value) { + addCriterion("mem_card_type >=", value, "memCardType"); + return (Criteria) this; + } + + public Criteria andMemCardTypeLessThan(Integer value) { + addCriterion("mem_card_type <", value, "memCardType"); + return (Criteria) this; + } + + public Criteria andMemCardTypeLessThanOrEqualTo(Integer value) { + addCriterion("mem_card_type <=", value, "memCardType"); + return (Criteria) this; + } + + public Criteria andMemCardTypeIn(List values) { + addCriterion("mem_card_type in", values, "memCardType"); + return (Criteria) this; + } + + public Criteria andMemCardTypeNotIn(List values) { + addCriterion("mem_card_type not in", values, "memCardType"); + return (Criteria) this; + } + + public Criteria andMemCardTypeBetween(Integer value1, Integer value2) { + addCriterion("mem_card_type between", value1, value2, "memCardType"); + return (Criteria) this; + } + + public Criteria andMemCardTypeNotBetween(Integer value1, Integer value2) { + addCriterion("mem_card_type not between", value1, value2, "memCardType"); + return (Criteria) this; + } + + public Criteria andMemCardNoIsNull() { + addCriterion("mem_card_no is null"); + return (Criteria) this; + } + + public Criteria andMemCardNoIsNotNull() { + addCriterion("mem_card_no is not null"); + return (Criteria) this; + } + + public Criteria andMemCardNoEqualTo(String value) { + addCriterion("mem_card_no =", value, "memCardNo"); + return (Criteria) this; + } + + public Criteria andMemCardNoNotEqualTo(String value) { + addCriterion("mem_card_no <>", value, "memCardNo"); + return (Criteria) this; + } + + public Criteria andMemCardNoGreaterThan(String value) { + addCriterion("mem_card_no >", value, "memCardNo"); + return (Criteria) this; + } + + public Criteria andMemCardNoGreaterThanOrEqualTo(String value) { + addCriterion("mem_card_no >=", value, "memCardNo"); + return (Criteria) this; + } + + public Criteria andMemCardNoLessThan(String value) { + addCriterion("mem_card_no <", value, "memCardNo"); + return (Criteria) this; + } + + public Criteria andMemCardNoLessThanOrEqualTo(String value) { + addCriterion("mem_card_no <=", value, "memCardNo"); + return (Criteria) this; + } + + public Criteria andMemCardNoLike(String value) { + addCriterion("mem_card_no like", value, "memCardNo"); + return (Criteria) this; + } + + public Criteria andMemCardNoNotLike(String value) { + addCriterion("mem_card_no not like", value, "memCardNo"); + return (Criteria) this; + } + + public Criteria andMemCardNoIn(List values) { + addCriterion("mem_card_no in", values, "memCardNo"); + return (Criteria) this; + } + + public Criteria andMemCardNoNotIn(List values) { + addCriterion("mem_card_no not in", values, "memCardNo"); + return (Criteria) this; + } + + public Criteria andMemCardNoBetween(String value1, String value2) { + addCriterion("mem_card_no between", value1, value2, "memCardNo"); + return (Criteria) this; + } + + public Criteria andMemCardNoNotBetween(String value1, String value2) { + addCriterion("mem_card_no not between", value1, value2, "memCardNo"); + return (Criteria) this; + } + public Criteria andPayModelIsNull() { addCriterion("pay_model is null"); return (Criteria) this; diff --git a/hai-service/src/main/java/com/hai/entity/HighUserCard.java b/hai-service/src/main/java/com/hai/entity/HighUserCard.java new file mode 100644 index 00000000..c963a39f --- /dev/null +++ b/hai-service/src/main/java/com/hai/entity/HighUserCard.java @@ -0,0 +1,200 @@ +package com.hai.entity; + +import java.io.Serializable; +import java.util.Date; + +/** + * high_user_card + * @author + */ +/** + * + * 代码由工具生成 + * + **/ +public class HighUserCard implements Serializable { + /** + * 主键 + */ + private Long id; + + /** + * 用户id + */ + private Long userId; + + /** + * 卡号 + */ + private String cardNo; + + /** + * 类型 1:汇联通工会卡 + */ + private Integer type; + + /** + * 状态 0:删除 1:正常 + */ + private Integer status; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 修改时间 + */ + private Date updateTime; + + private String ext1; + + private String ext2; + + private String ext3; + + private static final long serialVersionUID = 1L; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + + public String getCardNo() { + return cardNo; + } + + public void setCardNo(String cardNo) { + this.cardNo = cardNo; + } + + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + public String getExt1() { + return ext1; + } + + public void setExt1(String ext1) { + this.ext1 = ext1; + } + + public String getExt2() { + return ext2; + } + + public void setExt2(String ext2) { + this.ext2 = ext2; + } + + public String getExt3() { + return ext3; + } + + public void setExt3(String ext3) { + this.ext3 = ext3; + } + + @Override + public boolean equals(Object that) { + if (this == that) { + return true; + } + if (that == null) { + return false; + } + if (getClass() != that.getClass()) { + return false; + } + HighUserCard other = (HighUserCard) that; + return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) + && (this.getUserId() == null ? other.getUserId() == null : this.getUserId().equals(other.getUserId())) + && (this.getCardNo() == null ? other.getCardNo() == null : this.getCardNo().equals(other.getCardNo())) + && (this.getType() == null ? other.getType() == null : this.getType().equals(other.getType())) + && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus())) + && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime())) + && (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime())) + && (this.getExt1() == null ? other.getExt1() == null : this.getExt1().equals(other.getExt1())) + && (this.getExt2() == null ? other.getExt2() == null : this.getExt2().equals(other.getExt2())) + && (this.getExt3() == null ? other.getExt3() == null : this.getExt3().equals(other.getExt3())); + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); + result = prime * result + ((getUserId() == null) ? 0 : getUserId().hashCode()); + result = prime * result + ((getCardNo() == null) ? 0 : getCardNo().hashCode()); + result = prime * result + ((getType() == null) ? 0 : getType().hashCode()); + result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode()); + result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode()); + result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode()); + result = prime * result + ((getExt1() == null) ? 0 : getExt1().hashCode()); + result = prime * result + ((getExt2() == null) ? 0 : getExt2().hashCode()); + result = prime * result + ((getExt3() == null) ? 0 : getExt3().hashCode()); + return result; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", id=").append(id); + sb.append(", userId=").append(userId); + sb.append(", cardNo=").append(cardNo); + sb.append(", type=").append(type); + sb.append(", status=").append(status); + sb.append(", createTime=").append(createTime); + sb.append(", updateTime=").append(updateTime); + sb.append(", ext1=").append(ext1); + sb.append(", ext2=").append(ext2); + sb.append(", ext3=").append(ext3); + sb.append(", serialVersionUID=").append(serialVersionUID); + sb.append("]"); + return sb.toString(); + } +} \ No newline at end of file diff --git a/hai-service/src/main/java/com/hai/entity/HighUserCardExample.java b/hai-service/src/main/java/com/hai/entity/HighUserCardExample.java new file mode 100644 index 00000000..c2914da4 --- /dev/null +++ b/hai-service/src/main/java/com/hai/entity/HighUserCardExample.java @@ -0,0 +1,863 @@ +package com.hai.entity; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class HighUserCardExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + private Integer limit; + + private Long offset; + + public HighUserCardExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + public void setLimit(Integer limit) { + this.limit = limit; + } + + public Integer getLimit() { + return limit; + } + + public void setOffset(Long offset) { + this.offset = offset; + } + + public Long getOffset() { + return offset; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andIdIsNull() { + addCriterion("id is null"); + return (Criteria) this; + } + + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); + return (Criteria) this; + } + + public Criteria andIdEqualTo(Long value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(Long value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(Long value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(Long value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(Long value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(Long value) { + addCriterion("id <=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(Long value1, Long value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(Long value1, Long value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andUserIdIsNull() { + addCriterion("user_id is null"); + return (Criteria) this; + } + + public Criteria andUserIdIsNotNull() { + addCriterion("user_id is not null"); + return (Criteria) this; + } + + public Criteria andUserIdEqualTo(Long value) { + addCriterion("user_id =", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdNotEqualTo(Long value) { + addCriterion("user_id <>", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdGreaterThan(Long value) { + addCriterion("user_id >", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdGreaterThanOrEqualTo(Long value) { + addCriterion("user_id >=", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdLessThan(Long value) { + addCriterion("user_id <", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdLessThanOrEqualTo(Long value) { + addCriterion("user_id <=", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdIn(List values) { + addCriterion("user_id in", values, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdNotIn(List values) { + addCriterion("user_id not in", values, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdBetween(Long value1, Long value2) { + addCriterion("user_id between", value1, value2, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdNotBetween(Long value1, Long value2) { + addCriterion("user_id not between", value1, value2, "userId"); + return (Criteria) this; + } + + public Criteria andCardNoIsNull() { + addCriterion("card_no is null"); + return (Criteria) this; + } + + public Criteria andCardNoIsNotNull() { + addCriterion("card_no is not null"); + return (Criteria) this; + } + + public Criteria andCardNoEqualTo(String value) { + addCriterion("card_no =", value, "cardNo"); + return (Criteria) this; + } + + public Criteria andCardNoNotEqualTo(String value) { + addCriterion("card_no <>", value, "cardNo"); + return (Criteria) this; + } + + public Criteria andCardNoGreaterThan(String value) { + addCriterion("card_no >", value, "cardNo"); + return (Criteria) this; + } + + public Criteria andCardNoGreaterThanOrEqualTo(String value) { + addCriterion("card_no >=", value, "cardNo"); + return (Criteria) this; + } + + public Criteria andCardNoLessThan(String value) { + addCriterion("card_no <", value, "cardNo"); + return (Criteria) this; + } + + public Criteria andCardNoLessThanOrEqualTo(String value) { + addCriterion("card_no <=", value, "cardNo"); + return (Criteria) this; + } + + public Criteria andCardNoLike(String value) { + addCriterion("card_no like", value, "cardNo"); + return (Criteria) this; + } + + public Criteria andCardNoNotLike(String value) { + addCriterion("card_no not like", value, "cardNo"); + return (Criteria) this; + } + + public Criteria andCardNoIn(List values) { + addCriterion("card_no in", values, "cardNo"); + return (Criteria) this; + } + + public Criteria andCardNoNotIn(List values) { + addCriterion("card_no not in", values, "cardNo"); + return (Criteria) this; + } + + public Criteria andCardNoBetween(String value1, String value2) { + addCriterion("card_no between", value1, value2, "cardNo"); + return (Criteria) this; + } + + public Criteria andCardNoNotBetween(String value1, String value2) { + addCriterion("card_no not between", value1, value2, "cardNo"); + return (Criteria) this; + } + + public Criteria andTypeIsNull() { + addCriterion("`type` is null"); + return (Criteria) this; + } + + public Criteria andTypeIsNotNull() { + addCriterion("`type` is not null"); + return (Criteria) this; + } + + public Criteria andTypeEqualTo(Integer value) { + addCriterion("`type` =", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeNotEqualTo(Integer value) { + addCriterion("`type` <>", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeGreaterThan(Integer value) { + addCriterion("`type` >", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeGreaterThanOrEqualTo(Integer value) { + addCriterion("`type` >=", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeLessThan(Integer value) { + addCriterion("`type` <", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeLessThanOrEqualTo(Integer value) { + addCriterion("`type` <=", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeIn(List values) { + addCriterion("`type` in", values, "type"); + return (Criteria) this; + } + + public Criteria andTypeNotIn(List values) { + addCriterion("`type` not in", values, "type"); + return (Criteria) this; + } + + public Criteria andTypeBetween(Integer value1, Integer value2) { + addCriterion("`type` between", value1, value2, "type"); + return (Criteria) this; + } + + public Criteria andTypeNotBetween(Integer value1, Integer value2) { + addCriterion("`type` not between", value1, value2, "type"); + return (Criteria) this; + } + + public Criteria andStatusIsNull() { + addCriterion("`status` is null"); + return (Criteria) this; + } + + public Criteria andStatusIsNotNull() { + addCriterion("`status` is not null"); + return (Criteria) this; + } + + public Criteria andStatusEqualTo(Integer value) { + addCriterion("`status` =", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusNotEqualTo(Integer value) { + addCriterion("`status` <>", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusGreaterThan(Integer value) { + addCriterion("`status` >", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusGreaterThanOrEqualTo(Integer value) { + addCriterion("`status` >=", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusLessThan(Integer value) { + addCriterion("`status` <", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusLessThanOrEqualTo(Integer value) { + addCriterion("`status` <=", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusIn(List values) { + addCriterion("`status` in", values, "status"); + return (Criteria) this; + } + + public Criteria andStatusNotIn(List values) { + addCriterion("`status` not in", values, "status"); + return (Criteria) this; + } + + public Criteria andStatusBetween(Integer value1, Integer value2) { + addCriterion("`status` between", value1, value2, "status"); + return (Criteria) this; + } + + public Criteria andStatusNotBetween(Integer value1, Integer value2) { + addCriterion("`status` not between", value1, value2, "status"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNull() { + addCriterion("create_time is null"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNotNull() { + addCriterion("create_time is not null"); + return (Criteria) this; + } + + public Criteria andCreateTimeEqualTo(Date value) { + addCriterion("create_time =", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotEqualTo(Date value) { + addCriterion("create_time <>", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThan(Date value) { + addCriterion("create_time >", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("create_time >=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThan(Date value) { + addCriterion("create_time <", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThanOrEqualTo(Date value) { + addCriterion("create_time <=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeIn(List values) { + addCriterion("create_time in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotIn(List values) { + addCriterion("create_time not in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeBetween(Date value1, Date value2) { + addCriterion("create_time between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotBetween(Date value1, Date value2) { + addCriterion("create_time not between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIsNull() { + addCriterion("update_time is null"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIsNotNull() { + addCriterion("update_time is not null"); + return (Criteria) this; + } + + public Criteria andUpdateTimeEqualTo(Date value) { + addCriterion("update_time =", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotEqualTo(Date value) { + addCriterion("update_time <>", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThan(Date value) { + addCriterion("update_time >", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("update_time >=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThan(Date value) { + addCriterion("update_time <", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThanOrEqualTo(Date value) { + addCriterion("update_time <=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIn(List values) { + addCriterion("update_time in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotIn(List values) { + addCriterion("update_time not in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeBetween(Date value1, Date value2) { + addCriterion("update_time between", value1, value2, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotBetween(Date value1, Date value2) { + addCriterion("update_time not between", value1, value2, "updateTime"); + return (Criteria) this; + } + + public Criteria andExt1IsNull() { + addCriterion("ext_1 is null"); + return (Criteria) this; + } + + public Criteria andExt1IsNotNull() { + addCriterion("ext_1 is not null"); + return (Criteria) this; + } + + public Criteria andExt1EqualTo(String value) { + addCriterion("ext_1 =", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1NotEqualTo(String value) { + addCriterion("ext_1 <>", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1GreaterThan(String value) { + addCriterion("ext_1 >", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1GreaterThanOrEqualTo(String value) { + addCriterion("ext_1 >=", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1LessThan(String value) { + addCriterion("ext_1 <", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1LessThanOrEqualTo(String value) { + addCriterion("ext_1 <=", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1Like(String value) { + addCriterion("ext_1 like", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1NotLike(String value) { + addCriterion("ext_1 not like", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1In(List values) { + addCriterion("ext_1 in", values, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1NotIn(List values) { + addCriterion("ext_1 not in", values, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1Between(String value1, String value2) { + addCriterion("ext_1 between", value1, value2, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1NotBetween(String value1, String value2) { + addCriterion("ext_1 not between", value1, value2, "ext1"); + return (Criteria) this; + } + + public Criteria andExt2IsNull() { + addCriterion("ext_2 is null"); + return (Criteria) this; + } + + public Criteria andExt2IsNotNull() { + addCriterion("ext_2 is not null"); + return (Criteria) this; + } + + public Criteria andExt2EqualTo(String value) { + addCriterion("ext_2 =", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2NotEqualTo(String value) { + addCriterion("ext_2 <>", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2GreaterThan(String value) { + addCriterion("ext_2 >", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2GreaterThanOrEqualTo(String value) { + addCriterion("ext_2 >=", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2LessThan(String value) { + addCriterion("ext_2 <", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2LessThanOrEqualTo(String value) { + addCriterion("ext_2 <=", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2Like(String value) { + addCriterion("ext_2 like", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2NotLike(String value) { + addCriterion("ext_2 not like", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2In(List values) { + addCriterion("ext_2 in", values, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2NotIn(List values) { + addCriterion("ext_2 not in", values, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2Between(String value1, String value2) { + addCriterion("ext_2 between", value1, value2, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2NotBetween(String value1, String value2) { + addCriterion("ext_2 not between", value1, value2, "ext2"); + return (Criteria) this; + } + + public Criteria andExt3IsNull() { + addCriterion("ext_3 is null"); + return (Criteria) this; + } + + public Criteria andExt3IsNotNull() { + addCriterion("ext_3 is not null"); + return (Criteria) this; + } + + public Criteria andExt3EqualTo(String value) { + addCriterion("ext_3 =", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3NotEqualTo(String value) { + addCriterion("ext_3 <>", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3GreaterThan(String value) { + addCriterion("ext_3 >", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3GreaterThanOrEqualTo(String value) { + addCriterion("ext_3 >=", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3LessThan(String value) { + addCriterion("ext_3 <", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3LessThanOrEqualTo(String value) { + addCriterion("ext_3 <=", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3Like(String value) { + addCriterion("ext_3 like", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3NotLike(String value) { + addCriterion("ext_3 not like", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3In(List values) { + addCriterion("ext_3 in", values, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3NotIn(List values) { + addCriterion("ext_3 not in", values, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3Between(String value1, String value2) { + addCriterion("ext_3 between", value1, value2, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3NotBetween(String value1, String value2) { + addCriterion("ext_3 not between", value1, value2, "ext3"); + return (Criteria) this; + } + } + + /** + */ + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} \ No newline at end of file diff --git a/hai-service/src/main/java/com/hai/enum_type/UserCardType.java b/hai-service/src/main/java/com/hai/enum_type/UserCardType.java new file mode 100644 index 00000000..313389c1 --- /dev/null +++ b/hai-service/src/main/java/com/hai/enum_type/UserCardType.java @@ -0,0 +1,32 @@ +package com.hai.enum_type; + +public enum UserCardType { + + type1(1, "汇联通工会卡"), + ; + + private Integer type; + + private String name; + + UserCardType(Integer type,String name) { + this.type = type; + this.name = name; + } + + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/hai-service/src/main/java/com/hai/service/HighUserCardService.java b/hai-service/src/main/java/com/hai/service/HighUserCardService.java new file mode 100644 index 00000000..7ba4953d --- /dev/null +++ b/hai-service/src/main/java/com/hai/service/HighUserCardService.java @@ -0,0 +1,39 @@ +package com.hai.service; + +import com.hai.entity.HighUser; +import com.hai.entity.HighUserCard; + +import java.util.List; + +public interface HighUserCardService { + + /** + * 编辑 + * @param highUserCard + */ + void editCard(HighUserCard highUserCard); + + /** + * 根据id查询详情 + * @param id + * @return + */ + HighUserCard getDetailById(Long id); + + /** + * 查询列表 + * @param type + * @param userId + * @return + */ + List getListByUser(Long userId,Integer type); + + /** + * 根据用户和卡号查询 + * @param userId + * @param codeNo + * @return + */ + HighUserCard getDetailByUserCardNo(Long userId,String codeNo); + +} diff --git a/hai-service/src/main/java/com/hai/service/impl/HighUserCardServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/HighUserCardServiceImpl.java new file mode 100644 index 00000000..dee42d00 --- /dev/null +++ b/hai-service/src/main/java/com/hai/service/impl/HighUserCardServiceImpl.java @@ -0,0 +1,58 @@ +package com.hai.service.impl; + +import com.hai.dao.HighUserCardMapper; +import com.hai.entity.HighUserCard; +import com.hai.entity.HighUserCardExample; +import com.hai.service.HighUserCardService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Date; +import java.util.List; + +@Service("highUserCardService") +public class HighUserCardServiceImpl implements HighUserCardService { + + @Resource + private HighUserCardMapper highUserCardMapper; + + @Override + public void editCard(HighUserCard highUserCard) { + if(highUserCard.getId() == null){ + highUserCard.setCreateTime(new Date()); + highUserCard.setUpdateTime(new Date()); + highUserCard.setStatus(1); + highUserCardMapper.insert(highUserCard); + } else { + highUserCard.setUpdateTime(new Date()); + highUserCardMapper.updateByPrimaryKey(highUserCard); + } + } + + @Override + public HighUserCard getDetailById(Long id) { + return highUserCardMapper.selectByPrimaryKey(id); + } + + @Override + public List getListByUser(Long userId, Integer type) { + HighUserCardExample example = new HighUserCardExample(); + HighUserCardExample.Criteria criteria = example.createCriteria().andUserIdEqualTo(userId).andStatusNotEqualTo(0); + if (type != null) { + criteria.andTypeEqualTo(type); + } + example.setOrderByClause("create_time desc"); + return highUserCardMapper.selectByExample(example); + } + + @Override + public HighUserCard getDetailByUserCardNo(Long userId, String cardNo) { + HighUserCardExample example = new HighUserCardExample(); + example.createCriteria().andUserIdEqualTo(userId).andCardNoEqualTo(cardNo).andStatusNotEqualTo(0); + List list = highUserCardMapper.selectByExample(example); + if (list.size() > 0) { + return list.get(0); + } + return null; + } +} diff --git a/hai-service/src/main/resources/dev/commonConfig.properties b/hai-service/src/main/resources/dev/commonConfig.properties index 66282e2f..681a182f 100644 --- a/hai-service/src/main/resources/dev/commonConfig.properties +++ b/hai-service/src/main/resources/dev/commonConfig.properties @@ -15,6 +15,10 @@ huiliantongAppNo=guizhouhltcs huiliantongAppkey=g%2BNnjR54YSUWM2iKg%2Fd82A9x9hg2kYV7 huiliantongAppsecret=FA28E95ACABFA4B2B8E25857437B07F1 +HuiLianTongUnionCardUrl=http://hltgz.com:4010/api/v2/execute.json +HuiLianTongUnionCardAccessCode=6FCAE1470CEF465988351BB65ABAA8AE +HuiLianTongUnionCardSignCode=F8E91A3C + wx_cert=/home/project/wx_cert/ TelApiKey=2d01f6b520254b1a80f6b167832cea18 diff --git a/hai-service/src/main/resources/pre/commonConfig.properties b/hai-service/src/main/resources/pre/commonConfig.properties index 66282e2f..681a182f 100644 --- a/hai-service/src/main/resources/pre/commonConfig.properties +++ b/hai-service/src/main/resources/pre/commonConfig.properties @@ -15,6 +15,10 @@ huiliantongAppNo=guizhouhltcs huiliantongAppkey=g%2BNnjR54YSUWM2iKg%2Fd82A9x9hg2kYV7 huiliantongAppsecret=FA28E95ACABFA4B2B8E25857437B07F1 +HuiLianTongUnionCardUrl=http://hltgz.com:4010/api/v2/execute.json +HuiLianTongUnionCardAccessCode=6FCAE1470CEF465988351BB65ABAA8AE +HuiLianTongUnionCardSignCode=F8E91A3C + wx_cert=/home/project/wx_cert/ TelApiKey=2d01f6b520254b1a80f6b167832cea18 diff --git a/hai-service/src/main/resources/prod-9401/commonConfig.properties b/hai-service/src/main/resources/prod-9401/commonConfig.properties index e786a840..90f1b6fd 100644 --- a/hai-service/src/main/resources/prod-9401/commonConfig.properties +++ b/hai-service/src/main/resources/prod-9401/commonConfig.properties @@ -15,6 +15,10 @@ huiliantongAppNo=guizhouhltcs huiliantongAppkey=g%2BNnjR54YSUWM2iKg%2Fd82A9x9hg2kYV7 huiliantongAppsecret=FA28E95ACABFA4B2B8E25857437B07F1 +HuiLianTongUnionCardUrl=http://hltgz.com:4010/api/v2/execute.json +HuiLianTongUnionCardAccessCode=6FCAE1470CEF465988351BB65ABAA8AE +HuiLianTongUnionCardSignCode=F8E91A3C + wx_cert=/home/project/wx_cert/ TelApiKey=2d01f6b520254b1a80f6b167832cea18 diff --git a/hai-service/src/main/resources/prod/commonConfig.properties b/hai-service/src/main/resources/prod/commonConfig.properties index e786a840..90f1b6fd 100644 --- a/hai-service/src/main/resources/prod/commonConfig.properties +++ b/hai-service/src/main/resources/prod/commonConfig.properties @@ -15,6 +15,10 @@ huiliantongAppNo=guizhouhltcs huiliantongAppkey=g%2BNnjR54YSUWM2iKg%2Fd82A9x9hg2kYV7 huiliantongAppsecret=FA28E95ACABFA4B2B8E25857437B07F1 +HuiLianTongUnionCardUrl=http://hltgz.com:4010/api/v2/execute.json +HuiLianTongUnionCardAccessCode=6FCAE1470CEF465988351BB65ABAA8AE +HuiLianTongUnionCardSignCode=F8E91A3C + wx_cert=/home/project/wx_cert/ TelApiKey=2d01f6b520254b1a80f6b167832cea18