diff --git a/.gitignore b/.gitignore index 0d33232c..8bc7d764 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,13 @@ hai-user/hai-user.iml hai-service/hai-service.iml +hai-bweb/src/main/java/com/bweb/controller/ApiIpAddressController.java +hai-service/src/main/java/com/hai/dao/ApiIpAddressMapper.java +hai-service/src/main/java/com/hai/dao/ApiIpAddressMapperExt.java +hai-service/src/main/java/com/hai/dao/ApiIpAddressSqlProvider.java +hai-service/src/main/java/com/hai/entity/ApiIpAddress.java +hai-service/src/main/java/com/hai/entity/ApiIpAddressExample.java +hai-service/src/main/java/com/hai/service/ApiIpAddressService.java +hai-service/src/main/java/com/hai/service/impl/ApiIpAddressServiceImpl.java +v1/src/main/java/com/v1/controller/ApiMerchantsController.java +v1/src/main/java/com/v1/controller/ApiOrderController.java diff --git a/hai-bweb/src/main/java/com/bweb/controller/ApiIpAddressController.java b/hai-bweb/src/main/java/com/bweb/controller/ApiIpAddressController.java deleted file mode 100644 index bf395a74..00000000 --- a/hai-bweb/src/main/java/com/bweb/controller/ApiIpAddressController.java +++ /dev/null @@ -1,158 +0,0 @@ -package com.bweb.controller; - -import com.alibaba.fastjson.JSONObject; -import com.hai.common.exception.ErrorCode; -import com.hai.common.exception.ErrorHelp; -import com.hai.common.exception.SysCode; -import com.hai.common.security.SessionObject; -import com.hai.common.security.UserCenter; -import com.hai.common.utils.RedisUtil; -import com.hai.common.utils.ResponseMsgUtil; -import com.hai.entity.ApiIpAddress; -import com.hai.entity.ApiMerchants; -import com.hai.model.ResponseData; -import com.hai.model.UserInfoModel; -import com.hai.service.ApiIpAddressService; -import com.hai.service.ApiMerchantsService; -import com.hai.service.CommonService; -import com.hai.service.SecConfigService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import java.util.Date; -import java.util.HashMap; -import java.util.Map; - -@Controller -@RequestMapping(value = "/apiIpAddress") -@Api(value = "Ip地址管理") -public class ApiIpAddressController { - - Logger log = LoggerFactory.getLogger(ApiMemberProductController.class); - - @Resource - private ApiIpAddressService apiIpAddressService; - - @Autowired - private UserCenter userCenter; - - @Resource - private SecConfigService secConfigService; - - @Resource - private ApiMerchantsService apiMerchantsService; - - - @RequestMapping(value="/editApiIpAddress",method = RequestMethod.POST) - @ResponseBody - @ApiOperation(value = "编辑ip地址") - public ResponseData editApiIpAddress(@RequestBody ApiIpAddress apiIpAddress, HttpServletRequest request) { - try { - SessionObject sessionObject = userCenter.getSessionObject(request); - UserInfoModel userInfoModel = (UserInfoModel) sessionObject.getObject(); - if (userInfoModel.getBsCompany() == null) { - log.error("HighMerchantController -> updateMerchant() error!","该主角色没有权限"); - throw ErrorHelp.genException(SysCode.System, ErrorCode.MENU_TREE_HAS_NOT_ERROR, ""); - } - - if (apiIpAddress.getMchId() == null) { - log.error("ApiMemberProductController -> insertMemberProduct() error!","参数错误"); - throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, ""); - } - - ApiIpAddress apiIpAddressEdit = apiIpAddressService.findByMchId(apiIpAddress.getMchId()); - - // 判断是否存在ip地址内容 - if (apiIpAddressEdit == null ) { - apiIpAddress.setCreateTime(new Date()); - apiIpAddress.setUpdateTime(new Date()); - apiIpAddressService.insertApiIpAddress(apiIpAddress); - } else { - apiIpAddressEdit.setUpdateTime(new Date()); - apiIpAddressEdit.setIpAddress(apiIpAddress.getIpAddress()); - apiIpAddressService.updateApiIpAddress(apiIpAddressEdit); - } - - - - return ResponseMsgUtil.success("新增成功"); - } catch (Exception e) { - log.error("ApiMerchantsController -> insertMerchant() error!",e); - return ResponseMsgUtil.exception(e); - } - } - - - @RequestMapping(value = "/findByMchId", method = RequestMethod.GET) - @ResponseBody - @ApiOperation(value = "根据商户号查询详情") - public ResponseData findByMchId(@RequestParam(value = "mchId", required = true) String mchId) { - try { - - return ResponseMsgUtil.success(apiIpAddressService.findByMchId(mchId)); - - } catch (Exception e) { - log.error("OutRechargePriceController --> findById() error!", e); - return ResponseMsgUtil.exception(e); - } - } - - @RequestMapping(value = "/getSecConfigList", method = RequestMethod.GET) - @ResponseBody - @ApiOperation(value = "根据商户号查询已配置接口") - public ResponseData getSecConfigList(@RequestParam(value = "mchId", required = true) String mchId) { - try { - - Map map = new HashMap<>(); - map.put("codeValue", mchId); - - return ResponseMsgUtil.success(secConfigService.getSecConfigList(map)); - - } catch (Exception e) { - log.error("OutRechargePriceController --> findById() error!", e); - return ResponseMsgUtil.exception(e); - } - } - - @RequestMapping(value="/configMerchant",method = RequestMethod.POST) - @ResponseBody - @ApiOperation(value = "配置门店可用接口") - public ResponseData configMerchant(@RequestBody JSONObject object, HttpServletRequest request) { - try { - SessionObject sessionObject = userCenter.getSessionObject(request); - UserInfoModel userInfoModel = (UserInfoModel) sessionObject.getObject(); - if (userInfoModel.getBsCompany() == null) { - log.error("HighMerchantController -> updateMerchant() error!","该主角色没有权限"); - throw ErrorHelp.genException(SysCode.System, ErrorCode.MENU_TREE_HAS_NOT_ERROR, ""); - } - - if (object.getString("mchId") == null || object.getString("configProduct") == null) { - log.error("ApiMemberProductController -> insertMemberProduct() error!","参数错误"); - throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, ""); - } - - ApiMerchants merchants = apiMerchantsService.findByMchId(object.getString("mchId")); - - if (merchants == null) { - log.error("ApiMemberProductController -> insertMemberProduct() error!","商户状态错误"); - throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "商户状态错误"); - } - - secConfigService.configMerchant(object.getString("mchId") , object.getString("configProduct")); - - return ResponseMsgUtil.success("配置成功"); - } catch (Exception e) { - log.error("ApiMerchantsController -> insertMerchant() error!",e); - return ResponseMsgUtil.exception(e); - } - } - - -} diff --git a/hai-bweb/src/main/java/com/bweb/controller/BsProductConfigController.java b/hai-bweb/src/main/java/com/bweb/controller/BsProductConfigController.java index 99ca83d3..e60b0661 100644 --- a/hai-bweb/src/main/java/com/bweb/controller/BsProductConfigController.java +++ b/hai-bweb/src/main/java/com/bweb/controller/BsProductConfigController.java @@ -129,6 +129,7 @@ public class BsProductConfigController { apiProductService.ProductConfig(object); + return ResponseMsgUtil.success("新增成功"); } catch (Exception e) { diff --git a/hai-bweb/src/main/java/com/bweb/controller/HighTestController.java b/hai-bweb/src/main/java/com/bweb/controller/HighTestController.java index 14f8b65f..6c744524 100644 --- a/hai-bweb/src/main/java/com/bweb/controller/HighTestController.java +++ b/hai-bweb/src/main/java/com/bweb/controller/HighTestController.java @@ -1 +1,5 @@ -package com.bweb.controller; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.alipay.api.domain.ForbbidenTime; import com.hai.common.exception.ErrorCode; import com.hai.common.exception.ErrorHelp; import com.hai.common.exception.SysCode; import com.hai.common.pay.util.sdk.WXPayConstants; import com.hai.common.utils.*; import com.hai.config.HuiLianTongConfig; import com.hai.config.HuiLianTongUnionCardConfig; import com.hai.config.QianZhuConfig; import com.hai.config.WxOrderConfig; import com.hai.entity.*; import com.hai.model.OrderRefundModel; import com.hai.model.ResponseData; import com.hai.service.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.math.BigDecimal; import java.util.*; import java.util.regex.Matcher; import java.util.regex.Pattern; /** * @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 OutRechargeOrderService outRechargeOrderService; @Resource private HighOrderService highOrderService; @Resource private HighUserService highUserService; @Resource private HighOilCardService oilCardService; @Resource private ApiProductService apiProductService; @Resource private BsRechargeCodeService rechargeCodeService; @Resource private OutRechargePriceService rechargePriceService; @Resource private CommonService commonService; @RequestMapping(value = "/kfcRefund", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "KFC退款") public ResponseData kfcRefund(@RequestParam(name = "orderNo", required = true) String orderNo,HttpServletRequest request) { try { OrderRefundModel orderRefundModel = null; if (StringUtils.isNotBlank(orderNo)) { // 查询订单 HighOrder order = highOrderService.getOrderByOrderNo(orderNo); // 订单状态：1 待支付 2 已支付 3.已完成 4. 已退款 5.已取消 6.退款中 7.拒绝退款 if (order != null && order.getOrderStatus() == 2) { orderRefundModel = WxOrderConfig.orderToRefund(order.getPaySerialNo(), order.getPayRealPrice(), "1609882817", order.getPayRealPrice()); if(orderRefundModel.getResult_code().equals("SUCCESS")) { for (HighChildOrder childOrder : order.getHighChildOrderList()) { childOrder.setChildOrderStatus(4); } order.setOrderStatus(4); //order.setRefundTime(new Date()); //order.setRefundPrice(order.getPayRealPrice()); highOrderService.updateOrder(order); return ResponseMsgUtil.success(orderRefundModel); } } } return ResponseMsgUtil.success(orderRefundModel); } catch (Exception e) { log.error("HighUserCardController --> oilCardRefund() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/oilCardRefund", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "油卡退款") public ResponseData oilCardRefund(@RequestParam(name = "orderNo", required = true) String orderNo,HttpServletRequest request) { try { oilCardService.refund(orderNo); return ResponseMsgUtil.success(""); } catch (Exception e) { log.error("HighUserCardController --> oilCardRefund() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value="/resolveResponse",method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "解析") public ResponseData resolveResponse( @RequestParam(name = "data", required = false) String data ) { try { JSONObject cardInfoObject = HuiLianTongUnionCardConfig.resolveResponse(data); return ResponseMsgUtil.success(cardInfoObject); } catch (Exception e) { log.error("getUserByTelephone",e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value="/consumption",method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "工会卡重新发起充值") public ResponseData consumption( @RequestParam(name = "orderNo", required = false) String orderNo ) { try { OutRechargeOrder order = outRechargeOrderService.findByOrderNo(orderNo); String goodsDesc = "重新充值"; String tranDesc = order.getRechargeContent() + "重新充值" + order.getPayRealPrice() + "元"; String instCode = "11101527"; String businessType = "hisen_consume"; String orderNoPost = "AGAIN" + DateUtil.date2String(new Date(), "yyyyMMddHHmmss") + IDGenerator.nextId(5); // 工会卡支付 JSONObject consumption = HuiLianTongUnionCardConfig.consumption(orderNoPost, order.getLaborUnionCard(), order.getPayRealPrice(), businessType, instCode, goodsDesc, tranDesc); JSONObject cardInfoObject = HuiLianTongUnionCardConfig.resolveResponse(consumption.getString("data")); return ResponseMsgUtil.success(cardInfoObject); } catch (Exception e) { log.error("getUserByTelephone",e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/getHuiLianTongCardConsume", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "查询汇联通工会卡消费记录") public ResponseData getHuiLianTongCardConsume(@RequestParam(name = "businessType", required = true) String businessType, @RequestParam(name = "cardNo", required = true) String cardNo, @RequestParam(name = "sdate", required = true) Long sdate, @RequestParam(name = "edate", required = true) Long edate, @RequestParam(name = "pageNum", required = true) Integer pageNum, @RequestParam(name = "pageSize", required = true) Integer pageSize, HttpServletRequest request) { try { JSONObject consumptionRecord = HuiLianTongUnionCardConfig.queryConsumptionRecordByBusiness(businessType, cardNo, sdate, edate, pageNum, pageSize); if (StringUtils.isBlank(consumptionRecord.getString("data"))) { throw ErrorHelp.genException(SysCode.System, ErrorCode.REQUEST_ERROR, ""); } JSONArray array = HuiLianTongUnionCardConfig.resolveResponse(consumptionRecord.getString("data")).getJSONArray("records"); // // String s = "HFR1"; // String s1 = "AGAIN1"; // // List list = new ArrayList<>(); // // // for (Object data : array) { // JSONObject dataObject = (JSONObject) data; // if (!StringUtils.contains(dataObject.getString("orderNo"),s) && !StringUtils.contains(dataObject.getString("orderNo"),s1)) { // list.add(dataObject); // } // return ResponseMsgUtil.success(array); } catch (Exception e) { log.error("HighUserCardController --> getHuiLianTongCardConsume() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/orderToRefund", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "积分充值退款") public ResponseData orderToRefund(@RequestParam(name = "orderId", required = true) Long orderId ,HttpServletRequest request) { try { HighOrder highOrder = highOrderService.getOrderById(orderId); // 微信退款 OrderRefundModel orderRefundModel = WxOrderConfig.orderToRefund(highOrder.getPaySerialNo(), highOrder.getPayRealPrice(), highOrder.getPayRealPrice()); if(orderRefundModel.getResult_code().equals("SUCCESS")) { for (HighChildOrder childOrder : highOrder.getHighChildOrderList()) { childOrder.setChildOrderStatus(4); } highOrder.setOrderStatus(4); //highOrder.setRefundTime(new Date()); //highOrder.setRefundPrice(highOrder.getPayRealPrice()); highOrderService.updateOrder(highOrder); } if (highUserService.findGoldRepeat(3 , highOrder.getId())) { String remark = "订单" + highOrder.getOrderNo() + "退款积分：" + highOrder.getPayRealPrice().multiply(BigDecimal.valueOf(100)).intValue(); highUserService.goldHandle(highOrder.getMemId(), highOrder.getPayRealPrice().multiply(BigDecimal.valueOf(100)).intValue(), 2, 3, highOrder.getId() , remark); }else { log.error("orderToPay error!", "已有退款记录"); throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "已有退款记录"); } return ResponseMsgUtil.success(orderRefundModel); } catch (Exception e) { log.error("HighOrderController --> orderToRefund() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/orderToRefundByHlt", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "汇联通充值退款") public ResponseData orderToRefundByHlt(@RequestParam(name = "orderId", required = true) Long orderId ,HttpServletRequest request) { try { HighOrder highOrder = highOrderService.getOrderById(orderId); // 微信退款 OrderRefundModel orderRefundModel = WxOrderConfig.orderToRefund(highOrder.getPaySerialNo(), highOrder.getPayRealPrice(), WxOrderConfig.MCH_ID_1619676214 , highOrder.getPayRealPrice()); if(orderRefundModel.getResult_code().equals("SUCCESS")) { for (HighChildOrder childOrder : highOrder.getHighChildOrderList()) { childOrder.setChildOrderStatus(4); } highOrder.setOrderStatus(4); //highOrder.setRefundTime(new Date()); //highOrder.setRefundPrice(highOrder.getPayRealPrice()); highOrderService.updateOrder(highOrder); } return ResponseMsgUtil.success(orderRefundModel); } catch (Exception e) { log.error("HighOrderController --> orderToRefund() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/rechargeOrderToRefund", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "话费退款") public ResponseData rechargeOrderToRefund( @RequestParam(name = "orderId", required = true) Long orderId) { try { outRechargeOrderService.rechargeOrderToRefund(orderId); return ResponseMsgUtil.success("退款成功"); } catch (Exception e) { log.error("HighOrderController --> unionStagingPay() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/getStarbucksProducts", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "更新星巴克商品") public ResponseData getStarbucksProducts(HttpServletRequest request) { try { JSONObject jsonObject = QianZhuConfig.getStarbucksProducts(1 , 200); JSONObject object = jsonObject.getJSONObject("data"); JSONArray array = object.getJSONArray("items"); for (Object data : array) { JSONObject dataObject = (JSONObject) data; ApiStarbucksProducts starbucksProducts = apiProductService.findStarbucksProductsByGoodsId(dataObject.getLong("id")); if (dataObject.getInteger("shelfStatus") == 5) { if (starbucksProducts == null) { starbucksProducts = new ApiStarbucksProducts(); } starbucksProducts.setCategoryName(dataObject.getString("categoryName")); starbucksProducts.setCream(dataObject.getString("cream")); starbucksProducts.setCupSize(dataObject.getString("cupSize")); starbucksProducts.setDefaultImage(dataObject.getString("defaultImage")); starbucksProducts.setDes(dataObject.getString("des")); starbucksProducts.setEspresso(dataObject.getString("espresso")); starbucksProducts.setMarketGrandePrice(dataObject.getBigDecimal("marketGrandePrice")); starbucksProducts.setMarketTallPrice(dataObject.getBigDecimal("marketTallPrice")); starbucksProducts.setMarketVentiPrice(dataObject.getBigDecimal("marketVentiPrice")); starbucksProducts.setSalesGrandePrice(dataObject.getBigDecimal("salesGrandePrice")); starbucksProducts.setSalesTallPrice(dataObject.getBigDecimal("salesTallPrice")); starbucksProducts.setSalesVentiPrice(dataObject.getBigDecimal("salesVentiPrice")); starbucksProducts.setMilk(dataObject.getString("milk")); starbucksProducts.setMilkBubble(dataObject.getString("milkBubble")); starbucksProducts.setName(dataObject.getString("name")); starbucksProducts.setTemperature(dataObject.getString("temperature")); if (starbucksProducts.getId() == null) { starbucksProducts.setCreateTime(new Date()); starbucksProducts.setOperatorId(9999L); starbucksProducts.setOperatorName("系统生成"); starbucksProducts.setStatus(100); starbucksProducts.setGoodsId(dataObject.getLong("id")); apiProductService.insertStarbucksProducts(starbucksProducts); } else { starbucksProducts.setUpdateTime(new Date()); apiProductService.updateStarbucksProducts(starbucksProducts); } } } return ResponseMsgUtil.success("商品生成成功"); } catch (Exception e) { log.error("HighUserCardController --> oilCardRefund() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/getKfcStore", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "查询肯德基门店") public ResponseData getKfcStore(HttpServletRequest request) { try { JSONObject jsonObject = QianZhuConfig.getKfcStore(); JSONArray object = jsonObject.getJSONArray("data"); for (Object data : object) { JSONObject dataObject = (JSONObject) data; Map mapStore = new HashMap<>(); mapStore.put("storeCode" , dataObject.getString("storeCode")); ApiKfcStores apiKfcStores = apiProductService.findKfcStores(mapStore); if (apiKfcStores == null) { apiKfcStores = new ApiKfcStores(); } apiKfcStores.setProvinceCode(dataObject.getString("provinceCode")); apiKfcStores.setProvinceName(dataObject.getString("provinceName")); apiKfcStores.setCityCode(dataObject.getString("cityCode")); apiKfcStores.setCityName(dataObject.getString("cityName")); apiKfcStores.setCityNameFirstLetter(dataObject.getString("cityNameFirstLetter")); apiKfcStores.setKfcCityId(dataObject.getInteger("kfcCityId")); apiKfcStores.setKfcCityCode(dataObject.getString("kfcCityCode")); apiKfcStores.setStoreName(dataObject.getString("storeName")); apiKfcStores.setStoreCode(dataObject.getString("storeCode")); apiKfcStores.setLon(dataObject.getString("lon")); apiKfcStores.setLat(dataObject.getString("lat")); apiKfcStores.setAddress(dataObject.getString("address")); apiKfcStores.setStartTime(dataObject.getString("startTime")); apiKfcStores.setEndTime(dataObject.getString("endTime")); apiKfcStores.setStoreStatus(dataObject.getInteger("storeStatus")); apiKfcStores.setShelfStatus(dataObject.getInteger("shelfStatus")); if (apiKfcStores.getId() == null) { apiKfcStores.setCreateTime(new Date()); apiKfcStores.setOperatorId(9999L); apiKfcStores.setOperatorName("系统生成"); apiKfcStores.setStatus(100); apiProductService.insertKfcStore(apiKfcStores); } else { apiKfcStores.setUpdateTime(new Date()); apiProductService.updateKfcStore(apiKfcStores); } } return ResponseMsgUtil.success("生成成功"); } catch (Exception e) { log.error("HighUserCardController --> oilCardRefund() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/insertCity", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "插入城市") public ResponseData insertCity(HttpServletRequest request) { try { JSONObject jsonObject = QianZhuConfig.getAllCities(); JSONArray object = jsonObject.getJSONArray("data"); for (Object data : object) { JSONObject dataObject = (JSONObject) data; ApiCity apiCity = new ApiCity(); apiCity.setCityInitial(dataObject.getString("cityInitial")); apiCity.setCityCode(dataObject.getString("cityCode")); apiCity.setCityName(dataObject.getString("cityName")); apiCity.setProvinceCode(dataObject.getString("provinceCode")); apiCity.setProvinceName(dataObject.getString("provinceName")); apiCity.setCreateTime(new Date()); apiCity.setUpdateTime(new Date()); apiCity.setOperatorId(9999L); apiCity.setOperatorName("系统生成"); apiCity.setStatus(100); apiProductService.insertCity(apiCity); } return ResponseMsgUtil.success("生成成功"); } catch (Exception e) { log.error("HighUserCardController --> oilCardRefund() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/updatePrice", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "更新价格") public ResponseData updatePrice() { try { List list = rechargePriceService.getListRechargePrice(new HashMap<>()); for (OutRechargePrice rechargePrice : list) { BsRechargeCode rechargeCode = new BsRechargeCode(); if (rechargePrice.getGoodsId() != null) { rechargeCode.setStatus(100); rechargeCode.setUpdateTime(new Date()); rechargeCode.setCreateTime(new Date()); rechargeCode.setGoodsId(rechargePrice.getGoodsId().toString()); rechargeCode.setOperatorName("系统自动更新"); rechargeCode.setType(1); rechargeCode.setSourceId(rechargePrice.getId().toString()); rechargeCode.setRechargePlatform(2); rechargeCodeService.insertRechargeCode(rechargeCode); } } return ResponseMsgUtil.success("生成成功"); } catch (Exception e) { log.error("HighUserCardController --> oilCardRefund() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/test", method = RequestMethod.POST) @ResponseBody @ApiOperation(value = "测试") public ResponseData test(@RequestBody JSONObject object) { try { return ResponseMsgUtil.success(HuiLianTongConfig.test(object)); } catch (Exception e) { log.error("HighOrderController --> unionStagingPay() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/下单", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "支付") public ResponseData insertV2() { try { Map map = new HashMap<>(); map.put("timetable" , new Date().getTime()); map.put("apiKey" , "9A838BEBC60712775E119366DB804C43"); map.put("orderNo" , "20220329182036435619"); map.put("count" , "1"); map.put("couTypeCode" , "test"); map.put("phone" , "15206071196"); map.put("merchId" , "20220670800"); map.put("sign" , WxUtils.generateSignApi(map, MapUtils.getString(map, "apiKey"), WXPayConstants.SignType.MD5)); return ResponseMsgUtil.success(HttpsUtils.doPost("https://hsgcs.dctpay.com/v1/gzSinopec/couJointDist" , map)); } catch (Exception e) { log.error("HighOrderController --> getBackendToken() error!", e); return ResponseMsgUtil.exception(e); } } } \ No newline at end of file +<<<<<<< HEAD +package com.bweb.controller; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.alipay.api.domain.ForbbidenTime; import com.hai.common.exception.ErrorCode; import com.hai.common.exception.ErrorHelp; import com.hai.common.exception.SysCode; import com.hai.common.pay.util.sdk.WXPayConstants; import com.hai.common.utils.*; import com.hai.config.HuiLianTongConfig; import com.hai.config.HuiLianTongUnionCardConfig; import com.hai.config.QianZhuConfig; import com.hai.config.WxOrderConfig; import com.hai.entity.*; import com.hai.model.OrderRefundModel; import com.hai.model.ResponseData; import com.hai.service.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.math.BigDecimal; import java.util.*; import java.util.regex.Matcher; import java.util.regex.Pattern; /** * @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 OutRechargeOrderService outRechargeOrderService; @Resource private HighOrderService highOrderService; @Resource private HighUserService highUserService; @Resource private HighOilCardService oilCardService; @Resource private ApiProductService apiProductService; @Resource private BsRechargeCodeService rechargeCodeService; @Resource private OutRechargePriceService rechargePriceService; @Resource private CommonService commonService; @RequestMapping(value = "/kfcRefund", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "KFC退款") public ResponseData kfcRefund(@RequestParam(name = "orderNo", required = true) String orderNo,HttpServletRequest request) { try { OrderRefundModel orderRefundModel = null; if (StringUtils.isNotBlank(orderNo)) { // 查询订单 HighOrder order = highOrderService.getOrderByOrderNo(orderNo); // 订单状态：1 待支付 2 已支付 3.已完成 4. 已退款 5.已取消 6.退款中 7.拒绝退款 if (order != null && order.getOrderStatus() == 2) { orderRefundModel = WxOrderConfig.orderToRefund(order.getPaySerialNo(), order.getPayRealPrice(), "1609882817", order.getPayRealPrice()); if(orderRefundModel.getResult_code().equals("SUCCESS")) { for (HighChildOrder childOrder : order.getHighChildOrderList()) { childOrder.setChildOrderStatus(4); } order.setOrderStatus(4); //order.setRefundTime(new Date()); //order.setRefundPrice(order.getPayRealPrice()); highOrderService.updateOrder(order); return ResponseMsgUtil.success(orderRefundModel); } } } return ResponseMsgUtil.success(orderRefundModel); } catch (Exception e) { log.error("HighUserCardController --> oilCardRefund() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/oilCardRefund", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "油卡退款") public ResponseData oilCardRefund(@RequestParam(name = "orderNo", required = true) String orderNo,HttpServletRequest request) { try { oilCardService.refund(orderNo); return ResponseMsgUtil.success(""); } catch (Exception e) { log.error("HighUserCardController --> oilCardRefund() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value="/resolveResponse",method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "解析") public ResponseData resolveResponse( @RequestParam(name = "data", required = false) String data ) { try { JSONObject cardInfoObject = HuiLianTongUnionCardConfig.resolveResponse(data); return ResponseMsgUtil.success(cardInfoObject); } catch (Exception e) { log.error("getUserByTelephone",e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value="/consumption",method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "工会卡重新发起充值") public ResponseData consumption( @RequestParam(name = "orderNo", required = false) String orderNo ) { try { OutRechargeOrder order = outRechargeOrderService.findByOrderNo(orderNo); String goodsDesc = "重新充值"; String tranDesc = order.getRechargeContent() + "重新充值" + order.getPayRealPrice() + "元"; String instCode = "11101527"; String businessType = "hisen_consume"; String orderNoPost = "AGAIN" + DateUtil.date2String(new Date(), "yyyyMMddHHmmss") + IDGenerator.nextId(5); // 工会卡支付 JSONObject consumption = HuiLianTongUnionCardConfig.consumption(orderNoPost, order.getLaborUnionCard(), order.getPayRealPrice(), businessType, instCode, goodsDesc, tranDesc); JSONObject cardInfoObject = HuiLianTongUnionCardConfig.resolveResponse(consumption.getString("data")); return ResponseMsgUtil.success(cardInfoObject); } catch (Exception e) { log.error("getUserByTelephone",e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/getHuiLianTongCardConsume", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "查询汇联通工会卡消费记录") public ResponseData getHuiLianTongCardConsume(@RequestParam(name = "businessType", required = true) String businessType, @RequestParam(name = "cardNo", required = true) String cardNo, @RequestParam(name = "sdate", required = true) Long sdate, @RequestParam(name = "edate", required = true) Long edate, @RequestParam(name = "pageNum", required = true) Integer pageNum, @RequestParam(name = "pageSize", required = true) Integer pageSize, HttpServletRequest request) { try { JSONObject consumptionRecord = HuiLianTongUnionCardConfig.queryConsumptionRecordByBusiness(businessType, cardNo, sdate, edate, pageNum, pageSize); if (StringUtils.isBlank(consumptionRecord.getString("data"))) { throw ErrorHelp.genException(SysCode.System, ErrorCode.REQUEST_ERROR, ""); } JSONArray array = HuiLianTongUnionCardConfig.resolveResponse(consumptionRecord.getString("data")).getJSONArray("records"); // // String s = "HFR1"; // String s1 = "AGAIN1"; // // List list = new ArrayList<>(); // // // for (Object data : array) { // JSONObject dataObject = (JSONObject) data; // if (!StringUtils.contains(dataObject.getString("orderNo"),s) && !StringUtils.contains(dataObject.getString("orderNo"),s1)) { // list.add(dataObject); // } // return ResponseMsgUtil.success(array); } catch (Exception e) { log.error("HighUserCardController --> getHuiLianTongCardConsume() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/orderToRefund", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "积分充值退款") public ResponseData orderToRefund(@RequestParam(name = "orderId", required = true) Long orderId ,HttpServletRequest request) { try { HighOrder highOrder = highOrderService.getOrderById(orderId); // 微信退款 OrderRefundModel orderRefundModel = WxOrderConfig.orderToRefund(highOrder.getPaySerialNo(), highOrder.getPayRealPrice(), highOrder.getPayRealPrice()); if(orderRefundModel.getResult_code().equals("SUCCESS")) { for (HighChildOrder childOrder : highOrder.getHighChildOrderList()) { childOrder.setChildOrderStatus(4); } highOrder.setOrderStatus(4); //highOrder.setRefundTime(new Date()); //highOrder.setRefundPrice(highOrder.getPayRealPrice()); highOrderService.updateOrder(highOrder); } if (highUserService.findGoldRepeat(3 , highOrder.getId())) { String remark = "订单" + highOrder.getOrderNo() + "退款积分：" + highOrder.getPayRealPrice().multiply(BigDecimal.valueOf(100)).intValue(); highUserService.goldHandle(highOrder.getMemId(), highOrder.getPayRealPrice().multiply(BigDecimal.valueOf(100)).intValue(), 2, 3, highOrder.getId() , remark); }else { log.error("orderToPay error!", "已有退款记录"); throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "已有退款记录"); } return ResponseMsgUtil.success(orderRefundModel); } catch (Exception e) { log.error("HighOrderController --> orderToRefund() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/orderToRefundByHlt", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "汇联通充值退款") public ResponseData orderToRefundByHlt(@RequestParam(name = "orderId", required = true) Long orderId ,HttpServletRequest request) { try { HighOrder highOrder = highOrderService.getOrderById(orderId); // 微信退款 OrderRefundModel orderRefundModel = WxOrderConfig.orderToRefund(highOrder.getPaySerialNo(), highOrder.getPayRealPrice(), WxOrderConfig.MCH_ID_1619676214 , highOrder.getPayRealPrice()); if(orderRefundModel.getResult_code().equals("SUCCESS")) { for (HighChildOrder childOrder : highOrder.getHighChildOrderList()) { childOrder.setChildOrderStatus(4); } highOrder.setOrderStatus(4); //highOrder.setRefundTime(new Date()); //highOrder.setRefundPrice(highOrder.getPayRealPrice()); highOrderService.updateOrder(highOrder); } return ResponseMsgUtil.success(orderRefundModel); } catch (Exception e) { log.error("HighOrderController --> orderToRefund() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/rechargeOrderToRefund", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "话费退款") public ResponseData rechargeOrderToRefund( @RequestParam(name = "orderId", required = true) Long orderId) { try { outRechargeOrderService.rechargeOrderToRefund(orderId); return ResponseMsgUtil.success("退款成功"); } catch (Exception e) { log.error("HighOrderController --> unionStagingPay() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/getStarbucksProducts", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "更新星巴克商品") public ResponseData getStarbucksProducts(HttpServletRequest request) { try { JSONObject jsonObject = QianZhuConfig.getStarbucksProducts(1 , 200); JSONObject object = jsonObject.getJSONObject("data"); JSONArray array = object.getJSONArray("items"); for (Object data : array) { JSONObject dataObject = (JSONObject) data; ApiStarbucksProducts starbucksProducts = apiProductService.findStarbucksProductsByGoodsId(dataObject.getLong("id")); if (dataObject.getInteger("shelfStatus") == 5) { if (starbucksProducts == null) { starbucksProducts = new ApiStarbucksProducts(); } starbucksProducts.setCategoryName(dataObject.getString("categoryName")); starbucksProducts.setCream(dataObject.getString("cream")); starbucksProducts.setCupSize(dataObject.getString("cupSize")); starbucksProducts.setDefaultImage(dataObject.getString("defaultImage")); starbucksProducts.setDes(dataObject.getString("des")); starbucksProducts.setEspresso(dataObject.getString("espresso")); starbucksProducts.setMarketGrandePrice(dataObject.getBigDecimal("marketGrandePrice")); starbucksProducts.setMarketTallPrice(dataObject.getBigDecimal("marketTallPrice")); starbucksProducts.setMarketVentiPrice(dataObject.getBigDecimal("marketVentiPrice")); starbucksProducts.setSalesGrandePrice(dataObject.getBigDecimal("salesGrandePrice")); starbucksProducts.setSalesTallPrice(dataObject.getBigDecimal("salesTallPrice")); starbucksProducts.setSalesVentiPrice(dataObject.getBigDecimal("salesVentiPrice")); starbucksProducts.setMilk(dataObject.getString("milk")); starbucksProducts.setMilkBubble(dataObject.getString("milkBubble")); starbucksProducts.setName(dataObject.getString("name")); starbucksProducts.setTemperature(dataObject.getString("temperature")); if (starbucksProducts.getId() == null) { starbucksProducts.setCreateTime(new Date()); starbucksProducts.setOperatorId(9999L); starbucksProducts.setOperatorName("系统生成"); starbucksProducts.setStatus(100); starbucksProducts.setGoodsId(dataObject.getLong("id")); apiProductService.insertStarbucksProducts(starbucksProducts); } else { starbucksProducts.setUpdateTime(new Date()); apiProductService.updateStarbucksProducts(starbucksProducts); } } } return ResponseMsgUtil.success("商品生成成功"); } catch (Exception e) { log.error("HighUserCardController --> oilCardRefund() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/getKfcStore", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "查询肯德基门店") public ResponseData getKfcStore(HttpServletRequest request) { try { JSONObject jsonObject = QianZhuConfig.getKfcStore(); JSONArray object = jsonObject.getJSONArray("data"); for (Object data : object) { JSONObject dataObject = (JSONObject) data; Map mapStore = new HashMap<>(); mapStore.put("storeCode" , dataObject.getString("storeCode")); ApiKfcStores apiKfcStores = apiProductService.findKfcStores(mapStore); if (apiKfcStores == null) { apiKfcStores = new ApiKfcStores(); } apiKfcStores.setProvinceCode(dataObject.getString("provinceCode")); apiKfcStores.setProvinceName(dataObject.getString("provinceName")); apiKfcStores.setCityCode(dataObject.getString("cityCode")); apiKfcStores.setCityName(dataObject.getString("cityName")); apiKfcStores.setCityNameFirstLetter(dataObject.getString("cityNameFirstLetter")); apiKfcStores.setKfcCityId(dataObject.getInteger("kfcCityId")); apiKfcStores.setKfcCityCode(dataObject.getString("kfcCityCode")); apiKfcStores.setStoreName(dataObject.getString("storeName")); apiKfcStores.setStoreCode(dataObject.getString("storeCode")); apiKfcStores.setLon(dataObject.getString("lon")); apiKfcStores.setLat(dataObject.getString("lat")); apiKfcStores.setAddress(dataObject.getString("address")); apiKfcStores.setStartTime(dataObject.getString("startTime")); apiKfcStores.setEndTime(dataObject.getString("endTime")); apiKfcStores.setStoreStatus(dataObject.getInteger("storeStatus")); apiKfcStores.setShelfStatus(dataObject.getInteger("shelfStatus")); if (apiKfcStores.getId() == null) { apiKfcStores.setCreateTime(new Date()); apiKfcStores.setOperatorId(9999L); apiKfcStores.setOperatorName("系统生成"); apiKfcStores.setStatus(100); apiProductService.insertKfcStore(apiKfcStores); } else { apiKfcStores.setUpdateTime(new Date()); apiProductService.updateKfcStore(apiKfcStores); } } return ResponseMsgUtil.success("生成成功"); } catch (Exception e) { log.error("HighUserCardController --> oilCardRefund() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/insertCity", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "插入城市") public ResponseData insertCity(HttpServletRequest request) { try { JSONObject jsonObject = QianZhuConfig.getAllCities(); JSONArray object = jsonObject.getJSONArray("data"); for (Object data : object) { JSONObject dataObject = (JSONObject) data; ApiCity apiCity = new ApiCity(); apiCity.setCityInitial(dataObject.getString("cityInitial")); apiCity.setCityCode(dataObject.getString("cityCode")); apiCity.setCityName(dataObject.getString("cityName")); apiCity.setProvinceCode(dataObject.getString("provinceCode")); apiCity.setProvinceName(dataObject.getString("provinceName")); apiCity.setCreateTime(new Date()); apiCity.setUpdateTime(new Date()); apiCity.setOperatorId(9999L); apiCity.setOperatorName("系统生成"); apiCity.setStatus(100); apiProductService.insertCity(apiCity); } return ResponseMsgUtil.success("生成成功"); } catch (Exception e) { log.error("HighUserCardController --> oilCardRefund() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/updatePrice", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "更新价格") public ResponseData updatePrice() { try { List list = rechargePriceService.getListRechargePrice(new HashMap<>()); for (OutRechargePrice rechargePrice : list) { BsRechargeCode rechargeCode = new BsRechargeCode(); if (rechargePrice.getGoodsId() != null) { rechargeCode.setStatus(100); rechargeCode.setUpdateTime(new Date()); rechargeCode.setCreateTime(new Date()); rechargeCode.setGoodsId(rechargePrice.getGoodsId().toString()); rechargeCode.setOperatorName("系统自动更新"); rechargeCode.setType(1); rechargeCode.setSourceId(rechargePrice.getId().toString()); rechargeCode.setRechargePlatform(2); rechargeCodeService.insertRechargeCode(rechargeCode); } } return ResponseMsgUtil.success("生成成功"); } catch (Exception e) { log.error("HighUserCardController --> oilCardRefund() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/test", method = RequestMethod.POST) @ResponseBody @ApiOperation(value = "测试") public ResponseData test(@RequestBody JSONObject object) { try { return ResponseMsgUtil.success(HuiLianTongConfig.test(object)); } catch (Exception e) { log.error("HighOrderController --> unionStagingPay() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/下单", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "支付") public ResponseData insertV2() { try { Map map = new HashMap<>(); map.put("timetable" , new Date().getTime()); map.put("apiKey" , "9A838BEBC60712775E119366DB804C43"); map.put("orderNo" , "20220329182036435619"); map.put("count" , "1"); map.put("couTypeCode" , "test"); map.put("phone" , "15206071196"); map.put("merchId" , "20220670800"); map.put("sign" , WxUtils.generateSignApi(map, MapUtils.getString(map, "apiKey"), WXPayConstants.SignType.MD5)); return ResponseMsgUtil.success(HttpsUtils.doPost("https://hsgcs.dctpay.com/v1/gzSinopec/couJointDist" , map)); } catch (Exception e) { log.error("HighOrderController --> getBackendToken() error!", e); return ResponseMsgUtil.exception(e); } } } +======= +package com.bweb.controller; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.alipay.api.domain.ForbbidenTime; import com.hai.common.exception.ErrorCode; import com.hai.common.exception.ErrorHelp; import com.hai.common.exception.SysCode; import com.hai.common.utils.DateUtil; import com.hai.common.utils.IDGenerator; import com.hai.common.utils.ResponseMsgUtil; import com.hai.config.*; import com.hai.entity.*; import com.hai.model.HighMerchantStoreModel; import com.hai.model.OrderRefundModel; import com.hai.model.ResponseData; import com.hai.service.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.math.BigDecimal; import java.util.*; import java.util.regex.Matcher; import java.util.regex.Pattern; /** * @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 OutRechargeOrderService outRechargeOrderService; @Resource private HighOrderService highOrderService; @Resource private HighUserService highUserService; @Resource private HighOilCardService oilCardService; @Resource private ApiProductService apiProductService; @Resource private BsRechargeCodeService rechargeCodeService; @Resource private OutRechargePriceService rechargePriceService; @Resource private ShellGroupService shellGroupService; @Resource private HighMerchantStoreService highMerchantStoreService; @Resource private UnionPayConfig unionPayConfig; @RequestMapping(value = "/gasSyncPayment", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "gasSyncPayment") public ResponseData gasSyncPayment(@RequestParam(name = "orderNo", required = true) String orderNo) { try { HighOrder order = highOrderService.getOrderByOrderNo(orderNo); for (HighChildOrder childOrder : order.getHighChildOrderList()) { HighMerchantStoreModel store = highMerchantStoreService.getMerchantStoreById(childOrder.getGoodsId()); // 推送加好油 shellGroupService.gasSyncPayment(order.getOrderNo(), store.getStoreKey(), order.getPayTime(), childOrder.getTotalPrice(), childOrder.getGasOilNo(), childOrder.getGasGunNo(), order.getPayablePrice(), order.getDeductionPrice() ); } return ResponseMsgUtil.success(null); } catch (Exception e) { log.error("HighOrderController --> gasPageQueryAllStation() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/kfcRefund", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "KFC退款") public ResponseData kfcRefund(@RequestParam(name = "orderNo", required = true) String orderNo,HttpServletRequest request) { try { OrderRefundModel orderRefundModel = null; if (StringUtils.isNotBlank(orderNo)) { // 查询订单 HighOrder order = highOrderService.getOrderByOrderNo(orderNo); // 订单状态：1 待支付 2 已支付 3.已完成 4. 已退款 5.已取消 6.退款中 7.拒绝退款 if (order != null && order.getOrderStatus() == 2) { orderRefundModel = WxOrderConfig.orderToRefund(order.getPaySerialNo(), order.getPayRealPrice(), "1609882817", order.getPayRealPrice()); if(orderRefundModel.getResult_code().equals("SUCCESS")) { for (HighChildOrder childOrder : order.getHighChildOrderList()) { childOrder.setChildOrdeStatus(4); } order.setOrderStatus(4); order.setRefundTime(new Date()); order.setRefundPrice(order.getPayRealPrice()); highOrderService.updateOrder(order); return ResponseMsgUtil.success(orderRefundModel); } } } return ResponseMsgUtil.success(orderRefundModel); } catch (Exception e) { log.error("HighUserCardController --> oilCardRefund() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/oilCardRefund", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "油卡退款") public ResponseData oilCardRefund(@RequestParam(name = "orderNo", required = true) String orderNo,HttpServletRequest request) { try { oilCardService.refund(orderNo); return ResponseMsgUtil.success(""); } catch (Exception e) { log.error("HighUserCardController --> oilCardRefund() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value="/resolveResponse",method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "解析") public ResponseData resolveResponse( @RequestParam(name = "data", required = false) String data ) { try { JSONObject cardInfoObject = HuiLianTongUnionCardConfig.resolveResponse(data); return ResponseMsgUtil.success(cardInfoObject); } catch (Exception e) { log.error("getUserByTelephone",e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value="/consumption",method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "工会卡重新发起充值") public ResponseData consumption( @RequestParam(name = "orderNo", required = false) String orderNo ) { try { OutRechargeOrder order = outRechargeOrderService.findByOrderNo(orderNo); String goodsDesc = "重新充值"; String tranDesc = order.getRechargeContent() + "重新充值" + order.getPayRealPrice() + "元"; String instCode = "11101527"; String businessType = "hisen_consume"; String orderNoPost = "AGAIN" + DateUtil.date2String(new Date(), "yyyyMMddHHmmss") + IDGenerator.nextId(5); // 工会卡支付 JSONObject consumption = HuiLianTongUnionCardConfig.consumption(orderNoPost, order.getLaborUnionCard(), order.getPayRealPrice(), businessType, instCode, goodsDesc, tranDesc); JSONObject cardInfoObject = HuiLianTongUnionCardConfig.resolveResponse(consumption.getString("data")); return ResponseMsgUtil.success(cardInfoObject); } catch (Exception e) { log.error("getUserByTelephone",e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/getHuiLianTongCardConsume", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "查询汇联通工会卡消费记录") public ResponseData getHuiLianTongCardConsume(@RequestParam(name = "businessType", required = true) String businessType, @RequestParam(name = "cardNo", required = true) String cardNo, @RequestParam(name = "sdate", required = true) Long sdate, @RequestParam(name = "edate", required = true) Long edate, @RequestParam(name = "pageNum", required = true) Integer pageNum, @RequestParam(name = "pageSize", required = true) Integer pageSize, HttpServletRequest request) { try { JSONObject consumptionRecord = HuiLianTongUnionCardConfig.queryConsumptionRecordByBusiness(businessType, cardNo, sdate, edate, pageNum, pageSize); if (StringUtils.isBlank(consumptionRecord.getString("data"))) { throw ErrorHelp.genException(SysCode.System, ErrorCode.REQUEST_ERROR, ""); } JSONArray array = HuiLianTongUnionCardConfig.resolveResponse(consumptionRecord.getString("data")).getJSONArray("records"); // // String s = "HFR1"; // String s1 = "AGAIN1"; // // List list = new ArrayList<>(); // // // for (Object data : array) { // JSONObject dataObject = (JSONObject) data; // if (!StringUtils.contains(dataObject.getString("orderNo"),s) && !StringUtils.contains(dataObject.getString("orderNo"),s1)) { // list.add(dataObject); // } // return ResponseMsgUtil.success(array); } catch (Exception e) { log.error("HighUserCardController --> getHuiLianTongCardConsume() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/orderToRefund", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "积分充值退款") public ResponseData orderToRefund(@RequestParam(name = "orderId", required = true) Long orderId ,HttpServletRequest request) { try { HighOrder highOrder = highOrderService.getOrderById(orderId); // 微信退款 OrderRefundModel orderRefundModel = WxOrderConfig.orderToRefund(highOrder.getPaySerialNo(), highOrder.getPayRealPrice(), highOrder.getPayRealPrice()); if(orderRefundModel.getResult_code().equals("SUCCESS")) { for (HighChildOrder childOrder : highOrder.getHighChildOrderList()) { childOrder.setChildOrdeStatus(4); } highOrder.setOrderStatus(4); highOrder.setRefundTime(new Date()); highOrder.setRefundPrice(highOrder.getPayRealPrice()); highOrderService.updateOrder(highOrder); } if (highUserService.findGoldRepeat(3 , highOrder.getId())) { String remark = "订单" + highOrder.getOrderNo() + "退款积分：" + highOrder.getPayRealPrice().multiply(BigDecimal.valueOf(100)).intValue(); highUserService.goldHandle(highOrder.getMemId(), highOrder.getPayRealPrice().multiply(BigDecimal.valueOf(100)).intValue(), 2, 3, highOrder.getId() , remark); }else { log.error("orderToPay error!", "已有退款记录"); throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "已有退款记录"); } return ResponseMsgUtil.success(orderRefundModel); } catch (Exception e) { log.error("HighOrderController --> orderToRefund() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/orderToRefundByHlt", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "汇联通充值退款") public ResponseData orderToRefundByHlt(@RequestParam(name = "orderId", required = true) Long orderId ,HttpServletRequest request) { try { HighOrder highOrder = highOrderService.getOrderById(orderId); // 微信退款 OrderRefundModel orderRefundModel = WxOrderConfig.orderToRefund(highOrder.getPaySerialNo(), highOrder.getPayRealPrice(), WxOrderConfig.MCH_ID_1619676214 , highOrder.getPayRealPrice()); if(orderRefundModel.getResult_code().equals("SUCCESS")) { for (HighChildOrder childOrder : highOrder.getHighChildOrderList()) { childOrder.setChildOrdeStatus(4); } highOrder.setOrderStatus(4); highOrder.setRefundTime(new Date()); highOrder.setRefundPrice(highOrder.getPayRealPrice()); highOrderService.updateOrder(highOrder); } return ResponseMsgUtil.success(orderRefundModel); } catch (Exception e) { log.error("HighOrderController --> orderToRefund() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/rechargeOrderToRefund", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "话费退款") public ResponseData rechargeOrderToRefund( @RequestParam(name = "orderId", required = true) Long orderId) { try { outRechargeOrderService.rechargeOrderToRefund(orderId); return ResponseMsgUtil.success("退款成功"); } catch (Exception e) { log.error("HighOrderController --> unionStagingPay() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/refund", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "退款") public ResponseData refund(@RequestParam(name = "orderId", required = true) Long orderId ,HttpServletRequest request) { try { HighOrder highOrder = highOrderService.getOrderById(orderId); if (highOrder == null) { throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未知的订单号"); } // 微信退款 OrderRefundModel orderRefundModel = WxOrderConfig.orderToRefund(highOrder.getPaySerialNo(), highOrder.getPayRealPrice(), highOrder.getAccountMerchantNum() , highOrder.getPayRealPrice()); if(orderRefundModel.getResult_code().equals("SUCCESS")) { highOrder.setOrderStatus(4); highOrder.setRefundTime(new Date()); highOrder.setRefundPrice(highOrder.getPayRealPrice()); highOrderService.updateOrderDetail(highOrder); for (HighChildOrder childOrder : highOrder.getHighChildOrderList()) { childOrder.setChildOrdeStatus(4); highOrderService.updateChildOrder(childOrder); } } return ResponseMsgUtil.success(orderRefundModel); } catch (Exception e) { log.error("HighOrderController --> orderToRefund() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/getStarbucksProducts", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "更新星巴克商品") public ResponseData getStarbucksProducts(HttpServletRequest request) { try { JSONObject jsonObject = QianZhuConfig.getStarbucksProducts(1 , 200); JSONObject object = jsonObject.getJSONObject("data"); JSONArray array = object.getJSONArray("items"); for (Object data : array) { JSONObject dataObject = (JSONObject) data; ApiStarbucksProducts starbucksProducts = apiProductService.findStarbucksProductsByGoodsId(dataObject.getLong("id")); if (dataObject.getInteger("shelfStatus") == 5) { if (starbucksProducts == null) { starbucksProducts = new ApiStarbucksProducts(); } starbucksProducts.setCategoryName(dataObject.getString("categoryName")); starbucksProducts.setCream(dataObject.getString("cream")); starbucksProducts.setCupSize(dataObject.getString("cupSize")); starbucksProducts.setDefaultImage(dataObject.getString("defaultImage")); starbucksProducts.setDes(dataObject.getString("des")); starbucksProducts.setEspresso(dataObject.getString("espresso")); starbucksProducts.setMarketGrandePrice(dataObject.getBigDecimal("marketGrandePrice")); starbucksProducts.setMarketTallPrice(dataObject.getBigDecimal("marketTallPrice")); starbucksProducts.setMarketVentiPrice(dataObject.getBigDecimal("marketVentiPrice")); starbucksProducts.setSalesGrandePrice(dataObject.getBigDecimal("salesGrandePrice")); starbucksProducts.setSalesTallPrice(dataObject.getBigDecimal("salesTallPrice")); starbucksProducts.setSalesVentiPrice(dataObject.getBigDecimal("salesVentiPrice")); starbucksProducts.setMilk(dataObject.getString("milk")); starbucksProducts.setMilkBubble(dataObject.getString("milkBubble")); starbucksProducts.setName(dataObject.getString("name")); starbucksProducts.setTemperature(dataObject.getString("temperature")); if (starbucksProducts.getId() == null) { starbucksProducts.setCreateTime(new Date()); starbucksProducts.setOperatorId(9999L); starbucksProducts.setOperatorName("系统生成"); starbucksProducts.setStatus(100); starbucksProducts.setGoodsId(dataObject.getLong("id")); apiProductService.insertStarbucksProducts(starbucksProducts); } else { starbucksProducts.setUpdateTime(new Date()); apiProductService.updateStarbucksProducts(starbucksProducts); } } } return ResponseMsgUtil.success("商品生成成功"); } catch (Exception e) { log.error("HighUserCardController --> oilCardRefund() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/getKfcStore", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "查询肯德基门店") public ResponseData getKfcStore(HttpServletRequest request) { try { JSONObject jsonObject = QianZhuConfig.getKfcStore(); JSONArray object = jsonObject.getJSONArray("data"); for (Object data : object) { JSONObject dataObject = (JSONObject) data; Map mapStore = new HashMap<>(); mapStore.put("storeCode" , dataObject.getString("storeCode")); ApiKfcStores apiKfcStores = apiProductService.findKfcStores(mapStore); if (apiKfcStores == null) { apiKfcStores = new ApiKfcStores(); } apiKfcStores.setProvinceCode(dataObject.getString("provinceCode")); apiKfcStores.setProvinceName(dataObject.getString("provinceName")); apiKfcStores.setCityCode(dataObject.getString("cityCode")); apiKfcStores.setCityName(dataObject.getString("cityName")); apiKfcStores.setCityNameFirstLetter(dataObject.getString("cityNameFirstLetter")); apiKfcStores.setKfcCityId(dataObject.getInteger("kfcCityId")); apiKfcStores.setKfcCityCode(dataObject.getString("kfcCityCode")); apiKfcStores.setStoreName(dataObject.getString("storeName")); apiKfcStores.setStoreCode(dataObject.getString("storeCode")); apiKfcStores.setLon(dataObject.getString("lon")); apiKfcStores.setLat(dataObject.getString("lat")); apiKfcStores.setAddress(dataObject.getString("address")); apiKfcStores.setStartTime(dataObject.getString("startTime")); apiKfcStores.setEndTime(dataObject.getString("endTime")); apiKfcStores.setStoreStatus(dataObject.getInteger("storeStatus")); apiKfcStores.setShelfStatus(dataObject.getInteger("shelfStatus")); if (apiKfcStores.getId() == null) { apiKfcStores.setCreateTime(new Date()); apiKfcStores.setOperatorId(9999L); apiKfcStores.setOperatorName("系统生成"); apiKfcStores.setStatus(100); apiProductService.insertKfcStore(apiKfcStores); } else { apiKfcStores.setUpdateTime(new Date()); apiProductService.updateKfcStore(apiKfcStores); } } return ResponseMsgUtil.success("生成成功"); } catch (Exception e) { log.error("HighUserCardController --> oilCardRefund() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/insertCity", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "插入城市") public ResponseData insertCity(HttpServletRequest request) { try { JSONObject jsonObject = QianZhuConfig.getAllCities(); JSONArray object = jsonObject.getJSONArray("data"); for (Object data : object) { JSONObject dataObject = (JSONObject) data; ApiCity apiCity = new ApiCity(); apiCity.setCityInitial(dataObject.getString("cityInitial")); apiCity.setCityCode(dataObject.getString("cityCode")); apiCity.setCityName(dataObject.getString("cityName")); apiCity.setProvinceCode(dataObject.getString("provinceCode")); apiCity.setProvinceName(dataObject.getString("provinceName")); apiCity.setCreateTime(new Date()); apiCity.setUpdateTime(new Date()); apiCity.setOperatorId(9999L); apiCity.setOperatorName("系统生成"); apiCity.setStatus(100); apiProductService.insertCity(apiCity); } return ResponseMsgUtil.success("生成成功"); } catch (Exception e) { log.error("HighUserCardController --> oilCardRefund() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/updatePrice", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "更新价格") public ResponseData updatePrice() { try { List list = rechargePriceService.getListRechargePrice(new HashMap<>()); for (OutRechargePrice rechargePrice : list) { BsRechargeCode rechargeCode = new BsRechargeCode(); if (rechargePrice.getGoodsId() != null) { rechargeCode.setStatus(100); rechargeCode.setUpdateTime(new Date()); rechargeCode.setCreateTime(new Date()); rechargeCode.setGoodsId(rechargePrice.getGoodsId().toString()); rechargeCode.setOperatorName("系统自动更新"); rechargeCode.setType(1); rechargeCode.setSourceId(rechargePrice.getId().toString()); rechargeCode.setRechargePlatform(2); rechargeCodeService.insertRechargeCode(rechargeCode); } } return ResponseMsgUtil.success("生成成功"); } catch (Exception e) { log.error("HighUserCardController --> oilCardRefund() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/test", method = RequestMethod.POST) @ResponseBody @ApiOperation(value = "测试") public ResponseData test(@RequestBody JSONObject object) { try { return ResponseMsgUtil.success(HuiLianTongConfig.test(object)); } catch (Exception e) { log.error("HighOrderController --> unionStagingPay() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/下单", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "支付") public ResponseData insertV2() { try { String orderNo = "HF2022080818504922206"; JSONObject object = QianZhuConfig.insertV2("PLM100024", orderNo, "15585850137"); object.put("orderNo", orderNo); return ResponseMsgUtil.success(object); } catch (Exception e) { log.error("HighOrderController --> getBackendToken() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/unionZwrefund", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "银联退货") public ResponseData unionZwrefund(@RequestParam(name = "orderId", required = true) Long orderId) { try { HighOrder order = highOrderService.getOrderById(orderId); if (order != null) { Calendar startTime = Calendar.getInstance(); startTime.set(Calendar.HOUR_OF_DAY, 00); startTime.set(Calendar.MINUTE, 00); startTime.set(Calendar.SECOND, 00); Calendar endTime = Calendar.getInstance(); startTime.set(Calendar.HOUR_OF_DAY, 23); startTime.set(Calendar.MINUTE, 59); startTime.set(Calendar.SECOND, 59); // 订单是否处于当日的订单 if (DateUtil.isEffectiveDate(order.getPayTime(), startTime.getTime(), endTime.getTime())) { // 订单撤销 JSONObject refund = UnionPayConfig.cancel(UnionPayConfig.MER_ID3, UnionPayConfig.TERM_ID3, order.getOrderNo(), order.getPaySerialNo()); System.out.println(refund.toJSONString()); if (!refund.getString("resultcode").equals("00") || !refund.getString("resultcode").equals("W6")) { throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, refund.getString("returnmsg")); } order.setOrderStatus(4); order.setRefundTime(new Date()); order.setRefundPrice(order.getPayRealPrice()); highOrderService.updateOrderDetail(order); return ResponseMsgUtil.success("退款成功"); } else { // 订单退款 JSONObject refund = UnionPayConfig.zwrefund(UnionPayConfig.MER_ID3, UnionPayConfig.TERM_ID3, order.getOrderNo(), order.getPaySerialNo(), order.getPayRealPrice().multiply(new BigDecimal("100")).longValue()); System.out.println(refund.toJSONString()); if (!refund.getString("resultcode").equals("00") || !refund.getString("resultcode").equals("W6")) { throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, refund.getString("returnmsg")); } order.setOrderStatus(4); order.setRefundTime(new Date()); order.setRefundPrice(order.getPayRealPrice()); highOrderService.updateOrderDetail(order); return ResponseMsgUtil.success("退款成功"); } } throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未知的订单"); } catch (Exception e) { log.error("HighOrderController --> getBackendToken() error!", e); return ResponseMsgUtil.exception(e); } } } +>>>>>>> master diff --git a/hai-bweb/src/main/java/com/bweb/controller/LoginController.java b/hai-bweb/src/main/java/com/bweb/controller/LoginController.java index dc46a1de..3c9865a0 100644 --- a/hai-bweb/src/main/java/com/bweb/controller/LoginController.java +++ b/hai-bweb/src/main/java/com/bweb/controller/LoginController.java @@ -71,12 +71,6 @@ public class LoginController { @Resource private HighGasStaffService gasStaffService; - @Resource - private ApiMerchantsService apiMerchantsService; - - @Resource - private ApiIpAddressService apiIpAddressService; - @RequestMapping(value="/userLogin",method = RequestMethod.POST) @ResponseBody @ApiOperation(value = "机构用户登录（{'loginName':'','password':''}）") @@ -238,21 +232,6 @@ public class LoginController { throw ErrorHelp.genException(SysCode.System, ErrorCode.MERCHANT_STORE_NOF_FOUND, ""); } userInfoModel.setMerchantStore(merchantStore); - } else if (secUser.getObjectType() == 21) { - // 查询APi - ApiMerchants apiMerchants = apiMerchantsService.findById(secUser.getObjectId()); - if(apiMerchants == null){ - log.error("login error!","当前账户不存在"); - throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "当前账户不存在"); - } - if(apiMerchants.getStatus() != 100) { - log.error("login error!","账户状态异常，请联系管理员"); - throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "账户状态异常，请联系管理员"); - } - ApiIpAddress apiIpAddress = apiIpAddressService.findByMchId(apiMerchants.getMchId()); - apiMerchants.setExt1(apiIpAddress.getIpAddress()); - userInfoModel.setApiMerchants(apiMerchants); - } else { log.error("login error!","用户信息错误"); throw ErrorHelp.genException(SysCode.System, ErrorCode.SEC_USER_EXPIRED, ""); diff --git a/hai-cweb/src/main/java/com/cweb/controller/CommonController.java b/hai-cweb/src/main/java/com/cweb/controller/CommonController.java index f6571c2c..ce500b90 100644 --- a/hai-cweb/src/main/java/com/cweb/controller/CommonController.java +++ b/hai-cweb/src/main/java/com/cweb/controller/CommonController.java @@ -232,7 +232,7 @@ public class CommonController { } } - @RequestMapping(value = "/getScanCodePageHtmlSign", method = RequestMethod.POST) + @RequestMapping(value = "/ getScanCodePageHtmlSign", method = RequestMethod.POST) @ResponseBody @ApiOperation(value = "获取扫码页面签名") public ResponseData getScanCodePageHtmlSign(@RequestBody JSONObject body) { diff --git a/hai-cweb/src/main/java/com/cweb/controller/HighUserController.java b/hai-cweb/src/main/java/com/cweb/controller/HighUserController.java index cd90f73c..0bca3d78 100644 --- a/hai-cweb/src/main/java/com/cweb/controller/HighUserController.java +++ b/hai-cweb/src/main/java/com/cweb/controller/HighUserController.java @@ -144,7 +144,7 @@ public class HighUserController { HighUserModel userInfoModel = (HighUserModel) sessionObject.getObject(); if (StringUtils.isBlank(body.getString("password")) - || body.getString("password").length() != 6) { + || body.getString("password").length() != 6){ log.error("HighUserController --> setUserPayPwd() error!", "请设置6位支付密码"); throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "请设置6位支付密码"); } @@ -178,7 +178,7 @@ public class HighUserController { @RequestMapping(value = "/updateUserPayPwd", method = RequestMethod.POST) @ResponseBody @ApiOperation(value = "修改用户支付密码") - public ResponseData updateUserPayPwd(@RequestBody JSONObject body,HttpServletRequest request) { + public ResponseData updateUserPayPwd(@RequestBody JSONObject body,HttpServletRequest request, HttpServletResponse response) { try { // 用户 SessionObject sessionObject = userCenter.getSessionObject(request); diff --git a/hai-cweb/src/main/java/com/cweb/controller/OutRechargePriceController.java b/hai-cweb/src/main/java/com/cweb/controller/OutRechargePriceController.java index 3225faeb..af8c3cfb 100644 --- a/hai-cweb/src/main/java/com/cweb/controller/OutRechargePriceController.java +++ b/hai-cweb/src/main/java/com/cweb/controller/OutRechargePriceController.java @@ -43,6 +43,9 @@ public class OutRechargePriceController { private static Logger log = LoggerFactory.getLogger(HighMerchantStoreController.class); + @Autowired + private UserCenter userCenter; + @Resource private OutRechargePriceService outRechargePriceService; diff --git a/hai-cweb/src/main/java/com/cweb/controller/pay/UnionPayController.java b/hai-cweb/src/main/java/com/cweb/controller/pay/UnionPayController.java index 81cd0989..19fc05cb 100644 --- a/hai-cweb/src/main/java/com/cweb/controller/pay/UnionPayController.java +++ b/hai-cweb/src/main/java/com/cweb/controller/pay/UnionPayController.java @@ -424,6 +424,32 @@ public class UnionPayController { if (highChildOrder.getGoodsType() == 4 || highChildOrder.getGoodsType() == 9) { highChildOrder.setChildOrdeStatus(2); } + if (highChildOrder.getGoodsType() == 7) { + highChildOrder.setChildOrdeStatus(2); + HighDiscountPackageActual actual = discountPackageActualService.getDetailByChildOrderId(highChildOrder.getId()); + if (actual != null) { + List discountList = discountPackageDiscountActualService.getHighDiscountPackageDiscountActualList(actual.getId()); + for (HighDiscountPackageDiscountActual discount : discountList) { + highDiscountUserRelService.receiveDiscount(order.getMemId(), discount.getAgentDiscountCodeId()); + } + HighDiscountPackage discountPackage = discountPackageService.findDiscountPackageById(actual.getDiscountPackageId()); + HighDiscountPackageRecord record = new HighDiscountPackageRecord(); + record.setDiscountPackageId(discountPackage.getId()); + record.setDiscountPackageTitle(discountPackage.getTitle()); + record.setUsingAttribution(discountPackage.getUsingAttribution()); + record.setCompanyId(discountPackage.getCompanyId()); + record.setOrderId(order.getId().intValue()); + record.setChildOrderId(highChildOrder.getId().intValue()); + record.setRecordNo(System.currentTimeMillis()+""); + record.setSalesType(1); + record.setPrice(order.getPayPrice()); + record.setUserId(order.getMemId().intValue()); + discountPackageRecordService.insertRecord(record); + actual.setAllocationTime(new Date()); + actual.setStatus(3); // 状态： 1: 待分配 2:预分配（售卖）3:已分配 + discountPackageActualService.updateHighDiscountPackageActual(actual); + } + } } */ diff --git a/hai-service/src/main/java/com/hai/config/WxOrderConfig.java b/hai-service/src/main/java/com/hai/config/WxOrderConfig.java index bce88928..86c6e371 100644 --- a/hai-service/src/main/java/com/hai/config/WxOrderConfig.java +++ b/hai-service/src/main/java/com/hai/config/WxOrderConfig.java @@ -1,9 +1,17 @@ package com.hai.config; +import com.alibaba.fastjson.JSONObject; +import com.hai.common.exception.ErrorCode; +import com.hai.common.exception.ErrorHelp; +import com.hai.common.exception.SysCode; import com.hai.common.pay.util.XmlUtil; import com.hai.common.pay.util.sdk.WXPayConstants; +import com.hai.common.utils.ResponseMsgUtil; import com.hai.common.utils.WxUtils; +import com.hai.entity.OutRechargeOrder; import com.hai.model.OrderRefundModel; +import com.hai.model.ResponseData; +import io.swagger.annotations.ApiOperation; import org.apache.http.HttpEntity; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpPost; @@ -15,8 +23,13 @@ import org.apache.http.ssl.SSLContexts; import org.apache.http.util.EntityUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; import javax.net.ssl.SSLContext; +import javax.servlet.http.HttpServletRequest; import java.io.FileInputStream; import java.math.BigDecimal; import java.security.KeyStore; diff --git a/hai-service/src/main/java/com/hai/dao/ApiIpAddressMapper.java b/hai-service/src/main/java/com/hai/dao/ApiIpAddressMapper.java deleted file mode 100644 index b2660173..00000000 --- a/hai-service/src/main/java/com/hai/dao/ApiIpAddressMapper.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.hai.dao; - -import com.hai.entity.ApiIpAddress; -import com.hai.entity.ApiIpAddressExample; -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 ApiIpAddressMapper extends ApiIpAddressMapperExt { - @SelectProvider(type=ApiIpAddressSqlProvider.class, method="countByExample") - long countByExample(ApiIpAddressExample example); - - @DeleteProvider(type=ApiIpAddressSqlProvider.class, method="deleteByExample") - int deleteByExample(ApiIpAddressExample example); - - @Delete({ - "delete from api_ip_address", - "where id = #{id,jdbcType=BIGINT}" - }) - int deleteByPrimaryKey(Long id); - - @Insert({ - "insert into api_ip_address (ip_address, mch_id, ", - "create_time, update_time, ", - "ext_1, ext_2, ext_3)", - "values (#{ipAddress,jdbcType=VARCHAR}, #{mchId,jdbcType=VARCHAR}, ", - "#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, ", - "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" - }) - @Options(useGeneratedKeys=true,keyProperty="id") - int insert(ApiIpAddress record); - - @InsertProvider(type=ApiIpAddressSqlProvider.class, method="insertSelective") - @Options(useGeneratedKeys=true,keyProperty="id") - int insertSelective(ApiIpAddress record); - - @SelectProvider(type=ApiIpAddressSqlProvider.class, method="selectByExample") - @Results({ - @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), - @Result(column="ip_address", property="ipAddress", jdbcType=JdbcType.VARCHAR), - @Result(column="mch_id", property="mchId", jdbcType=JdbcType.VARCHAR), - @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(ApiIpAddressExample example); - - @Select({ - "select", - "id, ip_address, mch_id, create_time, update_time, ext_1, ext_2, ext_3", - "from api_ip_address", - "where id = #{id,jdbcType=BIGINT}" - }) - @Results({ - @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), - @Result(column="ip_address", property="ipAddress", jdbcType=JdbcType.VARCHAR), - @Result(column="mch_id", property="mchId", jdbcType=JdbcType.VARCHAR), - @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) - }) - ApiIpAddress selectByPrimaryKey(Long id); - - @UpdateProvider(type=ApiIpAddressSqlProvider.class, method="updateByExampleSelective") - int updateByExampleSelective(@Param("record") ApiIpAddress record, @Param("example") ApiIpAddressExample example); - - @UpdateProvider(type=ApiIpAddressSqlProvider.class, method="updateByExample") - int updateByExample(@Param("record") ApiIpAddress record, @Param("example") ApiIpAddressExample example); - - @UpdateProvider(type=ApiIpAddressSqlProvider.class, method="updateByPrimaryKeySelective") - int updateByPrimaryKeySelective(ApiIpAddress record); - - @Update({ - "update api_ip_address", - "set ip_address = #{ipAddress,jdbcType=VARCHAR},", - "mch_id = #{mchId,jdbcType=VARCHAR},", - "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(ApiIpAddress record); -} \ No newline at end of file diff --git a/hai-service/src/main/java/com/hai/dao/ApiIpAddressMapperExt.java b/hai-service/src/main/java/com/hai/dao/ApiIpAddressMapperExt.java deleted file mode 100644 index d28315cc..00000000 --- a/hai-service/src/main/java/com/hai/dao/ApiIpAddressMapperExt.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.hai.dao; - -/** - * mapper扩展类 - */ -public interface ApiIpAddressMapperExt { -} \ No newline at end of file diff --git a/hai-service/src/main/java/com/hai/dao/ApiIpAddressSqlProvider.java b/hai-service/src/main/java/com/hai/dao/ApiIpAddressSqlProvider.java deleted file mode 100644 index e27cdb95..00000000 --- a/hai-service/src/main/java/com/hai/dao/ApiIpAddressSqlProvider.java +++ /dev/null @@ -1,276 +0,0 @@ -package com.hai.dao; - -import com.hai.entity.ApiIpAddress; -import com.hai.entity.ApiIpAddressExample.Criteria; -import com.hai.entity.ApiIpAddressExample.Criterion; -import com.hai.entity.ApiIpAddressExample; -import java.util.List; -import java.util.Map; -import org.apache.ibatis.jdbc.SQL; - -public class ApiIpAddressSqlProvider { - - public String countByExample(ApiIpAddressExample example) { - SQL sql = new SQL(); - sql.SELECT("count(*)").FROM("api_ip_address"); - applyWhere(sql, example, false); - return sql.toString(); - } - - public String deleteByExample(ApiIpAddressExample example) { - SQL sql = new SQL(); - sql.DELETE_FROM("api_ip_address"); - applyWhere(sql, example, false); - return sql.toString(); - } - - public String insertSelective(ApiIpAddress record) { - SQL sql = new SQL(); - sql.INSERT_INTO("api_ip_address"); - - if (record.getIpAddress() != null) { - sql.VALUES("ip_address", "#{ipAddress,jdbcType=VARCHAR}"); - } - - if (record.getMchId() != null) { - sql.VALUES("mch_id", "#{mchId,jdbcType=VARCHAR}"); - } - - 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(ApiIpAddressExample example) { - SQL sql = new SQL(); - if (example != null && example.isDistinct()) { - sql.SELECT_DISTINCT("id"); - } else { - sql.SELECT("id"); - } - sql.SELECT("ip_address"); - sql.SELECT("mch_id"); - sql.SELECT("create_time"); - sql.SELECT("update_time"); - sql.SELECT("ext_1"); - sql.SELECT("ext_2"); - sql.SELECT("ext_3"); - sql.FROM("api_ip_address"); - applyWhere(sql, example, false); - - if (example != null && example.getOrderByClause() != null) { - sql.ORDER_BY(example.getOrderByClause()); - } - - return sql.toString(); - } - - public String updateByExampleSelective(Map parameter) { - ApiIpAddress record = (ApiIpAddress) parameter.get("record"); - ApiIpAddressExample example = (ApiIpAddressExample) parameter.get("example"); - - SQL sql = new SQL(); - sql.UPDATE("api_ip_address"); - - if (record.getId() != null) { - sql.SET("id = #{record.id,jdbcType=BIGINT}"); - } - - if (record.getIpAddress() != null) { - sql.SET("ip_address = #{record.ipAddress,jdbcType=VARCHAR}"); - } - - if (record.getMchId() != null) { - sql.SET("mch_id = #{record.mchId,jdbcType=VARCHAR}"); - } - - 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("api_ip_address"); - - sql.SET("id = #{record.id,jdbcType=BIGINT}"); - sql.SET("ip_address = #{record.ipAddress,jdbcType=VARCHAR}"); - sql.SET("mch_id = #{record.mchId,jdbcType=VARCHAR}"); - 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}"); - - ApiIpAddressExample example = (ApiIpAddressExample) parameter.get("example"); - applyWhere(sql, example, true); - return sql.toString(); - } - - public String updateByPrimaryKeySelective(ApiIpAddress record) { - SQL sql = new SQL(); - sql.UPDATE("api_ip_address"); - - if (record.getIpAddress() != null) { - sql.SET("ip_address = #{ipAddress,jdbcType=VARCHAR}"); - } - - if (record.getMchId() != null) { - sql.SET("mch_id = #{mchId,jdbcType=VARCHAR}"); - } - - 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, ApiIpAddressExample example, boolean includeExamplePhrase) { - if (example == null) { - return; - } - - String parmPhrase1; - String parmPhrase1_th; - String parmPhrase2; - String parmPhrase2_th; - String parmPhrase3; - String parmPhrase3_th; - if (includeExamplePhrase) { - parmPhrase1 = "%s #{example.oredCriteria[%d].allCriteria[%d].value}"; - parmPhrase1_th = "%s #{example.oredCriteria[%d].allCriteria[%d].value,typeHandler=%s}"; - parmPhrase2 = "%s #{example.oredCriteria[%d].allCriteria[%d].value} and #{example.oredCriteria[%d].criteria[%d].secondValue}"; - parmPhrase2_th = "%s #{example.oredCriteria[%d].allCriteria[%d].value,typeHandler=%s} and #{example.oredCriteria[%d].criteria[%d].secondValue,typeHandler=%s}"; - parmPhrase3 = "#{example.oredCriteria[%d].allCriteria[%d].value[%d]}"; - parmPhrase3_th = "#{example.oredCriteria[%d].allCriteria[%d].value[%d],typeHandler=%s}"; - } else { - parmPhrase1 = "%s #{oredCriteria[%d].allCriteria[%d].value}"; - parmPhrase1_th = "%s #{oredCriteria[%d].allCriteria[%d].value,typeHandler=%s}"; - parmPhrase2 = "%s #{oredCriteria[%d].allCriteria[%d].value} and #{oredCriteria[%d].criteria[%d].secondValue}"; - parmPhrase2_th = "%s #{oredCriteria[%d].allCriteria[%d].value,typeHandler=%s} and #{oredCriteria[%d].criteria[%d].secondValue,typeHandler=%s}"; - parmPhrase3 = "#{oredCriteria[%d].allCriteria[%d].value[%d]}"; - parmPhrase3_th = "#{oredCriteria[%d].allCriteria[%d].value[%d],typeHandler=%s}"; - } - - StringBuilder sb = new StringBuilder(); - List oredCriteria = example.getOredCriteria(); - boolean firstCriteria = true; - for (int i = 0; i < oredCriteria.size(); i++) { - Criteria criteria = oredCriteria.get(i); - if (criteria.isValid()) { - if (firstCriteria) { - firstCriteria = false; - } else { - sb.append(" or "); - } - - sb.append('('); - List criterions = criteria.getAllCriteria(); - boolean firstCriterion = true; - for (int j = 0; j < criterions.size(); j++) { - Criterion criterion = criterions.get(j); - if (firstCriterion) { - firstCriterion = false; - } else { - sb.append(" and "); - } - - if (criterion.isNoValue()) { - sb.append(criterion.getCondition()); - } else if (criterion.isSingleValue()) { - if (criterion.getTypeHandler() == null) { - sb.append(String.format(parmPhrase1, criterion.getCondition(), i, j)); - } else { - sb.append(String.format(parmPhrase1_th, criterion.getCondition(), i, j,criterion.getTypeHandler())); - } - } else if (criterion.isBetweenValue()) { - if (criterion.getTypeHandler() == null) { - sb.append(String.format(parmPhrase2, criterion.getCondition(), i, j, i, j)); - } else { - sb.append(String.format(parmPhrase2_th, criterion.getCondition(), i, j, criterion.getTypeHandler(), i, j, criterion.getTypeHandler())); - } - } else if (criterion.isListValue()) { - sb.append(criterion.getCondition()); - sb.append(" ("); - List listItems = (List) criterion.getValue(); - boolean comma = false; - for (int k = 0; k < listItems.size(); k++) { - if (comma) { - sb.append(", "); - } else { - comma = true; - } - if (criterion.getTypeHandler() == null) { - sb.append(String.format(parmPhrase3, i, j, k)); - } else { - sb.append(String.format(parmPhrase3_th, i, j, k, criterion.getTypeHandler())); - } - } - sb.append(')'); - } - } - sb.append(')'); - } - } - - if (sb.length() > 0) { - sql.WHERE(sb.toString()); - } - } -} \ No newline at end of file diff --git a/hai-service/src/main/java/com/hai/entity/ApiAmountRecord.java b/hai-service/src/main/java/com/hai/entity/ApiAmountRecord.java index f38eaefc..da3277e6 100644 --- a/hai-service/src/main/java/com/hai/entity/ApiAmountRecord.java +++ b/hai-service/src/main/java/com/hai/entity/ApiAmountRecord.java @@ -45,7 +45,7 @@ public class ApiAmountRecord implements Serializable { private String mchId; /** - * 1:充值金额 2：订单退款 3 话费消费 4: 肯德基订单 5：星巴克订单 6：会员充值 7：重庆中石油 + * 1:充值金额 2：订单退款 3 话费消费 */ private Integer sourceType; diff --git a/hai-service/src/main/java/com/hai/entity/ApiIpAddress.java b/hai-service/src/main/java/com/hai/entity/ApiIpAddress.java deleted file mode 100644 index 3a98d566..00000000 --- a/hai-service/src/main/java/com/hai/entity/ApiIpAddress.java +++ /dev/null @@ -1,177 +0,0 @@ -package com.hai.entity; - -import java.io.Serializable; -import java.util.Date; - -/** - * api_ip_address - * @author - */ -/** - * - * 代码由工具生成 - * - **/ -public class ApiIpAddress implements Serializable { - /** - * 主键 - */ - private Long id; - - /** - * ip地址 - */ - private String ipAddress; - - /** - * 商户号 - */ - private String mchId; - - /** - * 创建时间 - */ - private Date createTime; - - /** - * 更新时间 - */ - private Date updateTime; - - /** - * ext_1 - */ - private String ext1; - - /** - * ext_2 - */ - private String ext2; - - /** - * ext_3 - */ - private String ext3; - - private static final long serialVersionUID = 1L; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getIpAddress() { - return ipAddress; - } - - public void setIpAddress(String ipAddress) { - this.ipAddress = ipAddress; - } - - public String getMchId() { - return mchId; - } - - public void setMchId(String mchId) { - this.mchId = mchId; - } - - 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; - } - ApiIpAddress other = (ApiIpAddress) that; - return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) - && (this.getIpAddress() == null ? other.getIpAddress() == null : this.getIpAddress().equals(other.getIpAddress())) - && (this.getMchId() == null ? other.getMchId() == null : this.getMchId().equals(other.getMchId())) - && (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 + ((getIpAddress() == null) ? 0 : getIpAddress().hashCode()); - result = prime * result + ((getMchId() == null) ? 0 : getMchId().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(", ipAddress=").append(ipAddress); - sb.append(", mchId=").append(mchId); - 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/ApiIpAddressExample.java b/hai-service/src/main/java/com/hai/entity/ApiIpAddressExample.java deleted file mode 100644 index 6a171d91..00000000 --- a/hai-service/src/main/java/com/hai/entity/ApiIpAddressExample.java +++ /dev/null @@ -1,753 +0,0 @@ -package com.hai.entity; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -public class ApiIpAddressExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - private Integer limit; - - private Long offset; - - public ApiIpAddressExample() { - 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 andIpAddressIsNull() { - addCriterion("ip_address is null"); - return (Criteria) this; - } - - public Criteria andIpAddressIsNotNull() { - addCriterion("ip_address is not null"); - return (Criteria) this; - } - - public Criteria andIpAddressEqualTo(String value) { - addCriterion("ip_address =", value, "ipAddress"); - return (Criteria) this; - } - - public Criteria andIpAddressNotEqualTo(String value) { - addCriterion("ip_address <>", value, "ipAddress"); - return (Criteria) this; - } - - public Criteria andIpAddressGreaterThan(String value) { - addCriterion("ip_address >", value, "ipAddress"); - return (Criteria) this; - } - - public Criteria andIpAddressGreaterThanOrEqualTo(String value) { - addCriterion("ip_address >=", value, "ipAddress"); - return (Criteria) this; - } - - public Criteria andIpAddressLessThan(String value) { - addCriterion("ip_address <", value, "ipAddress"); - return (Criteria) this; - } - - public Criteria andIpAddressLessThanOrEqualTo(String value) { - addCriterion("ip_address <=", value, "ipAddress"); - return (Criteria) this; - } - - public Criteria andIpAddressLike(String value) { - addCriterion("ip_address like", value, "ipAddress"); - return (Criteria) this; - } - - public Criteria andIpAddressNotLike(String value) { - addCriterion("ip_address not like", value, "ipAddress"); - return (Criteria) this; - } - - public Criteria andIpAddressIn(List values) { - addCriterion("ip_address in", values, "ipAddress"); - return (Criteria) this; - } - - public Criteria andIpAddressNotIn(List values) { - addCriterion("ip_address not in", values, "ipAddress"); - return (Criteria) this; - } - - public Criteria andIpAddressBetween(String value1, String value2) { - addCriterion("ip_address between", value1, value2, "ipAddress"); - return (Criteria) this; - } - - public Criteria andIpAddressNotBetween(String value1, String value2) { - addCriterion("ip_address not between", value1, value2, "ipAddress"); - return (Criteria) this; - } - - public Criteria andMchIdIsNull() { - addCriterion("mch_id is null"); - return (Criteria) this; - } - - public Criteria andMchIdIsNotNull() { - addCriterion("mch_id is not null"); - return (Criteria) this; - } - - public Criteria andMchIdEqualTo(String value) { - addCriterion("mch_id =", value, "mchId"); - return (Criteria) this; - } - - public Criteria andMchIdNotEqualTo(String value) { - addCriterion("mch_id <>", value, "mchId"); - return (Criteria) this; - } - - public Criteria andMchIdGreaterThan(String value) { - addCriterion("mch_id >", value, "mchId"); - return (Criteria) this; - } - - public Criteria andMchIdGreaterThanOrEqualTo(String value) { - addCriterion("mch_id >=", value, "mchId"); - return (Criteria) this; - } - - public Criteria andMchIdLessThan(String value) { - addCriterion("mch_id <", value, "mchId"); - return (Criteria) this; - } - - public Criteria andMchIdLessThanOrEqualTo(String value) { - addCriterion("mch_id <=", value, "mchId"); - return (Criteria) this; - } - - public Criteria andMchIdLike(String value) { - addCriterion("mch_id like", value, "mchId"); - return (Criteria) this; - } - - public Criteria andMchIdNotLike(String value) { - addCriterion("mch_id not like", value, "mchId"); - return (Criteria) this; - } - - public Criteria andMchIdIn(List values) { - addCriterion("mch_id in", values, "mchId"); - return (Criteria) this; - } - - public Criteria andMchIdNotIn(List values) { - addCriterion("mch_id not in", values, "mchId"); - return (Criteria) this; - } - - public Criteria andMchIdBetween(String value1, String value2) { - addCriterion("mch_id between", value1, value2, "mchId"); - return (Criteria) this; - } - - public Criteria andMchIdNotBetween(String value1, String value2) { - addCriterion("mch_id not between", value1, value2, "mchId"); - 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/UserInfoModel.java b/hai-service/src/main/java/com/hai/model/UserInfoModel.java index b150ad97..ab991381 100644 --- a/hai-service/src/main/java/com/hai/model/UserInfoModel.java +++ b/hai-service/src/main/java/com/hai/model/UserInfoModel.java @@ -36,8 +36,6 @@ public class UserInfoModel { private HighTySalesman highTySalesman; // 加油站员工 private HighGasStaff gasStaff; - // APi商户角色 - private ApiMerchants apiMerchants; // 权限列表 private List permissionList; // 菜单权限列表 @@ -135,16 +133,7 @@ public class UserInfoModel { this.highAgent = highAgent; } - - public ApiMerchants getApiMerchants() { - return apiMerchants; - } - - public void setApiMerchants(ApiMerchants apiMerchants) { - this.apiMerchants = apiMerchants; - } - - public HighTyAgent getHighTyAgent() { + public HighTyAgent getHighTyAgent() { return highTyAgent; } diff --git a/hai-service/src/main/java/com/hai/service/ApiIpAddressService.java b/hai-service/src/main/java/com/hai/service/ApiIpAddressService.java deleted file mode 100644 index 77ecc43e..00000000 --- a/hai-service/src/main/java/com/hai/service/ApiIpAddressService.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.hai.service; - -import com.hai.entity.ApiAmountRecord; -import com.hai.entity.ApiIpAddress; - -import java.util.List; -import java.util.Map; - -/** - * @serviceName ApiIpAddressService.java - * @author Sum1Dream - * @version 1.0.0 - * @Description // Api商户IP地址管理 - * @createTime 14:18 2022/12/6 - **/ -public interface ApiIpAddressService { - - /** - * @Author Sum1Dream - * @Name insertApiIpAddress - * @Description // 新增ip地址内容 - * @Date 14:21 2022/12/6 - * @Param [apiIpAddress] - * @Return void - */ - void insertApiIpAddress(ApiIpAddress apiIpAddress); - - /** - * @Author Sum1Dream - * @Name updateApiIpAddress - * @Description // 修改IP地址内容 - * @Date 15:29 2022/12/6 - * @Param [apiIpAddress] - * @Return void - */ - void updateApiIpAddress(ApiIpAddress apiIpAddress); - - /** - * @Author Sum1Dream - * @Name findById - * @Description // 查询ip地址详情 - * @Date 14:19 2022/12/6 - * @Param [id] - * @Return com.hai.entity.ApiIpAddress - */ - ApiIpAddress findById(Long id); - - /** - * @Author Sum1Dream - * @Name findByMchId - * @Description // 根据商户号查询IP地址内容 - * @Date 14:23 2022/12/6 - * @Param [mchId] - * @Return com.hai.entity.ApiIpAddress - */ - ApiIpAddress findByMchId(String mchId); - - /** - * @Author Sum1Dream - * @Name getApiIpAddressByList - * @Description // 查询IP地址列表 - * @Date 14:19 2022/12/6 - * @Param [map] - * @Return java.util.List - */ - List getApiIpAddressByList(Map map); - - /** - * @Author Sum1Dream - * @Name validationIpAddressLegal - * @Description // 验证IP地址合法性 - * @Date 09:49 2022/12/13 - * @Param [mchId, ipAddress] - * @Return java.lang.Boolean - */ - Boolean validationIpAddressLegal(String mchId , String ipAddress); - -} diff --git a/hai-service/src/main/java/com/hai/service/ApiMerchantsService.java b/hai-service/src/main/java/com/hai/service/ApiMerchantsService.java index fce1a3df..46632ee0 100644 --- a/hai-service/src/main/java/com/hai/service/ApiMerchantsService.java +++ b/hai-service/src/main/java/com/hai/service/ApiMerchantsService.java @@ -28,7 +28,7 @@ public interface ApiMerchantsService { * @Param [com.alibaba.fastjson.JSONObject] * @return void */ - void insertApiMerchants(ApiMerchants apiMerchants) throws Exception ; + void insertApiMerchants(ApiMerchants apiMerchants) throws Exception; /** * @Author Sum1Dream diff --git a/hai-service/src/main/java/com/hai/service/ApiOpenService.java b/hai-service/src/main/java/com/hai/service/ApiOpenService.java index a66dd8bc..e3551e48 100644 --- a/hai-service/src/main/java/com/hai/service/ApiOpenService.java +++ b/hai-service/src/main/java/com/hai/service/ApiOpenService.java @@ -23,14 +23,4 @@ public interface ApiOpenService { */ void createOrder(JSONObject object , ApiMerchants apiMerchants , ApiProductConfig productConfig) throws Exception; - - /** - * @Author Sum1Dream - * @name createOrder.java - * @Description // 充值预下单 - * @Date 17:31 2022/6/10 - * @Param [com.alibaba.fastjson.JSONObject] - * @return com.alibaba.fastjson.JSONObject - */ - void createOrder(JSONObject object , ApiMerchants apiMerchants) throws Exception; } diff --git a/hai-service/src/main/java/com/hai/service/ApiProductService.java b/hai-service/src/main/java/com/hai/service/ApiProductService.java index 03f069fc..998458cf 100644 --- a/hai-service/src/main/java/com/hai/service/ApiProductService.java +++ b/hai-service/src/main/java/com/hai/service/ApiProductService.java @@ -148,10 +148,8 @@ public interface ApiProductService { */ List findStarbucksByCategoryName(String categoryName); - // 配置产品 void ProductConfig(JSONObject object); - // 更新产品配置 void updateProductConfig(JSONObject object); /** @@ -226,14 +224,6 @@ public interface ApiProductService { */ void insertCity(ApiCity apiCity); - /** - * @Author Sum1Dream - * @Name updateCity - * @Description // 更新城市 - * @Date 09:20 2022/12/13 - * @Param [apiCity] - * @Return void - */ void updateCity(ApiCity apiCity); /** diff --git a/hai-service/src/main/java/com/hai/service/SecConfigService.java b/hai-service/src/main/java/com/hai/service/SecConfigService.java index dd132051..278508de 100644 --- a/hai-service/src/main/java/com/hai/service/SecConfigService.java +++ b/hai-service/src/main/java/com/hai/service/SecConfigService.java @@ -2,7 +2,6 @@ package com.hai.service; import com.hai.entity.SecConfig; -import java.util.List; import java.util.Map; import java.util.SortedMap; @@ -71,24 +70,4 @@ public interface SecConfigService { */ Boolean isSignVerify(Map map , String sign) throws Exception; - /** - * @Author Sum1Dream - * @Name getSecConfigList - * @Description // 查询数据 - * @Date 16:03 2022/12/7 - * @Param [map] - * @Return java.util.List - */ - List getSecConfigList(Map map); - - /** - * @Author Sum1Dream - * @Name configMerchant - * @Description // 配置商户 - * @Date 16:09 2022/12/7 - * @Param [mchId, configProduct] - * @Return void - */ - void configMerchant(String mchId , String configProduct); - } diff --git a/hai-service/src/main/java/com/hai/service/impl/ApiIpAddressServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/ApiIpAddressServiceImpl.java deleted file mode 100644 index 5e5a2bd4..00000000 --- a/hai-service/src/main/java/com/hai/service/impl/ApiIpAddressServiceImpl.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.hai.service.impl; - -import com.hai.dao.ApiIpAddressMapper; -import com.hai.entity.ApiIpAddress; -import com.hai.entity.ApiIpAddressExample; -import com.hai.service.ApiIpAddressService; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import java.util.List; -import java.util.Map; - -@Service("apiIpAddressService") -public class ApiIpAddressServiceImpl implements ApiIpAddressService { - - @Resource - private ApiIpAddressMapper apiIpAddressMapper; - - @Override - public void insertApiIpAddress(ApiIpAddress apiIpAddress) { - apiIpAddressMapper.insert(apiIpAddress); - } - - @Override - public void updateApiIpAddress(ApiIpAddress apiIpAddress) { - apiIpAddressMapper.updateByPrimaryKey(apiIpAddress); - } - - @Override - public ApiIpAddress findById(Long id) { - return apiIpAddressMapper.selectByPrimaryKey(id); - } - - @Override - public ApiIpAddress findByMchId(String mchId) { - ApiIpAddressExample example = new ApiIpAddressExample(); - ApiIpAddressExample.Criteria criteria = example.createCriteria(); - criteria.andMchIdEqualTo(mchId); - - List list = apiIpAddressMapper.selectByExample(example); - - if (list.size() > 0) { - return list.get(0); - } - - return null; - } - - @Override - public List getApiIpAddressByList(Map map) { - return null; - } - - @Override - public Boolean validationIpAddressLegal(String mchId, String ipAddress) { - - ApiIpAddressExample example = new ApiIpAddressExample(); - example.createCriteria().andMchIdEqualTo(mchId).andIpAddressEqualTo(ipAddress); - - List list = apiIpAddressMapper.selectByExample(example); - - return list.size()>0; - } -} diff --git a/hai-service/src/main/java/com/hai/service/impl/ApiOpenServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/ApiOpenServiceImpl.java index 9444fa95..d71a8a86 100644 --- a/hai-service/src/main/java/com/hai/service/impl/ApiOpenServiceImpl.java +++ b/hai-service/src/main/java/com/hai/service/impl/ApiOpenServiceImpl.java @@ -227,12 +227,11 @@ public class ApiOpenServiceImpl implements ApiOpenService { } JSONObject returnObject = RechargeConfig.rechargeOrderByJj(object); object.put("return_content", returnObject); - childOrder.setStatus(102); -// if (returnObject != null && returnObject.getLong("code") == 200) { -// childOrder.setStatus(102); -// } else { -// childOrder.setStatus(103); -// } + if (returnObject != null && returnObject.getLong("code") == 200) { + childOrder.setStatus(102); + } else { + childOrder.setStatus(103); + } rechargePlatformType = 1; break; } @@ -285,264 +284,6 @@ public class ApiOpenServiceImpl implements ApiOpenService { } - @Override - @Transactional(rollbackFor=Exception.class,isolation = Isolation.SERIALIZABLE,propagation= Propagation.REQUIRES_NEW) - public void createOrder(JSONObject object , ApiMerchants apiMerchants) throws Exception { - -// // 定义订单 -// HighOrder highOrder = new HighOrder(); -// highOrder.setMerchId(apiMerchants.getMchId()); -// highOrder.setWhetherRebate(false); -// highOrder.setMemPhone(apiMerchants.getPhone()); -// highOrder.setMemName(apiMerchants.getMerchantName()); -// highOrder.setMemId(apiMerchants.getId()); -// highOrder.setCreateTime(new Date()); -// highOrder.setOrderStatus(1); -// highOrder.setProductType(object.getInteger("productType")); -// highOrder.setPayType(OrderPayTypeEnum.type8.getType()); -// highOrder.setOrderNo("HF" + DateUtil.date2String(new Date(),"yyyyMMddHHmmss") + IDGenerator.nextId(5)); -// highOrderMapper.insert(highOrder); -// -// // 订单总金额 -// BigDecimal marketPriceTotal = new BigDecimal(0); -// -// // 定义下单json对象 -// JSONObject jsonObject; -// -// // 获取token -// JSONObject userToken = QianZhuConfig.getTokenV2(apiMerchants.getId().toString(), apiMerchants.getMerchantName(), apiMerchants.getPhone()); -// -// if (!userToken.getBoolean("success")) { -// throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, userToken.getString("message")); -// } -// -// // 1 星巴克 2 肯德基 3 会员充值 -// if (object.getInteger("productType") == 1) { -// -// // 判断当前商户是否有权限下单 -// if (!secConfigService.isConfig("STARBUCKS_CONFIG" , object.getString("merchId"))) { -// throw ErrorHelp.genException(SysCode.System, ErrorCode.MERCHANT_NOT_AUTHORIZED, "当前帐户无权限查询！"); -// } -// -// List List = new ArrayList<>(); -// -// // 获取下单内容 -// JSONArray array = object.getJSONArray("orderItems"); -// -// // 组装下单数据 -// for (Object o : array) { -// JSONObject object1 = (JSONObject) o; -// Map contentMap = new LinkedHashMap<>(); -// if (!object1.getString("productId").equals("")) { -// contentMap.put("productId", object1.getString("productId")); -// } -// if (!object1.getString("cupSize").equals("")) { -// contentMap.put("cupSize", object1.getString("cupSize")); -// } -// if (!object1.getString("temperature").equals("")) { -// contentMap.put("temperature", object1.getString("temperature")); -// } -// if (!object1.getString("cream").equals("")) { -// contentMap.put("cream", object1.getString("cream")); -// } -// if (!object1.getString("espresso").equals("")) { -// contentMap.put("espresso", object1.getString("espresso")); -// } -// if (!object1.getString("milk").equals("")) { -// contentMap.put("milk", object1.getString("milk")); -// } -// if (!object1.getString("milkBubble").equals("")) { -// contentMap.put("milkBubble", object1.getString("milkBubble")); -// } -// if (!"".equals(object1.getString("num"))) { -// contentMap.put("num", object1.getString("num")); -// } -// // 添加到LIST -// List.add(JSON.toJSONString(contentMap)); -// } -// -// // 下单 -// jsonObject = QianZhuConfig.starbucksOrders(apiMerchants.getId().toString(), object.getString("storeCode"), List.toString().replace(" ", ""), object.getString("customerMobile")); -// -// // 判断下单是否成功 -// if (!Objects.equals(jsonObject.getString("code"), "200")) { -// throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, jsonObject.getString("message")); -// } -// -// if (!jsonObject.getBoolean("success")) { -// throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, jsonObject.getString("message")); -// } -// -// // 根据订单号查询订单详情 -// JSONObject orderObject = QianZhuConfig.starbucksOrderByOrderNo(jsonObject.getJSONObject("data").getString("orderNo")); -// -// // 判断是否成功 -// if (!orderObject.getBoolean("success")) { -// throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, jsonObject.getString("message")); -// } -// -// // 获取星巴克订单内容 -// JSONArray starbucksOrder = orderObject.getJSONObject("data").getJSONArray("orderItems"); -// -// -// // 循环获取星巴克订单 -// for (Object starbucksObject : starbucksOrder) { -// JSONObject childObject = (JSONObject) starbucksObject; -// HighChildOrder childOrder = new HighChildOrder(); -// childOrder.setOrderId(highOrder.getId()); -// childOrder.setChildOrdeStatus(1); -// childOrder.setMemId(highOrder.getMemId()); -// childOrder.setGoodsType(9); -// childOrder.setStoreId(object.getLong("storeCode")); -// childOrder.setGoodsId(childObject.getLong("id")); -// childOrder.setStoreAddress(childObject.getString("storeAddress")); -// childOrder.setStoreName(childObject.getString("storeName")); -// childOrder.setGoodsName(childObject.getString("productName")); -// childOrder.setGoodsImg(childObject.getString("imgUrl")); -// childOrder.setSaleCount(childObject.getInteger("quantity")); -// childOrder.setGoodsPrice(childObject.getBigDecimal("marketPrice")); -// -// // 计算子订单支付金额 -// BigDecimal childPrice = childObject.getBigDecimal("marketPrice"); -// childOrder.setGoodsActualPrice(childPrice); -// // 计算市场价金额 -// childOrder.setTotalPrice(childPrice.multiply(childObject.getBigDecimal("quantity"))); -// marketPriceTotal = marketPriceTotal.add(childOrder.getTotalPrice()); -// -// highChildOrderMapper.insert(childOrder); -// } -// // 拼接json对象 -// object.put("sourceType" , 5); -// object.put("content" , apiMerchants.getMerchantName() + "|" + "星巴克下单" + "｜扣款" + marketPriceTotal); -// }else if (object.getInteger("productType") == 2) { -// -// // 判断当前商户是否有肯德基下单权限 -// if (!secConfigService.isConfig("KFC_CONFIG" , object.getString("merchId"))) { -// throw ErrorHelp.genException(SysCode.System, ErrorCode.MERCHANT_NOT_AUTHORIZED, "当前帐户无权限查询！"); -// } -// // 判断就餐方式 -// if (object.getInteger("eatType") == null) { -// throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "请选择就餐方式！"); -// } -// // 下单 -// jsonObject = QianZhuConfig.createKfcOrder(object.getInteger("eatType"), object.getString("storeCode"), object.getString("customerMobile"), object.getString("orderItems"), apiMerchants.getId().toString()); -// -// // 判断下单是否成功 -// if (!Objects.equals(jsonObject.getString("code"), "10000")) { -// throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, jsonObject.getString("message")); -// } -// -// // 根据订单号查询订单详情 -// JSONObject orderObject = QianZhuConfig.getKfcOrderByOrderNo(jsonObject.getJSONObject("data").getString("orderNo")); -// // 判断下单是否成功 -// if (!orderObject.getBoolean("success")) { -// throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, jsonObject.getString("message")); -// } -// -// // 获取肯德基订单内容 -// JSONArray kfcOrder = orderObject.getJSONObject("data").getJSONObject("kfcPlaceOrder").getJSONArray("items"); -// for (Object kfcObject : kfcOrder) { -// -// JSONObject childObject = (JSONObject) kfcObject; -// HighChildOrder childOrder = new HighChildOrder(); -// childOrder.setOrderId(highOrder.getId()); -// childOrder.setChildOrdeStatus(1); -// childOrder.setGoodsType(4); -// childOrder.setMemId(highOrder.getMemId()); -// childOrder.setExt6(object.getString("storeCode")); -// childOrder.setGoodsId(childObject.getLong("productId")); -// childOrder.setStoreAddress(orderObject.getJSONObject("data").getJSONObject("kfcPlaceOrder").getString("storeAddress")); -// childOrder.setStoreName(orderObject.getJSONObject("data").getJSONObject("kfcPlaceOrder").getString("storeName")); -// childOrder.setGoodsName(childObject.getString("productName")); -// childOrder.setGoodsImg(childObject.getString("imageUrl")); -// childOrder.setSaleCount(childObject.getInteger("quantity")); -// childOrder.setGoodsPrice(childObject.getBigDecimal("originPrice")); -// -// // 计算利润 -// // 计算子订单支付金额 -// BigDecimal childPrice = childObject.getBigDecimal("originPrice"); -// childOrder.setGoodsActualPrice(childPrice); -// // 计算市场价金额 -// childOrder.setTotalPrice(childPrice.multiply(childObject.getBigDecimal("quantity"))); -// marketPriceTotal = marketPriceTotal.add(childOrder.getTotalPrice()); -// highChildOrderMapper.insert(childOrder); -// } -// // 拼接json对象 -// object.put("sourceType" , 4); -// object.put("content" , apiMerchants.getMerchantName() + "|" + "肯德基下单" + "｜扣款" + marketPriceTotal); -// } else if (object.getInteger("productType") == 3) { -// -// // 判断是否有会员充值下单权限 -// if (!secConfigService.isConfig("MEMBER_RECHARGE_CONFIG" , object.getString("merchId"))) { -// throw ErrorHelp.genException(SysCode.System, ErrorCode.MERCHANT_NOT_AUTHORIZED, "当前帐户无权限查询！"); -// } -// -// // 获取会员充值 -// ApiMemberProduct memberProduct = apiMemberProductService.findById(object.getLong("goodsId")); -// -// if (memberProduct == null) { -// throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "当前产品不可购买"); -// } -// -// object.put("productId", memberProduct.getProductId()); -// -// HighChildOrder childOrder = new HighChildOrder(); -// childOrder.setOrderId(highOrder.getId()); -// childOrder.setChildOrdeStatus(1); -// childOrder.setGoodsType(10); -// childOrder.setStoreId(object.getLong("storeCode")); -// childOrder.setGoodsId(memberProduct.getId()); -// childOrder.setGoodsName(memberProduct.getName()); -// childOrder.setSaleCount(1); -// childOrder.setMemId(highOrder.getMemId()); -// childOrder.setGoodsPrice(memberProduct.getPrice()); -// childOrder.setGoodsActualPrice(memberProduct.getPrice()); -// // 计算市场价金额 -// childOrder.setTotalPrice(memberProduct.getPrice()); -// marketPriceTotal = marketPriceTotal.add(childOrder.getTotalPrice()); -// highChildOrderMapper.insert(childOrder); -// object.put("sourceType" , 6); -// object.put("content" , apiMerchants.getMerchantName() + "|" + "第三方会员充值下单" + "｜扣款" + marketPriceTotal); -// } -// // 当前账号余额是否可以充值当前金额 -// if (apiMerchants.getAmounts().compareTo(marketPriceTotal) < 0) { -// throw ErrorHelp.genException(SysCode.System, ErrorCode.INSUFFICIENT_BALANCE); -// } -// -// highOrder.setTotalPrice(marketPriceTotal); -// highOrder.setPayPrice(marketPriceTotal); -// highOrder.setPayRealPrice(marketPriceTotal); -// highOrder.setPayablePrice(marketPriceTotal); -// ApiAmountRecord apiAmountRecord = apiMerchantAmount(highOrder , apiMerchants , object); -// -// highOrder.setOrderStatus(2); -// highOrder.setPayTime(new Date()); -// highOrder.setPaySerialNo("22" + DateUtil.date2String(new Date(), "yyyyMMddHHmmss") + IDGenerator.nextId(5)); -// highOrderMapper.updateByPrimaryKey(highOrder); -// -// // 更新子订单状态 -// List childOrderList = highOrderService.getChildOrderByOrder(highOrder.getId()); -// -// for (HighChildOrder highChildOrder : childOrderList) { -// highChildOrder.setChildOrdeStatus(2); -// highChildOrderMapper.updateByPrimaryKey(highChildOrder); -// } -// -// // 插入订单记录 -// ApiOrderRecord apiOrderRecordPost = new ApiOrderRecord(); -// apiOrderRecordPost.setStatus(103); -// apiOrderRecordPost.setOrderNo(highOrder.getOrderNo()); -// apiOrderRecordPost.setSourceOrderNo(apiAmountRecord.getSourceOrderNo()); -// apiOrderRecordPost.setCreateTime(new Date()); -// apiOrderRecordPost.setMchId(apiMerchants.getMchId()); -// apiOrderRecordPost.setOrderId(highOrder.getId()); -// apiOrderRecordPost.setGoodsId(apiMerchants.getMchId()); -// apiOrderRecordPost.setNotifyUrl(object.getString("notifyUrl")); -// apiOrderRecordPost.setUpdateTime(new Date()); -// -// apiOrderRecordService.insertOrderRecord(apiOrderRecordPost); - } - private ApiAmountRecord apiMerchantAmount(HighOrder highOrder , ApiMerchants apiMerchants , JSONObject object) throws Exception { // 插入金额记录 // 变更前金额 diff --git a/hai-service/src/main/java/com/hai/service/impl/SecConfigServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/SecConfigServiceImpl.java index d66dc6cd..ec15975d 100644 --- a/hai-service/src/main/java/com/hai/service/impl/SecConfigServiceImpl.java +++ b/hai-service/src/main/java/com/hai/service/impl/SecConfigServiceImpl.java @@ -5,14 +5,18 @@ import com.hai.common.utils.WxUtils; import com.hai.dao.SecConfigMapper; import com.hai.entity.SecConfig; import com.hai.entity.SecConfigExample; +import com.hai.entity.SecDictionary; +import com.hai.entity.SecDictionaryExample; import com.hai.service.ApiMerchantsService; import com.hai.service.SecConfigService; import org.apache.commons.collections4.MapUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.SortedMap; @Service("secConfigServiceImpl") public class SecConfigServiceImpl implements SecConfigService { @@ -64,39 +68,4 @@ public class SecConfigServiceImpl implements SecConfigService { return signPost.equals(sign); } - @Override - public List getSecConfigList(Map map) { - SecConfigExample example = new SecConfigExample(); - SecConfigExample.Criteria criteria = example.createCriteria(); - - if (MapUtils.getString(map , "codeValue") != null) { - criteria.andCodeValueEqualTo(MapUtils.getString(map , "codeValue")); - } - - return secConfigMapper.selectByExample(example); - } - - @Override - public void configMerchant(String mchId, String configProduct) { - SecConfigExample example = new SecConfigExample(); - - example.createCriteria().andCodeValueEqualTo(mchId); - - List list = secConfigMapper.selectByExample(example); - - // 删除当前所有配置 - for (SecConfig secConfig : list) { - secConfigMapper.deleteByPrimaryKey(secConfig.getId()); - } - - String [] configProductArray = configProduct.split(","); - - for (String s : configProductArray) { - SecConfig secConfig = new SecConfig(); - secConfig.setCodeType(s); - secConfig.setCodeValue(mchId); - secConfigMapper.insert(secConfig); - } - - } } diff --git a/hai-user/target/hai-user-1.0-SNAPSHOT.jar b/hai-user/target/hai-user-1.0-SNAPSHOT.jar new file mode 100644 index 00000000..33f883c8 Binary files /dev/null and b/hai-user/target/hai-user-1.0-SNAPSHOT.jar differ diff --git a/hai-user/target/hai-user-1.0-SNAPSHOT.jar.original b/hai-user/target/hai-user-1.0-SNAPSHOT.jar.original new file mode 100644 index 00000000..9ff889d9 Binary files /dev/null and b/hai-user/target/hai-user-1.0-SNAPSHOT.jar.original differ diff --git a/hai-user/target/maven-archiver/pom.properties b/hai-user/target/maven-archiver/pom.properties index dd7478c0..9b8b5301 100644 --- a/hai-user/target/maven-archiver/pom.properties +++ b/hai-user/target/maven-archiver/pom.properties @@ -1,4 +1,8 @@ +<<<<<<< HEAD #Created by Apache Maven 3.8.2 +======= +#Created by Apache Maven 3.6.3 +>>>>>>> master version=1.0-SNAPSHOT groupId=com.hsg artifactId=hai-user diff --git a/hai-user/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/hai-user/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index 41cf9fdb..b2daf6ad 100644 --- a/hai-user/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/hai-user/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -1,3 +1,4 @@ +<<<<<<< HEAD /Volumes/work/code/high-work/high-service/hai-user/src/main/java/com/web/config/RedisConfig.java /Volumes/work/code/high-work/high-service/hai-user/src/main/java/com/web/controller/LoginController.java /Volumes/work/code/high-work/high-service/hai-user/src/main/java/com/web/config/WxMaConfiguration.java @@ -17,3 +18,24 @@ /Volumes/work/code/high-work/high-service/hai-user/src/main/java/com/web/config/CorsConfig.java /Volumes/work/code/high-work/high-service/hai-user/src/main/java/com/web/config/SysConfig.java /Volumes/work/code/high-work/high-service/hai-user/src/main/java/com/web/controller/DiscountController.java +======= +D:\hurui\huifu\hai-server\hai-user\src\main\java\com\web\controller\WechatController.java +D:\hurui\huifu\hai-server\hai-user\src\main\java\com\web\controller\SmsController.java +D:\hurui\huifu\hai-server\hai-user\src\main\java\com\web\config\MultipartConfig.java +D:\hurui\huifu\hai-server\hai-user\src\main\java\com\web\config\AuthConfig.java +D:\hurui\huifu\hai-server\hai-user\src\main\java\com\web\config\SysConst.java +D:\hurui\huifu\hai-server\hai-user\src\main\java\com\web\controller\LoginController.java +D:\hurui\huifu\hai-server\hai-user\src\main\java\com\web\config\ConfigListener.java +D:\hurui\huifu\hai-server\hai-user\src\main\java\com\web\controller\LoginLogController.java +D:\hurui\huifu\hai-server\hai-user\src\main\java\com\web\config\SysConfig.java +D:\hurui\huifu\hai-server\hai-user\src\main\java\com\web\config\RedisConfig.java +D:\hurui\huifu\hai-server\hai-user\src\main\java\com\web\config\CorsConfig.java +D:\hurui\huifu\hai-server\hai-user\src\main\java\com\web\config\SentinelFilterConfig.java +D:\hurui\huifu\hai-server\hai-user\src\main\java\com\web\controller\UserController.java +D:\hurui\huifu\hai-server\hai-user\src\main\java\com\web\controller\TestController.java +D:\hurui\huifu\hai-server\hai-user\src\main\java\com\web\type\LoginType.java +D:\hurui\huifu\hai-server\hai-user\src\main\java\com\web\config\SwaggerConfig.java +D:\hurui\huifu\hai-server\hai-user\src\main\java\com\UserApplication.java +D:\hurui\huifu\hai-server\hai-user\src\main\java\com\web\config\WxMaConfiguration.java +D:\hurui\huifu\hai-server\hai-user\src\main\java\com\web\controller\DiscountController.java +>>>>>>> master diff --git a/v1/src/main/java/com/v1/controller/ApiMerchantsController.java b/v1/src/main/java/com/v1/controller/ApiMerchantsController.java index ac87d7f7..bf70a102 100644 --- a/v1/src/main/java/com/v1/controller/ApiMerchantsController.java +++ b/v1/src/main/java/com/v1/controller/ApiMerchantsController.java @@ -37,9 +37,6 @@ public class ApiMerchantsController { @Resource private SecConfigService secConfigService; - @Resource - private ApiIpAddressService apiIpAddressService; - @RequestMapping(value = "/checkAccountBalance", method = RequestMethod.POST) @ResponseBody @ApiOperation(value = "查询帐户余额") @@ -54,7 +51,7 @@ public class ApiMerchantsController { ip = request.getHeader("x-forwarded-for"); } - if (!apiIpAddressService.validationIpAddressLegal(object.getString("merchId") , ip)) { + if (!secConfigService.isConfig("IP_WHITE" , ip)) { log.error("getRechargeProduct error!", "非法ip地址，请联系管理人员！"); throw ErrorHelp.genException(SysCode.System, ErrorCode.IP_ERROR, "非法ip地址，请联系管理人员！"); } diff --git a/v1/src/main/java/com/v1/controller/ApiOrderController.java b/v1/src/main/java/com/v1/controller/ApiOrderController.java index b8680ba6..4acee2d9 100644 --- a/v1/src/main/java/com/v1/controller/ApiOrderController.java +++ b/v1/src/main/java/com/v1/controller/ApiOrderController.java @@ -45,9 +45,6 @@ public class ApiOrderController { @Resource private ApiOpenService apiOpenService; - @Resource - private ApiIpAddressService apiIpAddressService; - @RequestMapping(value = "/createOrder", method = RequestMethod.POST) @ResponseBody @ApiOperation(value = "充值预下单") @@ -62,8 +59,8 @@ public class ApiOrderController { ip = request.getHeader("x-forwarded-for"); } - if (!apiIpAddressService.validationIpAddressLegal(object.getString("merchId") , ip)) { - log.error("getRechargeProduct error!", "非法ip地址，请联系管理人员！"); + if (!secConfigService.isConfig("IP_WHITE" , ip)) { + log.error("createOrder error!", "非法ip地址，请联系管理人员！"); throw ErrorHelp.genException(SysCode.System, ErrorCode.IP_ERROR, "非法ip地址，请联系管理人员！"); } diff --git a/v1/src/main/java/com/v1/controller/RechargeProductController.java b/v1/src/main/java/com/v1/controller/RechargeProductController.java index 5f0f3bad..4dbc4046 100644 --- a/v1/src/main/java/com/v1/controller/RechargeProductController.java +++ b/v1/src/main/java/com/v1/controller/RechargeProductController.java @@ -120,6 +120,64 @@ public class RechargeProductController { } } + @RequestMapping(value = "/checkAccountBalance", method = RequestMethod.POST) + @ResponseBody + @ApiOperation(value = "查询帐户余额") + public ResponseData checkAccountBalance(@RequestBody JSONObject object , HttpServletRequest request ) { + try { + + String ip = ""; + // 有的user可能使用代理，为处理用户使用代理的情况，使用x-forwarded-for + if (request.getHeader("x-forwarded-for") == null) { + ip = request.getRemoteAddr(); + } else { + ip = request.getHeader("x-forwarded-for"); + } + + if (!secConfigService.isConfig("IP_WHITE" , ip)) { + log.error("getRechargeProduct error!", "非法ip地址，请联系管理人员！"); + throw ErrorHelp.genException(SysCode.System, ErrorCode.IP_ERROR, "非法ip地址，请联系管理人员！"); + } + + if (StringUtils.isBlank(object.getString("apiKey")) || + StringUtils.isBlank(object.getString("merchId")) || + StringUtils.isBlank(object.getString("timetable")) || + StringUtils.isBlank(object.getString("sign")) + ) { + log.error("getRechargeProduct error!", "请求参数校验失败！"); + throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR); + } + + ApiMerchants apiMerchants = apiMerchantsService.findByMchId(object.getString("merchId")); + + if (apiMerchants == null) { + log.error("getRechargeProduct error!", "商户号错误！"); + throw ErrorHelp.genException(SysCode.System, ErrorCode.ACCOUNT_NOT_EXIST); + } + + Map map = new HashMap<>(); + map.put("apiKey" , object.getString("apiKey")); + map.put("timetable" , object.getString("timetable")); + map.put("merchId" , object.getString("merchId")); + + if (!secConfigService.isSignVerify(map , object.getString("sign"))) { + log.error("getRechargeProduct error!", "签名校验失败！"); + throw ErrorHelp.genException(SysCode.System, ErrorCode.SIGN_VERIFY); + } + + if (!ToolConfig.timetableCheck(15L , object.getLong("timetable"))) { + log.error("getRechargeProduct error!", "请求时间超过15分钟！"); + throw ErrorHelp.genException(SysCode.System, ErrorCode.TIME_OUT); + } + + return ResponseMsgUtil.success(apiMerchants.getAmounts()); + + } catch (Exception e) { + log.error("HighOpenApiController --> getRechargeProduct() error!", e); + return ResponseMsgUtil.exception(e); + } + } + @RequestMapping(value = "/queryOrderResult", method = RequestMethod.POST) @ResponseBody @ApiOperation(value = "查询订单结果") @@ -191,6 +249,7 @@ public class RechargeProductController { returnObject.put("payStatus" , rechargeOrder.getPayStatus()); returnObject.put("rechargeStatus" , rechargeOrder.getRechargeStatus()); + return ResponseMsgUtil.success(returnObject); } catch (Exception e) {