diff --git a/hai-bweb/src/main/java/com/bweb/controller/HighTyAgentController.java b/hai-bweb/src/main/java/com/bweb/controller/HighTyAgentController.java index 61859997..90feb4c0 100644 --- a/hai-bweb/src/main/java/com/bweb/controller/HighTyAgentController.java +++ b/hai-bweb/src/main/java/com/bweb/controller/HighTyAgentController.java @@ -7,9 +7,11 @@ import com.github.pagehelper.PageInfo; import com.hai.common.exception.ErrorCode; import com.hai.common.exception.ErrorHelp; import com.hai.common.exception.SysCode; +import com.hai.common.security.UserCenter; import com.hai.common.utils.ResponseMsgUtil; import com.hai.entity.HighTyAgent; import com.hai.model.ResponseData; +import com.hai.model.UserInfoModel; import com.hai.service.HighTyAgentService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -34,11 +36,21 @@ public class HighTyAgentController { @Resource private HighTyAgentService tyAgentService; + @Resource + private UserCenter userCenter; + @RequestMapping(value = "/addAgent", method = RequestMethod.POST) @ResponseBody @ApiOperation(value = "增加代理商") public ResponseData addAgent(@RequestBody JSONObject body, HttpServletRequest request) { try { + UserInfoModel userModel = userCenter.getSessionModel(UserInfoModel.class); + if (userModel == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.SEC_USER_EXPIRED, ""); + } + if (userModel.getBsOrganization() == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMPETENCE_INSUFFICIENT, ""); + } if (StringUtils.isBlank(body.getString("agentName")) || StringUtils.isBlank(body.getString("agentUser")) @@ -48,6 +60,7 @@ public class HighTyAgentController { } HighTyAgent tyAgent = new HighTyAgent(); + tyAgent.setOrgId(userModel.getBsOrganization().getId()); tyAgent.setAgentName(body.getString("agentName")); tyAgent.setAgentUser(body.getString("agentUser")); tyAgent.setAgentPhone(body.getString("agentPhone")); @@ -147,7 +160,8 @@ public class HighTyAgentController { @RequestMapping(value = "/getAgentList", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "查询代理商列表") - public ResponseData getAgentList(@RequestParam(name = "agentKey", required = false) String agentKey, + public ResponseData getAgentList(@RequestParam(name = "orgId", required = false) Long orgId, + @RequestParam(name = "agentKey", required = false) String agentKey, @RequestParam(name = "agentName", required = false) String agentName, @RequestParam(name = "agentUser", required = false) String agentUser, @RequestParam(name = "agentPhone", required = false) String agentPhone, @@ -156,6 +170,18 @@ public class HighTyAgentController { try { Map param = new HashMap<>(); + if (orgId == null) { + UserInfoModel userModel = userCenter.getSessionModel(UserInfoModel.class); + if (userModel == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.SEC_USER_EXPIRED, ""); + } + if (userModel.getBsOrganization() == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMPETENCE_INSUFFICIENT, ""); + } + param.put("orgId", userModel.getBsOrganization().getId()); + } else { + param.put("orgId", orgId); + } param.put("agentKey", agentKey); param.put("agentName", agentName); param.put("agentUser", agentUser); diff --git a/hai-bweb/src/main/java/com/bweb/controller/HighTyAgentOilStationController.java b/hai-bweb/src/main/java/com/bweb/controller/HighTyAgentOilStationController.java new file mode 100644 index 00000000..37fa4e54 --- /dev/null +++ b/hai-bweb/src/main/java/com/bweb/controller/HighTyAgentOilStationController.java @@ -0,0 +1,318 @@ +package com.bweb.controller; + +import com.alibaba.fastjson.JSONObject; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.hai.common.exception.ErrorCode; +import com.hai.common.exception.ErrorHelp; +import com.hai.common.exception.SysCode; +import com.hai.common.security.UserCenter; +import com.hai.common.utils.ResponseMsgUtil; +import com.hai.enum_type.UserObjectTypeEnum; +import com.hai.model.ResponseData; +import com.hai.model.UserInfoModel; +import com.hai.service.BsOrganizationService; +import com.hai.service.HighTyAgentOilStationService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Controller +@RequestMapping(value = "/tyAgentOilStation") +@Api(value = "订单接口") +public class HighTyAgentOilStationController { + + private static Logger log = LoggerFactory.getLogger(HighTyAgentOilStationController.class); + + @Resource + private HighTyAgentOilStationService highTyAgentOilStationService; + + @Resource + private BsOrganizationService organizationService; + + @Resource + private UserCenter userCenter; + + @RequestMapping(value = "/assignOrg", method = RequestMethod.POST) + @ResponseBody + @ApiOperation(value = "分配机构") + public ResponseData assignOrg(@RequestBody JSONObject body) { + try { + UserInfoModel userModel = userCenter.getSessionModel(UserInfoModel.class); + if (userModel == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.SEC_USER_EXPIRED, ""); + } + if (userModel.getBsCompany() == null || !userModel.getSecUser().getAdminFlag().equals(1)) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMPETENCE_INSUFFICIENT, ""); + } + + if (body.getLong("orgId") == null + || body.getJSONArray("storeList") == null + || body.getJSONArray("storeList").size() == 0 + ) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, ""); + } + + List storeList = new ArrayList<>(); + for (Object obj : body.getJSONArray("storeList")) { + JSONObject objData = (JSONObject)obj; + if (objData.getLong("storeId") == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, ""); + } + storeList.add(objData.getLong("storeId")); + } + highTyAgentOilStationService.assignOrg(body.getLong("orgId"), storeList); + + return ResponseMsgUtil.success("操作成功"); + + } catch (Exception e) { + log.error("HighTyAgentController --> assignOrg() error!", e); + return ResponseMsgUtil.exception(e); + } + } + + @RequestMapping(value = "/unbindOrg", method = RequestMethod.POST) + @ResponseBody + @ApiOperation(value = "解绑机构") + public ResponseData unbindOrg(@RequestBody JSONObject body) { + try { + UserInfoModel userModel = userCenter.getSessionModel(UserInfoModel.class); + if (userModel == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.SEC_USER_EXPIRED, ""); + } + if (userModel.getBsCompany() == null || !userModel.getSecUser().getAdminFlag().equals(1)) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMPETENCE_INSUFFICIENT, ""); + } + + if (body.getJSONArray("oilStationList") == null + || body.getJSONArray("oilStationList").size() == 0) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, ""); + } + + List oilStationList = new ArrayList<>(); + for (Object obj : body.getJSONArray("oilStationList")) { + JSONObject objData = (JSONObject)obj; + if (objData.getLong("oilStationId") == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, ""); + } + oilStationList.add(objData.getLong("oilStationId")); + } + highTyAgentOilStationService.unbindOrg(oilStationList); + + return ResponseMsgUtil.success("操作成功"); + + } catch (Exception e) { + log.error("HighTyAgentController --> assignOrg() error!", e); + return ResponseMsgUtil.exception(e); + } + } + + @RequestMapping(value = "/assignAgent", method = RequestMethod.POST) + @ResponseBody + @ApiOperation(value = "分配代理商") + public ResponseData assignAgent(@RequestBody JSONObject body) { + try { + UserInfoModel userModel = userCenter.getSessionModel(UserInfoModel.class); + if (userModel == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.SEC_USER_EXPIRED, ""); + } + + if (body.getLong("agentId") == null + || body.getJSONArray("oilStationList") == null + || body.getJSONArray("oilStationList").size() == 0 + ) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, ""); + } + + List storeList = new ArrayList<>(); + for (Object obj : body.getJSONArray("oilStationList")) { + JSONObject objData = (JSONObject)obj; + if (objData.getLong("oilStationId") == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, ""); + } + storeList.add(objData.getLong("oilStationId")); + } + highTyAgentOilStationService.assignAgent(body.getLong("agentId"), storeList); + + return ResponseMsgUtil.success("操作成功"); + + } catch (Exception e) { + log.error("HighTyAgentController --> assignOrg() error!", e); + return ResponseMsgUtil.exception(e); + } + } + + @RequestMapping(value = "/unbindAgent", method = RequestMethod.POST) + @ResponseBody + @ApiOperation(value = "解绑代理商") + public ResponseData unbindAgent(@RequestBody JSONObject body) { + try { + UserInfoModel userModel = userCenter.getSessionModel(UserInfoModel.class); + if (userModel == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.SEC_USER_EXPIRED, ""); + } + if (userModel.getBsCompany() == null && !userModel.getSecUser().getAdminFlag().equals(1)) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMPETENCE_INSUFFICIENT, ""); + } + + if (body.getJSONArray("oilStationList") == null + || body.getJSONArray("oilStationList").size() == 0) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, ""); + } + + List oilStationList = new ArrayList<>(); + for (Object obj : body.getJSONArray("oilStationList")) { + JSONObject objData = (JSONObject)obj; + if (objData.getLong("oilStationId") == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, ""); + } + oilStationList.add(objData.getLong("oilStationId")); + } + highTyAgentOilStationService.unbindAgent(oilStationList); + + return ResponseMsgUtil.success("操作成功"); + + } catch (Exception e) { + log.error("HighTyAgentController --> assignOrg() error!", e); + return ResponseMsgUtil.exception(e); + } + } + + @RequestMapping(value = "/assignSalesman", method = RequestMethod.POST) + @ResponseBody + @ApiOperation(value = "分配业务员") + public ResponseData assignSalesman(@RequestBody JSONObject body) { + try { + UserInfoModel userModel = userCenter.getSessionModel(UserInfoModel.class); + if (userModel == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.SEC_USER_EXPIRED, ""); + } + if (!userModel.getSecUser().getObjectType().equals(UserObjectTypeEnum.type6.getType())) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMPETENCE_INSUFFICIENT, ""); + } + + if (body.getLong("salesmanId") == null + || body.getJSONArray("oilStationList") == null + || body.getJSONArray("oilStationList").size() == 0 + ) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, ""); + } + + List storeList = new ArrayList<>(); + for (Object obj : body.getJSONArray("oilStationList")) { + JSONObject objData = (JSONObject)obj; + if (objData.getLong("oilStationId") == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, ""); + } + storeList.add(objData.getLong("oilStationId")); + } + highTyAgentOilStationService.assignSalesman(body.getLong("salesmanId"), storeList); + + return ResponseMsgUtil.success("操作成功"); + + } catch (Exception e) { + log.error("HighTyAgentController --> assignOrg() error!", e); + return ResponseMsgUtil.exception(e); + } + } + + @RequestMapping(value = "/unbindSalesman", method = RequestMethod.POST) + @ResponseBody + @ApiOperation(value = "解绑业务员") + public ResponseData unbindSalesman(@RequestBody JSONObject body) { + try { + UserInfoModel userModel = userCenter.getSessionModel(UserInfoModel.class); + if (userModel == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.SEC_USER_EXPIRED, ""); + } + if (userModel.getBsCompany() != null && !userModel.getSecUser().getAdminFlag().equals(1)) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMPETENCE_INSUFFICIENT, ""); + } + + if (body.getJSONArray("oilStationList") == null + || body.getJSONArray("oilStationList").size() == 0) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, ""); + } + + List oilStationList = new ArrayList<>(); + for (Object obj : body.getJSONArray("oilStationList")) { + JSONObject objData = (JSONObject)obj; + if (objData.getLong("oilStationId") == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, ""); + } + oilStationList.add(objData.getLong("oilStationId")); + } + highTyAgentOilStationService.unbindSalesman(oilStationList); + + return ResponseMsgUtil.success("操作成功"); + + } catch (Exception e) { + log.error("HighTyAgentController --> assignOrg() error!", e); + return ResponseMsgUtil.exception(e); + } + } + + @RequestMapping(value = "/getOilStationList", method = RequestMethod.GET) + @ResponseBody + @ApiOperation(value = "查询加油站列表") + public ResponseData getOilStationList(@RequestParam(name = "regionName", required = false) String regionName, + @RequestParam(name = "storeName", required = false) String storeName, + @RequestParam(name = "isAssignOrgId", required = false) Boolean isAssignOrgId, + @RequestParam(name = "organizationName", required = false) String organizationName, + @RequestParam(name = "isAssignTyAgent", required = false) Boolean isAssignTyAgent, + @RequestParam(name = "tyAgentName", required = false) String tyAgentName, + @RequestParam(name = "isAssignTySalesman", required = false) Boolean isAssignTySalesman, + @RequestParam(name = "tySalesmanName", required = false) String tySalesmanName, + @RequestParam(name = "pageNum", required = true) Integer pageNum, + @RequestParam(name = "pageSize", required = true) Integer pageSize) { + try { + UserInfoModel userModel = userCenter.getSessionModel(UserInfoModel.class); + if (userModel == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.SEC_USER_EXPIRED, ""); + } + Map param = new HashMap<>(); + param.put("regionName", regionName); + param.put("storeName", storeName); + + if (userModel.getBsCompany() != null && userModel.getSecUser().getAdminFlag().equals(1)) { + param.put("isAssignOrgId", isAssignOrgId); + param.put("organizationName", organizationName); + param.put("isAssignTyAgent", isAssignTyAgent); + param.put("tyAgentName", tyAgentName); + param.put("isAssignTySalesman", isAssignTySalesman); + param.put("tySalesmanName", tySalesmanName); + + } else if (userModel.getBsCompany() != null && userModel.getSecUser().getAdminFlag().equals(0)) { + param.put("organizationId", userModel.getBsOrganization().getId()); + param.put("isAssignTyAgent", isAssignTyAgent); + param.put("tyAgentName", tyAgentName); + param.put("isAssignTySalesman", isAssignTySalesman); + param.put("tySalesmanName", tySalesmanName); + + } else if (userModel.getSecUser().getObjectType().equals(UserObjectTypeEnum.type6.getType())) { + param.put("tyAgentId", userModel.getHighTyAgent().getId()); + param.put("isAssignTySalesman", isAssignTySalesman); + param.put("tySalesmanName", tySalesmanName); + + } else if (userModel.getSecUser().getObjectType().equals(UserObjectTypeEnum.type7.getType())) { + param.put("tySalesmanId", userModel.getHighTySalesman().getId()); + } + + PageHelper.startPage(pageNum,pageSize); + return ResponseMsgUtil.success(new PageInfo<>(highTyAgentOilStationService.getOilStationList(param))); + + } catch (Exception e) { + log.error("HighTyAgentController --> getOilStationList() error!", e); + return ResponseMsgUtil.exception(e); + } + } +} 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 744f9392..fb98fc86 100644 --- a/hai-cweb/src/main/java/com/cweb/controller/HighTestController.java +++ b/hai-cweb/src/main/java/com/cweb/controller/HighTestController.java @@ -1 +1 @@ -package com.cweb.controller; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.cweb.config.SysConst; import com.hai.common.exception.ErrorCode; import com.hai.common.exception.ErrorHelp; import com.hai.common.exception.SysCode; import com.hai.common.pay.util.XmlUtil; import com.hai.common.pay.util.sdk.WXPayConstants; import com.hai.common.security.SessionObject; import com.hai.common.utils.*; import com.hai.config.*; import com.hai.dao.HighGasOrderPushMapper; import com.hai.entity.*; import com.hai.model.*; import com.hai.service.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.apache.http.HttpEntity; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpPost; import org.apache.http.conn.ssl.SSLConnectionSocketFactory; import org.apache.http.entity.StringEntity; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClients; import org.apache.http.ssl.SSLContexts; import org.apache.http.util.EntityUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Controller; import org.springframework.util.IdGenerator; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.net.ssl.SSLContext; import javax.servlet.http.HttpServletRequest; import java.io.FileInputStream; import java.math.BigDecimal; import java.security.KeyStore; import java.util.*; /** * @Auther: 胡锐 * @Description: * @Date: 2021/3/26 23:08 */ @Controller @RequestMapping(value = "/test") @Api(value = "订单接口") public class HighTestController { private static Logger log = LoggerFactory.getLogger(HighTestController.class); @Resource private HighMerchantService highMerchantService; @Resource private HighMerchantStoreService highMerchantStoreService; @Resource private HighGasOilPriceService highGasOilPriceService; @Resource private HighOrderService highOrderService; @Resource private HighProfitSharingRecordService highProfitSharingRecordService; @Resource private HighGasOrderPushMapper highGasOrderPushMapper; @Resource private HuiLianTongConfig huiLianTongConfig; @Resource private UnionPayConfig unionPayConfig; @Resource private UnionStagingPayConfig unionStagingPayConfig; @Resource private UnionUserConfig unionUserConfig; @Resource private OutRechargeOrderService outRechargeOrderService; @RequestMapping(value = "/getHuiLianTongCardInfo", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "查询汇联通工会卡详情") public ResponseData getHuiLianTongCardInfo(@RequestParam(name = "cardNo", required = true) String cardNo, HttpServletRequest request) { try { // 用户 // JSONObject cardInfo = HuiLianTongUnionCardConfig.queryCardInfo(cardNo); if (StringUtils.isBlank(cardInfo.getString("data"))) { throw ErrorHelp.genException(SysCode.System, ErrorCode.REQUEST_ERROR, ""); } return ResponseMsgUtil.success(HuiLianTongUnionCardConfig.resolveResponse(cardInfo.getString("data"))); } catch (Exception e) { log.error("HighUserCardController --> getHuiLianTongCardInfo() error!", e); return ResponseMsgUtil.exception(e); } } // // @RequestMapping(value = "/getMobile", method = RequestMethod.GET) // @ResponseBody // @ApiOperation(value = "话费充值") // public ResponseData getMobile( // @RequestParam(name = "orderNo", required = true) String orderNo, // @RequestParam(name = "amount", required = true) Integer amount, // @RequestParam(name = "phone", required = true) String phone, // HttpServletRequest request) { // try { // return ResponseMsgUtil.success(outRechargeOrderService.getMobile(phone,amount,orderNo)); // // } catch (Exception e) { // log.error("HighUserCardController --> getHuiLianTongCardInfo() error!", e); // return ResponseMsgUtil.exception(e); // } // } @RequestMapping(value = "/initTYMerchantStore", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "初始化加油站") public ResponseData initTYMerchantStore(@RequestParam(name = "merchantId", required = true) Long merchantId) throws Exception { HighMerchantModel merchant = highMerchantService.getMerchantById(merchantId); if (merchant == null) { throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未找到商户"); } JSONObject jsonObjectP = TuanYouConfig.queryGasInfoListByPage(1, 1000); JSONObject resultObjectP = jsonObjectP.getObject("result", JSONObject.class); for (int i = 1; i <= resultObjectP.getInteger("totalPageNum").intValue();i++) { JSONObject jsonObject = TuanYouConfig.queryGasInfoListByPage(i, 1000); JSONObject resultObject = jsonObject.getObject("result", JSONObject.class); JSONArray jsonArray = resultObject.getJSONArray("gasInfoList"); HighMerchantStore highMerchantStore; HighGasOilPrice highGasOilPrice; for (Object gasObject : jsonArray) { JSONObject object = JSONObject.parseObject(JSONObject.toJSONString(gasObject)); HighMerchantStoreModel store = highMerchantStoreService.getMerchantStoreByKey(object.getString("gasId")); if (store != null) { store.setType(1); store.setMerchantId(merchant.getId()); store.setCompanyId(merchant.getCompanyId()); store.setStoreKey(object.getString("gasId")); store.setStoreName(object.getString("gasName")); store.setStoreLogo(object.getString("gasLogoSmall")); store.setRegionId(object.getLong("provinceCode")); store.setRegionName(object.getString("provinceName")); store.setAddress(object.getString("gasAddress")); store.setLongitude(object.getString("gasAddressLongitude")); store.setLatitude(object.getString("gasAddressLatitude")); store.setStatus(object.getInteger("gasStatus")); store.setOperatorId(0L); store.setOperatorName("系统创建"); store.setUpdateTime(new Date()); store.setExt1(object.getString("gasSourceId")); highMerchantStoreService.updateMerchantStoreDetail(store); JSONArray oilPriceList = object.getJSONArray("oilPriceList"); for (Object oilPrice : oilPriceList) { JSONObject oilPriceObject = JSONObject.parseObject(JSONObject.toJSONString(oilPrice)); // 查询门店油号 highGasOilPrice = highGasOilPriceService.getGasOilPriceByStoreAndOilNo(store.getId(), oilPriceObject.getInteger("oilNo")); if (highGasOilPrice == null) { highGasOilPrice = new HighGasOilPrice(); highGasOilPrice.setMerchantStoreId(store.getId()); highGasOilPrice.setOilNo(oilPriceObject.getInteger("oilNo")); highGasOilPrice.setOilNoName(oilPriceObject.getString("oilNoName")); highGasOilPrice.setPriceVip(oilPriceObject.getBigDecimal("priceVip")); highGasOilPrice.setPriceGun(oilPriceObject.getBigDecimal("priceGun")); highGasOilPrice.setPriceOfficial(oilPriceObject.getBigDecimal("priceOfficial")); highGasOilPrice.setOilType(oilPriceObject.getInteger("oilType")); highGasOilPrice.setOilTypeName(oilPriceObject.getString("oilTypeName")); } else { highGasOilPrice.setMerchantStoreId(store.getId()); highGasOilPrice.setOilNo(oilPriceObject.getInteger("oilNo")); highGasOilPrice.setOilNoName(oilPriceObject.getString("oilNoName")); highGasOilPrice.setPriceVip(oilPriceObject.getBigDecimal("priceVip")); highGasOilPrice.setPriceGun(oilPriceObject.getBigDecimal("priceGun")); highGasOilPrice.setPriceOfficial(oilPriceObject.getBigDecimal("priceOfficial")); highGasOilPrice.setOilType(oilPriceObject.getInteger("oilType")); highGasOilPrice.setOilTypeName(oilPriceObject.getString("oilTypeName")); } highGasOilPriceService.editGasOilPrice(highGasOilPrice); } } else { highMerchantStore = new HighMerchantStore(); highMerchantStore.setType(1); highMerchantStore.setMerchantId(merchant.getId()); highMerchantStore.setCompanyId(merchant.getCompanyId()); highMerchantStore.setStoreKey(object.getString("gasId")); highMerchantStore.setStoreName(object.getString("gasName")); highMerchantStore.setStoreLogo(object.getString("gasLogoSmall")); highMerchantStore.setRegionId(object.getLong("provinceCode")); highMerchantStore.setRegionName(object.getString("provinceName")); highMerchantStore.setAddress(object.getString("gasAddress")); highMerchantStore.setLongitude(object.getString("gasAddressLongitude")); highMerchantStore.setLatitude(object.getString("gasAddressLatitude")); highMerchantStore.setStatus(1); highMerchantStore.setOperatorId(0L); highMerchantStore.setOperatorName("系统创建"); highMerchantStore.setCreateTime(new Date()); highMerchantStore.setUpdateTime(new Date()); highMerchantStore.setExt1(object.getString("gasSourceId")); HighMerchantStoreModel merchantStoreModel = new HighMerchantStoreModel(); BeanUtils.copyProperties(highMerchantStore, merchantStoreModel); highMerchantStoreService.insertMerchantStore(merchantStoreModel); JSONArray oilPriceList = object.getJSONArray("oilPriceList"); for (Object oilPrice : oilPriceList) { JSONObject oilPriceObject = JSONObject.parseObject(JSONObject.toJSONString(oilPrice)); highGasOilPrice = new HighGasOilPrice(); highGasOilPrice.setMerchantStoreId(merchantStoreModel.getId()); highGasOilPrice.setOilNo(oilPriceObject.getInteger("oilNo")); highGasOilPrice.setOilNoName(oilPriceObject.getString("oilNoName")); highGasOilPrice.setPriceVip(oilPriceObject.getBigDecimal("priceVip")); highGasOilPrice.setPriceGun(oilPriceObject.getBigDecimal("priceGun")); highGasOilPrice.setPriceOfficial(oilPriceObject.getBigDecimal("priceOfficial")); highGasOilPrice.setOilType(oilPriceObject.getInteger("oilType")); highGasOilPrice.setOilTypeName(oilPriceObject.getString("oilTypeName")); highGasOilPriceService.editGasOilPrice(highGasOilPrice); } } } } return ResponseMsgUtil.success("初始化完成"); } @RequestMapping(value = "/detectTYMerchantStore", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "检测加油站") public ResponseData detectTYMerchantStore(@RequestParam(name = "merchantId", required = true) Long merchantId) throws Exception { HighMerchantModel merchant = highMerchantService.getMerchantById(merchantId); if (merchant == null) { throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未找到商户"); } Map param = new HashMap<>(); param.put("merchantId", merchant.getId()); List stores = highMerchantStoreService.getMerchantStoreList(param); for (HighMerchantStore store : stores) { JSONObject jsonObject = TuanYouConfig.queryGasInfoByGasId(store.getStoreKey()); if (jsonObject != null && jsonObject.getString("code").equals("200")) { JSONObject result = jsonObject.getJSONObject("result"); store.setStatus(result.getInteger("gasStatus")); } else { store.setStatus(0); } highMerchantStoreService.updateMerchantStoreDetail(store); } return ResponseMsgUtil.success("初始化完成"); } /* @RequestMapping(value = "/pushTuanYouOrder", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "推送团油订单") public ResponseData pushTuanYouOrder() { try { HighOrder order = highOrderService.getOrderByOrderNo("HF2021102112141171406"); for (HighChildOrder highChildOrder : order.getHighChildOrderList()) { HighMerchantStoreModel store = highMerchantStoreService.getMerchantStoreById(highChildOrder.getGoodsId()); // 推送团油订单 Map paramMap = new HashMap<>(); paramMap.put("gasId", store.getStoreKey()); paramMap.put("oilNo", highChildOrder.getGasOilNo()); paramMap.put("gunNo", highChildOrder.getGasGunNo()); BigDecimal priceGun = highChildOrder.getGasPriceGun(); BigDecimal priceVip = highChildOrder.getGasPriceVip(); paramMap.put("priceGun", priceGun); // 枪单价 paramMap.put("priceVip", priceVip); // 优惠价 paramMap.put("driverPhone", order.getMemPhone()); // paramMap.put("driverPhone", "17726395120"); paramMap.put("thirdSerialNo", order.getOrderNo()); paramMap.put("refuelingAmount", highChildOrder.getTotalPrice()); // 油品类型 1:汽油:2:柴油;3:天然气 if (highChildOrder.getGasOilType() == 1) { paramMap.put("accountNo", CommonSysConst.getSysConfig().getTuanYouGasolineAccount()); } else if (highChildOrder.getGasOilType() == 2) { paramMap.put("accountNo", CommonSysConst.getSysConfig().getTuanYouDieselAccount()); } JSONObject orderPushObject = TuanYouConfig.refuelingOrderPush(paramMap); // 推送团油订单记录 HighGasOrderPush highGasOrderPush = new HighGasOrderPush(); highGasOrderPush.setCreateTime(new Date()); highGasOrderPush.setCode(orderPushObject.getString("code")); highGasOrderPush.setRequestContent(JSONObject.toJSONString(paramMap)); highGasOrderPush.setReturnContent(orderPushObject.toJSONString()); highGasOrderPushMapper.insert(highGasOrderPush); if (orderPushObject != null && orderPushObject.getString("code").equals("200")) { highChildOrder.setGasOrderNo(orderPushObject.getJSONObject("result").getString("orderNo")); } highOrderService.updateOrder(order); } return ResponseMsgUtil.success(order); } catch (Exception e) { log.error("HighOrderController --> getOrderById() error!", e); return ResponseMsgUtil.exception(e); } }*/ @RequestMapping(value = "/queryCompanyAccountInfo2JD", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "查询团油余额") public ResponseData queryCompanyAccountInfo2JD() { try { return ResponseMsgUtil.success(TuanYouConfig.queryCompanyAccountInfo2JD()); } catch (Exception e) { log.error("HighOrderController --> queryCompanyAccountInfo2JD() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/queryCompanyPriceDetail", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "查询团油余额") public ResponseData queryCompanyPriceDetail() { try { return ResponseMsgUtil.success(TuanYouConfig.queryCompanyPriceDetail("LW000115995", "92")); } catch (Exception e) { log.error("HighOrderController --> queryCompanyAccountInfo2JD() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/couJointDist", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "派发贵州卡券") public ResponseData couJointDist(@RequestParam(name = "token", required = true) String token) { try { return ResponseMsgUtil.success(HuiLianTongConfig.couJointDist(token,"HF2022031509263475105","20JY000575",1,"18385214742", "oArhO6QZSIJAcawo1Wwx5cKKZ0ns")); } catch (Exception e) { log.error("HighOrderController --> getOrderById() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/tradeQuery", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "派发贵州卡券") public ResponseData tradeQuery(@RequestParam(name = "token", required = true) String token) { try { return ResponseMsgUtil.success(UnionPayConfig.tradeQuery(UnionPayConfig.MER_ID3,UnionPayConfig.TERM_ID3,"HF2022031215130820400")); } catch (Exception e) { log.error("HighOrderController --> getOrderById() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/zwrefund", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "派发贵州卡券") public ResponseData zwrefund() { try { return ResponseMsgUtil.success(UnionPayConfig.zwrefund(UnionPayConfig.MER_ID3,UnionPayConfig.TERM_ID3,"HF2022031215130820400", "31720220312151311876232", new BigDecimal("270").multiply(new BigDecimal("100")).longValue())); } catch (Exception e) { log.error("HighOrderController --> getOrderById() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/unionPay", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "银联支付") public ResponseData unionPay(HttpServletRequest request) { try { // return ResponseMsgUtil.success(RequestUtils.getIpAddress(request)); return ResponseMsgUtil.success(unionPayConfig.upPreOrder(UnionPayConfig.MER_ID3, UnionPayConfig.TERM_ID3, "HF"+System.currentTimeMillis(), new BigDecimal("1"), "test",CommonSysConst.getSysConfig().getUnionPayNotifyUrl(), request)); } catch (Exception e) { log.error("HighOrderController --> unionPay() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/getToken", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "获取贵州中石化token") public ResponseData getToken() { try { return ResponseMsgUtil.success(huiLianTongConfig.getToken()); } catch (Exception e) { log.error("HighOrderController --> getToken() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/unionTradeQuery", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "银联交易查询") public ResponseData unionTradeQuery(@RequestParam(name = "paySerialNo", required = true) String paySerialNo) { try { return ResponseMsgUtil.success(UnionPayConfig.tradeQuery(UnionPayConfig.MER_ID1, UnionPayConfig.TERM_ID1, paySerialNo)); } catch (Exception e) { log.error("HighOrderController --> unionTradeQuery() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/getBackendToken", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "获取访问令牌backendToken") public ResponseData getBackendToken() { try { return ResponseMsgUtil.success(unionUserConfig.getBackendToken()); } catch (Exception e) { log.error("HighOrderController --> getBackendToken() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/wxSplitAccount", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "微信分账") public ResponseData wxSplitAccount() { try { HighOrder orderNo = highOrderService.getOrderByOrderNo("HF2021101812025050304"); wxProfitsharing(orderNo.getOrderNo(),orderNo.getPaySerialNo(),orderNo.getPayRealPrice()); return ResponseMsgUtil.success("分账成功"); } catch (Exception e) { log.error("HighOrderController --> getOrderById() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/unionStagingPay", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "银联分期支付") public ResponseData unionStagingPay(HttpServletRequest request) { try { /* String orderNo = DateUtil.format(new Date(), DateUtil.YMDHMS); orderNo += IDGenerator.nextId(28 - orderNo.length());*/ String orgTrace = CommonSysConst.getSysConfig().getUnionStagingPayOrgId().substring(0,4) +CommonSysConst.getSysConfig().getUnionStagingPayOrgId().substring(CommonSysConst.getSysConfig().getUnionStagingPayOrgId().length() - 4,CommonSysConst.getSysConfig().getUnionStagingPayOrgId().length()) +DateUtil.format(new Date(), DateUtil.YMDHMS) +IDGenerator.nextId(6); return ResponseMsgUtil.success(unionStagingPayConfig.advancePay( orgTrace, orgTrace, new BigDecimal("1"), CommonSysConst.getSysConfig().getUnionStagingPayNotifyUrl(), request)); } catch (Exception e) { log.error("HighOrderController --> unionStagingPay() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/queryStaging", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "分期查询") public ResponseData queryStaging(@RequestParam(name = "oriOrgTrace", required = true) String oriOrgTrace,HttpServletRequest request) { try { String orgTrace = CommonSysConst.getSysConfig().getUnionStagingPayOrgId().substring(0,4) +CommonSysConst.getSysConfig().getUnionStagingPayOrgId().substring(CommonSysConst.getSysConfig().getUnionStagingPayOrgId().length() - 4,CommonSysConst.getSysConfig().getUnionStagingPayOrgId().length()) +DateUtil.format(new Date(), DateUtil.YMDHMS) +IDGenerator.nextId(6); return ResponseMsgUtil.success(UnionStagingPayConfig.queryStaging(orgTrace,oriOrgTrace ,"", new Date(), request)); } catch (Exception e) { log.error("HighOrderController --> unionStagingPay() error!", e); return ResponseMsgUtil.exception(e); } } /* @RequestMapping(value = "/orderToRefund", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "退款") public ResponseData orderToRefund(HttpServletRequest request) { try { OrderRefundModel orderRefundModel = WxOrderConfig.orderToRefund("4200001301202202035413938093", new BigDecimal("30.80"), new BigDecimal("16.90")); return ResponseMsgUtil.success(orderRefundModel); } catch (Exception e) { log.error("HighOrderController --> orderToRefund() error!", e); return ResponseMsgUtil.exception(e); } }*/ @RequestMapping(value = "/query", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "订单查询") public ResponseData query(@RequestParam(name = "oriOrgTrace", required = true) String oriOrgTrace,HttpServletRequest request) { try { String orgTrace = CommonSysConst.getSysConfig().getUnionStagingPayOrgId().substring(0,4) +CommonSysConst.getSysConfig().getUnionStagingPayOrgId().substring(CommonSysConst.getSysConfig().getUnionStagingPayOrgId().length() - 4,CommonSysConst.getSysConfig().getUnionStagingPayOrgId().length()) +DateUtil.format(new Date(), DateUtil.YMDHMS) +IDGenerator.nextId(6); return ResponseMsgUtil.success(UnionStagingPayConfig.query(orgTrace,oriOrgTrace ,"", new Date(), request)); } catch (Exception e) { log.error("HighOrderController --> unionStagingPay() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/mposrefund", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "分期退款") public ResponseData mposrefund(@RequestParam(name = "oriOrgTrace", required = true) String oriOrgTrace,HttpServletRequest request) { try { String orgTrace = CommonSysConst.getSysConfig().getUnionStagingPayOrgId().substring(0,4) +CommonSysConst.getSysConfig().getUnionStagingPayOrgId().substring(CommonSysConst.getSysConfig().getUnionStagingPayOrgId().length() - 4,CommonSysConst.getSysConfig().getUnionStagingPayOrgId().length()) +DateUtil.format(new Date(), DateUtil.YMDHMS) +IDGenerator.nextId(6); return ResponseMsgUtil.success(UnionStagingPayConfig.standardRefund(orgTrace,oriOrgTrace ,new BigDecimal("1"), "", new Date(), request)); } catch (Exception e) { log.error("HighOrderController --> unionStagingPay() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/mposfindrefund", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "分期退款查询") public ResponseData mposfindrefund(@RequestParam(name = "oriOrgTrace", required = true) String oriOrgTrace,HttpServletRequest request) { try { String orgTrace = CommonSysConst.getSysConfig().getUnionStagingPayOrgId().substring(0,4) +CommonSysConst.getSysConfig().getUnionStagingPayOrgId().substring(CommonSysConst.getSysConfig().getUnionStagingPayOrgId().length() - 4,CommonSysConst.getSysConfig().getUnionStagingPayOrgId().length()) +DateUtil.format(new Date(), DateUtil.YMDHMS) +IDGenerator.nextId(6); return ResponseMsgUtil.success(UnionStagingPayConfig.mposfindrefund(orgTrace,oriOrgTrace ,"", new Date(), request)); } catch (Exception e) { log.error("HighOrderController --> unionStagingPay() error!", e); return ResponseMsgUtil.exception(e); } } public void wxProfitsharing(String transaction_id,String out_order_no, BigDecimal amount) { try { Map param = new LinkedHashMap<>(); param.put("appid", "wx637bd6f7314daa46"); param.put("mch_id", "1289663601"); param.put("sub_mch_id" , "1609882817"); // 个体户黎杨珍 param.put("transaction_id" , transaction_id); param.put("out_order_no" , out_order_no); param.put("nonce_str" , WxUtils.makeNonStr()); // 分账金额 BigDecimal porofitSharingAmount = amount; List> receiversList = new ArrayList<>(); Map receiversMap = new LinkedHashMap<>(); receiversMap.put("type", "MERCHANT_ID"); receiversMap.put("account", "1603942866"); receiversMap.put("amount", porofitSharingAmount.multiply(new BigDecimal("100")).intValue()); receiversMap.put("description", "分给商户【惠昕石化】"); receiversList.add(receiversMap); param.put("receivers" , JSONObject.toJSONString(receiversList)); String signStr = WxUtils.generateSignature(param, "Skufk5oi85wDFGl888i6wsRSTkdd5df5" , WXPayConstants.SignType.HMACSHA256); param.put("sign" , signStr); String resultXmL = this.doRefundRequest(param.get("mch_id"),null, WxUtils.mapToXml(param)); // 请求分账返回的结果 ResultProfitSharing resultProfitSharing = XmlUtil.getObjectFromXML(resultXmL, ResultProfitSharing.class); if (!resultProfitSharing.getResult_code().equals("FAIL")) { HighProfitSharingRecord sharingRecord = new HighProfitSharingRecord(); sharingRecord.setOutOrderNo(resultProfitSharing.getOut_order_no()); sharingRecord.setTransactionId(resultProfitSharing.getTransaction_id()); sharingRecord.setOrderId(resultProfitSharing.getOrder_id()); sharingRecord.setStatus(resultProfitSharing.getResult_code()); sharingRecord.setPrice(amount); sharingRecord.setCreateTime(new Date()); sharingRecord.setContent(resultXmL); highProfitSharingRecordService.insert(sharingRecord); } } catch (Exception e) { log.error("CmsContentController --> getCorporateAdvertising() error!", e); } } public CloseableHttpClient readCertificate(String mchId) throws Exception{ /** * 注意PKCS12证书 是从微信商户平台-》账户设置-》 API安全 中下载的 */ KeyStore keyStore = KeyStore.getInstance("PKCS12"); //P12文件目录 证书路径,这里需要你自己修改,linux下还是windows下的根路径 FileInputStream instream = new FileInputStream("/home/project/wx_cert/1289663601_apiclient_cert.p12"); // FileInputStream instream = new FileInputStream("G:\\hurui-project/hai-parent/hai-service/src/main/java/privatekey/1289663601_apiclient_cert.p12"); try { keyStore.load(instream, "1289663601".toCharArray());//这里写密码..默认是你的MCHID } finally { instream.close(); } SSLContext sslcontext = SSLContexts.custom().loadKeyMaterial(keyStore, "1289663601".toCharArray()).build();//这里也是写密码的 SSLConnectionSocketFactory sslsf = new SSLConnectionSocketFactory(sslcontext, SSLConnectionSocketFactory.getDefaultHostnameVerifier()); // Allow TLSv1 protocol only return HttpClients.custom().setSSLSocketFactory(sslsf).build(); } public String doRefundRequest(String mchId, String url, String data) throws Exception { //小程序退款需要调用双向证书的认证 CloseableHttpClient httpClient = readCertificate(mchId); try { HttpPost httpost = new HttpPost("https://api.mch.weixin.qq.com/secapi/pay/refund"); // 设置响应头信息 httpost.addHeader("Connection", "keep-alive"); httpost.addHeader("Accept", "*/*"); httpost.addHeader("Content-Type", "text/xml"); httpost.addHeader("Host", "api.mch.weixin.qq.com"); httpost.addHeader("X-Requested-With", "XMLHttpRequest"); httpost.addHeader("Cache-Control", "max-age=0"); httpost.addHeader("User-Agent", "Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.0) "); httpost.setEntity(new StringEntity(data, "UTF-8")); CloseableHttpResponse response = httpClient.execute(httpost); try { HttpEntity entity = response.getEntity(); String jsonStr = EntityUtils.toString(response.getEntity(), "UTF-8"); EntityUtils.consume(entity); return jsonStr; } finally { response.close(); } } catch (Exception e){ throw new RuntimeException(e); } finally { httpClient.close(); } } } \ No newline at end of file +package com.cweb.controller; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.cweb.config.SysConst; import com.hai.common.exception.ErrorCode; import com.hai.common.exception.ErrorHelp; import com.hai.common.exception.SysCode; import com.hai.common.pay.util.XmlUtil; import com.hai.common.pay.util.sdk.WXPayConstants; import com.hai.common.security.SessionObject; import com.hai.common.utils.*; import com.hai.config.*; import com.hai.dao.HighGasOrderPushMapper; import com.hai.entity.*; import com.hai.model.*; import com.hai.service.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.apache.http.HttpEntity; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpPost; import org.apache.http.conn.ssl.SSLConnectionSocketFactory; import org.apache.http.entity.StringEntity; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClients; import org.apache.http.ssl.SSLContexts; import org.apache.http.util.EntityUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Controller; import org.springframework.util.IdGenerator; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.net.ssl.SSLContext; import javax.servlet.http.HttpServletRequest; import java.io.FileInputStream; import java.math.BigDecimal; import java.security.KeyStore; import java.util.*; /** * @Auther: 胡锐 * @Description: * @Date: 2021/3/26 23:08 */ @Controller @RequestMapping(value = "/test") @Api(value = "订单接口") public class HighTestController { private static Logger log = LoggerFactory.getLogger(HighTestController.class); @Resource private HighMerchantService highMerchantService; @Resource private HighMerchantStoreService highMerchantStoreService; @Resource private HighGasOilPriceService highGasOilPriceService; @Resource private HighOrderService highOrderService; @Resource private HighProfitSharingRecordService highProfitSharingRecordService; @Resource private HighGasOrderPushMapper highGasOrderPushMapper; @Resource private HuiLianTongConfig huiLianTongConfig; @Resource private UnionPayConfig unionPayConfig; @Resource private UnionStagingPayConfig unionStagingPayConfig; @Resource private UnionUserConfig unionUserConfig; @Resource private OutRechargeOrderService outRechargeOrderService; @RequestMapping(value = "/getHuiLianTongCardInfo", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "查询汇联通工会卡详情") public ResponseData getHuiLianTongCardInfo(@RequestParam(name = "cardNo", required = true) String cardNo, HttpServletRequest request) { try { // 用户 // JSONObject cardInfo = HuiLianTongUnionCardConfig.queryCardInfo(cardNo); if (StringUtils.isBlank(cardInfo.getString("data"))) { throw ErrorHelp.genException(SysCode.System, ErrorCode.REQUEST_ERROR, ""); } return ResponseMsgUtil.success(HuiLianTongUnionCardConfig.resolveResponse(cardInfo.getString("data"))); } catch (Exception e) { log.error("HighUserCardController --> getHuiLianTongCardInfo() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/queryGasInfoByGasId", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "根据油站 id 拉取最新的油站数据") public ResponseData queryGasInfoByGasId(@RequestParam(name = "gasId", required = true) String gasId, HttpServletRequest request) { try { return ResponseMsgUtil.success(TuanYouConfig.queryGasInfoByGasId(gasId)); } catch (Exception e) { log.error("HighUserCardController --> getHuiLianTongCardInfo() error!", e); return ResponseMsgUtil.exception(e); } } // // @RequestMapping(value = "/getMobile", method = RequestMethod.GET) // @ResponseBody // @ApiOperation(value = "话费充值") // public ResponseData getMobile( // @RequestParam(name = "orderNo", required = true) String orderNo, // @RequestParam(name = "amount", required = true) Integer amount, // @RequestParam(name = "phone", required = true) String phone, // HttpServletRequest request) { // try { // return ResponseMsgUtil.success(outRechargeOrderService.getMobile(phone,amount,orderNo)); // // } catch (Exception e) { // log.error("HighUserCardController --> getHuiLianTongCardInfo() error!", e); // return ResponseMsgUtil.exception(e); // } // } @RequestMapping(value = "/initTYMerchantStore", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "初始化加油站") public ResponseData initTYMerchantStore(@RequestParam(name = "merchantId", required = true) Long merchantId) throws Exception { HighMerchantModel merchant = highMerchantService.getMerchantById(merchantId); if (merchant == null) { throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未找到商户"); } JSONObject jsonObjectP = TuanYouConfig.queryGasInfoListByPage(1, 1000); JSONObject resultObjectP = jsonObjectP.getObject("result", JSONObject.class); for (int i = 1; i <= resultObjectP.getInteger("totalPageNum").intValue();i++) { JSONObject jsonObject = TuanYouConfig.queryGasInfoListByPage(i, 1000); JSONObject resultObject = jsonObject.getObject("result", JSONObject.class); JSONArray jsonArray = resultObject.getJSONArray("gasInfoList"); HighMerchantStore highMerchantStore; HighGasOilPrice highGasOilPrice; for (Object gasObject : jsonArray) { JSONObject object = JSONObject.parseObject(JSONObject.toJSONString(gasObject)); HighMerchantStoreModel store = highMerchantStoreService.getMerchantStoreByKey(object.getString("gasId")); if (store != null) { store.setType(1); store.setMerchantId(merchant.getId()); store.setCompanyId(merchant.getCompanyId()); store.setStoreKey(object.getString("gasId")); store.setStoreName(object.getString("gasName")); store.setStoreLogo(object.getString("gasLogoSmall")); store.setRegionId(object.getLong("provinceCode")); store.setRegionName(object.getString("provinceName")); store.setAddress(object.getString("gasAddress")); store.setLongitude(object.getString("gasAddressLongitude")); store.setLatitude(object.getString("gasAddressLatitude")); store.setStatus(object.getInteger("gasStatus")); store.setOperatorId(0L); store.setOperatorName("系统创建"); store.setUpdateTime(new Date()); store.setExt1(object.getString("gasSourceId")); highMerchantStoreService.updateMerchantStoreDetail(store); JSONArray oilPriceList = object.getJSONArray("oilPriceList"); for (Object oilPrice : oilPriceList) { JSONObject oilPriceObject = JSONObject.parseObject(JSONObject.toJSONString(oilPrice)); // 查询门店油号 highGasOilPrice = highGasOilPriceService.getGasOilPriceByStoreAndOilNo(store.getId(), oilPriceObject.getInteger("oilNo")); if (highGasOilPrice == null) { highGasOilPrice = new HighGasOilPrice(); highGasOilPrice.setMerchantStoreId(store.getId()); highGasOilPrice.setOilNo(oilPriceObject.getInteger("oilNo")); highGasOilPrice.setOilNoName(oilPriceObject.getString("oilNoName")); highGasOilPrice.setPriceVip(oilPriceObject.getBigDecimal("priceVip")); highGasOilPrice.setPriceGun(oilPriceObject.getBigDecimal("priceGun")); highGasOilPrice.setPriceOfficial(oilPriceObject.getBigDecimal("priceOfficial")); highGasOilPrice.setOilType(oilPriceObject.getInteger("oilType")); highGasOilPrice.setOilTypeName(oilPriceObject.getString("oilTypeName")); } else { highGasOilPrice.setMerchantStoreId(store.getId()); highGasOilPrice.setOilNo(oilPriceObject.getInteger("oilNo")); highGasOilPrice.setOilNoName(oilPriceObject.getString("oilNoName")); highGasOilPrice.setPriceVip(oilPriceObject.getBigDecimal("priceVip")); highGasOilPrice.setPriceGun(oilPriceObject.getBigDecimal("priceGun")); highGasOilPrice.setPriceOfficial(oilPriceObject.getBigDecimal("priceOfficial")); highGasOilPrice.setOilType(oilPriceObject.getInteger("oilType")); highGasOilPrice.setOilTypeName(oilPriceObject.getString("oilTypeName")); } highGasOilPriceService.editGasOilPrice(highGasOilPrice); } } else { highMerchantStore = new HighMerchantStore(); highMerchantStore.setType(1); highMerchantStore.setMerchantId(merchant.getId()); highMerchantStore.setCompanyId(merchant.getCompanyId()); highMerchantStore.setStoreKey(object.getString("gasId")); highMerchantStore.setStoreName(object.getString("gasName")); highMerchantStore.setStoreLogo(object.getString("gasLogoSmall")); highMerchantStore.setRegionId(object.getLong("provinceCode")); highMerchantStore.setRegionName(object.getString("provinceName")); highMerchantStore.setAddress(object.getString("gasAddress")); highMerchantStore.setLongitude(object.getString("gasAddressLongitude")); highMerchantStore.setLatitude(object.getString("gasAddressLatitude")); highMerchantStore.setStatus(1); highMerchantStore.setOperatorId(0L); highMerchantStore.setOperatorName("系统创建"); highMerchantStore.setCreateTime(new Date()); highMerchantStore.setUpdateTime(new Date()); highMerchantStore.setExt1(object.getString("gasSourceId")); HighMerchantStoreModel merchantStoreModel = new HighMerchantStoreModel(); BeanUtils.copyProperties(highMerchantStore, merchantStoreModel); highMerchantStoreService.insertMerchantStore(merchantStoreModel); JSONArray oilPriceList = object.getJSONArray("oilPriceList"); for (Object oilPrice : oilPriceList) { JSONObject oilPriceObject = JSONObject.parseObject(JSONObject.toJSONString(oilPrice)); highGasOilPrice = new HighGasOilPrice(); highGasOilPrice.setMerchantStoreId(merchantStoreModel.getId()); highGasOilPrice.setOilNo(oilPriceObject.getInteger("oilNo")); highGasOilPrice.setOilNoName(oilPriceObject.getString("oilNoName")); highGasOilPrice.setPriceVip(oilPriceObject.getBigDecimal("priceVip")); highGasOilPrice.setPriceGun(oilPriceObject.getBigDecimal("priceGun")); highGasOilPrice.setPriceOfficial(oilPriceObject.getBigDecimal("priceOfficial")); highGasOilPrice.setOilType(oilPriceObject.getInteger("oilType")); highGasOilPrice.setOilTypeName(oilPriceObject.getString("oilTypeName")); highGasOilPriceService.editGasOilPrice(highGasOilPrice); } } } } return ResponseMsgUtil.success("初始化完成"); } @RequestMapping(value = "/detectTYMerchantStore", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "检测加油站") public ResponseData detectTYMerchantStore(@RequestParam(name = "merchantId", required = true) Long merchantId) throws Exception { HighMerchantModel merchant = highMerchantService.getMerchantById(merchantId); if (merchant == null) { throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未找到商户"); } Map param = new HashMap<>(); param.put("merchantId", merchant.getId()); List stores = highMerchantStoreService.getMerchantStoreList(param); for (HighMerchantStore store : stores) { JSONObject jsonObject = TuanYouConfig.queryGasInfoByGasId(store.getStoreKey()); if (jsonObject != null && jsonObject.getString("code").equals("200")) { JSONObject result = jsonObject.getJSONObject("result"); store.setStatus(result.getInteger("gasStatus")); } else { store.setStatus(0); } highMerchantStoreService.updateMerchantStoreDetail(store); } return ResponseMsgUtil.success("初始化完成"); } /* @RequestMapping(value = "/pushTuanYouOrder", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "推送团油订单") public ResponseData pushTuanYouOrder() { try { HighOrder order = highOrderService.getOrderByOrderNo("HF2021102112141171406"); for (HighChildOrder highChildOrder : order.getHighChildOrderList()) { HighMerchantStoreModel store = highMerchantStoreService.getMerchantStoreById(highChildOrder.getGoodsId()); // 推送团油订单 Map paramMap = new HashMap<>(); paramMap.put("gasId", store.getStoreKey()); paramMap.put("oilNo", highChildOrder.getGasOilNo()); paramMap.put("gunNo", highChildOrder.getGasGunNo()); BigDecimal priceGun = highChildOrder.getGasPriceGun(); BigDecimal priceVip = highChildOrder.getGasPriceVip(); paramMap.put("priceGun", priceGun); // 枪单价 paramMap.put("priceVip", priceVip); // 优惠价 paramMap.put("driverPhone", order.getMemPhone()); // paramMap.put("driverPhone", "17726395120"); paramMap.put("thirdSerialNo", order.getOrderNo()); paramMap.put("refuelingAmount", highChildOrder.getTotalPrice()); // 油品类型 1:汽油:2:柴油;3:天然气 if (highChildOrder.getGasOilType() == 1) { paramMap.put("accountNo", CommonSysConst.getSysConfig().getTuanYouGasolineAccount()); } else if (highChildOrder.getGasOilType() == 2) { paramMap.put("accountNo", CommonSysConst.getSysConfig().getTuanYouDieselAccount()); } JSONObject orderPushObject = TuanYouConfig.refuelingOrderPush(paramMap); // 推送团油订单记录 HighGasOrderPush highGasOrderPush = new HighGasOrderPush(); highGasOrderPush.setCreateTime(new Date()); highGasOrderPush.setCode(orderPushObject.getString("code")); highGasOrderPush.setRequestContent(JSONObject.toJSONString(paramMap)); highGasOrderPush.setReturnContent(orderPushObject.toJSONString()); highGasOrderPushMapper.insert(highGasOrderPush); if (orderPushObject != null && orderPushObject.getString("code").equals("200")) { highChildOrder.setGasOrderNo(orderPushObject.getJSONObject("result").getString("orderNo")); } highOrderService.updateOrder(order); } return ResponseMsgUtil.success(order); } catch (Exception e) { log.error("HighOrderController --> getOrderById() error!", e); return ResponseMsgUtil.exception(e); } }*/ @RequestMapping(value = "/queryCompanyAccountInfo2JD", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "查询团油余额") public ResponseData queryCompanyAccountInfo2JD() { try { return ResponseMsgUtil.success(TuanYouConfig.queryCompanyAccountInfo2JD()); } catch (Exception e) { log.error("HighOrderController --> queryCompanyAccountInfo2JD() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/queryCompanyPriceDetail", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "查询团油余额") public ResponseData queryCompanyPriceDetail() { try { return ResponseMsgUtil.success(TuanYouConfig.queryCompanyPriceDetail("LW000115995", "92")); } catch (Exception e) { log.error("HighOrderController --> queryCompanyAccountInfo2JD() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/couJointDist", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "派发贵州卡券") public ResponseData couJointDist(@RequestParam(name = "token", required = true) String token) { try { return ResponseMsgUtil.success(HuiLianTongConfig.couJointDist(token,"HF2022031509263475105","20JY000575",1,"18385214742", "oArhO6QZSIJAcawo1Wwx5cKKZ0ns")); } catch (Exception e) { log.error("HighOrderController --> getOrderById() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/tradeQuery", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "派发贵州卡券") public ResponseData tradeQuery(@RequestParam(name = "token", required = true) String token) { try { return ResponseMsgUtil.success(UnionPayConfig.tradeQuery(UnionPayConfig.MER_ID3,UnionPayConfig.TERM_ID3,"HF2022031215130820400")); } catch (Exception e) { log.error("HighOrderController --> getOrderById() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/zwrefund", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "派发贵州卡券") public ResponseData zwrefund() { try { return ResponseMsgUtil.success(UnionPayConfig.zwrefund(UnionPayConfig.MER_ID3,UnionPayConfig.TERM_ID3,"HF2022031215130820400", "31720220312151311876232", new BigDecimal("270").multiply(new BigDecimal("100")).longValue())); } catch (Exception e) { log.error("HighOrderController --> getOrderById() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/unionPay", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "银联支付") public ResponseData unionPay(HttpServletRequest request) { try { // return ResponseMsgUtil.success(RequestUtils.getIpAddress(request)); return ResponseMsgUtil.success(unionPayConfig.upPreOrder(UnionPayConfig.MER_ID3, UnionPayConfig.TERM_ID3, "HF"+System.currentTimeMillis(), new BigDecimal("1"), "test",CommonSysConst.getSysConfig().getUnionPayNotifyUrl(), request)); } catch (Exception e) { log.error("HighOrderController --> unionPay() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/getToken", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "获取贵州中石化token") public ResponseData getToken() { try { return ResponseMsgUtil.success(huiLianTongConfig.getToken()); } catch (Exception e) { log.error("HighOrderController --> getToken() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/unionTradeQuery", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "银联交易查询") public ResponseData unionTradeQuery(@RequestParam(name = "paySerialNo", required = true) String paySerialNo) { try { return ResponseMsgUtil.success(UnionPayConfig.tradeQuery(UnionPayConfig.MER_ID1, UnionPayConfig.TERM_ID1, paySerialNo)); } catch (Exception e) { log.error("HighOrderController --> unionTradeQuery() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/getBackendToken", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "获取访问令牌backendToken") public ResponseData getBackendToken() { try { return ResponseMsgUtil.success(unionUserConfig.getBackendToken()); } catch (Exception e) { log.error("HighOrderController --> getBackendToken() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/wxSplitAccount", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "微信分账") public ResponseData wxSplitAccount() { try { HighOrder orderNo = highOrderService.getOrderByOrderNo("HF2021101812025050304"); wxProfitsharing(orderNo.getOrderNo(),orderNo.getPaySerialNo(),orderNo.getPayRealPrice()); return ResponseMsgUtil.success("分账成功"); } catch (Exception e) { log.error("HighOrderController --> getOrderById() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/unionStagingPay", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "银联分期支付") public ResponseData unionStagingPay(HttpServletRequest request) { try { /* String orderNo = DateUtil.format(new Date(), DateUtil.YMDHMS); orderNo += IDGenerator.nextId(28 - orderNo.length());*/ String orgTrace = CommonSysConst.getSysConfig().getUnionStagingPayOrgId().substring(0,4) +CommonSysConst.getSysConfig().getUnionStagingPayOrgId().substring(CommonSysConst.getSysConfig().getUnionStagingPayOrgId().length() - 4,CommonSysConst.getSysConfig().getUnionStagingPayOrgId().length()) +DateUtil.format(new Date(), DateUtil.YMDHMS) +IDGenerator.nextId(6); return ResponseMsgUtil.success(unionStagingPayConfig.advancePay( orgTrace, orgTrace, new BigDecimal("1"), CommonSysConst.getSysConfig().getUnionStagingPayNotifyUrl(), request)); } catch (Exception e) { log.error("HighOrderController --> unionStagingPay() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/queryStaging", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "分期查询") public ResponseData queryStaging(@RequestParam(name = "oriOrgTrace", required = true) String oriOrgTrace,HttpServletRequest request) { try { String orgTrace = CommonSysConst.getSysConfig().getUnionStagingPayOrgId().substring(0,4) +CommonSysConst.getSysConfig().getUnionStagingPayOrgId().substring(CommonSysConst.getSysConfig().getUnionStagingPayOrgId().length() - 4,CommonSysConst.getSysConfig().getUnionStagingPayOrgId().length()) +DateUtil.format(new Date(), DateUtil.YMDHMS) +IDGenerator.nextId(6); return ResponseMsgUtil.success(UnionStagingPayConfig.queryStaging(orgTrace,oriOrgTrace ,"", new Date(), request)); } catch (Exception e) { log.error("HighOrderController --> unionStagingPay() error!", e); return ResponseMsgUtil.exception(e); } } /* @RequestMapping(value = "/orderToRefund", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "退款") public ResponseData orderToRefund(HttpServletRequest request) { try { OrderRefundModel orderRefundModel = WxOrderConfig.orderToRefund("4200001301202202035413938093", new BigDecimal("30.80"), new BigDecimal("16.90")); return ResponseMsgUtil.success(orderRefundModel); } catch (Exception e) { log.error("HighOrderController --> orderToRefund() error!", e); return ResponseMsgUtil.exception(e); } }*/ @RequestMapping(value = "/query", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "订单查询") public ResponseData query(@RequestParam(name = "oriOrgTrace", required = true) String oriOrgTrace,HttpServletRequest request) { try { String orgTrace = CommonSysConst.getSysConfig().getUnionStagingPayOrgId().substring(0,4) +CommonSysConst.getSysConfig().getUnionStagingPayOrgId().substring(CommonSysConst.getSysConfig().getUnionStagingPayOrgId().length() - 4,CommonSysConst.getSysConfig().getUnionStagingPayOrgId().length()) +DateUtil.format(new Date(), DateUtil.YMDHMS) +IDGenerator.nextId(6); return ResponseMsgUtil.success(UnionStagingPayConfig.query(orgTrace,oriOrgTrace ,"", new Date(), request)); } catch (Exception e) { log.error("HighOrderController --> unionStagingPay() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/mposrefund", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "分期退款") public ResponseData mposrefund(@RequestParam(name = "oriOrgTrace", required = true) String oriOrgTrace,HttpServletRequest request) { try { String orgTrace = CommonSysConst.getSysConfig().getUnionStagingPayOrgId().substring(0,4) +CommonSysConst.getSysConfig().getUnionStagingPayOrgId().substring(CommonSysConst.getSysConfig().getUnionStagingPayOrgId().length() - 4,CommonSysConst.getSysConfig().getUnionStagingPayOrgId().length()) +DateUtil.format(new Date(), DateUtil.YMDHMS) +IDGenerator.nextId(6); return ResponseMsgUtil.success(UnionStagingPayConfig.standardRefund(orgTrace,oriOrgTrace ,new BigDecimal("1"), "", new Date(), request)); } catch (Exception e) { log.error("HighOrderController --> unionStagingPay() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/mposfindrefund", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "分期退款查询") public ResponseData mposfindrefund(@RequestParam(name = "oriOrgTrace", required = true) String oriOrgTrace,HttpServletRequest request) { try { String orgTrace = CommonSysConst.getSysConfig().getUnionStagingPayOrgId().substring(0,4) +CommonSysConst.getSysConfig().getUnionStagingPayOrgId().substring(CommonSysConst.getSysConfig().getUnionStagingPayOrgId().length() - 4,CommonSysConst.getSysConfig().getUnionStagingPayOrgId().length()) +DateUtil.format(new Date(), DateUtil.YMDHMS) +IDGenerator.nextId(6); return ResponseMsgUtil.success(UnionStagingPayConfig.mposfindrefund(orgTrace,oriOrgTrace ,"", new Date(), request)); } catch (Exception e) { log.error("HighOrderController --> unionStagingPay() error!", e); return ResponseMsgUtil.exception(e); } } public void wxProfitsharing(String transaction_id,String out_order_no, BigDecimal amount) { try { Map param = new LinkedHashMap<>(); param.put("appid", "wx637bd6f7314daa46"); param.put("mch_id", "1289663601"); param.put("sub_mch_id" , "1609882817"); // 个体户黎杨珍 param.put("transaction_id" , transaction_id); param.put("out_order_no" , out_order_no); param.put("nonce_str" , WxUtils.makeNonStr()); // 分账金额 BigDecimal porofitSharingAmount = amount; List> receiversList = new ArrayList<>(); Map receiversMap = new LinkedHashMap<>(); receiversMap.put("type", "MERCHANT_ID"); receiversMap.put("account", "1603942866"); receiversMap.put("amount", porofitSharingAmount.multiply(new BigDecimal("100")).intValue()); receiversMap.put("description", "分给商户【惠昕石化】"); receiversList.add(receiversMap); param.put("receivers" , JSONObject.toJSONString(receiversList)); String signStr = WxUtils.generateSignature(param, "Skufk5oi85wDFGl888i6wsRSTkdd5df5" , WXPayConstants.SignType.HMACSHA256); param.put("sign" , signStr); String resultXmL = this.doRefundRequest(param.get("mch_id"),null, WxUtils.mapToXml(param)); // 请求分账返回的结果 ResultProfitSharing resultProfitSharing = XmlUtil.getObjectFromXML(resultXmL, ResultProfitSharing.class); if (!resultProfitSharing.getResult_code().equals("FAIL")) { HighProfitSharingRecord sharingRecord = new HighProfitSharingRecord(); sharingRecord.setOutOrderNo(resultProfitSharing.getOut_order_no()); sharingRecord.setTransactionId(resultProfitSharing.getTransaction_id()); sharingRecord.setOrderId(resultProfitSharing.getOrder_id()); sharingRecord.setStatus(resultProfitSharing.getResult_code()); sharingRecord.setPrice(amount); sharingRecord.setCreateTime(new Date()); sharingRecord.setContent(resultXmL); highProfitSharingRecordService.insert(sharingRecord); } } catch (Exception e) { log.error("CmsContentController --> getCorporateAdvertising() error!", e); } } public CloseableHttpClient readCertificate(String mchId) throws Exception{ /** * 注意PKCS12证书 是从微信商户平台-》账户设置-》 API安全 中下载的 */ KeyStore keyStore = KeyStore.getInstance("PKCS12"); //P12文件目录 证书路径,这里需要你自己修改,linux下还是windows下的根路径 FileInputStream instream = new FileInputStream("/home/project/wx_cert/1289663601_apiclient_cert.p12"); // FileInputStream instream = new FileInputStream("G:\\hurui-project/hai-parent/hai-service/src/main/java/privatekey/1289663601_apiclient_cert.p12"); try { keyStore.load(instream, "1289663601".toCharArray());//这里写密码..默认是你的MCHID } finally { instream.close(); } SSLContext sslcontext = SSLContexts.custom().loadKeyMaterial(keyStore, "1289663601".toCharArray()).build();//这里也是写密码的 SSLConnectionSocketFactory sslsf = new SSLConnectionSocketFactory(sslcontext, SSLConnectionSocketFactory.getDefaultHostnameVerifier()); // Allow TLSv1 protocol only return HttpClients.custom().setSSLSocketFactory(sslsf).build(); } public String doRefundRequest(String mchId, String url, String data) throws Exception { //小程序退款需要调用双向证书的认证 CloseableHttpClient httpClient = readCertificate(mchId); try { HttpPost httpost = new HttpPost("https://api.mch.weixin.qq.com/secapi/pay/refund"); // 设置响应头信息 httpost.addHeader("Connection", "keep-alive"); httpost.addHeader("Accept", "*/*"); httpost.addHeader("Content-Type", "text/xml"); httpost.addHeader("Host", "api.mch.weixin.qq.com"); httpost.addHeader("X-Requested-With", "XMLHttpRequest"); httpost.addHeader("Cache-Control", "max-age=0"); httpost.addHeader("User-Agent", "Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.0) "); httpost.setEntity(new StringEntity(data, "UTF-8")); CloseableHttpResponse response = httpClient.execute(httpost); try { HttpEntity entity = response.getEntity(); String jsonStr = EntityUtils.toString(response.getEntity(), "UTF-8"); EntityUtils.consume(entity); return jsonStr; } finally { response.close(); } } catch (Exception e){ throw new RuntimeException(e); } finally { httpClient.close(); } } } \ No newline at end of file diff --git a/hai-service/src/main/java/com/hai/dao/HighTyAgentMapper.java b/hai-service/src/main/java/com/hai/dao/HighTyAgentMapper.java index be402906..ec3dfd9f 100644 --- a/hai-service/src/main/java/com/hai/dao/HighTyAgentMapper.java +++ b/hai-service/src/main/java/com/hai/dao/HighTyAgentMapper.java @@ -39,16 +39,18 @@ public interface HighTyAgentMapper extends HighTyAgentMapperExt { int deleteByPrimaryKey(Long id); @Insert({ - "insert into high_ty_agent (agent_key, agent_name, ", - "agent_address, agent_user, ", - "agent_phone, `status`, ", - "create_time, update_time, ", - "ext_1, ext_2, ext_3)", - "values (#{agentKey,jdbcType=VARCHAR}, #{agentName,jdbcType=VARCHAR}, ", - "#{agentAddress,jdbcType=VARCHAR}, #{agentUser,jdbcType=VARCHAR}, ", - "#{agentPhone,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, ", - "#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, ", - "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" + "insert into high_ty_agent (org_id, agent_key, ", + "agent_name, agent_address, ", + "agent_user, agent_phone, ", + "`status`, create_time, ", + "update_time, ext_1, ", + "ext_2, ext_3)", + "values (#{orgId,jdbcType=BIGINT}, #{agentKey,jdbcType=VARCHAR}, ", + "#{agentName,jdbcType=VARCHAR}, #{agentAddress,jdbcType=VARCHAR}, ", + "#{agentUser,jdbcType=VARCHAR}, #{agentPhone,jdbcType=VARCHAR}, ", + "#{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(HighTyAgent record); @@ -60,6 +62,7 @@ public interface HighTyAgentMapper extends HighTyAgentMapperExt { @SelectProvider(type=HighTyAgentSqlProvider.class, method="selectByExample") @Results({ @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), + @Result(column="org_id", property="orgId", jdbcType=JdbcType.BIGINT), @Result(column="agent_key", property="agentKey", jdbcType=JdbcType.VARCHAR), @Result(column="agent_name", property="agentName", jdbcType=JdbcType.VARCHAR), @Result(column="agent_address", property="agentAddress", jdbcType=JdbcType.VARCHAR), @@ -76,13 +79,14 @@ public interface HighTyAgentMapper extends HighTyAgentMapperExt { @Select({ "select", - "id, agent_key, agent_name, agent_address, agent_user, agent_phone, `status`, ", + "id, org_id, agent_key, agent_name, agent_address, agent_user, agent_phone, `status`, ", "create_time, update_time, ext_1, ext_2, ext_3", "from high_ty_agent", "where id = #{id,jdbcType=BIGINT}" }) @Results({ @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), + @Result(column="org_id", property="orgId", jdbcType=JdbcType.BIGINT), @Result(column="agent_key", property="agentKey", jdbcType=JdbcType.VARCHAR), @Result(column="agent_name", property="agentName", jdbcType=JdbcType.VARCHAR), @Result(column="agent_address", property="agentAddress", jdbcType=JdbcType.VARCHAR), @@ -108,7 +112,8 @@ public interface HighTyAgentMapper extends HighTyAgentMapperExt { @Update({ "update high_ty_agent", - "set agent_key = #{agentKey,jdbcType=VARCHAR},", + "set org_id = #{orgId,jdbcType=BIGINT},", + "agent_key = #{agentKey,jdbcType=VARCHAR},", "agent_name = #{agentName,jdbcType=VARCHAR},", "agent_address = #{agentAddress,jdbcType=VARCHAR},", "agent_user = #{agentUser,jdbcType=VARCHAR},", diff --git a/hai-service/src/main/java/com/hai/dao/HighTyAgentOilStationMapper.java b/hai-service/src/main/java/com/hai/dao/HighTyAgentOilStationMapper.java index 71143fbe..824a83fa 100644 --- a/hai-service/src/main/java/com/hai/dao/HighTyAgentOilStationMapper.java +++ b/hai-service/src/main/java/com/hai/dao/HighTyAgentOilStationMapper.java @@ -39,13 +39,15 @@ public interface HighTyAgentOilStationMapper extends HighTyAgentOilStationMapper int deleteByPrimaryKey(Long id); @Insert({ - "insert into high_ty_agent_oil_station (ty_agent_id, ty_agent_name, ", + "insert into high_ty_agent_oil_station (organization_id, organization_name, ", + "ty_agent_id, ty_agent_name, ", "ty_salesman_id, ty_salesman_name, ", "oil_station_id, oil_station_name, ", "`status`, create_time, ", "update_time, ext_1, ", "ext_2, ext_3)", - "values (#{tyAgentId,jdbcType=BIGINT}, #{tyAgentName,jdbcType=VARCHAR}, ", + "values (#{organizationId,jdbcType=BIGINT}, #{organizationName,jdbcType=VARCHAR}, ", + "#{tyAgentId,jdbcType=BIGINT}, #{tyAgentName,jdbcType=VARCHAR}, ", "#{tySalesmanId,jdbcType=BIGINT}, #{tySalesmanName,jdbcType=VARCHAR}, ", "#{oilStationId,jdbcType=BIGINT}, #{oilStationName,jdbcType=VARCHAR}, ", "#{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, ", @@ -62,6 +64,8 @@ public interface HighTyAgentOilStationMapper extends HighTyAgentOilStationMapper @SelectProvider(type=HighTyAgentOilStationSqlProvider.class, method="selectByExample") @Results({ @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), + @Result(column="organization_id", property="organizationId", jdbcType=JdbcType.BIGINT), + @Result(column="organization_name", property="organizationName", jdbcType=JdbcType.VARCHAR), @Result(column="ty_agent_id", property="tyAgentId", jdbcType=JdbcType.BIGINT), @Result(column="ty_agent_name", property="tyAgentName", jdbcType=JdbcType.VARCHAR), @Result(column="ty_salesman_id", property="tySalesmanId", jdbcType=JdbcType.BIGINT), @@ -79,13 +83,16 @@ public interface HighTyAgentOilStationMapper extends HighTyAgentOilStationMapper @Select({ "select", - "id, ty_agent_id, ty_agent_name, ty_salesman_id, ty_salesman_name, oil_station_id, ", - "oil_station_name, `status`, create_time, update_time, ext_1, ext_2, ext_3", + "id, organization_id, organization_name, ty_agent_id, ty_agent_name, ty_salesman_id, ", + "ty_salesman_name, oil_station_id, oil_station_name, `status`, create_time, update_time, ", + "ext_1, ext_2, ext_3", "from high_ty_agent_oil_station", "where id = #{id,jdbcType=BIGINT}" }) @Results({ @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), + @Result(column="organization_id", property="organizationId", jdbcType=JdbcType.BIGINT), + @Result(column="organization_name", property="organizationName", jdbcType=JdbcType.VARCHAR), @Result(column="ty_agent_id", property="tyAgentId", jdbcType=JdbcType.BIGINT), @Result(column="ty_agent_name", property="tyAgentName", jdbcType=JdbcType.VARCHAR), @Result(column="ty_salesman_id", property="tySalesmanId", jdbcType=JdbcType.BIGINT), @@ -112,7 +119,9 @@ public interface HighTyAgentOilStationMapper extends HighTyAgentOilStationMapper @Update({ "update high_ty_agent_oil_station", - "set ty_agent_id = #{tyAgentId,jdbcType=BIGINT},", + "set organization_id = #{organizationId,jdbcType=BIGINT},", + "organization_name = #{organizationName,jdbcType=VARCHAR},", + "ty_agent_id = #{tyAgentId,jdbcType=BIGINT},", "ty_agent_name = #{tyAgentName,jdbcType=VARCHAR},", "ty_salesman_id = #{tySalesmanId,jdbcType=BIGINT},", "ty_salesman_name = #{tySalesmanName,jdbcType=VARCHAR},", diff --git a/hai-service/src/main/java/com/hai/dao/HighTyAgentOilStationMapperExt.java b/hai-service/src/main/java/com/hai/dao/HighTyAgentOilStationMapperExt.java index c4df9959..02750d6d 100644 --- a/hai-service/src/main/java/com/hai/dao/HighTyAgentOilStationMapperExt.java +++ b/hai-service/src/main/java/com/hai/dao/HighTyAgentOilStationMapperExt.java @@ -1,7 +1,54 @@ package com.hai.dao; +import com.hai.model.TyAgentOilStationModel; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; +import java.util.Map; + /** * mapper扩展类 */ public interface HighTyAgentOilStationMapperExt { -} \ No newline at end of file + + @Select("") + List queryOilStationList(@Param("param") Map param); + +} diff --git a/hai-service/src/main/java/com/hai/dao/HighTyAgentOilStationSqlProvider.java b/hai-service/src/main/java/com/hai/dao/HighTyAgentOilStationSqlProvider.java index f7404b6e..5db7191c 100644 --- a/hai-service/src/main/java/com/hai/dao/HighTyAgentOilStationSqlProvider.java +++ b/hai-service/src/main/java/com/hai/dao/HighTyAgentOilStationSqlProvider.java @@ -28,6 +28,14 @@ public class HighTyAgentOilStationSqlProvider { SQL sql = new SQL(); sql.INSERT_INTO("high_ty_agent_oil_station"); + if (record.getOrganizationId() != null) { + sql.VALUES("organization_id", "#{organizationId,jdbcType=BIGINT}"); + } + + if (record.getOrganizationName() != null) { + sql.VALUES("organization_name", "#{organizationName,jdbcType=VARCHAR}"); + } + if (record.getTyAgentId() != null) { sql.VALUES("ty_agent_id", "#{tyAgentId,jdbcType=BIGINT}"); } @@ -86,6 +94,8 @@ public class HighTyAgentOilStationSqlProvider { } else { sql.SELECT("id"); } + sql.SELECT("organization_id"); + sql.SELECT("organization_name"); sql.SELECT("ty_agent_id"); sql.SELECT("ty_agent_name"); sql.SELECT("ty_salesman_id"); @@ -119,6 +129,14 @@ public class HighTyAgentOilStationSqlProvider { sql.SET("id = #{record.id,jdbcType=BIGINT}"); } + if (record.getOrganizationId() != null) { + sql.SET("organization_id = #{record.organizationId,jdbcType=BIGINT}"); + } + + if (record.getOrganizationName() != null) { + sql.SET("organization_name = #{record.organizationName,jdbcType=VARCHAR}"); + } + if (record.getTyAgentId() != null) { sql.SET("ty_agent_id = #{record.tyAgentId,jdbcType=BIGINT}"); } @@ -176,6 +194,8 @@ public class HighTyAgentOilStationSqlProvider { sql.UPDATE("high_ty_agent_oil_station"); sql.SET("id = #{record.id,jdbcType=BIGINT}"); + sql.SET("organization_id = #{record.organizationId,jdbcType=BIGINT}"); + sql.SET("organization_name = #{record.organizationName,jdbcType=VARCHAR}"); sql.SET("ty_agent_id = #{record.tyAgentId,jdbcType=BIGINT}"); sql.SET("ty_agent_name = #{record.tyAgentName,jdbcType=VARCHAR}"); sql.SET("ty_salesman_id = #{record.tySalesmanId,jdbcType=BIGINT}"); @@ -198,6 +218,14 @@ public class HighTyAgentOilStationSqlProvider { SQL sql = new SQL(); sql.UPDATE("high_ty_agent_oil_station"); + if (record.getOrganizationId() != null) { + sql.SET("organization_id = #{organizationId,jdbcType=BIGINT}"); + } + + if (record.getOrganizationName() != null) { + sql.SET("organization_name = #{organizationName,jdbcType=VARCHAR}"); + } + if (record.getTyAgentId() != null) { sql.SET("ty_agent_id = #{tyAgentId,jdbcType=BIGINT}"); } diff --git a/hai-service/src/main/java/com/hai/dao/HighTyAgentPriceMapper.java b/hai-service/src/main/java/com/hai/dao/HighTyAgentPriceMapper.java new file mode 100644 index 00000000..7dbf717d --- /dev/null +++ b/hai-service/src/main/java/com/hai/dao/HighTyAgentPriceMapper.java @@ -0,0 +1,122 @@ +package com.hai.dao; + +import com.hai.entity.HighTyAgentPrice; +import com.hai.entity.HighTyAgentPriceExample; +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 HighTyAgentPriceMapper extends HighTyAgentPriceMapperExt { + @SelectProvider(type=HighTyAgentPriceSqlProvider.class, method="countByExample") + long countByExample(HighTyAgentPriceExample example); + + @DeleteProvider(type=HighTyAgentPriceSqlProvider.class, method="deleteByExample") + int deleteByExample(HighTyAgentPriceExample example); + + @Delete({ + "delete from high_ty_agent_price", + "where id = #{id,jdbcType=BIGINT}" + }) + int deleteByPrimaryKey(Long id); + + @Insert({ + "insert into high_ty_agent_price (ty_agent_oil_station_id, oil_no_name, ", + "oil_no, price_rate, ", + "`status`, create_time, ", + "update_time, ext_1, ", + "ext_2, ext_3)", + "values (#{tyAgentOilStationId,jdbcType=BIGINT}, #{oilNoName,jdbcType=VARCHAR}, ", + "#{oilNo,jdbcType=VARCHAR}, #{priceRate,jdbcType=DECIMAL}, ", + "#{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(HighTyAgentPrice record); + + @InsertProvider(type=HighTyAgentPriceSqlProvider.class, method="insertSelective") + @Options(useGeneratedKeys=true,keyProperty="id") + int insertSelective(HighTyAgentPrice record); + + @SelectProvider(type=HighTyAgentPriceSqlProvider.class, method="selectByExample") + @Results({ + @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), + @Result(column="ty_agent_oil_station_id", property="tyAgentOilStationId", jdbcType=JdbcType.BIGINT), + @Result(column="oil_no_name", property="oilNoName", jdbcType=JdbcType.VARCHAR), + @Result(column="oil_no", property="oilNo", jdbcType=JdbcType.VARCHAR), + @Result(column="price_rate", property="priceRate", jdbcType=JdbcType.DECIMAL), + @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(HighTyAgentPriceExample example); + + @Select({ + "select", + "id, ty_agent_oil_station_id, oil_no_name, oil_no, price_rate, `status`, create_time, ", + "update_time, ext_1, ext_2, ext_3", + "from high_ty_agent_price", + "where id = #{id,jdbcType=BIGINT}" + }) + @Results({ + @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), + @Result(column="ty_agent_oil_station_id", property="tyAgentOilStationId", jdbcType=JdbcType.BIGINT), + @Result(column="oil_no_name", property="oilNoName", jdbcType=JdbcType.VARCHAR), + @Result(column="oil_no", property="oilNo", jdbcType=JdbcType.VARCHAR), + @Result(column="price_rate", property="priceRate", jdbcType=JdbcType.DECIMAL), + @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) + }) + HighTyAgentPrice selectByPrimaryKey(Long id); + + @UpdateProvider(type=HighTyAgentPriceSqlProvider.class, method="updateByExampleSelective") + int updateByExampleSelective(@Param("record") HighTyAgentPrice record, @Param("example") HighTyAgentPriceExample example); + + @UpdateProvider(type=HighTyAgentPriceSqlProvider.class, method="updateByExample") + int updateByExample(@Param("record") HighTyAgentPrice record, @Param("example") HighTyAgentPriceExample example); + + @UpdateProvider(type=HighTyAgentPriceSqlProvider.class, method="updateByPrimaryKeySelective") + int updateByPrimaryKeySelective(HighTyAgentPrice record); + + @Update({ + "update high_ty_agent_price", + "set ty_agent_oil_station_id = #{tyAgentOilStationId,jdbcType=BIGINT},", + "oil_no_name = #{oilNoName,jdbcType=VARCHAR},", + "oil_no = #{oilNo,jdbcType=VARCHAR},", + "price_rate = #{priceRate,jdbcType=DECIMAL},", + "`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(HighTyAgentPrice record); +} \ No newline at end of file diff --git a/hai-service/src/main/java/com/hai/dao/HighTyAgentPriceMapperExt.java b/hai-service/src/main/java/com/hai/dao/HighTyAgentPriceMapperExt.java new file mode 100644 index 00000000..0b1f5ef5 --- /dev/null +++ b/hai-service/src/main/java/com/hai/dao/HighTyAgentPriceMapperExt.java @@ -0,0 +1,7 @@ +package com.hai.dao; + +/** + * mapper扩展类 + */ +public interface HighTyAgentPriceMapperExt { +} \ No newline at end of file diff --git a/hai-service/src/main/java/com/hai/dao/HighTyAgentPriceSqlProvider.java b/hai-service/src/main/java/com/hai/dao/HighTyAgentPriceSqlProvider.java new file mode 100644 index 00000000..77c7fbe8 --- /dev/null +++ b/hai-service/src/main/java/com/hai/dao/HighTyAgentPriceSqlProvider.java @@ -0,0 +1,318 @@ +package com.hai.dao; + +import com.hai.entity.HighTyAgentPrice; +import com.hai.entity.HighTyAgentPriceExample.Criteria; +import com.hai.entity.HighTyAgentPriceExample.Criterion; +import com.hai.entity.HighTyAgentPriceExample; +import java.util.List; +import java.util.Map; +import org.apache.ibatis.jdbc.SQL; + +public class HighTyAgentPriceSqlProvider { + + public String countByExample(HighTyAgentPriceExample example) { + SQL sql = new SQL(); + sql.SELECT("count(*)").FROM("high_ty_agent_price"); + applyWhere(sql, example, false); + return sql.toString(); + } + + public String deleteByExample(HighTyAgentPriceExample example) { + SQL sql = new SQL(); + sql.DELETE_FROM("high_ty_agent_price"); + applyWhere(sql, example, false); + return sql.toString(); + } + + public String insertSelective(HighTyAgentPrice record) { + SQL sql = new SQL(); + sql.INSERT_INTO("high_ty_agent_price"); + + if (record.getTyAgentOilStationId() != null) { + sql.VALUES("ty_agent_oil_station_id", "#{tyAgentOilStationId,jdbcType=BIGINT}"); + } + + if (record.getOilNoName() != null) { + sql.VALUES("oil_no_name", "#{oilNoName,jdbcType=VARCHAR}"); + } + + if (record.getOilNo() != null) { + sql.VALUES("oil_no", "#{oilNo,jdbcType=VARCHAR}"); + } + + if (record.getPriceRate() != null) { + sql.VALUES("price_rate", "#{priceRate,jdbcType=DECIMAL}"); + } + + 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(HighTyAgentPriceExample example) { + SQL sql = new SQL(); + if (example != null && example.isDistinct()) { + sql.SELECT_DISTINCT("id"); + } else { + sql.SELECT("id"); + } + sql.SELECT("ty_agent_oil_station_id"); + sql.SELECT("oil_no_name"); + sql.SELECT("oil_no"); + sql.SELECT("price_rate"); + 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_ty_agent_price"); + applyWhere(sql, example, false); + + if (example != null && example.getOrderByClause() != null) { + sql.ORDER_BY(example.getOrderByClause()); + } + + return sql.toString(); + } + + public String updateByExampleSelective(Map parameter) { + HighTyAgentPrice record = (HighTyAgentPrice) parameter.get("record"); + HighTyAgentPriceExample example = (HighTyAgentPriceExample) parameter.get("example"); + + SQL sql = new SQL(); + sql.UPDATE("high_ty_agent_price"); + + if (record.getId() != null) { + sql.SET("id = #{record.id,jdbcType=BIGINT}"); + } + + if (record.getTyAgentOilStationId() != null) { + sql.SET("ty_agent_oil_station_id = #{record.tyAgentOilStationId,jdbcType=BIGINT}"); + } + + if (record.getOilNoName() != null) { + sql.SET("oil_no_name = #{record.oilNoName,jdbcType=VARCHAR}"); + } + + if (record.getOilNo() != null) { + sql.SET("oil_no = #{record.oilNo,jdbcType=VARCHAR}"); + } + + if (record.getPriceRate() != null) { + sql.SET("price_rate = #{record.priceRate,jdbcType=DECIMAL}"); + } + + 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_ty_agent_price"); + + sql.SET("id = #{record.id,jdbcType=BIGINT}"); + sql.SET("ty_agent_oil_station_id = #{record.tyAgentOilStationId,jdbcType=BIGINT}"); + sql.SET("oil_no_name = #{record.oilNoName,jdbcType=VARCHAR}"); + sql.SET("oil_no = #{record.oilNo,jdbcType=VARCHAR}"); + sql.SET("price_rate = #{record.priceRate,jdbcType=DECIMAL}"); + 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}"); + + HighTyAgentPriceExample example = (HighTyAgentPriceExample) parameter.get("example"); + applyWhere(sql, example, true); + return sql.toString(); + } + + public String updateByPrimaryKeySelective(HighTyAgentPrice record) { + SQL sql = new SQL(); + sql.UPDATE("high_ty_agent_price"); + + if (record.getTyAgentOilStationId() != null) { + sql.SET("ty_agent_oil_station_id = #{tyAgentOilStationId,jdbcType=BIGINT}"); + } + + if (record.getOilNoName() != null) { + sql.SET("oil_no_name = #{oilNoName,jdbcType=VARCHAR}"); + } + + if (record.getOilNo() != null) { + sql.SET("oil_no = #{oilNo,jdbcType=VARCHAR}"); + } + + if (record.getPriceRate() != null) { + sql.SET("price_rate = #{priceRate,jdbcType=DECIMAL}"); + } + + 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, HighTyAgentPriceExample 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/dao/HighTyAgentSqlProvider.java b/hai-service/src/main/java/com/hai/dao/HighTyAgentSqlProvider.java index 2d6cda90..19957c91 100644 --- a/hai-service/src/main/java/com/hai/dao/HighTyAgentSqlProvider.java +++ b/hai-service/src/main/java/com/hai/dao/HighTyAgentSqlProvider.java @@ -28,6 +28,10 @@ public class HighTyAgentSqlProvider { SQL sql = new SQL(); sql.INSERT_INTO("high_ty_agent"); + if (record.getOrgId() != null) { + sql.VALUES("org_id", "#{orgId,jdbcType=BIGINT}"); + } + if (record.getAgentKey() != null) { sql.VALUES("agent_key", "#{agentKey,jdbcType=VARCHAR}"); } @@ -82,6 +86,7 @@ public class HighTyAgentSqlProvider { } else { sql.SELECT("id"); } + sql.SELECT("org_id"); sql.SELECT("agent_key"); sql.SELECT("agent_name"); sql.SELECT("agent_address"); @@ -114,6 +119,10 @@ public class HighTyAgentSqlProvider { sql.SET("id = #{record.id,jdbcType=BIGINT}"); } + if (record.getOrgId() != null) { + sql.SET("org_id = #{record.orgId,jdbcType=BIGINT}"); + } + if (record.getAgentKey() != null) { sql.SET("agent_key = #{record.agentKey,jdbcType=VARCHAR}"); } @@ -167,6 +176,7 @@ public class HighTyAgentSqlProvider { sql.UPDATE("high_ty_agent"); sql.SET("id = #{record.id,jdbcType=BIGINT}"); + sql.SET("org_id = #{record.orgId,jdbcType=BIGINT}"); sql.SET("agent_key = #{record.agentKey,jdbcType=VARCHAR}"); sql.SET("agent_name = #{record.agentName,jdbcType=VARCHAR}"); sql.SET("agent_address = #{record.agentAddress,jdbcType=VARCHAR}"); @@ -188,6 +198,10 @@ public class HighTyAgentSqlProvider { SQL sql = new SQL(); sql.UPDATE("high_ty_agent"); + if (record.getOrgId() != null) { + sql.SET("org_id = #{orgId,jdbcType=BIGINT}"); + } + if (record.getAgentKey() != null) { sql.SET("agent_key = #{agentKey,jdbcType=VARCHAR}"); } diff --git a/hai-service/src/main/java/com/hai/entity/HighTyAgent.java b/hai-service/src/main/java/com/hai/entity/HighTyAgent.java index cd754d8c..de348596 100644 --- a/hai-service/src/main/java/com/hai/entity/HighTyAgent.java +++ b/hai-service/src/main/java/com/hai/entity/HighTyAgent.java @@ -15,6 +15,11 @@ import java.util.Date; public class HighTyAgent implements Serializable { private Long id; + /** + * 代理商公司id + */ + private Long orgId; + /** * 代理商编号 */ @@ -71,6 +76,14 @@ public class HighTyAgent implements Serializable { this.id = id; } + public Long getOrgId() { + return orgId; + } + + public void setOrgId(Long orgId) { + this.orgId = orgId; + } + public String getAgentKey() { return agentKey; } @@ -172,6 +185,7 @@ public class HighTyAgent implements Serializable { } HighTyAgent other = (HighTyAgent) that; return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) + && (this.getOrgId() == null ? other.getOrgId() == null : this.getOrgId().equals(other.getOrgId())) && (this.getAgentKey() == null ? other.getAgentKey() == null : this.getAgentKey().equals(other.getAgentKey())) && (this.getAgentName() == null ? other.getAgentName() == null : this.getAgentName().equals(other.getAgentName())) && (this.getAgentAddress() == null ? other.getAgentAddress() == null : this.getAgentAddress().equals(other.getAgentAddress())) @@ -190,6 +204,7 @@ public class HighTyAgent implements Serializable { final int prime = 31; int result = 1; result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); + result = prime * result + ((getOrgId() == null) ? 0 : getOrgId().hashCode()); result = prime * result + ((getAgentKey() == null) ? 0 : getAgentKey().hashCode()); result = prime * result + ((getAgentName() == null) ? 0 : getAgentName().hashCode()); result = prime * result + ((getAgentAddress() == null) ? 0 : getAgentAddress().hashCode()); @@ -211,6 +226,7 @@ public class HighTyAgent implements Serializable { sb.append(" ["); sb.append("Hash = ").append(hashCode()); sb.append(", id=").append(id); + sb.append(", orgId=").append(orgId); sb.append(", agentKey=").append(agentKey); sb.append(", agentName=").append(agentName); sb.append(", agentAddress=").append(agentAddress); diff --git a/hai-service/src/main/java/com/hai/entity/HighTyAgentExample.java b/hai-service/src/main/java/com/hai/entity/HighTyAgentExample.java index 82a9f81a..a5069e57 100644 --- a/hai-service/src/main/java/com/hai/entity/HighTyAgentExample.java +++ b/hai-service/src/main/java/com/hai/entity/HighTyAgentExample.java @@ -185,6 +185,66 @@ public class HighTyAgentExample { return (Criteria) this; } + public Criteria andOrgIdIsNull() { + addCriterion("org_id is null"); + return (Criteria) this; + } + + public Criteria andOrgIdIsNotNull() { + addCriterion("org_id is not null"); + return (Criteria) this; + } + + public Criteria andOrgIdEqualTo(Long value) { + addCriterion("org_id =", value, "orgId"); + return (Criteria) this; + } + + public Criteria andOrgIdNotEqualTo(Long value) { + addCriterion("org_id <>", value, "orgId"); + return (Criteria) this; + } + + public Criteria andOrgIdGreaterThan(Long value) { + addCriterion("org_id >", value, "orgId"); + return (Criteria) this; + } + + public Criteria andOrgIdGreaterThanOrEqualTo(Long value) { + addCriterion("org_id >=", value, "orgId"); + return (Criteria) this; + } + + public Criteria andOrgIdLessThan(Long value) { + addCriterion("org_id <", value, "orgId"); + return (Criteria) this; + } + + public Criteria andOrgIdLessThanOrEqualTo(Long value) { + addCriterion("org_id <=", value, "orgId"); + return (Criteria) this; + } + + public Criteria andOrgIdIn(List values) { + addCriterion("org_id in", values, "orgId"); + return (Criteria) this; + } + + public Criteria andOrgIdNotIn(List values) { + addCriterion("org_id not in", values, "orgId"); + return (Criteria) this; + } + + public Criteria andOrgIdBetween(Long value1, Long value2) { + addCriterion("org_id between", value1, value2, "orgId"); + return (Criteria) this; + } + + public Criteria andOrgIdNotBetween(Long value1, Long value2) { + addCriterion("org_id not between", value1, value2, "orgId"); + return (Criteria) this; + } + public Criteria andAgentKeyIsNull() { addCriterion("agent_key is null"); return (Criteria) this; diff --git a/hai-service/src/main/java/com/hai/entity/HighTyAgentOilStation.java b/hai-service/src/main/java/com/hai/entity/HighTyAgentOilStation.java index 83ad194b..a345a3b2 100644 --- a/hai-service/src/main/java/com/hai/entity/HighTyAgentOilStation.java +++ b/hai-service/src/main/java/com/hai/entity/HighTyAgentOilStation.java @@ -15,6 +15,16 @@ import java.util.Date; public class HighTyAgentOilStation implements Serializable { private Long id; + /** + * 部门id + */ + private Long organizationId; + + /** + * 部门名称 + */ + private String organizationName; + /** * 团油代理商id */ @@ -76,6 +86,22 @@ public class HighTyAgentOilStation implements Serializable { this.id = id; } + public Long getOrganizationId() { + return organizationId; + } + + public void setOrganizationId(Long organizationId) { + this.organizationId = organizationId; + } + + public String getOrganizationName() { + return organizationName; + } + + public void setOrganizationName(String organizationName) { + this.organizationName = organizationName; + } + public Long getTyAgentId() { return tyAgentId; } @@ -185,6 +211,8 @@ public class HighTyAgentOilStation implements Serializable { } HighTyAgentOilStation other = (HighTyAgentOilStation) that; return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) + && (this.getOrganizationId() == null ? other.getOrganizationId() == null : this.getOrganizationId().equals(other.getOrganizationId())) + && (this.getOrganizationName() == null ? other.getOrganizationName() == null : this.getOrganizationName().equals(other.getOrganizationName())) && (this.getTyAgentId() == null ? other.getTyAgentId() == null : this.getTyAgentId().equals(other.getTyAgentId())) && (this.getTyAgentName() == null ? other.getTyAgentName() == null : this.getTyAgentName().equals(other.getTyAgentName())) && (this.getTySalesmanId() == null ? other.getTySalesmanId() == null : this.getTySalesmanId().equals(other.getTySalesmanId())) @@ -204,6 +232,8 @@ public class HighTyAgentOilStation implements Serializable { final int prime = 31; int result = 1; result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); + result = prime * result + ((getOrganizationId() == null) ? 0 : getOrganizationId().hashCode()); + result = prime * result + ((getOrganizationName() == null) ? 0 : getOrganizationName().hashCode()); result = prime * result + ((getTyAgentId() == null) ? 0 : getTyAgentId().hashCode()); result = prime * result + ((getTyAgentName() == null) ? 0 : getTyAgentName().hashCode()); result = prime * result + ((getTySalesmanId() == null) ? 0 : getTySalesmanId().hashCode()); @@ -226,6 +256,8 @@ public class HighTyAgentOilStation implements Serializable { sb.append(" ["); sb.append("Hash = ").append(hashCode()); sb.append(", id=").append(id); + sb.append(", organizationId=").append(organizationId); + sb.append(", organizationName=").append(organizationName); sb.append(", tyAgentId=").append(tyAgentId); sb.append(", tyAgentName=").append(tyAgentName); sb.append(", tySalesmanId=").append(tySalesmanId); diff --git a/hai-service/src/main/java/com/hai/entity/HighTyAgentOilStationExample.java b/hai-service/src/main/java/com/hai/entity/HighTyAgentOilStationExample.java index cde37b5a..f56f52b9 100644 --- a/hai-service/src/main/java/com/hai/entity/HighTyAgentOilStationExample.java +++ b/hai-service/src/main/java/com/hai/entity/HighTyAgentOilStationExample.java @@ -185,6 +185,136 @@ public class HighTyAgentOilStationExample { return (Criteria) this; } + public Criteria andOrganizationIdIsNull() { + addCriterion("organization_id is null"); + return (Criteria) this; + } + + public Criteria andOrganizationIdIsNotNull() { + addCriterion("organization_id is not null"); + return (Criteria) this; + } + + public Criteria andOrganizationIdEqualTo(Long value) { + addCriterion("organization_id =", value, "organizationId"); + return (Criteria) this; + } + + public Criteria andOrganizationIdNotEqualTo(Long value) { + addCriterion("organization_id <>", value, "organizationId"); + return (Criteria) this; + } + + public Criteria andOrganizationIdGreaterThan(Long value) { + addCriterion("organization_id >", value, "organizationId"); + return (Criteria) this; + } + + public Criteria andOrganizationIdGreaterThanOrEqualTo(Long value) { + addCriterion("organization_id >=", value, "organizationId"); + return (Criteria) this; + } + + public Criteria andOrganizationIdLessThan(Long value) { + addCriterion("organization_id <", value, "organizationId"); + return (Criteria) this; + } + + public Criteria andOrganizationIdLessThanOrEqualTo(Long value) { + addCriterion("organization_id <=", value, "organizationId"); + return (Criteria) this; + } + + public Criteria andOrganizationIdIn(List values) { + addCriterion("organization_id in", values, "organizationId"); + return (Criteria) this; + } + + public Criteria andOrganizationIdNotIn(List values) { + addCriterion("organization_id not in", values, "organizationId"); + return (Criteria) this; + } + + public Criteria andOrganizationIdBetween(Long value1, Long value2) { + addCriterion("organization_id between", value1, value2, "organizationId"); + return (Criteria) this; + } + + public Criteria andOrganizationIdNotBetween(Long value1, Long value2) { + addCriterion("organization_id not between", value1, value2, "organizationId"); + return (Criteria) this; + } + + public Criteria andOrganizationNameIsNull() { + addCriterion("organization_name is null"); + return (Criteria) this; + } + + public Criteria andOrganizationNameIsNotNull() { + addCriterion("organization_name is not null"); + return (Criteria) this; + } + + public Criteria andOrganizationNameEqualTo(String value) { + addCriterion("organization_name =", value, "organizationName"); + return (Criteria) this; + } + + public Criteria andOrganizationNameNotEqualTo(String value) { + addCriterion("organization_name <>", value, "organizationName"); + return (Criteria) this; + } + + public Criteria andOrganizationNameGreaterThan(String value) { + addCriterion("organization_name >", value, "organizationName"); + return (Criteria) this; + } + + public Criteria andOrganizationNameGreaterThanOrEqualTo(String value) { + addCriterion("organization_name >=", value, "organizationName"); + return (Criteria) this; + } + + public Criteria andOrganizationNameLessThan(String value) { + addCriterion("organization_name <", value, "organizationName"); + return (Criteria) this; + } + + public Criteria andOrganizationNameLessThanOrEqualTo(String value) { + addCriterion("organization_name <=", value, "organizationName"); + return (Criteria) this; + } + + public Criteria andOrganizationNameLike(String value) { + addCriterion("organization_name like", value, "organizationName"); + return (Criteria) this; + } + + public Criteria andOrganizationNameNotLike(String value) { + addCriterion("organization_name not like", value, "organizationName"); + return (Criteria) this; + } + + public Criteria andOrganizationNameIn(List values) { + addCriterion("organization_name in", values, "organizationName"); + return (Criteria) this; + } + + public Criteria andOrganizationNameNotIn(List values) { + addCriterion("organization_name not in", values, "organizationName"); + return (Criteria) this; + } + + public Criteria andOrganizationNameBetween(String value1, String value2) { + addCriterion("organization_name between", value1, value2, "organizationName"); + return (Criteria) this; + } + + public Criteria andOrganizationNameNotBetween(String value1, String value2) { + addCriterion("organization_name not between", value1, value2, "organizationName"); + return (Criteria) this; + } + public Criteria andTyAgentIdIsNull() { addCriterion("ty_agent_id is null"); return (Criteria) this; diff --git a/hai-service/src/main/java/com/hai/entity/HighTyAgentPrice.java b/hai-service/src/main/java/com/hai/entity/HighTyAgentPrice.java new file mode 100644 index 00000000..37b63ca6 --- /dev/null +++ b/hai-service/src/main/java/com/hai/entity/HighTyAgentPrice.java @@ -0,0 +1,214 @@ +package com.hai.entity; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * high_ty_agent_price + * @author + */ +/** + * + * 代码由工具生成 + * + **/ +public class HighTyAgentPrice implements Serializable { + private Long id; + + /** + * 代理商公司id + */ + private Long tyAgentOilStationId; + + /** + * 油号名称 + */ + private String oilNoName; + + /** + * 油号 + */ + private String oilNo; + + /** + * 优惠比例 + */ + private BigDecimal priceRate; + + /** + * 状态 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 getTyAgentOilStationId() { + return tyAgentOilStationId; + } + + public void setTyAgentOilStationId(Long tyAgentOilStationId) { + this.tyAgentOilStationId = tyAgentOilStationId; + } + + public String getOilNoName() { + return oilNoName; + } + + public void setOilNoName(String oilNoName) { + this.oilNoName = oilNoName; + } + + public String getOilNo() { + return oilNo; + } + + public void setOilNo(String oilNo) { + this.oilNo = oilNo; + } + + public BigDecimal getPriceRate() { + return priceRate; + } + + public void setPriceRate(BigDecimal priceRate) { + this.priceRate = priceRate; + } + + 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; + } + HighTyAgentPrice other = (HighTyAgentPrice) that; + return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) + && (this.getTyAgentOilStationId() == null ? other.getTyAgentOilStationId() == null : this.getTyAgentOilStationId().equals(other.getTyAgentOilStationId())) + && (this.getOilNoName() == null ? other.getOilNoName() == null : this.getOilNoName().equals(other.getOilNoName())) + && (this.getOilNo() == null ? other.getOilNo() == null : this.getOilNo().equals(other.getOilNo())) + && (this.getPriceRate() == null ? other.getPriceRate() == null : this.getPriceRate().equals(other.getPriceRate())) + && (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 + ((getTyAgentOilStationId() == null) ? 0 : getTyAgentOilStationId().hashCode()); + result = prime * result + ((getOilNoName() == null) ? 0 : getOilNoName().hashCode()); + result = prime * result + ((getOilNo() == null) ? 0 : getOilNo().hashCode()); + result = prime * result + ((getPriceRate() == null) ? 0 : getPriceRate().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(", tyAgentOilStationId=").append(tyAgentOilStationId); + sb.append(", oilNoName=").append(oilNoName); + sb.append(", oilNo=").append(oilNo); + sb.append(", priceRate=").append(priceRate); + 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/HighTyAgentPriceExample.java b/hai-service/src/main/java/com/hai/entity/HighTyAgentPriceExample.java new file mode 100644 index 00000000..90f115cb --- /dev/null +++ b/hai-service/src/main/java/com/hai/entity/HighTyAgentPriceExample.java @@ -0,0 +1,934 @@ +package com.hai.entity; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class HighTyAgentPriceExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + private Integer limit; + + private Long offset; + + public HighTyAgentPriceExample() { + 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 andTyAgentOilStationIdIsNull() { + addCriterion("ty_agent_oil_station_id is null"); + return (Criteria) this; + } + + public Criteria andTyAgentOilStationIdIsNotNull() { + addCriterion("ty_agent_oil_station_id is not null"); + return (Criteria) this; + } + + public Criteria andTyAgentOilStationIdEqualTo(Long value) { + addCriterion("ty_agent_oil_station_id =", value, "tyAgentOilStationId"); + return (Criteria) this; + } + + public Criteria andTyAgentOilStationIdNotEqualTo(Long value) { + addCriterion("ty_agent_oil_station_id <>", value, "tyAgentOilStationId"); + return (Criteria) this; + } + + public Criteria andTyAgentOilStationIdGreaterThan(Long value) { + addCriterion("ty_agent_oil_station_id >", value, "tyAgentOilStationId"); + return (Criteria) this; + } + + public Criteria andTyAgentOilStationIdGreaterThanOrEqualTo(Long value) { + addCriterion("ty_agent_oil_station_id >=", value, "tyAgentOilStationId"); + return (Criteria) this; + } + + public Criteria andTyAgentOilStationIdLessThan(Long value) { + addCriterion("ty_agent_oil_station_id <", value, "tyAgentOilStationId"); + return (Criteria) this; + } + + public Criteria andTyAgentOilStationIdLessThanOrEqualTo(Long value) { + addCriterion("ty_agent_oil_station_id <=", value, "tyAgentOilStationId"); + return (Criteria) this; + } + + public Criteria andTyAgentOilStationIdIn(List values) { + addCriterion("ty_agent_oil_station_id in", values, "tyAgentOilStationId"); + return (Criteria) this; + } + + public Criteria andTyAgentOilStationIdNotIn(List values) { + addCriterion("ty_agent_oil_station_id not in", values, "tyAgentOilStationId"); + return (Criteria) this; + } + + public Criteria andTyAgentOilStationIdBetween(Long value1, Long value2) { + addCriterion("ty_agent_oil_station_id between", value1, value2, "tyAgentOilStationId"); + return (Criteria) this; + } + + public Criteria andTyAgentOilStationIdNotBetween(Long value1, Long value2) { + addCriterion("ty_agent_oil_station_id not between", value1, value2, "tyAgentOilStationId"); + return (Criteria) this; + } + + public Criteria andOilNoNameIsNull() { + addCriterion("oil_no_name is null"); + return (Criteria) this; + } + + public Criteria andOilNoNameIsNotNull() { + addCriterion("oil_no_name is not null"); + return (Criteria) this; + } + + public Criteria andOilNoNameEqualTo(String value) { + addCriterion("oil_no_name =", value, "oilNoName"); + return (Criteria) this; + } + + public Criteria andOilNoNameNotEqualTo(String value) { + addCriterion("oil_no_name <>", value, "oilNoName"); + return (Criteria) this; + } + + public Criteria andOilNoNameGreaterThan(String value) { + addCriterion("oil_no_name >", value, "oilNoName"); + return (Criteria) this; + } + + public Criteria andOilNoNameGreaterThanOrEqualTo(String value) { + addCriterion("oil_no_name >=", value, "oilNoName"); + return (Criteria) this; + } + + public Criteria andOilNoNameLessThan(String value) { + addCriterion("oil_no_name <", value, "oilNoName"); + return (Criteria) this; + } + + public Criteria andOilNoNameLessThanOrEqualTo(String value) { + addCriterion("oil_no_name <=", value, "oilNoName"); + return (Criteria) this; + } + + public Criteria andOilNoNameLike(String value) { + addCriterion("oil_no_name like", value, "oilNoName"); + return (Criteria) this; + } + + public Criteria andOilNoNameNotLike(String value) { + addCriterion("oil_no_name not like", value, "oilNoName"); + return (Criteria) this; + } + + public Criteria andOilNoNameIn(List values) { + addCriterion("oil_no_name in", values, "oilNoName"); + return (Criteria) this; + } + + public Criteria andOilNoNameNotIn(List values) { + addCriterion("oil_no_name not in", values, "oilNoName"); + return (Criteria) this; + } + + public Criteria andOilNoNameBetween(String value1, String value2) { + addCriterion("oil_no_name between", value1, value2, "oilNoName"); + return (Criteria) this; + } + + public Criteria andOilNoNameNotBetween(String value1, String value2) { + addCriterion("oil_no_name not between", value1, value2, "oilNoName"); + return (Criteria) this; + } + + public Criteria andOilNoIsNull() { + addCriterion("oil_no is null"); + return (Criteria) this; + } + + public Criteria andOilNoIsNotNull() { + addCriterion("oil_no is not null"); + return (Criteria) this; + } + + public Criteria andOilNoEqualTo(String value) { + addCriterion("oil_no =", value, "oilNo"); + return (Criteria) this; + } + + public Criteria andOilNoNotEqualTo(String value) { + addCriterion("oil_no <>", value, "oilNo"); + return (Criteria) this; + } + + public Criteria andOilNoGreaterThan(String value) { + addCriterion("oil_no >", value, "oilNo"); + return (Criteria) this; + } + + public Criteria andOilNoGreaterThanOrEqualTo(String value) { + addCriterion("oil_no >=", value, "oilNo"); + return (Criteria) this; + } + + public Criteria andOilNoLessThan(String value) { + addCriterion("oil_no <", value, "oilNo"); + return (Criteria) this; + } + + public Criteria andOilNoLessThanOrEqualTo(String value) { + addCriterion("oil_no <=", value, "oilNo"); + return (Criteria) this; + } + + public Criteria andOilNoLike(String value) { + addCriterion("oil_no like", value, "oilNo"); + return (Criteria) this; + } + + public Criteria andOilNoNotLike(String value) { + addCriterion("oil_no not like", value, "oilNo"); + return (Criteria) this; + } + + public Criteria andOilNoIn(List values) { + addCriterion("oil_no in", values, "oilNo"); + return (Criteria) this; + } + + public Criteria andOilNoNotIn(List values) { + addCriterion("oil_no not in", values, "oilNo"); + return (Criteria) this; + } + + public Criteria andOilNoBetween(String value1, String value2) { + addCriterion("oil_no between", value1, value2, "oilNo"); + return (Criteria) this; + } + + public Criteria andOilNoNotBetween(String value1, String value2) { + addCriterion("oil_no not between", value1, value2, "oilNo"); + return (Criteria) this; + } + + public Criteria andPriceRateIsNull() { + addCriterion("price_rate is null"); + return (Criteria) this; + } + + public Criteria andPriceRateIsNotNull() { + addCriterion("price_rate is not null"); + return (Criteria) this; + } + + public Criteria andPriceRateEqualTo(BigDecimal value) { + addCriterion("price_rate =", value, "priceRate"); + return (Criteria) this; + } + + public Criteria andPriceRateNotEqualTo(BigDecimal value) { + addCriterion("price_rate <>", value, "priceRate"); + return (Criteria) this; + } + + public Criteria andPriceRateGreaterThan(BigDecimal value) { + addCriterion("price_rate >", value, "priceRate"); + return (Criteria) this; + } + + public Criteria andPriceRateGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("price_rate >=", value, "priceRate"); + return (Criteria) this; + } + + public Criteria andPriceRateLessThan(BigDecimal value) { + addCriterion("price_rate <", value, "priceRate"); + return (Criteria) this; + } + + public Criteria andPriceRateLessThanOrEqualTo(BigDecimal value) { + addCriterion("price_rate <=", value, "priceRate"); + return (Criteria) this; + } + + public Criteria andPriceRateIn(List values) { + addCriterion("price_rate in", values, "priceRate"); + return (Criteria) this; + } + + public Criteria andPriceRateNotIn(List values) { + addCriterion("price_rate not in", values, "priceRate"); + return (Criteria) this; + } + + public Criteria andPriceRateBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("price_rate between", value1, value2, "priceRate"); + return (Criteria) this; + } + + public Criteria andPriceRateNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("price_rate not between", value1, value2, "priceRate"); + 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/model/TyAgentOilStationModel.java b/hai-service/src/main/java/com/hai/model/TyAgentOilStationModel.java new file mode 100644 index 00000000..4c541b5d --- /dev/null +++ b/hai-service/src/main/java/com/hai/model/TyAgentOilStationModel.java @@ -0,0 +1,149 @@ +package com.hai.model; + +public class TyAgentOilStationModel { + + private Long storeId; + private Long regionId; + private String regionName; + private String storeLogo; + private String storeKey; + private String storeName; + private String address; + private Long tyAgentOilStationId; + private Long organizationId; + private String organizationName; + private Long tyAgentId; + private String tyAgentName; + private Long tySalesmanId; + private String tySalesmanName; + private Long oilStationId; + private String oilStationName; + + public Long getTyAgentOilStationId() { + return tyAgentOilStationId; + } + + public void setTyAgentOilStationId(Long tyAgentOilStationId) { + this.tyAgentOilStationId = tyAgentOilStationId; + } + + public Long getStoreId() { + return storeId; + } + + public void setStoreId(Long storeId) { + this.storeId = storeId; + } + + public Long getRegionId() { + return regionId; + } + + public void setRegionId(Long regionId) { + this.regionId = regionId; + } + + public String getRegionName() { + return regionName; + } + + public void setRegionName(String regionName) { + this.regionName = regionName; + } + + public String getStoreLogo() { + return storeLogo; + } + + public void setStoreLogo(String storeLogo) { + this.storeLogo = storeLogo; + } + + public String getStoreKey() { + return storeKey; + } + + public void setStoreKey(String storeKey) { + this.storeKey = storeKey; + } + + public String getStoreName() { + return storeName; + } + + public void setStoreName(String storeName) { + this.storeName = storeName; + } + + public String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address; + } + + public Long getOrganizationId() { + return organizationId; + } + + public void setOrganizationId(Long organizationId) { + this.organizationId = organizationId; + } + + public String getOrganizationName() { + return organizationName; + } + + public void setOrganizationName(String organizationName) { + this.organizationName = organizationName; + } + + public Long getTyAgentId() { + return tyAgentId; + } + + public void setTyAgentId(Long tyAgentId) { + this.tyAgentId = tyAgentId; + } + + public String getTyAgentName() { + return tyAgentName; + } + + public void setTyAgentName(String tyAgentName) { + this.tyAgentName = tyAgentName; + } + + public Long getTySalesmanId() { + return tySalesmanId; + } + + public void setTySalesmanId(Long tySalesmanId) { + this.tySalesmanId = tySalesmanId; + } + + public String getTySalesmanName() { + return tySalesmanName; + } + + public void setTySalesmanName(String tySalesmanName) { + this.tySalesmanName = tySalesmanName; + } + + public Long getOilStationId() { + return oilStationId; + } + + public void setOilStationId(Long oilStationId) { + this.oilStationId = oilStationId; + } + + public String getOilStationName() { + return oilStationName; + } + + public void setOilStationName(String oilStationName) { + this.oilStationName = oilStationName; + } +} diff --git a/hai-service/src/main/java/com/hai/service/HighMerchantStoreService.java b/hai-service/src/main/java/com/hai/service/HighMerchantStoreService.java index 85d62316..64504c1e 100644 --- a/hai-service/src/main/java/com/hai/service/HighMerchantStoreService.java +++ b/hai-service/src/main/java/com/hai/service/HighMerchantStoreService.java @@ -63,6 +63,13 @@ public interface HighMerchantStoreService { */ HighMerchantStoreModel getMerchantStoreByKey(String storeKey); + /** + * 根据查询 + * @param id + * @return + */ + HighMerchantStore getDetailById(Long id); + /** * @Author 胡锐 * @Description 查询门店列表 diff --git a/hai-service/src/main/java/com/hai/service/HighTyAgentOilStationService.java b/hai-service/src/main/java/com/hai/service/HighTyAgentOilStationService.java new file mode 100644 index 00000000..1030785a --- /dev/null +++ b/hai-service/src/main/java/com/hai/service/HighTyAgentOilStationService.java @@ -0,0 +1,80 @@ +package com.hai.service; + +import com.hai.entity.HighTyAgentOilStation; +import com.hai.model.TyAgentOilStationModel; + +import java.util.List; +import java.util.Map; + +/** + * 团油代理商 加油站管理 + * @author hurui + */ +public interface HighTyAgentOilStationService { + + /** + * 编辑数据 + * @param tyAgentOilStation + */ + void editData(HighTyAgentOilStation tyAgentOilStation); + + /** + * 查询加油站列表 + * @param param + * @return + */ + List getOilStationList(Map param); + + /** + * 根据id 查询详情 + * @param id + * @return + */ + HighTyAgentOilStation getDetailById(Long id); + + /** + * 根据加油站id 查询 + * @param oilStationId + * @return + */ + HighTyAgentOilStation getDetailByOilStationId(Long oilStationId); + + /** + * 分配机构 + * @param orgId + * @param storeList + */ + void assignOrg(Long orgId,List storeList); + + /** + * 解绑机构 + * @param oilStationList + */ + void unbindOrg(List oilStationList); + + /** + * 分配代理商 + * @param agentId + * @param oilStationList + */ + void assignAgent(Long agentId,List oilStationList); + + /** + * 解绑代理商 + * @param oilStationList + */ + void unbindAgent(List oilStationList); + + /** + * 分配业务员 + * @param salesmanId + * @param oilStationList + */ + void assignSalesman(Long salesmanId,List oilStationList); + + /** + * 解绑业务员 + * @param oilStationList + */ + void unbindSalesman(List oilStationList); +} diff --git a/hai-service/src/main/java/com/hai/service/impl/HighMerchantStoreServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/HighMerchantStoreServiceImpl.java index b696d51a..966ca502 100644 --- a/hai-service/src/main/java/com/hai/service/impl/HighMerchantStoreServiceImpl.java +++ b/hai-service/src/main/java/com/hai/service/impl/HighMerchantStoreServiceImpl.java @@ -155,6 +155,11 @@ public class HighMerchantStoreServiceImpl implements HighMerchantStoreService { return null; } + @Override + public HighMerchantStore getDetailById(Long id) { + return highMerchantStoreMapper.selectByPrimaryKey(id); + } + @Override public List getMerchantStoreList(Map map) { HighMerchantStoreExample example = new HighMerchantStoreExample(); diff --git a/hai-service/src/main/java/com/hai/service/impl/HighTyAgentOilStationServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/HighTyAgentOilStationServiceImpl.java new file mode 100644 index 00000000..57caca46 --- /dev/null +++ b/hai-service/src/main/java/com/hai/service/impl/HighTyAgentOilStationServiceImpl.java @@ -0,0 +1,185 @@ +package com.hai.service.impl; + +import com.hai.common.exception.ErrorCode; +import com.hai.common.exception.ErrorHelp; +import com.hai.common.exception.SysCode; +import com.hai.dao.HighTyAgentOilStationMapper; +import com.hai.entity.*; +import com.hai.model.TyAgentOilStationModel; +import com.hai.service.*; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.Date; +import java.util.List; +import java.util.Map; + +@Service("highTyAgentOilStationService") +public class HighTyAgentOilStationServiceImpl implements HighTyAgentOilStationService { + + @Resource + private HighTyAgentOilStationMapper tyAgentOilStationMapper; + + @Resource + private HighTyAgentService tyAgentService; + + @Resource + private HighTySalesmanService tySalesmanService; + + @Resource + private HighMerchantStoreService merchantStoreService; + + @Resource + private BsOrganizationService organizationService; + + @Override + public void editData(HighTyAgentOilStation tyAgentOilStation) { + if (tyAgentOilStation.getId() == null) { + tyAgentOilStation.setStatus(1); + tyAgentOilStation.setCreateTime(new Date()); + tyAgentOilStation.setUpdateTime(new Date()); + tyAgentOilStationMapper.insert(tyAgentOilStation); + } else { + tyAgentOilStation.setUpdateTime(new Date()); + tyAgentOilStationMapper.updateByPrimaryKey(tyAgentOilStation); + } + } + + @Override + public List getOilStationList(Map param) { + return tyAgentOilStationMapper.queryOilStationList(param); + } + + @Override + public HighTyAgentOilStation getDetailById(Long id) { + return tyAgentOilStationMapper.selectByPrimaryKey(id); + } + + @Override + public HighTyAgentOilStation getDetailByOilStationId(Long oilStationId) { + HighTyAgentOilStationExample example = new HighTyAgentOilStationExample(); + example.createCriteria().andStatusNotEqualTo(0).andOilStationIdEqualTo(oilStationId); + List list = tyAgentOilStationMapper.selectByExample(example); + if (list.size() > 0) { + return list.get(0); + } + return null; + } + + @Override + @Transactional(rollbackFor=Exception.class,propagation= Propagation.REQUIRES_NEW) + public void assignOrg(Long orgId, List storeList) { + BsOrganization organization = organizationService.findById(orgId); + if (organization == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未知的机构"); + } + + HighTyAgentOilStation agentOilStation; + for (Long storeId : storeList) { + // 查询门店 + HighMerchantStore store = merchantStoreService.getDetailById(storeId); + if (store == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未知的加油站"); + } + if (getDetailByOilStationId(storeId) != null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, store.getStoreName() + ",已分配给其他代理公司"); + } + agentOilStation = new HighTyAgentOilStation(); + agentOilStation.setOrganizationId(organization.getId()); + agentOilStation.setOrganizationName(organization.getName()); + agentOilStation.setOilStationId(store.getId()); + agentOilStation.setOilStationName(store.getStoreName()); + editData(agentOilStation); + } + } + + @Override + @Transactional(rollbackFor=Exception.class,propagation= Propagation.REQUIRES_NEW) + public void unbindOrg(List oilStationList) { + for (Long oilStationId : oilStationList) { + HighTyAgentOilStation detail = getDetailById(oilStationId); + if (detail == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未知的加油站"); + } + detail.setStatus(0); + editData(detail); + } + } + + @Override + @Transactional(rollbackFor=Exception.class,propagation= Propagation.REQUIRES_NEW) + public void assignAgent(Long agentId, List oilStationList) { + HighTyAgent agent = tyAgentService.getDetailById(agentId); + if (agent == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未知的代理商"); + } + for (Long oilStationId : oilStationList) { + // 查询门店 + HighTyAgentOilStation agentOilStation = getDetailById(oilStationId); + if (agentOilStation == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未知的加油站"); + } + if (agentOilStation.getTyAgentId() != null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, agentOilStation.getOilStationName() + ",已分配给其他代理商"); + } + agentOilStation.setTyAgentId(agent.getId()); + agentOilStation.setTyAgentName(agent.getAgentName()); + editData(agentOilStation); + } + } + + @Override + @Transactional(rollbackFor=Exception.class,propagation= Propagation.REQUIRES_NEW) + public void unbindAgent(List oilStationList) { + for (Long oilStationId : oilStationList) { + HighTyAgentOilStation detail = getDetailById(oilStationId); + if (detail == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未知的加油站"); + } + detail.setTyAgentId(null); + detail.setTyAgentName(null); + detail.setTySalesmanId(null); + detail.setTySalesmanName(null); + editData(detail); + } + } + + @Override + @Transactional(rollbackFor=Exception.class,propagation= Propagation.REQUIRES_NEW) + public void assignSalesman(Long salesmanId, List oilStationList) { + HighTySalesman salesman = tySalesmanService.getDetailById(salesmanId); + if (salesman == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未知的业务员"); + } + for (Long oilStationId : oilStationList) { + // 查询门店 + HighTyAgentOilStation agentOilStation = getDetailById(oilStationId); + if (agentOilStation == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未知的加油站"); + } + if (agentOilStation.getTySalesmanId() != null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, agentOilStation.getOilStationName() + ",已分配给其他业务员"); + } + agentOilStation.setTySalesmanId(salesman.getId()); + agentOilStation.setTySalesmanName(salesman.getSalesmanName()); + editData(agentOilStation); + } + } + + @Override + @Transactional(rollbackFor=Exception.class,propagation= Propagation.REQUIRES_NEW) + public void unbindSalesman(List oilStationList) { + for (Long oilStationId : oilStationList) { + HighTyAgentOilStation detail = getDetailById(oilStationId); + if (detail == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未知的加油站"); + } + detail.setTySalesmanId(null); + detail.setTySalesmanName(null); + editData(detail); + } + } + +} diff --git a/hai-service/src/main/java/com/hai/service/impl/HighTyAgentServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/HighTyAgentServiceImpl.java index 767be0a9..62a416af 100644 --- a/hai-service/src/main/java/com/hai/service/impl/HighTyAgentServiceImpl.java +++ b/hai-service/src/main/java/com/hai/service/impl/HighTyAgentServiceImpl.java @@ -160,6 +160,10 @@ public class HighTyAgentServiceImpl implements HighTyAgentService { HighTyAgentExample example = new HighTyAgentExample(); HighTyAgentExample.Criteria criteria = example.createCriteria().andStatusNotEqualTo(0); + if (MapUtils.getLong(param, "orgId") != null) { + criteria.andOrgIdEqualTo(MapUtils.getLong(param, "orgId")); + } + if (StringUtils.isNotBlank(MapUtils.getString(param, "agentKey"))) { criteria.andAgentKeyLike("%" + MapUtils.getString(param, "agentKey") + "%"); }