diff --git a/bweb/src/main/java/com/bweb/controller/BsUserController.java b/bweb/src/main/java/com/bweb/controller/BsUserController.java index 83333f8..9a4c79f 100644 --- a/bweb/src/main/java/com/bweb/controller/BsUserController.java +++ b/bweb/src/main/java/com/bweb/controller/BsUserController.java @@ -65,22 +65,6 @@ public class BsUserController { @Resource private BsUserComplaintService userComplaintService; - @Resource - private PhgDataUserService phgDataUserService; - - @Resource - private BsUserCardService userCardService; - - @Resource - private CommonService commonService; - - @Resource - private GoodsUserAddressService goodsUserAddressService; - - @Resource - private GoodsSpecsService goodsSpecsService; - @Resource - private GoodsVpdService goodsVpdService; @RequestMapping(value="/restore",method = RequestMethod.POST) @ResponseBody diff --git a/bweb/src/main/java/com/bweb/controller/SecUserController.java b/bweb/src/main/java/com/bweb/controller/SecUserController.java index b58eccf..8ce6a93 100644 --- a/bweb/src/main/java/com/bweb/controller/SecUserController.java +++ b/bweb/src/main/java/com/bweb/controller/SecUserController.java @@ -73,6 +73,7 @@ public class SecUserController { secUser.setUserName(body.getString("userName")); secUser.setLoginName(body.getString("loginName")); + secUser.setPlatformCode(body.getString("platformCode")); secUser.setTelephone(body.getString("telephone")); secUser.setRoleId(body.getLong("roleId")); secUserService.editUser(secUser); diff --git a/bweb/src/main/java/com/bweb/controller/TestController.java b/bweb/src/main/java/com/bweb/controller/TestController.java index 3713e00..b9f5238 100644 --- a/bweb/src/main/java/com/bweb/controller/TestController.java +++ b/bweb/src/main/java/com/bweb/controller/TestController.java @@ -9,6 +9,7 @@ import com.hfkj.common.utils.*; import com.hfkj.entity.*; import com.hfkj.meituan.MeiTuanService; import com.hfkj.model.ResponseData; +import com.hfkj.model.goods.GoodsModel; import com.hfkj.service.discount.CouponDiscountService; import com.hfkj.service.goods.BsOrderGoodsService; import com.hfkj.service.goods.GoodsMsgService; @@ -23,6 +24,7 @@ import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -119,17 +121,25 @@ public class TestController { @RequestMapping(value="/orderGoodsUpdate",method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "商品更新") - public ResponseData orderGoodsUpdate() { + public ResponseData orderMsgUpdate() { try { - List orderGoodsList = orderGoodsService.getList(); + Map map = new HashMap<>(); - for (BsOrderGoods goods : orderGoodsList) { - BsOrderChild child = orderChildService.getDetail(goods.getChildOrderNo()); - goods.setStatus(child.getStatus()); - goods.setUpdateTime(new Date()); - orderGoodsService.update(goods); + map.put("status", 1); + + List list = goodsMsgService.getList(map); + + List specsList = goodsSpecsService.getList(new HashMap<>()); + + + for (GoodsMsg goodsMsg : list) { + List goodsSpecsList = specsList.stream().filter(s -> s.getGoodsId().equals(goodsMsg.getId())).collect(Collectors.toList()); + if (!goodsSpecsList.isEmpty()) { + goodsMsg.setSaleNum(CommonUtil.saleNumRandom(goodsSpecsList.get(0).getSalePrice())); + } + goodsMsgService.update(goodsMsg); } return ResponseMsgUtil.success("成功"); @@ -176,38 +186,44 @@ public class TestController { @RequestMapping(value="/getLogisticsMsg",method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "查询物流") - public ResponseData getLogisticsMsg(@RequestParam(value = "id" , required = false) Long id) { + public ResponseData getLogisticsMsg() { try { - Map map = new HashMap<>(); + Map objectMap = new HashMap<>(); - BsOrderGoods orderGoods = bsOrderGoodsService.queryDetail(id); + objectMap.put("status" , 2); - if (orderGoods == null) { - throw ErrorHelp.genException(SysCode.System , ErrorCode.COMMON_ERROR , "暂无物流信息!"); - } + List orderGoodsList = orderGoodsService.getList(objectMap); + + for (BsOrderGoods goods : orderGoodsList) { - GoodsUserAddress userAddress = addressService.queryDetail(orderGoods.getDeliveryAddressId()); + if (goods == null) { + throw ErrorHelp.genException(SysCode.System , ErrorCode.COMMON_ERROR , "暂无物流信息!"); + } - if (userAddress == null) { - throw ErrorHelp.genException(SysCode.System , ErrorCode.COMMON_ERROR , "暂无物流信息!"); - } + GoodsUserAddress userAddress = addressService.queryDetail(goods.getDeliveryAddressId()); - GoodsLogistics logistics = (GoodsLogistics) bsOrderGoodsService.getLogisticsMsg(orderGoods.getLogisticsNo() , userAddress.getPhone()); + if (userAddress == null) { + throw ErrorHelp.genException(SysCode.System , ErrorCode.COMMON_ERROR , "暂无物流信息!"); + } - if (logistics.getLogisticsStatus() != null) { - orderGoods.setLogisticsStatus(logistics.getLogisticsStatus()); - orderGoods.setLogisticsStatusDesc(logistics.getLogisticsStatusDesc()); - } else { - orderGoods.setLogisticsStatus(OrderLogisticsStatusEnum.statusWAIT_ACCEPT.getCode()); - orderGoods.setLogisticsStatusDesc(OrderLogisticsStatusEnum.statusWAIT_ACCEPT.getName()); - } + if (goods.getLogisticsNo() != null) { + GoodsLogistics logistics = (GoodsLogistics) bsOrderGoodsService.getLogisticsMsg(goods.getLogisticsNo() , userAddress.getPhone()); + if (logistics.getLogisticsStatus() != null) { + goods.setLogisticsStatus(logistics.getLogisticsStatus()); + goods.setLogisticsStatusDesc(logistics.getLogisticsStatusDesc()); + } else { + goods.setLogisticsStatus(OrderLogisticsStatusEnum.statusWAIT_ACCEPT.getCode()); + goods.setLogisticsStatusDesc(OrderLogisticsStatusEnum.statusWAIT_ACCEPT.getName()); + } - bsOrderGoodsService.update(orderGoods); - map.put("logistics", logistics); - JSONArray object = JSONArray.parseArray(logistics.getLogisticsTraceDetails()); - map.put("logisticsTraceDetails", object); + goods.setUpdateTime(new Date()); + + bsOrderGoodsService.update(goods); + } + + } - return ResponseMsgUtil.success(map); + return ResponseMsgUtil.success("map"); } catch (Exception e) { log.error("error!",e); diff --git a/cweb/src/main/java/com/cweb/controller/CommonController.java b/cweb/src/main/java/com/cweb/controller/CommonController.java index d5f0c63..169d92a 100644 --- a/cweb/src/main/java/com/cweb/controller/CommonController.java +++ b/cweb/src/main/java/com/cweb/controller/CommonController.java @@ -11,7 +11,7 @@ import com.hfkj.entity.BsOrderGoods; import com.hfkj.entity.GoodsLogistics; import com.hfkj.entity.GoodsUserAddress; import com.hfkj.model.ResponseData; -import com.hfkj.qianzhu.channel.QianZhuService; +import com.hfkj.qianzhu.QianZhuService; import com.hfkj.service.CommonService; import com.hfkj.service.goods.BsOrderGoodsService; import com.hfkj.service.goods.GoodsUserAddressService; @@ -24,8 +24,6 @@ import org.springframework.beans.factory.annotation.Autowired; 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.stream.Collectors; diff --git a/cweb/src/main/java/com/cweb/controller/goods/GoodsController.java b/cweb/src/main/java/com/cweb/controller/goods/GoodsController.java index 25cf899..d89c2c2 100644 --- a/cweb/src/main/java/com/cweb/controller/goods/GoodsController.java +++ b/cweb/src/main/java/com/cweb/controller/goods/GoodsController.java @@ -130,6 +130,7 @@ public class GoodsController { map.put("status", 1); List list = goodsMsgService.getList(map); + List specsList = goodsSpecsService.getList(new HashMap<>()); List goodsModels = new ArrayList<>(); @@ -137,10 +138,8 @@ public class GoodsController { GoodsModel goodsModel = new GoodsModel(); - Map mapSpecs = new HashMap<>(); - mapSpecs.put("goodsId" , goodsMsg.getId()); + List goodsSpecs = specsList.stream().filter(s -> s.getGoodsId().equals(goodsMsg.getId())).collect(Collectors.toList()); - List goodsSpecs = goodsSpecsService.getList(mapSpecs); if (!goodsSpecs.isEmpty()) { BigDecimal minPrice = goodsSpecs.get(0).getSalePrice(); BigDecimal minOriginalPrice = goodsSpecs.get(0).getOriginalPrice(); @@ -169,7 +168,6 @@ public class GoodsController { } } - return ResponseMsgUtil.success(PageUtil.initPageInfoObj(pageNum, goodsModels.size(), pageSize, new PageInfo<>(goodsModels))); } catch (Exception e) { diff --git a/cweb/src/main/java/com/cweb/controller/qianZhu/CinemaController.java b/cweb/src/main/java/com/cweb/controller/qianZhu/CinemaController.java index cd2f0a1..61e9cb8 100644 --- a/cweb/src/main/java/com/cweb/controller/qianZhu/CinemaController.java +++ b/cweb/src/main/java/com/cweb/controller/qianZhu/CinemaController.java @@ -11,13 +11,11 @@ import com.hfkj.common.utils.PageUtil; import com.hfkj.common.utils.ResponseMsgUtil; import com.hfkj.entity.BsProductConfig; import com.hfkj.model.ResponseData; -import com.hfkj.model.goods.GoodsModel; -import com.hfkj.qianzhu.channel.CinemaService; +import com.hfkj.qianzhu.CinemaService; import com.hfkj.service.BsProductConfigService; import com.hfkj.sysenum.order.OrderChildProductTypeEnum; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.jacoco.agent.rt.internal_035b120.core.internal.flow.IFrame; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Controller; diff --git a/cweb/src/main/java/com/cweb/controller/qianZhu/StarbucksController.java b/cweb/src/main/java/com/cweb/controller/qianZhu/StarbucksController.java index 715571a..f1350a2 100644 --- a/cweb/src/main/java/com/cweb/controller/qianZhu/StarbucksController.java +++ b/cweb/src/main/java/com/cweb/controller/qianZhu/StarbucksController.java @@ -2,14 +2,13 @@ package com.cweb.controller.qianZhu; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.hfkj.common.utils.PageUtil; import com.hfkj.common.utils.ResponseMsgUtil; import com.hfkj.common.utils.StarbucksUtil; import com.hfkj.entity.BsProductConfig; import com.hfkj.model.ResponseData; -import com.hfkj.qianzhu.channel.StarbucksService; +import com.hfkj.qianzhu.StarbucksService; import com.hfkj.service.BsProductConfigService; import com.hfkj.sysenum.order.OrderChildProductTypeEnum; import io.swagger.annotations.Api; @@ -25,7 +24,6 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; import java.math.BigDecimal; -import java.math.RoundingMode; import java.util.*; import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; @@ -94,6 +92,10 @@ public class StarbucksController { BigDecimal tallPrice = StarbucksUtil.calculatePrice(productConfig.getDiscount() , item.getBigDecimal("salesTallPrice")); List priceList = new ArrayList<>(); + List priceListOriginal = new ArrayList<>(); + priceListOriginal.add(item.getBigDecimal("marketTallPrice")); + priceListOriginal.add(item.getBigDecimal("marketGrandePrice")); + priceListOriginal.add(item.getBigDecimal("marketVentiPrice")); // 判断如果卖家 大于 原价 展示原价 if (tallPrice.compareTo(item.getBigDecimal("marketTallPrice")) > 0) { item.put("tallPrice" , item.getBigDecimal("marketTallPrice")); @@ -124,7 +126,9 @@ public class StarbucksController { } Collections.sort(priceList); + Collections.sort(priceListOriginal); item.put("tallPrice" ,priceList.get(0)); + item.put("tallOriginalPrice" ,priceListOriginal.get(0)); List dataList = new ArrayList<>(); diff --git a/cweb/src/main/resources/prod/logback.xml b/cweb/src/main/resources/prod/logback.xml index dd3c64b..9951ae1 100644 --- a/cweb/src/main/resources/prod/logback.xml +++ b/cweb/src/main/resources/prod/logback.xml @@ -88,7 +88,7 @@ UTF-8 - + diff --git a/order/src/main/java/com/order/controller/OrderController.java b/order/src/main/java/com/order/controller/OrderController.java index 39e16ad..2a8f010 100644 --- a/order/src/main/java/com/order/controller/OrderController.java +++ b/order/src/main/java/com/order/controller/OrderController.java @@ -9,23 +9,30 @@ import com.hfkj.common.exception.SysCode; import com.hfkj.common.security.UserCenter; import com.hfkj.common.utils.PageUtil; import com.hfkj.common.utils.ResponseMsgUtil; +import com.hfkj.common.utils.SignatureUtil; +import com.hfkj.config.CommonSysConst; import com.hfkj.entity.BsOrder; +import com.hfkj.entity.BsOrderChild; +import com.hfkj.entity.BsOrderGoods; +import com.hfkj.entity.GoodsSpecs; +import com.hfkj.haioil.HaiOilService; import com.hfkj.model.ResponseData; import com.hfkj.model.UserSessionObject; import com.hfkj.model.order.OrderChildModel; import com.hfkj.model.order.OrderModel; +import com.hfkj.service.goods.BsOrderGoodsService; +import com.hfkj.service.goods.GoodsSpecsService; import com.hfkj.service.order.BsOrderService; +import com.hfkj.service.order.impl.BsOrderChildServiceImpl; import com.hfkj.service.pay.HuiPayService; import com.hfkj.sysenum.UserStatusEnum; -import com.hfkj.sysenum.order.OrderChildProductTypeEnum; -import com.hfkj.sysenum.order.OrderPayChannelEnum; -import com.hfkj.sysenum.order.OrderPayTypeEnum; -import com.hfkj.sysenum.order.OrderStatusEnum; +import com.hfkj.sysenum.order.*; 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.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; @@ -49,12 +56,19 @@ public class OrderController { private UserCenter userCenter; @Resource private BsOrderService orderService; + @Resource + private BsOrderChildServiceImpl orderChildService; + @Resource + private GoodsSpecsService goodsSpecsService; + @Resource + private BsOrderGoodsService orderGoodsService; @RequestMapping(value="/create",method = RequestMethod.POST) @ResponseBody @ApiOperation(value = "创建订单") public ResponseData create(@RequestBody OrderModel body) { try { + System.out.println("body" + body.toString()); // 用户session UserSessionObject userSession = userCenter.getSessionModel(UserSessionObject.class); @@ -98,11 +112,11 @@ public class OrderController { @ApiOperation(value = "取消订单") public ResponseData cancel(@RequestBody JSONObject body) { try { + if (body == null|| StringUtils.isBlank(body.getString("orderNo"))) { throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, ""); } - return ResponseMsgUtil.success(orderService.cancel(body.getString("orderNo"), false)); } catch (Exception e) { @@ -133,6 +147,7 @@ public class OrderController { @RequestParam(value = "pageNum" , required = true) Integer pageNum, @RequestParam(value = "pageSize" , required = true) Integer pageSize) { try { + // 用户session UserSessionObject userSession = userCenter.getSessionModel(UserSessionObject.class); if (userSession == null) { @@ -177,6 +192,7 @@ public class OrderController { @RequestParam(value = "pageNum" , required = true) Integer pageNum, @RequestParam(value = "pageSize" , required = true) Integer pageSize) { try { + Map param = new HashMap<>(); param.put("orderNo", orderNo); param.put("userPhone", userPhone); @@ -262,4 +278,64 @@ public class OrderController { } } + @RequestMapping(value="/completeActivation",method = RequestMethod.POST) + @ResponseBody + @ApiOperation(value = "完成激活") + public ResponseData completeActivation(@RequestBody JSONObject body) { + try { + + if (body == null|| StringUtils.isBlank(body.getString("childOrderNo"))) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, ""); + } + + BsOrderChild bsOrderChild = orderChildService.getDetail(body.getString("childOrderNo")); + + if (bsOrderChild.getStatus() != OrderChildStatusEnum.status2.getCode()) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "当前状态不可完成激活!"); + } + // 子订单完成 + orderService.childOrderComplete(bsOrderChild.getChildOrderNo()); + + // 赠送优惠券包 + GoodsSpecs goodsSpecs = goodsSpecsService.queryDetailByGoodsId(bsOrderChild.getProductSpecId()); + + BsOrderGoods orderGoods = orderGoodsService.findGoodsOrderByChild(bsOrderChild.getChildOrderNo()); + + Map map = new HashMap<>(); + map.put("discountPkNo" , goodsSpecs.getExt1()); + map.put("number" , bsOrderChild.getProductCount()); + map.put("phone" , orderGoods.getUserPhone()); + HaiOilService.pushPk(map); + + return ResponseMsgUtil.success("操作成功"); + + } catch (Exception e) { + log.error("error!",e); + return ResponseMsgUtil.exception(e); + } + } + + @RequestMapping(value="/haiOilLogin",method = RequestMethod.POST) + @ResponseBody + @ApiOperation(value = "嗨加油登陆参数") + public ResponseData haiOilLogin(@RequestBody JSONObject body) { + try { + + if (body == null|| StringUtils.isBlank(body.getString("phone"))) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, ""); + } + + Map map = new HashMap<>(); + map.put("appId" , CommonSysConst.getSysConfig().getHaiOilAppid()); + map.put("phone" , body.getString("phone")); + map.put("sign" , SignatureUtil.createSign(map , CommonSysConst.getSysConfig().getHaiOilAppSecret())); + + return ResponseMsgUtil.success(map); + + } catch (Exception e) { + log.error("error!",e); + return ResponseMsgUtil.exception(e); + } + } + } diff --git a/order/src/main/java/com/order/controller/OrderPayController.java b/order/src/main/java/com/order/controller/OrderPayController.java index 3ffed80..17957a1 100644 --- a/order/src/main/java/com/order/controller/OrderPayController.java +++ b/order/src/main/java/com/order/controller/OrderPayController.java @@ -44,6 +44,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; import java.util.Date; import java.util.Map; +import java.util.stream.Collectors; /** * @className: OrderController @@ -190,32 +191,27 @@ public class OrderPayController { if (merPay == null) { throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "商户未配置支付"); }*/ + + if (order.getOrderChildList().stream().collect(Collectors.groupingBy(OrderChildModel::getProductType, Collectors.toList())).size() > 1) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "暂不支持合并下单"); + } + + String shopCode = HuiftConfig.shopcode98; + String signSecret = HuiftConfig.signSecret98; + + if (order.getOrderChildList().get(0).getProductType() == 1) { + shopCode = HuiftConfig.shopcode95; + signSecret = HuiftConfig.signSecret95; + } + // 请求支付渠道 - JSONObject thirdPreOrder = huiftTradeService.thirdPreOrder(order); + JSONObject thirdPreOrder = huiftTradeService.thirdPreOrder(order , shopCode , signSecret); for (OrderChildModel orderChild : order.getOrderChildList()) { orderChild.setSettleAccount(HuiftConfig.shopcode); orderChild.setSettleAccountKey(HuiftConfig.signSecret); orderChildService.editData(orderChild); } - // 插入订单关联 - BsUserLoginLog bsUserLoginLog = bsUserLoginLogService.findUserLog(order.getUserId()); - BsOrderOutside bsOrderOutside = new BsOrderOutside(); - - if (bsUserLoginLog != null) { - - bsOrderOutside.setPlatformCode(bsUserLoginLog.getPlatformCode()); - bsOrderOutside.setPlatformName(bsUserLoginLog.getPlatformName()); - bsOrderOutside.setLoginTypeCode(bsUserLoginLog.getLoginTypeCode()); - bsOrderOutside.setLoginTypeName(bsUserLoginLog.getLoginTypeName()); - } - bsOrderOutside.setOrderNo(order.getOrderNo()); - bsOrderOutside.setStatus(1); - bsOrderOutside.setCreateTime(new Date()); - bsOrderOutside.setUpdateTime(new Date()); - - bsOrderOutsideService.create(bsOrderOutside); - order.setPayChannelOrderNo(thirdPreOrder.getString("preOrderNo")); orderService.editData(order); diff --git a/order/src/main/java/com/order/controller/business/BsOrderCinemaController.java b/order/src/main/java/com/order/controller/business/BsOrderCinemaController.java index 323af35..3d6c4d5 100644 --- a/order/src/main/java/com/order/controller/business/BsOrderCinemaController.java +++ b/order/src/main/java/com/order/controller/business/BsOrderCinemaController.java @@ -9,9 +9,8 @@ import com.hfkj.common.utils.ResponseMsgUtil; import com.hfkj.entity.BsOrderCinema; import com.hfkj.model.ResponseData; import com.hfkj.model.SecUserSessionObject; -import com.hfkj.qianzhu.channel.CinemaService; +import com.hfkj.qianzhu.CinemaService; import com.hfkj.service.goods.BsOrderCinemaService; -import com.hfkj.sysenum.SecUserObjectTypeEnum; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; @@ -63,8 +62,8 @@ public class BsOrderCinemaController { Map map = new HashMap<>(); - if (userModel.getAccount().getObjectType().equals(SecUserObjectTypeEnum.type2.getCode())) { - map.put("merId", userModel.getAccount().getObjectId()); + if (userModel.getAccount().getPlatformCode() != null) { + map.put("platformCode", userModel.getAccount().getPlatformCode()); } map.put("orderNo", orderNo); diff --git a/order/src/main/java/com/order/controller/business/BsOrderGoodsController.java b/order/src/main/java/com/order/controller/business/BsOrderGoodsController.java index 339b078..3a56f61 100644 --- a/order/src/main/java/com/order/controller/business/BsOrderGoodsController.java +++ b/order/src/main/java/com/order/controller/business/BsOrderGoodsController.java @@ -100,6 +100,9 @@ public class BsOrderGoodsController { if (userModel.getAccount().getObjectType().equals(SecUserObjectTypeEnum.type2.getCode())) { map.put("merId", userModel.getAccount().getObjectId()); } + if (userModel.getAccount().getPlatformCode() != null) { + map.put("platformCode", userModel.getAccount().getPlatformCode()); + } map.put("logisticsNo", logisticsNo); map.put("goodsType", goodsType); @@ -153,8 +156,6 @@ public class BsOrderGoodsController { SecUserSessionObject userModel = (SecUserSessionObject) sessionObject.getObject(); - - Map map = new HashMap<>(); if (userModel.getAccount().getObjectType().equals(SecUserObjectTypeEnum.type1.getCode())) { map.put("merId", merId); @@ -163,6 +164,10 @@ public class BsOrderGoodsController { map.put("merId", userModel.getAccount().getObjectId()); } + if (userModel.getAccount().getPlatformCode() != null) { + map.put("platformCode", userModel.getAccount().getPlatformCode()); + } + map.put("logisticsNo", logisticsNo); map.put("goodsType", goodsType); map.put("goodsBrand", goodsBrand); @@ -302,7 +307,6 @@ public class BsOrderGoodsController { // 删除缓存 orderService.cacheDelete(goodsOrder.getOrderNo()); - bsOrderGoodsService.cacheDelete(goodsOrder.getLogisticsNo()); bsOrderGoodsService.update(goodsOrder); getLogisticsMsg(goodsOrder.getId()); return ResponseMsgUtil.success("更新成功!"); diff --git a/order/src/main/java/com/order/controller/business/BsOrderStarbucksController.java b/order/src/main/java/com/order/controller/business/BsOrderStarbucksController.java index f33bbe9..ab51262 100644 --- a/order/src/main/java/com/order/controller/business/BsOrderStarbucksController.java +++ b/order/src/main/java/com/order/controller/business/BsOrderStarbucksController.java @@ -2,14 +2,18 @@ package com.order.controller.business; import com.github.pagehelper.PageInfo; +import com.hfkj.common.security.SessionObject; +import com.hfkj.common.security.UserCenter; import com.hfkj.common.utils.PageUtil; import com.hfkj.common.utils.ResponseMsgUtil; import com.hfkj.entity.BsOrderChild; import com.hfkj.entity.BsOrderStarbucks; import com.hfkj.model.ResponseData; +import com.hfkj.model.SecUserSessionObject; import com.hfkj.model.order.OrderStarbucksModel; import com.hfkj.service.goods.BsOrderStarbucksService; import com.hfkj.service.order.BsOrderChildService; +import com.hfkj.sysenum.SecUserObjectTypeEnum; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; @@ -42,6 +46,9 @@ public class BsOrderStarbucksController { @Resource private BsOrderStarbucksService bsOrderStarbucksService; + @Resource + private UserCenter userCenter; + @RequestMapping(value="/getListStarbucks",method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "查询列表") @@ -61,7 +68,13 @@ public class BsOrderStarbucksController { @RequestParam(value = "pageSize" , required = true) Integer pageSize, HttpServletRequest request) { try { + + SessionObject sessionObject = userCenter.getSessionObject(request); + SecUserSessionObject userModel = (SecUserSessionObject) sessionObject.getObject(); + Map map = new HashMap<>(); + + map.put("orderNo", orderNo); map.put("childOrderNo", childOrderNo); map.put("productType", 4); @@ -72,7 +85,13 @@ public class BsOrderStarbucksController { map.put("status", status); List list = bsOrderChildService.getList(map); - List starbucksList = bsOrderStarbucksService.getList(new HashMap<>()); + + Map map1 = new HashMap<>(); + + if (userModel.getAccount().getPlatformCode() != null) { + map1.put("platformCode", userModel.getAccount().getPlatformCode()); + } + List starbucksList = bsOrderStarbucksService.getList(map1); List starbucksModelList = new ArrayList<>(); @@ -89,7 +108,6 @@ public class BsOrderStarbucksController { starbucksModel.setPayType(starbucks.get(0).getPayType()); starbucksModelList.add(starbucksModel); } - } if (storeAddress != null) { diff --git a/order/src/main/java/com/order/controller/business/OrderCouponController.java b/order/src/main/java/com/order/controller/business/OrderCouponController.java index edd135a..9c5d177 100644 --- a/order/src/main/java/com/order/controller/business/OrderCouponController.java +++ b/order/src/main/java/com/order/controller/business/OrderCouponController.java @@ -122,6 +122,11 @@ public class OrderCouponController { } else if (SecUserObjectTypeEnum.type2.getCode() == userSessionObject.getAccount().getObjectType()) { param.put("merId", userSessionObject.getAccount().getObjectId()); } + + if (userSessionObject.getAccount().getPlatformCode() != null) { + param.put("platformCode", userSessionObject.getAccount().getPlatformCode()); + } + param.put("orderNo", orderNo); param.put("userPhone", userPhone); param.put("tradeStatus", tradeStatus); diff --git a/order/src/main/resources/dev/logback.xml b/order/src/main/resources/dev/logback.xml index c88e0aa..9d782ad 100644 --- a/order/src/main/resources/dev/logback.xml +++ b/order/src/main/resources/dev/logback.xml @@ -219,7 +219,7 @@ UTF-8 - + @@ -268,4 +268,47 @@ + + + log/YuShangLog.log + + log/YuShangLog/YuShangLog.log.%d.%i + + + 64 MB + + + + + %d %p (%file:%line\)- %m%n + + UTF-8 + + + + + + + + + + log/HaiOilLog.log + + log/HaiOilLog/HaiOilLog.log.%d.%i + + + 64 MB + + + + + %d %p (%file:%line\)- %m%n + + UTF-8 + + + + + + diff --git a/order/src/main/resources/prod/logback.xml b/order/src/main/resources/prod/logback.xml index 06969bc..5309354 100644 --- a/order/src/main/resources/prod/logback.xml +++ b/order/src/main/resources/prod/logback.xml @@ -219,7 +219,7 @@ UTF-8 - + @@ -267,4 +267,48 @@ + + + log/YuShangLog.log + + log/YuShangLog/YuShangLog.log.%d.%i + + + 64 MB + + + + + %d %p (%file:%line\)- %m%n + + UTF-8 + + + + + + + + + + log/HaiOilLog.log + + log/HaiOilLog/HaiOilLog.log.%d.%i + + + 64 MB + + + + + %d %p (%file:%line\)- %m%n + + UTF-8 + + + + + + + diff --git a/schedule/src/main/java/com/hfkj/schedule/OrderGoodsSchedule.java b/schedule/src/main/java/com/hfkj/schedule/OrderGoodsSchedule.java index 0e02148..3b68208 100644 --- a/schedule/src/main/java/com/hfkj/schedule/OrderGoodsSchedule.java +++ b/schedule/src/main/java/com/hfkj/schedule/OrderGoodsSchedule.java @@ -61,7 +61,7 @@ public class OrderGoodsSchedule { } } - @Scheduled(cron = "30 0 0 * * ?") + @Scheduled(cron = "5 0 0 * * ?") public void getLogisticsMsg() { Map objectMap = new HashMap<>(); @@ -81,19 +81,20 @@ public class OrderGoodsSchedule { throw ErrorHelp.genException(SysCode.System , ErrorCode.COMMON_ERROR , "暂无物流信息!"); } - GoodsLogistics logistics = (GoodsLogistics) bsOrderGoodsService.getLogisticsMsg(goods.getLogisticsNo() , userAddress.getPhone()); - - if (logistics.getLogisticsStatus() != null) { - goods.setLogisticsStatus(logistics.getLogisticsStatus()); - goods.setLogisticsStatusDesc(logistics.getLogisticsStatusDesc()); - } else { - goods.setLogisticsStatus(OrderLogisticsStatusEnum.statusWAIT_ACCEPT.getCode()); - goods.setLogisticsStatusDesc(OrderLogisticsStatusEnum.statusWAIT_ACCEPT.getName()); - } + if (goods.getLogisticsNo() != null) { + GoodsLogistics logistics = (GoodsLogistics) bsOrderGoodsService.getLogisticsMsg(goods.getLogisticsNo() , userAddress.getPhone()); + if (logistics.getLogisticsStatus() != null) { + goods.setLogisticsStatus(logistics.getLogisticsStatus()); + goods.setLogisticsStatusDesc(logistics.getLogisticsStatusDesc()); + } else { + goods.setLogisticsStatus(OrderLogisticsStatusEnum.statusWAIT_ACCEPT.getCode()); + goods.setLogisticsStatusDesc(OrderLogisticsStatusEnum.statusWAIT_ACCEPT.getName()); + } - goods.setUpdateTime(new Date()); + goods.setUpdateTime(new Date()); - bsOrderGoodsService.update(goods); + bsOrderGoodsService.update(goods); + } } } diff --git a/service/src/main/java/com/hfkj/common/utils/CommonUtil.java b/service/src/main/java/com/hfkj/common/utils/CommonUtil.java index a1f5efc..4aa8ee4 100644 --- a/service/src/main/java/com/hfkj/common/utils/CommonUtil.java +++ b/service/src/main/java/com/hfkj/common/utils/CommonUtil.java @@ -2,6 +2,7 @@ package com.hfkj.common.utils; import java.math.BigDecimal; import java.math.RoundingMode; +import java.util.Random; public class CommonUtil { @@ -16,4 +17,39 @@ public class CommonUtil { return length + "米"; } + + public static Integer saleNumRandom(BigDecimal price){ + + + if (price.compareTo(new BigDecimal(41)) < 0) { + return randomNumberGenerator(3000 , 15000); + } + if (price.compareTo(new BigDecimal(40)) > 0 && price.compareTo(new BigDecimal(200)) < 0) { + return randomNumberGenerator( 500, 3000); + } + if (price.compareTo(new BigDecimal(201)) > 0 && price.compareTo(new BigDecimal(400)) < 0) { + return randomNumberGenerator( 200, 500); + } + if (price.compareTo(new BigDecimal(401)) > 0) { + return randomNumberGenerator( 10, 200); + } + + return 0; + } + + /** + * @MethodName RandomNumberGenerator + * @Description: 获取区间随机数 + * @param min + * @param max + * @return: java.lang.Integer + * @Author: Sum1Dream + * @Date: 2024/9/2 下午4:02 + */ + public static Integer randomNumberGenerator(Integer min , Integer max){ + + Random random = new Random(); + + return random.nextInt(max - min + 1) + min; + } } diff --git a/service/src/main/java/com/hfkj/common/utils/HttpsUtils.java b/service/src/main/java/com/hfkj/common/utils/HttpsUtils.java index 3de6e31..7e53848 100644 --- a/service/src/main/java/com/hfkj/common/utils/HttpsUtils.java +++ b/service/src/main/java/com/hfkj/common/utils/HttpsUtils.java @@ -54,7 +54,7 @@ public class HttpsUtils { // 设置连接池 connMgr = new PoolingHttpClientConnectionManager(); // 设置连接池大小 - connMgr.setMaxTotal(100); + connMgr.setMaxTotal(5000); connMgr.setDefaultMaxPerRoute(connMgr.getMaxTotal()); // Validate connections after 1 sec of inactivity connMgr.setValidateAfterInactivity(1000); @@ -100,7 +100,8 @@ public class HttpsUtils { } apiUrl += param; String result = null; - HttpClient httpClient = null; + CloseableHttpClient httpClient; + CloseableHttpResponse response = null; try { if (apiUrl.startsWith("https")) { @@ -111,7 +112,7 @@ public class HttpsUtils { } HttpGet httpGet = new HttpGet(apiUrl); - HttpResponse response = httpClient.execute(httpGet); + response = httpClient.execute(httpGet); HttpEntity entity = response.getEntity(); if (entity != null) { InputStream instream = entity.getContent(); @@ -120,48 +121,19 @@ public class HttpsUtils { return JSON.parseObject(result); } catch (Exception e) { log.error(e.getMessage(),e); - } - return null; - } - - public static JSONObject doGet(String url, Map params , String o) { - String apiUrl = url; - StringBuffer param = new StringBuffer(); - int i = 0; - for (String key : params.keySet()) { - if (i == 0) - param.append("?"); - else - param.append("&"); - param.append(key).append("=").append(params.get(key)); - i++; - } - apiUrl += param; - String result = null; - HttpClient httpClient = null; - try { - - if (apiUrl.startsWith("https")) { - httpClient = HttpClients.custom().setSSLSocketFactory(createSSLConnSocketFactory()) - .setConnectionManager(connMgr).setDefaultRequestConfig(requestConfig).build(); - } else { - httpClient = HttpClients.createDefault(); - } - - HttpGet httpGet = new HttpGet(apiUrl); - HttpResponse response = httpClient.execute(httpGet); - HttpEntity entity = response.getEntity(); - if (entity != null) { - InputStream instream = entity.getContent(); - result = IOUtils.toString(instream, "UTF-8"); + } finally { + if (response != null) { + try { + EntityUtils.consume(response.getEntity()); + } catch (IOException e) { + log.error(e.getMessage(),e); + } } - return JSON.parseObject(result); - } catch (Exception e) { - log.error(e.getMessage(),e); } return null; } + public static JSONObject doGet(String url, Map params , Map headers) { String apiUrl = url; StringBuffer param = new StringBuffer(); @@ -176,7 +148,8 @@ public class HttpsUtils { } apiUrl += param; String result = null; - HttpClient httpClient = null; + CloseableHttpClient httpClient = null; + CloseableHttpResponse response = null; try { if (apiUrl.startsWith("https")) { @@ -190,7 +163,7 @@ public class HttpsUtils { for (Map.Entry e : headers.entrySet()) { httpGet.addHeader(e.getKey(), e.getValue()); } - HttpResponse response = httpClient.execute(httpGet); + response = httpClient.execute(httpGet); HttpEntity entity = response.getEntity(); if (entity != null) { InputStream instream = entity.getContent(); @@ -199,6 +172,14 @@ public class HttpsUtils { return JSON.parseObject(result); } catch (Exception e) { log.error(e.getMessage(),e); + } finally { + if (response != null) { + try { + EntityUtils.consume(response.getEntity()); + } catch (IOException e) { + log.error(e.getMessage(),e); + } + } } return null; } @@ -223,7 +204,7 @@ public class HttpsUtils { * @return */ public static JSONObject doPost(String apiUrl, Map params) { - CloseableHttpClient httpClient = null; + CloseableHttpClient httpClient; if (apiUrl.startsWith("https")) { httpClient = HttpClients.custom().setSSLSocketFactory(createSSLConnSocketFactory()) .setConnectionManager(connMgr).setDefaultRequestConfig(requestConfig).build(); @@ -349,7 +330,7 @@ public class HttpsUtils { * @return */ public static JSONObject doPost(String apiUrl, String str) { - CloseableHttpClient httpClient = null; + CloseableHttpClient httpClient; if (apiUrl.startsWith("https")) { httpClient = HttpClients.custom().setSSLSocketFactory(createSSLConnSocketFactory()) .setConnectionManager(connMgr).setDefaultRequestConfig(requestConfig).build(); diff --git a/service/src/main/java/com/hfkj/common/utils/SignatureUtil.java b/service/src/main/java/com/hfkj/common/utils/SignatureUtil.java new file mode 100644 index 0000000..f4b5dee --- /dev/null +++ b/service/src/main/java/com/hfkj/common/utils/SignatureUtil.java @@ -0,0 +1,78 @@ +package com.hfkj.common.utils; + +import com.alibaba.fastjson.JSONObject; +import org.apache.commons.lang3.StringUtils; + +import javax.xml.bind.annotation.adapters.HexBinaryAdapter; +import java.security.MessageDigest; +import java.util.Arrays; +import java.util.Map; +import java.util.Set; + +public class SignatureUtil { + /** + * 参数签名 + * @param param 参数 + * @param key 秘钥 + * @return + * @throws Exception + */ + public static String createSign(Object param, String key) throws Exception { + Map map = JSONObject.parseObject(JSONObject.toJSONString(param), Map.class); + return md5Encode(paramSort(map, key).getBytes()); + } + + /** + * 验证签名 + * @param checkSign 需验证的签名字符串 + * @param param 参数 + * @param key 秘钥 + * @return + * @throws Exception + */ + public static Boolean checkSign(String checkSign,Object param, String key) throws Exception { + Map map = JSONObject.parseObject(JSONObject.toJSONString(param), Map.class); + // 去除签名 + map.remove("sign"); + if (checkSign.equals(createSign(map, key))) { + return true; + } + return false; + } + + /** + * 参数排序 + * @param param + * @return + */ + public static String paramSort(final Map param, String key) { + Set keySet = param.keySet(); + String[] keyArray = keySet.toArray(new String[keySet.size()]); + Arrays.sort(keyArray); + StringBuilder sb = new StringBuilder(); + for (String k : keyArray) { + if (StringUtils.isBlank(sb.toString())) { + sb.append(k).append("=").append(param.get(k)); + } else { + sb.append("&").append(k).append("=").append(param.get(k)); + } + } + sb.append("&key=").append(key); + return sb.toString(); + } + + /** + * MD5加密 + * @param data + * @return + * @throws Exception + */ + public static String md5Encode(byte[] data) throws Exception { + // 初始化MessageDigest + MessageDigest md = MessageDigest.getInstance("MD5"); + // 执行摘要信息 + byte[] digest = md.digest(data); + // 将摘要信息转换为32位的十六进制字符串 + return new String(new HexBinaryAdapter().marshal(digest)); + } +} diff --git a/service/src/main/java/com/hfkj/config/CommonSysConfig.java b/service/src/main/java/com/hfkj/config/CommonSysConfig.java index 90afb4f..123f966 100644 --- a/service/src/main/java/com/hfkj/config/CommonSysConfig.java +++ b/service/src/main/java/com/hfkj/config/CommonSysConfig.java @@ -138,4 +138,19 @@ public class CommonSysConfig { private String mtAccessKey; private String mtSecretKey; private String mtPostUrl; + + /** + * 娱尚接口请求参数 + */ + private String yuShangAppKey; + private String yuShangAppSecret; + private String yuShangPostUrl; + + /** + * 嗨加油请求参数 + */ + private String haiOilPostUrl; + private String haiOilAppid; + private String haiOilAppSecret; + } diff --git a/service/src/main/java/com/hfkj/config/GenerateSign.java b/service/src/main/java/com/hfkj/config/GenerateSign.java index 18e31d4..05e14a2 100644 --- a/service/src/main/java/com/hfkj/config/GenerateSign.java +++ b/service/src/main/java/com/hfkj/config/GenerateSign.java @@ -39,6 +39,8 @@ public class GenerateSign { return sb.toString(); } + + /** * @MethodName paramSort * @Description: 不带key @@ -61,6 +63,27 @@ public class GenerateSign { return sb.toString(); } + /** + * 生成签名 + * @param data 数据 + * @param key 秘钥app_secret + * @return 加密结果 + */ + public static String paramSortYuShang(final Map data, String key){ + Set keySet = data.keySet(); + String[] keyArray = keySet.toArray(new String[keySet.size()]); + Arrays.sort(keyArray); + StringBuilder sb = new StringBuilder(); + for (String k : keyArray) { + if (k.equals(WXPayConstants.FIELD_SIGN)) { + continue; + } + sb.append(data.get(k)); + } + sb.append(key); + return sb.toString(); + } + /** * 生成畅停签名. 注意,若含有sign_type字段,必须和signType参数保持一致。 * diff --git a/service/src/main/java/com/hfkj/dao/BsOrderCinemaMapper.java b/service/src/main/java/com/hfkj/dao/BsOrderCinemaMapper.java index 3d1dadf..542320b 100644 --- a/service/src/main/java/com/hfkj/dao/BsOrderCinemaMapper.java +++ b/service/src/main/java/com/hfkj/dao/BsOrderCinemaMapper.java @@ -43,9 +43,10 @@ public interface BsOrderCinemaMapper extends BsOrderCinemaMapperExt { "cinema_id, show_id, ", "film_id, seats_count, ", "seats, img, goods_name, ", - "goods_specs_name, order_no, ", - "child_order_no, channel_order_no, ", - "mer_id, user_id, user_phone, ", + "goods_specs_name, platform_code, ", + "order_no, child_order_no, ", + "channel_order_no, mer_id, ", + "user_id, user_phone, ", "total_price, total_deduction_price, ", "coupon_discount_price, integral_discount_price, ", "pay_real_price, pay_channel, ", @@ -60,9 +61,10 @@ public interface BsOrderCinemaMapper extends BsOrderCinemaMapperExt { "#{cinemaId,jdbcType=INTEGER}, #{showId,jdbcType=BIGINT}, ", "#{filmId,jdbcType=INTEGER}, #{seatsCount,jdbcType=INTEGER}, ", "#{seats,jdbcType=VARCHAR}, #{img,jdbcType=VARCHAR}, #{goodsName,jdbcType=VARCHAR}, ", - "#{goodsSpecsName,jdbcType=VARCHAR}, #{orderNo,jdbcType=VARCHAR}, ", - "#{childOrderNo,jdbcType=VARCHAR}, #{channelOrderNo,jdbcType=VARCHAR}, ", - "#{merId,jdbcType=BIGINT}, #{userId,jdbcType=BIGINT}, #{userPhone,jdbcType=VARCHAR}, ", + "#{goodsSpecsName,jdbcType=VARCHAR}, #{platformCode,jdbcType=VARCHAR}, ", + "#{orderNo,jdbcType=VARCHAR}, #{childOrderNo,jdbcType=VARCHAR}, ", + "#{channelOrderNo,jdbcType=VARCHAR}, #{merId,jdbcType=BIGINT}, ", + "#{userId,jdbcType=BIGINT}, #{userPhone,jdbcType=VARCHAR}, ", "#{totalPrice,jdbcType=DECIMAL}, #{totalDeductionPrice,jdbcType=DECIMAL}, ", "#{couponDiscountPrice,jdbcType=DECIMAL}, #{integralDiscountPrice,jdbcType=DECIMAL}, ", "#{payRealPrice,jdbcType=DECIMAL}, #{payChannel,jdbcType=INTEGER}, ", @@ -94,6 +96,7 @@ public interface BsOrderCinemaMapper extends BsOrderCinemaMapperExt { @Result(column="img", property="img", jdbcType=JdbcType.VARCHAR), @Result(column="goods_name", property="goodsName", jdbcType=JdbcType.VARCHAR), @Result(column="goods_specs_name", property="goodsSpecsName", jdbcType=JdbcType.VARCHAR), + @Result(column="platform_code", property="platformCode", jdbcType=JdbcType.VARCHAR), @Result(column="order_no", property="orderNo", jdbcType=JdbcType.VARCHAR), @Result(column="child_order_no", property="childOrderNo", jdbcType=JdbcType.VARCHAR), @Result(column="channel_order_no", property="channelOrderNo", jdbcType=JdbcType.VARCHAR), @@ -126,11 +129,11 @@ public interface BsOrderCinemaMapper extends BsOrderCinemaMapperExt { @Select({ "select", "id, draw_mode, accept_adjust, cinema_id, show_id, film_id, seats_count, seats, ", - "img, goods_name, goods_specs_name, order_no, child_order_no, channel_order_no, ", - "mer_id, user_id, user_phone, total_price, total_deduction_price, coupon_discount_price, ", - "integral_discount_price, pay_real_price, pay_channel, pay_serial_no, pay_type, ", - "`status`, create_time, pay_time, cancel_time, refund_time, finish_time, update_time, ", - "exception_status, exception_msg, ext_1, ext_2, ext_3", + "img, goods_name, goods_specs_name, platform_code, order_no, child_order_no, ", + "channel_order_no, mer_id, user_id, user_phone, total_price, total_deduction_price, ", + "coupon_discount_price, integral_discount_price, pay_real_price, pay_channel, ", + "pay_serial_no, pay_type, `status`, create_time, pay_time, cancel_time, refund_time, ", + "finish_time, update_time, exception_status, exception_msg, ext_1, ext_2, ext_3", "from bs_order_cinema", "where id = #{id,jdbcType=BIGINT}" }) @@ -146,6 +149,7 @@ public interface BsOrderCinemaMapper extends BsOrderCinemaMapperExt { @Result(column="img", property="img", jdbcType=JdbcType.VARCHAR), @Result(column="goods_name", property="goodsName", jdbcType=JdbcType.VARCHAR), @Result(column="goods_specs_name", property="goodsSpecsName", jdbcType=JdbcType.VARCHAR), + @Result(column="platform_code", property="platformCode", jdbcType=JdbcType.VARCHAR), @Result(column="order_no", property="orderNo", jdbcType=JdbcType.VARCHAR), @Result(column="child_order_no", property="childOrderNo", jdbcType=JdbcType.VARCHAR), @Result(column="channel_order_no", property="channelOrderNo", jdbcType=JdbcType.VARCHAR), @@ -196,6 +200,7 @@ public interface BsOrderCinemaMapper extends BsOrderCinemaMapperExt { "img = #{img,jdbcType=VARCHAR},", "goods_name = #{goodsName,jdbcType=VARCHAR},", "goods_specs_name = #{goodsSpecsName,jdbcType=VARCHAR},", + "platform_code = #{platformCode,jdbcType=VARCHAR},", "order_no = #{orderNo,jdbcType=VARCHAR},", "child_order_no = #{childOrderNo,jdbcType=VARCHAR},", "channel_order_no = #{channelOrderNo,jdbcType=VARCHAR},", diff --git a/service/src/main/java/com/hfkj/dao/BsOrderCinemaSqlProvider.java b/service/src/main/java/com/hfkj/dao/BsOrderCinemaSqlProvider.java index b8cfff9..21ce768 100644 --- a/service/src/main/java/com/hfkj/dao/BsOrderCinemaSqlProvider.java +++ b/service/src/main/java/com/hfkj/dao/BsOrderCinemaSqlProvider.java @@ -68,6 +68,10 @@ public class BsOrderCinemaSqlProvider { sql.VALUES("goods_specs_name", "#{goodsSpecsName,jdbcType=VARCHAR}"); } + if (record.getPlatformCode() != null) { + sql.VALUES("platform_code", "#{platformCode,jdbcType=VARCHAR}"); + } + if (record.getOrderNo() != null) { sql.VALUES("order_no", "#{orderNo,jdbcType=VARCHAR}"); } @@ -192,6 +196,7 @@ public class BsOrderCinemaSqlProvider { sql.SELECT("img"); sql.SELECT("goods_name"); sql.SELECT("goods_specs_name"); + sql.SELECT("platform_code"); sql.SELECT("order_no"); sql.SELECT("child_order_no"); sql.SELECT("channel_order_no"); @@ -279,6 +284,10 @@ public class BsOrderCinemaSqlProvider { sql.SET("goods_specs_name = #{record.goodsSpecsName,jdbcType=VARCHAR}"); } + if (record.getPlatformCode() != null) { + sql.SET("platform_code = #{record.platformCode,jdbcType=VARCHAR}"); + } + if (record.getOrderNo() != null) { sql.SET("order_no = #{record.orderNo,jdbcType=VARCHAR}"); } @@ -402,6 +411,7 @@ public class BsOrderCinemaSqlProvider { sql.SET("img = #{record.img,jdbcType=VARCHAR}"); sql.SET("goods_name = #{record.goodsName,jdbcType=VARCHAR}"); sql.SET("goods_specs_name = #{record.goodsSpecsName,jdbcType=VARCHAR}"); + sql.SET("platform_code = #{record.platformCode,jdbcType=VARCHAR}"); sql.SET("order_no = #{record.orderNo,jdbcType=VARCHAR}"); sql.SET("child_order_no = #{record.childOrderNo,jdbcType=VARCHAR}"); sql.SET("channel_order_no = #{record.channelOrderNo,jdbcType=VARCHAR}"); @@ -478,6 +488,10 @@ public class BsOrderCinemaSqlProvider { sql.SET("goods_specs_name = #{goodsSpecsName,jdbcType=VARCHAR}"); } + if (record.getPlatformCode() != null) { + sql.SET("platform_code = #{platformCode,jdbcType=VARCHAR}"); + } + if (record.getOrderNo() != null) { sql.SET("order_no = #{orderNo,jdbcType=VARCHAR}"); } diff --git a/service/src/main/java/com/hfkj/dao/BsOrderCouponMapper.java b/service/src/main/java/com/hfkj/dao/BsOrderCouponMapper.java index 92fa7f8..545e191 100644 --- a/service/src/main/java/com/hfkj/dao/BsOrderCouponMapper.java +++ b/service/src/main/java/com/hfkj/dao/BsOrderCouponMapper.java @@ -40,7 +40,8 @@ public interface BsOrderCouponMapper extends BsOrderCouponMapperExt { @Insert({ "insert into bs_order_coupon (order_no, child_order_no, ", - "mer_id, user_id, user_phone, ", + "mer_id, platform_code, ", + "user_id, user_phone, ", "goods_id, goods_name, ", "goods_type_id, goods_type_name, ", "goods_brand_id, goods_brand_name, ", @@ -58,7 +59,8 @@ public interface BsOrderCouponMapper extends BsOrderCouponMapperExt { "update_time, ext_1, ", "ext_2, ext_3)", "values (#{orderNo,jdbcType=VARCHAR}, #{childOrderNo,jdbcType=VARCHAR}, ", - "#{merId,jdbcType=BIGINT}, #{userId,jdbcType=BIGINT}, #{userPhone,jdbcType=VARCHAR}, ", + "#{merId,jdbcType=BIGINT}, #{platformCode,jdbcType=VARCHAR}, ", + "#{userId,jdbcType=BIGINT}, #{userPhone,jdbcType=VARCHAR}, ", "#{goodsId,jdbcType=BIGINT}, #{goodsName,jdbcType=VARCHAR}, ", "#{goodsTypeId,jdbcType=BIGINT}, #{goodsTypeName,jdbcType=VARCHAR}, ", "#{goodsBrandId,jdbcType=BIGINT}, #{goodsBrandName,jdbcType=VARCHAR}, ", @@ -89,6 +91,7 @@ public interface BsOrderCouponMapper extends BsOrderCouponMapperExt { @Result(column="order_no", property="orderNo", jdbcType=JdbcType.VARCHAR), @Result(column="child_order_no", property="childOrderNo", jdbcType=JdbcType.VARCHAR), @Result(column="mer_id", property="merId", jdbcType=JdbcType.BIGINT), + @Result(column="platform_code", property="platformCode", jdbcType=JdbcType.VARCHAR), @Result(column="user_id", property="userId", jdbcType=JdbcType.BIGINT), @Result(column="user_phone", property="userPhone", jdbcType=JdbcType.VARCHAR), @Result(column="goods_id", property="goodsId", jdbcType=JdbcType.BIGINT), @@ -128,10 +131,10 @@ public interface BsOrderCouponMapper extends BsOrderCouponMapperExt { @Select({ "select", - "id, order_no, child_order_no, mer_id, user_id, user_phone, goods_id, goods_name, ", - "goods_type_id, goods_type_name, goods_brand_id, goods_brand_name, goods_specs_id, ", - "goods_specs_name, goods_spesc_original_price, goods_spesc_sale_price, goods_vpd_id, ", - "goods_vpd_key, goods_vpd_source, goods_count, total_price, total_deduction_price, ", + "id, order_no, child_order_no, mer_id, platform_code, user_id, user_phone, goods_id, ", + "goods_name, goods_type_id, goods_type_name, goods_brand_id, goods_brand_name, ", + "goods_specs_id, goods_specs_name, goods_spesc_original_price, goods_spesc_sale_price, ", + "goods_vpd_id, goods_vpd_key, goods_vpd_source, goods_count, total_price, total_deduction_price, ", "coupon_discount_price, integral_discount_price, pay_real_price, pay_channel, ", "pay_serial_no, pay_type, `status`, create_time, pay_time, cancel_time, refund_time, ", "finish_time, update_time, ext_1, ext_2, ext_3", @@ -143,6 +146,7 @@ public interface BsOrderCouponMapper extends BsOrderCouponMapperExt { @Result(column="order_no", property="orderNo", jdbcType=JdbcType.VARCHAR), @Result(column="child_order_no", property="childOrderNo", jdbcType=JdbcType.VARCHAR), @Result(column="mer_id", property="merId", jdbcType=JdbcType.BIGINT), + @Result(column="platform_code", property="platformCode", jdbcType=JdbcType.VARCHAR), @Result(column="user_id", property="userId", jdbcType=JdbcType.BIGINT), @Result(column="user_phone", property="userPhone", jdbcType=JdbcType.VARCHAR), @Result(column="goods_id", property="goodsId", jdbcType=JdbcType.BIGINT), @@ -194,6 +198,7 @@ public interface BsOrderCouponMapper extends BsOrderCouponMapperExt { "set order_no = #{orderNo,jdbcType=VARCHAR},", "child_order_no = #{childOrderNo,jdbcType=VARCHAR},", "mer_id = #{merId,jdbcType=BIGINT},", + "platform_code = #{platformCode,jdbcType=VARCHAR},", "user_id = #{userId,jdbcType=BIGINT},", "user_phone = #{userPhone,jdbcType=VARCHAR},", "goods_id = #{goodsId,jdbcType=BIGINT},", diff --git a/service/src/main/java/com/hfkj/dao/BsOrderCouponMapperExt.java b/service/src/main/java/com/hfkj/dao/BsOrderCouponMapperExt.java index f62a811..3bbe20d 100644 --- a/service/src/main/java/com/hfkj/dao/BsOrderCouponMapperExt.java +++ b/service/src/main/java/com/hfkj/dao/BsOrderCouponMapperExt.java @@ -31,6 +31,7 @@ public interface BsOrderCouponMapperExt { " b.pay_channel payChannel," + " b.pay_type payType," + " b.pay_serial_no paySerialNo," + + " b.platform_code platformCode," + " b.`status` tradeStatus," + " b.create_time createTime," + " b.pay_time payTime," + @@ -47,6 +48,7 @@ public interface BsOrderCouponMapperExt { " and b.mer_id = #{param.merId} " + " and b.order_no like concat('%',#{param.orderNo},'%') " + " and b.child_order_no = #{param.orderChildNo} " + + " and b.platform_code = #{param.platformCode} " + " and b.user_phone like concat('%',#{param.userPhone},'%') " + " and b.pay_type = #{param.payType}" + " and b.status = #{param.tradeStatus}" + diff --git a/service/src/main/java/com/hfkj/dao/BsOrderCouponSqlProvider.java b/service/src/main/java/com/hfkj/dao/BsOrderCouponSqlProvider.java index e6f1da8..6d99697 100644 --- a/service/src/main/java/com/hfkj/dao/BsOrderCouponSqlProvider.java +++ b/service/src/main/java/com/hfkj/dao/BsOrderCouponSqlProvider.java @@ -40,6 +40,10 @@ public class BsOrderCouponSqlProvider { sql.VALUES("mer_id", "#{merId,jdbcType=BIGINT}"); } + if (record.getPlatformCode() != null) { + sql.VALUES("platform_code", "#{platformCode,jdbcType=VARCHAR}"); + } + if (record.getUserId() != null) { sql.VALUES("user_id", "#{userId,jdbcType=BIGINT}"); } @@ -189,6 +193,7 @@ public class BsOrderCouponSqlProvider { sql.SELECT("order_no"); sql.SELECT("child_order_no"); sql.SELECT("mer_id"); + sql.SELECT("platform_code"); sql.SELECT("user_id"); sql.SELECT("user_phone"); sql.SELECT("goods_id"); @@ -256,6 +261,10 @@ public class BsOrderCouponSqlProvider { sql.SET("mer_id = #{record.merId,jdbcType=BIGINT}"); } + if (record.getPlatformCode() != null) { + sql.SET("platform_code = #{record.platformCode,jdbcType=VARCHAR}"); + } + if (record.getUserId() != null) { sql.SET("user_id = #{record.userId,jdbcType=BIGINT}"); } @@ -404,6 +413,7 @@ public class BsOrderCouponSqlProvider { sql.SET("order_no = #{record.orderNo,jdbcType=VARCHAR}"); sql.SET("child_order_no = #{record.childOrderNo,jdbcType=VARCHAR}"); sql.SET("mer_id = #{record.merId,jdbcType=BIGINT}"); + sql.SET("platform_code = #{record.platformCode,jdbcType=VARCHAR}"); sql.SET("user_id = #{record.userId,jdbcType=BIGINT}"); sql.SET("user_phone = #{record.userPhone,jdbcType=VARCHAR}"); sql.SET("goods_id = #{record.goodsId,jdbcType=BIGINT}"); @@ -460,6 +470,10 @@ public class BsOrderCouponSqlProvider { sql.SET("mer_id = #{merId,jdbcType=BIGINT}"); } + if (record.getPlatformCode() != null) { + sql.SET("platform_code = #{platformCode,jdbcType=VARCHAR}"); + } + if (record.getUserId() != null) { sql.SET("user_id = #{userId,jdbcType=BIGINT}"); } diff --git a/service/src/main/java/com/hfkj/dao/BsOrderGoodsMapper.java b/service/src/main/java/com/hfkj/dao/BsOrderGoodsMapper.java index b987775..ad4953e 100644 --- a/service/src/main/java/com/hfkj/dao/BsOrderGoodsMapper.java +++ b/service/src/main/java/com/hfkj/dao/BsOrderGoodsMapper.java @@ -51,15 +51,15 @@ public interface BsOrderGoodsMapper extends BsOrderGoodsMapperExt { "goods_specs_original_price, goods_count, ", "total_price, total_deduction_price, ", "coupon_discount_price, integral_discount_price, ", - "pay_real_price, pay_channel, ", - "pay_serial_no, pay_type, ", - "`status`, logistics_status_desc, ", - "logistics_status, create_time, ", - "pay_time, cancel_time, ", - "refund_time, finish_time, ", - "update_time, exception_status, ", - "exception_msg, ext_1, ", - "ext_2, ext_3)", + "platform_code, pay_real_price, ", + "pay_channel, pay_serial_no, ", + "pay_type, `status`, ", + "logistics_status_desc, logistics_status, ", + "create_time, pay_time, ", + "cancel_time, refund_time, ", + "finish_time, update_time, ", + "exception_status, exception_msg, ", + "ext_1, ext_2, ext_3)", "values (#{logisticsNo,jdbcType=VARCHAR}, #{freightPrice,jdbcType=DECIMAL}, ", "#{deliveryAddressId,jdbcType=BIGINT}, #{deliveryAddress,jdbcType=VARCHAR}, ", "#{orderNo,jdbcType=VARCHAR}, #{childOrderNo,jdbcType=VARCHAR}, ", @@ -72,15 +72,15 @@ public interface BsOrderGoodsMapper extends BsOrderGoodsMapperExt { "#{goodsSpecsOriginalPrice,jdbcType=DECIMAL}, #{goodsCount,jdbcType=INTEGER}, ", "#{totalPrice,jdbcType=DECIMAL}, #{totalDeductionPrice,jdbcType=DECIMAL}, ", "#{couponDiscountPrice,jdbcType=DECIMAL}, #{integralDiscountPrice,jdbcType=DECIMAL}, ", - "#{payRealPrice,jdbcType=DECIMAL}, #{payChannel,jdbcType=INTEGER}, ", - "#{paySerialNo,jdbcType=VARCHAR}, #{payType,jdbcType=INTEGER}, ", - "#{status,jdbcType=INTEGER}, #{logisticsStatusDesc,jdbcType=VARCHAR}, ", - "#{logisticsStatus,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, ", - "#{payTime,jdbcType=TIMESTAMP}, #{cancelTime,jdbcType=TIMESTAMP}, ", - "#{refundTime,jdbcType=TIMESTAMP}, #{finishTime,jdbcType=TIMESTAMP}, ", - "#{updateTime,jdbcType=TIMESTAMP}, #{exceptionStatus,jdbcType=BIT}, ", - "#{exceptionMsg,jdbcType=VARCHAR}, #{ext1,jdbcType=VARCHAR}, ", - "#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" + "#{platformCode,jdbcType=VARCHAR}, #{payRealPrice,jdbcType=DECIMAL}, ", + "#{payChannel,jdbcType=INTEGER}, #{paySerialNo,jdbcType=VARCHAR}, ", + "#{payType,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, ", + "#{logisticsStatusDesc,jdbcType=VARCHAR}, #{logisticsStatus,jdbcType=VARCHAR}, ", + "#{createTime,jdbcType=TIMESTAMP}, #{payTime,jdbcType=TIMESTAMP}, ", + "#{cancelTime,jdbcType=TIMESTAMP}, #{refundTime,jdbcType=TIMESTAMP}, ", + "#{finishTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, ", + "#{exceptionStatus,jdbcType=BIT}, #{exceptionMsg,jdbcType=VARCHAR}, ", + "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" }) @Options(useGeneratedKeys=true,keyProperty="id") int insert(BsOrderGoods record); @@ -117,6 +117,7 @@ public interface BsOrderGoodsMapper extends BsOrderGoodsMapperExt { @Result(column="total_deduction_price", property="totalDeductionPrice", jdbcType=JdbcType.DECIMAL), @Result(column="coupon_discount_price", property="couponDiscountPrice", jdbcType=JdbcType.DECIMAL), @Result(column="integral_discount_price", property="integralDiscountPrice", jdbcType=JdbcType.DECIMAL), + @Result(column="platform_code", property="platformCode", jdbcType=JdbcType.VARCHAR), @Result(column="pay_real_price", property="payRealPrice", jdbcType=JdbcType.DECIMAL), @Result(column="pay_channel", property="payChannel", jdbcType=JdbcType.INTEGER), @Result(column="pay_serial_no", property="paySerialNo", jdbcType=JdbcType.VARCHAR), @@ -144,8 +145,8 @@ public interface BsOrderGoodsMapper extends BsOrderGoodsMapperExt { "child_order_no, mer_id, mer_name, user_id, user_phone, goods_id, img, goods_name, ", "goods_type_id, goods_type_name, goods_brand_id, goods_brand_name, goods_specs_id, ", "goods_specs_name, goods_specs_original_price, goods_count, total_price, total_deduction_price, ", - "coupon_discount_price, integral_discount_price, pay_real_price, pay_channel, ", - "pay_serial_no, pay_type, `status`, logistics_status_desc, logistics_status, ", + "coupon_discount_price, integral_discount_price, platform_code, pay_real_price, ", + "pay_channel, pay_serial_no, pay_type, `status`, logistics_status_desc, logistics_status, ", "create_time, pay_time, cancel_time, refund_time, finish_time, update_time, exception_status, ", "exception_msg, ext_1, ext_2, ext_3", "from bs_order_goods", @@ -178,6 +179,7 @@ public interface BsOrderGoodsMapper extends BsOrderGoodsMapperExt { @Result(column="total_deduction_price", property="totalDeductionPrice", jdbcType=JdbcType.DECIMAL), @Result(column="coupon_discount_price", property="couponDiscountPrice", jdbcType=JdbcType.DECIMAL), @Result(column="integral_discount_price", property="integralDiscountPrice", jdbcType=JdbcType.DECIMAL), + @Result(column="platform_code", property="platformCode", jdbcType=JdbcType.VARCHAR), @Result(column="pay_real_price", property="payRealPrice", jdbcType=JdbcType.DECIMAL), @Result(column="pay_channel", property="payChannel", jdbcType=JdbcType.INTEGER), @Result(column="pay_serial_no", property="paySerialNo", jdbcType=JdbcType.VARCHAR), @@ -235,6 +237,7 @@ public interface BsOrderGoodsMapper extends BsOrderGoodsMapperExt { "total_deduction_price = #{totalDeductionPrice,jdbcType=DECIMAL},", "coupon_discount_price = #{couponDiscountPrice,jdbcType=DECIMAL},", "integral_discount_price = #{integralDiscountPrice,jdbcType=DECIMAL},", + "platform_code = #{platformCode,jdbcType=VARCHAR},", "pay_real_price = #{payRealPrice,jdbcType=DECIMAL},", "pay_channel = #{payChannel,jdbcType=INTEGER},", "pay_serial_no = #{paySerialNo,jdbcType=VARCHAR},", diff --git a/service/src/main/java/com/hfkj/dao/BsOrderGoodsSqlProvider.java b/service/src/main/java/com/hfkj/dao/BsOrderGoodsSqlProvider.java index 6c5c8e2..6dc8d10 100644 --- a/service/src/main/java/com/hfkj/dao/BsOrderGoodsSqlProvider.java +++ b/service/src/main/java/com/hfkj/dao/BsOrderGoodsSqlProvider.java @@ -128,6 +128,10 @@ public class BsOrderGoodsSqlProvider { sql.VALUES("integral_discount_price", "#{integralDiscountPrice,jdbcType=DECIMAL}"); } + if (record.getPlatformCode() != null) { + sql.VALUES("platform_code", "#{platformCode,jdbcType=VARCHAR}"); + } + if (record.getPayRealPrice() != null) { sql.VALUES("pay_real_price", "#{payRealPrice,jdbcType=DECIMAL}"); } @@ -235,6 +239,7 @@ public class BsOrderGoodsSqlProvider { sql.SELECT("total_deduction_price"); sql.SELECT("coupon_discount_price"); sql.SELECT("integral_discount_price"); + sql.SELECT("platform_code"); sql.SELECT("pay_real_price"); sql.SELECT("pay_channel"); sql.SELECT("pay_serial_no"); @@ -374,6 +379,10 @@ public class BsOrderGoodsSqlProvider { sql.SET("integral_discount_price = #{record.integralDiscountPrice,jdbcType=DECIMAL}"); } + if (record.getPlatformCode() != null) { + sql.SET("platform_code = #{record.platformCode,jdbcType=VARCHAR}"); + } + if (record.getPayRealPrice() != null) { sql.SET("pay_real_price = #{record.payRealPrice,jdbcType=DECIMAL}"); } @@ -480,6 +489,7 @@ public class BsOrderGoodsSqlProvider { sql.SET("total_deduction_price = #{record.totalDeductionPrice,jdbcType=DECIMAL}"); sql.SET("coupon_discount_price = #{record.couponDiscountPrice,jdbcType=DECIMAL}"); sql.SET("integral_discount_price = #{record.integralDiscountPrice,jdbcType=DECIMAL}"); + sql.SET("platform_code = #{record.platformCode,jdbcType=VARCHAR}"); sql.SET("pay_real_price = #{record.payRealPrice,jdbcType=DECIMAL}"); sql.SET("pay_channel = #{record.payChannel,jdbcType=INTEGER}"); sql.SET("pay_serial_no = #{record.paySerialNo,jdbcType=VARCHAR}"); @@ -608,6 +618,10 @@ public class BsOrderGoodsSqlProvider { sql.SET("integral_discount_price = #{integralDiscountPrice,jdbcType=DECIMAL}"); } + if (record.getPlatformCode() != null) { + sql.SET("platform_code = #{platformCode,jdbcType=VARCHAR}"); + } + if (record.getPayRealPrice() != null) { sql.SET("pay_real_price = #{payRealPrice,jdbcType=DECIMAL}"); } diff --git a/service/src/main/java/com/hfkj/dao/BsOrderMemberMapper.java b/service/src/main/java/com/hfkj/dao/BsOrderMemberMapper.java new file mode 100644 index 0000000..db5c236 --- /dev/null +++ b/service/src/main/java/com/hfkj/dao/BsOrderMemberMapper.java @@ -0,0 +1,239 @@ +package com.hfkj.dao; + +import com.hfkj.entity.BsOrderMember; +import com.hfkj.entity.BsOrderMemberExample; +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 BsOrderMemberMapper extends BsOrderMemberMapperExt { + @SelectProvider(type=BsOrderMemberSqlProvider.class, method="countByExample") + long countByExample(BsOrderMemberExample example); + + @DeleteProvider(type=BsOrderMemberSqlProvider.class, method="deleteByExample") + int deleteByExample(BsOrderMemberExample example); + + @Delete({ + "delete from bs_order_member", + "where id = #{id,jdbcType=BIGINT}" + }) + int deleteByPrimaryKey(Long id); + + @Insert({ + "insert into bs_order_member (order_no, child_order_no, ", + "mer_id, platform_code, ", + "user_id, user_phone, ", + "goods_id, goods_name, ", + "goods_type_id, goods_type_name, ", + "goods_brand_id, goods_brand_name, ", + "goods_specs_id, goods_specs_name, ", + "goods_spesc_original_price, goods_spesc_sale_price, ", + "goods_vpd_id, goods_vpd_key, ", + "goods_vpd_source, goods_count, ", + "total_price, total_deduction_price, ", + "coupon_discount_price, integral_discount_price, ", + "pay_real_price, pay_channel, ", + "pay_serial_no, pay_type, ", + "`status`, create_time, ", + "pay_time, cancel_time, ", + "refund_time, finish_time, ", + "update_time, ext_1, ", + "ext_2, ext_3)", + "values (#{orderNo,jdbcType=VARCHAR}, #{childOrderNo,jdbcType=VARCHAR}, ", + "#{merId,jdbcType=BIGINT}, #{platformCode,jdbcType=VARCHAR}, ", + "#{userId,jdbcType=BIGINT}, #{userPhone,jdbcType=VARCHAR}, ", + "#{goodsId,jdbcType=BIGINT}, #{goodsName,jdbcType=VARCHAR}, ", + "#{goodsTypeId,jdbcType=BIGINT}, #{goodsTypeName,jdbcType=VARCHAR}, ", + "#{goodsBrandId,jdbcType=BIGINT}, #{goodsBrandName,jdbcType=VARCHAR}, ", + "#{goodsSpecsId,jdbcType=BIGINT}, #{goodsSpecsName,jdbcType=VARCHAR}, ", + "#{goodsSpescOriginalPrice,jdbcType=DECIMAL}, #{goodsSpescSalePrice,jdbcType=DECIMAL}, ", + "#{goodsVpdId,jdbcType=BIGINT}, #{goodsVpdKey,jdbcType=VARCHAR}, ", + "#{goodsVpdSource,jdbcType=INTEGER}, #{goodsCount,jdbcType=INTEGER}, ", + "#{totalPrice,jdbcType=DECIMAL}, #{totalDeductionPrice,jdbcType=DECIMAL}, ", + "#{couponDiscountPrice,jdbcType=DECIMAL}, #{integralDiscountPrice,jdbcType=DECIMAL}, ", + "#{payRealPrice,jdbcType=DECIMAL}, #{payChannel,jdbcType=INTEGER}, ", + "#{paySerialNo,jdbcType=VARCHAR}, #{payType,jdbcType=INTEGER}, ", + "#{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, ", + "#{payTime,jdbcType=TIMESTAMP}, #{cancelTime,jdbcType=TIMESTAMP}, ", + "#{refundTime,jdbcType=TIMESTAMP}, #{finishTime,jdbcType=TIMESTAMP}, ", + "#{updateTime,jdbcType=TIMESTAMP}, #{ext1,jdbcType=VARCHAR}, ", + "#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" + }) + @Options(useGeneratedKeys=true,keyProperty="id") + int insert(BsOrderMember record); + + @InsertProvider(type=BsOrderMemberSqlProvider.class, method="insertSelective") + @Options(useGeneratedKeys=true,keyProperty="id") + int insertSelective(BsOrderMember record); + + @SelectProvider(type=BsOrderMemberSqlProvider.class, method="selectByExample") + @Results({ + @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), + @Result(column="order_no", property="orderNo", jdbcType=JdbcType.VARCHAR), + @Result(column="child_order_no", property="childOrderNo", jdbcType=JdbcType.VARCHAR), + @Result(column="mer_id", property="merId", jdbcType=JdbcType.BIGINT), + @Result(column="platform_code", property="platformCode", jdbcType=JdbcType.VARCHAR), + @Result(column="user_id", property="userId", jdbcType=JdbcType.BIGINT), + @Result(column="user_phone", property="userPhone", jdbcType=JdbcType.VARCHAR), + @Result(column="goods_id", property="goodsId", jdbcType=JdbcType.BIGINT), + @Result(column="goods_name", property="goodsName", jdbcType=JdbcType.VARCHAR), + @Result(column="goods_type_id", property="goodsTypeId", jdbcType=JdbcType.BIGINT), + @Result(column="goods_type_name", property="goodsTypeName", jdbcType=JdbcType.VARCHAR), + @Result(column="goods_brand_id", property="goodsBrandId", jdbcType=JdbcType.BIGINT), + @Result(column="goods_brand_name", property="goodsBrandName", jdbcType=JdbcType.VARCHAR), + @Result(column="goods_specs_id", property="goodsSpecsId", jdbcType=JdbcType.BIGINT), + @Result(column="goods_specs_name", property="goodsSpecsName", jdbcType=JdbcType.VARCHAR), + @Result(column="goods_spesc_original_price", property="goodsSpescOriginalPrice", jdbcType=JdbcType.DECIMAL), + @Result(column="goods_spesc_sale_price", property="goodsSpescSalePrice", jdbcType=JdbcType.DECIMAL), + @Result(column="goods_vpd_id", property="goodsVpdId", jdbcType=JdbcType.BIGINT), + @Result(column="goods_vpd_key", property="goodsVpdKey", jdbcType=JdbcType.VARCHAR), + @Result(column="goods_vpd_source", property="goodsVpdSource", jdbcType=JdbcType.INTEGER), + @Result(column="goods_count", property="goodsCount", jdbcType=JdbcType.INTEGER), + @Result(column="total_price", property="totalPrice", jdbcType=JdbcType.DECIMAL), + @Result(column="total_deduction_price", property="totalDeductionPrice", jdbcType=JdbcType.DECIMAL), + @Result(column="coupon_discount_price", property="couponDiscountPrice", jdbcType=JdbcType.DECIMAL), + @Result(column="integral_discount_price", property="integralDiscountPrice", jdbcType=JdbcType.DECIMAL), + @Result(column="pay_real_price", property="payRealPrice", jdbcType=JdbcType.DECIMAL), + @Result(column="pay_channel", property="payChannel", jdbcType=JdbcType.INTEGER), + @Result(column="pay_serial_no", property="paySerialNo", jdbcType=JdbcType.VARCHAR), + @Result(column="pay_type", property="payType", jdbcType=JdbcType.INTEGER), + @Result(column="status", property="status", jdbcType=JdbcType.INTEGER), + @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP), + @Result(column="pay_time", property="payTime", jdbcType=JdbcType.TIMESTAMP), + @Result(column="cancel_time", property="cancelTime", jdbcType=JdbcType.TIMESTAMP), + @Result(column="refund_time", property="refundTime", jdbcType=JdbcType.TIMESTAMP), + @Result(column="finish_time", property="finishTime", 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(BsOrderMemberExample example); + + @Select({ + "select", + "id, order_no, child_order_no, mer_id, platform_code, user_id, user_phone, goods_id, ", + "goods_name, goods_type_id, goods_type_name, goods_brand_id, goods_brand_name, ", + "goods_specs_id, goods_specs_name, goods_spesc_original_price, goods_spesc_sale_price, ", + "goods_vpd_id, goods_vpd_key, goods_vpd_source, goods_count, total_price, total_deduction_price, ", + "coupon_discount_price, integral_discount_price, pay_real_price, pay_channel, ", + "pay_serial_no, pay_type, `status`, create_time, pay_time, cancel_time, refund_time, ", + "finish_time, update_time, ext_1, ext_2, ext_3", + "from bs_order_member", + "where id = #{id,jdbcType=BIGINT}" + }) + @Results({ + @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), + @Result(column="order_no", property="orderNo", jdbcType=JdbcType.VARCHAR), + @Result(column="child_order_no", property="childOrderNo", jdbcType=JdbcType.VARCHAR), + @Result(column="mer_id", property="merId", jdbcType=JdbcType.BIGINT), + @Result(column="platform_code", property="platformCode", jdbcType=JdbcType.VARCHAR), + @Result(column="user_id", property="userId", jdbcType=JdbcType.BIGINT), + @Result(column="user_phone", property="userPhone", jdbcType=JdbcType.VARCHAR), + @Result(column="goods_id", property="goodsId", jdbcType=JdbcType.BIGINT), + @Result(column="goods_name", property="goodsName", jdbcType=JdbcType.VARCHAR), + @Result(column="goods_type_id", property="goodsTypeId", jdbcType=JdbcType.BIGINT), + @Result(column="goods_type_name", property="goodsTypeName", jdbcType=JdbcType.VARCHAR), + @Result(column="goods_brand_id", property="goodsBrandId", jdbcType=JdbcType.BIGINT), + @Result(column="goods_brand_name", property="goodsBrandName", jdbcType=JdbcType.VARCHAR), + @Result(column="goods_specs_id", property="goodsSpecsId", jdbcType=JdbcType.BIGINT), + @Result(column="goods_specs_name", property="goodsSpecsName", jdbcType=JdbcType.VARCHAR), + @Result(column="goods_spesc_original_price", property="goodsSpescOriginalPrice", jdbcType=JdbcType.DECIMAL), + @Result(column="goods_spesc_sale_price", property="goodsSpescSalePrice", jdbcType=JdbcType.DECIMAL), + @Result(column="goods_vpd_id", property="goodsVpdId", jdbcType=JdbcType.BIGINT), + @Result(column="goods_vpd_key", property="goodsVpdKey", jdbcType=JdbcType.VARCHAR), + @Result(column="goods_vpd_source", property="goodsVpdSource", jdbcType=JdbcType.INTEGER), + @Result(column="goods_count", property="goodsCount", jdbcType=JdbcType.INTEGER), + @Result(column="total_price", property="totalPrice", jdbcType=JdbcType.DECIMAL), + @Result(column="total_deduction_price", property="totalDeductionPrice", jdbcType=JdbcType.DECIMAL), + @Result(column="coupon_discount_price", property="couponDiscountPrice", jdbcType=JdbcType.DECIMAL), + @Result(column="integral_discount_price", property="integralDiscountPrice", jdbcType=JdbcType.DECIMAL), + @Result(column="pay_real_price", property="payRealPrice", jdbcType=JdbcType.DECIMAL), + @Result(column="pay_channel", property="payChannel", jdbcType=JdbcType.INTEGER), + @Result(column="pay_serial_no", property="paySerialNo", jdbcType=JdbcType.VARCHAR), + @Result(column="pay_type", property="payType", jdbcType=JdbcType.INTEGER), + @Result(column="status", property="status", jdbcType=JdbcType.INTEGER), + @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP), + @Result(column="pay_time", property="payTime", jdbcType=JdbcType.TIMESTAMP), + @Result(column="cancel_time", property="cancelTime", jdbcType=JdbcType.TIMESTAMP), + @Result(column="refund_time", property="refundTime", jdbcType=JdbcType.TIMESTAMP), + @Result(column="finish_time", property="finishTime", 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) + }) + BsOrderMember selectByPrimaryKey(Long id); + + @UpdateProvider(type=BsOrderMemberSqlProvider.class, method="updateByExampleSelective") + int updateByExampleSelective(@Param("record") BsOrderMember record, @Param("example") BsOrderMemberExample example); + + @UpdateProvider(type=BsOrderMemberSqlProvider.class, method="updateByExample") + int updateByExample(@Param("record") BsOrderMember record, @Param("example") BsOrderMemberExample example); + + @UpdateProvider(type=BsOrderMemberSqlProvider.class, method="updateByPrimaryKeySelective") + int updateByPrimaryKeySelective(BsOrderMember record); + + @Update({ + "update bs_order_member", + "set order_no = #{orderNo,jdbcType=VARCHAR},", + "child_order_no = #{childOrderNo,jdbcType=VARCHAR},", + "mer_id = #{merId,jdbcType=BIGINT},", + "platform_code = #{platformCode,jdbcType=VARCHAR},", + "user_id = #{userId,jdbcType=BIGINT},", + "user_phone = #{userPhone,jdbcType=VARCHAR},", + "goods_id = #{goodsId,jdbcType=BIGINT},", + "goods_name = #{goodsName,jdbcType=VARCHAR},", + "goods_type_id = #{goodsTypeId,jdbcType=BIGINT},", + "goods_type_name = #{goodsTypeName,jdbcType=VARCHAR},", + "goods_brand_id = #{goodsBrandId,jdbcType=BIGINT},", + "goods_brand_name = #{goodsBrandName,jdbcType=VARCHAR},", + "goods_specs_id = #{goodsSpecsId,jdbcType=BIGINT},", + "goods_specs_name = #{goodsSpecsName,jdbcType=VARCHAR},", + "goods_spesc_original_price = #{goodsSpescOriginalPrice,jdbcType=DECIMAL},", + "goods_spesc_sale_price = #{goodsSpescSalePrice,jdbcType=DECIMAL},", + "goods_vpd_id = #{goodsVpdId,jdbcType=BIGINT},", + "goods_vpd_key = #{goodsVpdKey,jdbcType=VARCHAR},", + "goods_vpd_source = #{goodsVpdSource,jdbcType=INTEGER},", + "goods_count = #{goodsCount,jdbcType=INTEGER},", + "total_price = #{totalPrice,jdbcType=DECIMAL},", + "total_deduction_price = #{totalDeductionPrice,jdbcType=DECIMAL},", + "coupon_discount_price = #{couponDiscountPrice,jdbcType=DECIMAL},", + "integral_discount_price = #{integralDiscountPrice,jdbcType=DECIMAL},", + "pay_real_price = #{payRealPrice,jdbcType=DECIMAL},", + "pay_channel = #{payChannel,jdbcType=INTEGER},", + "pay_serial_no = #{paySerialNo,jdbcType=VARCHAR},", + "pay_type = #{payType,jdbcType=INTEGER},", + "`status` = #{status,jdbcType=INTEGER},", + "create_time = #{createTime,jdbcType=TIMESTAMP},", + "pay_time = #{payTime,jdbcType=TIMESTAMP},", + "cancel_time = #{cancelTime,jdbcType=TIMESTAMP},", + "refund_time = #{refundTime,jdbcType=TIMESTAMP},", + "finish_time = #{finishTime,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(BsOrderMember record); +} \ No newline at end of file diff --git a/service/src/main/java/com/hfkj/dao/BsOrderMemberMapperExt.java b/service/src/main/java/com/hfkj/dao/BsOrderMemberMapperExt.java new file mode 100644 index 0000000..f534cc5 --- /dev/null +++ b/service/src/main/java/com/hfkj/dao/BsOrderMemberMapperExt.java @@ -0,0 +1,7 @@ +package com.hfkj.dao; + +/** + * mapper扩展类 + */ +public interface BsOrderMemberMapperExt { +} \ No newline at end of file diff --git a/service/src/main/java/com/hfkj/dao/BsOrderMemberSqlProvider.java b/service/src/main/java/com/hfkj/dao/BsOrderMemberSqlProvider.java new file mode 100644 index 0000000..5eab2a7 --- /dev/null +++ b/service/src/main/java/com/hfkj/dao/BsOrderMemberSqlProvider.java @@ -0,0 +1,710 @@ +package com.hfkj.dao; + +import com.hfkj.entity.BsOrderMember; +import com.hfkj.entity.BsOrderMemberExample.Criteria; +import com.hfkj.entity.BsOrderMemberExample.Criterion; +import com.hfkj.entity.BsOrderMemberExample; +import java.util.List; +import java.util.Map; +import org.apache.ibatis.jdbc.SQL; + +public class BsOrderMemberSqlProvider { + + public String countByExample(BsOrderMemberExample example) { + SQL sql = new SQL(); + sql.SELECT("count(*)").FROM("bs_order_member"); + applyWhere(sql, example, false); + return sql.toString(); + } + + public String deleteByExample(BsOrderMemberExample example) { + SQL sql = new SQL(); + sql.DELETE_FROM("bs_order_member"); + applyWhere(sql, example, false); + return sql.toString(); + } + + public String insertSelective(BsOrderMember record) { + SQL sql = new SQL(); + sql.INSERT_INTO("bs_order_member"); + + if (record.getOrderNo() != null) { + sql.VALUES("order_no", "#{orderNo,jdbcType=VARCHAR}"); + } + + if (record.getChildOrderNo() != null) { + sql.VALUES("child_order_no", "#{childOrderNo,jdbcType=VARCHAR}"); + } + + if (record.getMerId() != null) { + sql.VALUES("mer_id", "#{merId,jdbcType=BIGINT}"); + } + + if (record.getPlatformCode() != null) { + sql.VALUES("platform_code", "#{platformCode,jdbcType=VARCHAR}"); + } + + if (record.getUserId() != null) { + sql.VALUES("user_id", "#{userId,jdbcType=BIGINT}"); + } + + if (record.getUserPhone() != null) { + sql.VALUES("user_phone", "#{userPhone,jdbcType=VARCHAR}"); + } + + if (record.getGoodsId() != null) { + sql.VALUES("goods_id", "#{goodsId,jdbcType=BIGINT}"); + } + + if (record.getGoodsName() != null) { + sql.VALUES("goods_name", "#{goodsName,jdbcType=VARCHAR}"); + } + + if (record.getGoodsTypeId() != null) { + sql.VALUES("goods_type_id", "#{goodsTypeId,jdbcType=BIGINT}"); + } + + if (record.getGoodsTypeName() != null) { + sql.VALUES("goods_type_name", "#{goodsTypeName,jdbcType=VARCHAR}"); + } + + if (record.getGoodsBrandId() != null) { + sql.VALUES("goods_brand_id", "#{goodsBrandId,jdbcType=BIGINT}"); + } + + if (record.getGoodsBrandName() != null) { + sql.VALUES("goods_brand_name", "#{goodsBrandName,jdbcType=VARCHAR}"); + } + + if (record.getGoodsSpecsId() != null) { + sql.VALUES("goods_specs_id", "#{goodsSpecsId,jdbcType=BIGINT}"); + } + + if (record.getGoodsSpecsName() != null) { + sql.VALUES("goods_specs_name", "#{goodsSpecsName,jdbcType=VARCHAR}"); + } + + if (record.getGoodsSpescOriginalPrice() != null) { + sql.VALUES("goods_spesc_original_price", "#{goodsSpescOriginalPrice,jdbcType=DECIMAL}"); + } + + if (record.getGoodsSpescSalePrice() != null) { + sql.VALUES("goods_spesc_sale_price", "#{goodsSpescSalePrice,jdbcType=DECIMAL}"); + } + + if (record.getGoodsVpdId() != null) { + sql.VALUES("goods_vpd_id", "#{goodsVpdId,jdbcType=BIGINT}"); + } + + if (record.getGoodsVpdKey() != null) { + sql.VALUES("goods_vpd_key", "#{goodsVpdKey,jdbcType=VARCHAR}"); + } + + if (record.getGoodsVpdSource() != null) { + sql.VALUES("goods_vpd_source", "#{goodsVpdSource,jdbcType=INTEGER}"); + } + + if (record.getGoodsCount() != null) { + sql.VALUES("goods_count", "#{goodsCount,jdbcType=INTEGER}"); + } + + if (record.getTotalPrice() != null) { + sql.VALUES("total_price", "#{totalPrice,jdbcType=DECIMAL}"); + } + + if (record.getTotalDeductionPrice() != null) { + sql.VALUES("total_deduction_price", "#{totalDeductionPrice,jdbcType=DECIMAL}"); + } + + if (record.getCouponDiscountPrice() != null) { + sql.VALUES("coupon_discount_price", "#{couponDiscountPrice,jdbcType=DECIMAL}"); + } + + if (record.getIntegralDiscountPrice() != null) { + sql.VALUES("integral_discount_price", "#{integralDiscountPrice,jdbcType=DECIMAL}"); + } + + if (record.getPayRealPrice() != null) { + sql.VALUES("pay_real_price", "#{payRealPrice,jdbcType=DECIMAL}"); + } + + if (record.getPayChannel() != null) { + sql.VALUES("pay_channel", "#{payChannel,jdbcType=INTEGER}"); + } + + if (record.getPaySerialNo() != null) { + sql.VALUES("pay_serial_no", "#{paySerialNo,jdbcType=VARCHAR}"); + } + + if (record.getPayType() != null) { + sql.VALUES("pay_type", "#{payType,jdbcType=INTEGER}"); + } + + if (record.getStatus() != null) { + sql.VALUES("`status`", "#{status,jdbcType=INTEGER}"); + } + + if (record.getCreateTime() != null) { + sql.VALUES("create_time", "#{createTime,jdbcType=TIMESTAMP}"); + } + + if (record.getPayTime() != null) { + sql.VALUES("pay_time", "#{payTime,jdbcType=TIMESTAMP}"); + } + + if (record.getCancelTime() != null) { + sql.VALUES("cancel_time", "#{cancelTime,jdbcType=TIMESTAMP}"); + } + + if (record.getRefundTime() != null) { + sql.VALUES("refund_time", "#{refundTime,jdbcType=TIMESTAMP}"); + } + + if (record.getFinishTime() != null) { + sql.VALUES("finish_time", "#{finishTime,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(BsOrderMemberExample example) { + SQL sql = new SQL(); + if (example != null && example.isDistinct()) { + sql.SELECT_DISTINCT("id"); + } else { + sql.SELECT("id"); + } + sql.SELECT("order_no"); + sql.SELECT("child_order_no"); + sql.SELECT("mer_id"); + sql.SELECT("platform_code"); + sql.SELECT("user_id"); + sql.SELECT("user_phone"); + sql.SELECT("goods_id"); + sql.SELECT("goods_name"); + sql.SELECT("goods_type_id"); + sql.SELECT("goods_type_name"); + sql.SELECT("goods_brand_id"); + sql.SELECT("goods_brand_name"); + sql.SELECT("goods_specs_id"); + sql.SELECT("goods_specs_name"); + sql.SELECT("goods_spesc_original_price"); + sql.SELECT("goods_spesc_sale_price"); + sql.SELECT("goods_vpd_id"); + sql.SELECT("goods_vpd_key"); + sql.SELECT("goods_vpd_source"); + sql.SELECT("goods_count"); + sql.SELECT("total_price"); + sql.SELECT("total_deduction_price"); + sql.SELECT("coupon_discount_price"); + sql.SELECT("integral_discount_price"); + sql.SELECT("pay_real_price"); + sql.SELECT("pay_channel"); + sql.SELECT("pay_serial_no"); + sql.SELECT("pay_type"); + sql.SELECT("`status`"); + sql.SELECT("create_time"); + sql.SELECT("pay_time"); + sql.SELECT("cancel_time"); + sql.SELECT("refund_time"); + sql.SELECT("finish_time"); + sql.SELECT("update_time"); + sql.SELECT("ext_1"); + sql.SELECT("ext_2"); + sql.SELECT("ext_3"); + sql.FROM("bs_order_member"); + applyWhere(sql, example, false); + + if (example != null && example.getOrderByClause() != null) { + sql.ORDER_BY(example.getOrderByClause()); + } + + return sql.toString(); + } + + public String updateByExampleSelective(Map parameter) { + BsOrderMember record = (BsOrderMember) parameter.get("record"); + BsOrderMemberExample example = (BsOrderMemberExample) parameter.get("example"); + + SQL sql = new SQL(); + sql.UPDATE("bs_order_member"); + + if (record.getId() != null) { + sql.SET("id = #{record.id,jdbcType=BIGINT}"); + } + + if (record.getOrderNo() != null) { + sql.SET("order_no = #{record.orderNo,jdbcType=VARCHAR}"); + } + + if (record.getChildOrderNo() != null) { + sql.SET("child_order_no = #{record.childOrderNo,jdbcType=VARCHAR}"); + } + + if (record.getMerId() != null) { + sql.SET("mer_id = #{record.merId,jdbcType=BIGINT}"); + } + + if (record.getPlatformCode() != null) { + sql.SET("platform_code = #{record.platformCode,jdbcType=VARCHAR}"); + } + + if (record.getUserId() != null) { + sql.SET("user_id = #{record.userId,jdbcType=BIGINT}"); + } + + if (record.getUserPhone() != null) { + sql.SET("user_phone = #{record.userPhone,jdbcType=VARCHAR}"); + } + + if (record.getGoodsId() != null) { + sql.SET("goods_id = #{record.goodsId,jdbcType=BIGINT}"); + } + + if (record.getGoodsName() != null) { + sql.SET("goods_name = #{record.goodsName,jdbcType=VARCHAR}"); + } + + if (record.getGoodsTypeId() != null) { + sql.SET("goods_type_id = #{record.goodsTypeId,jdbcType=BIGINT}"); + } + + if (record.getGoodsTypeName() != null) { + sql.SET("goods_type_name = #{record.goodsTypeName,jdbcType=VARCHAR}"); + } + + if (record.getGoodsBrandId() != null) { + sql.SET("goods_brand_id = #{record.goodsBrandId,jdbcType=BIGINT}"); + } + + if (record.getGoodsBrandName() != null) { + sql.SET("goods_brand_name = #{record.goodsBrandName,jdbcType=VARCHAR}"); + } + + if (record.getGoodsSpecsId() != null) { + sql.SET("goods_specs_id = #{record.goodsSpecsId,jdbcType=BIGINT}"); + } + + if (record.getGoodsSpecsName() != null) { + sql.SET("goods_specs_name = #{record.goodsSpecsName,jdbcType=VARCHAR}"); + } + + if (record.getGoodsSpescOriginalPrice() != null) { + sql.SET("goods_spesc_original_price = #{record.goodsSpescOriginalPrice,jdbcType=DECIMAL}"); + } + + if (record.getGoodsSpescSalePrice() != null) { + sql.SET("goods_spesc_sale_price = #{record.goodsSpescSalePrice,jdbcType=DECIMAL}"); + } + + if (record.getGoodsVpdId() != null) { + sql.SET("goods_vpd_id = #{record.goodsVpdId,jdbcType=BIGINT}"); + } + + if (record.getGoodsVpdKey() != null) { + sql.SET("goods_vpd_key = #{record.goodsVpdKey,jdbcType=VARCHAR}"); + } + + if (record.getGoodsVpdSource() != null) { + sql.SET("goods_vpd_source = #{record.goodsVpdSource,jdbcType=INTEGER}"); + } + + if (record.getGoodsCount() != null) { + sql.SET("goods_count = #{record.goodsCount,jdbcType=INTEGER}"); + } + + if (record.getTotalPrice() != null) { + sql.SET("total_price = #{record.totalPrice,jdbcType=DECIMAL}"); + } + + if (record.getTotalDeductionPrice() != null) { + sql.SET("total_deduction_price = #{record.totalDeductionPrice,jdbcType=DECIMAL}"); + } + + if (record.getCouponDiscountPrice() != null) { + sql.SET("coupon_discount_price = #{record.couponDiscountPrice,jdbcType=DECIMAL}"); + } + + if (record.getIntegralDiscountPrice() != null) { + sql.SET("integral_discount_price = #{record.integralDiscountPrice,jdbcType=DECIMAL}"); + } + + if (record.getPayRealPrice() != null) { + sql.SET("pay_real_price = #{record.payRealPrice,jdbcType=DECIMAL}"); + } + + if (record.getPayChannel() != null) { + sql.SET("pay_channel = #{record.payChannel,jdbcType=INTEGER}"); + } + + if (record.getPaySerialNo() != null) { + sql.SET("pay_serial_no = #{record.paySerialNo,jdbcType=VARCHAR}"); + } + + if (record.getPayType() != null) { + sql.SET("pay_type = #{record.payType,jdbcType=INTEGER}"); + } + + if (record.getStatus() != null) { + sql.SET("`status` = #{record.status,jdbcType=INTEGER}"); + } + + if (record.getCreateTime() != null) { + sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}"); + } + + if (record.getPayTime() != null) { + sql.SET("pay_time = #{record.payTime,jdbcType=TIMESTAMP}"); + } + + if (record.getCancelTime() != null) { + sql.SET("cancel_time = #{record.cancelTime,jdbcType=TIMESTAMP}"); + } + + if (record.getRefundTime() != null) { + sql.SET("refund_time = #{record.refundTime,jdbcType=TIMESTAMP}"); + } + + if (record.getFinishTime() != null) { + sql.SET("finish_time = #{record.finishTime,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("bs_order_member"); + + sql.SET("id = #{record.id,jdbcType=BIGINT}"); + sql.SET("order_no = #{record.orderNo,jdbcType=VARCHAR}"); + sql.SET("child_order_no = #{record.childOrderNo,jdbcType=VARCHAR}"); + sql.SET("mer_id = #{record.merId,jdbcType=BIGINT}"); + sql.SET("platform_code = #{record.platformCode,jdbcType=VARCHAR}"); + sql.SET("user_id = #{record.userId,jdbcType=BIGINT}"); + sql.SET("user_phone = #{record.userPhone,jdbcType=VARCHAR}"); + sql.SET("goods_id = #{record.goodsId,jdbcType=BIGINT}"); + sql.SET("goods_name = #{record.goodsName,jdbcType=VARCHAR}"); + sql.SET("goods_type_id = #{record.goodsTypeId,jdbcType=BIGINT}"); + sql.SET("goods_type_name = #{record.goodsTypeName,jdbcType=VARCHAR}"); + sql.SET("goods_brand_id = #{record.goodsBrandId,jdbcType=BIGINT}"); + sql.SET("goods_brand_name = #{record.goodsBrandName,jdbcType=VARCHAR}"); + sql.SET("goods_specs_id = #{record.goodsSpecsId,jdbcType=BIGINT}"); + sql.SET("goods_specs_name = #{record.goodsSpecsName,jdbcType=VARCHAR}"); + sql.SET("goods_spesc_original_price = #{record.goodsSpescOriginalPrice,jdbcType=DECIMAL}"); + sql.SET("goods_spesc_sale_price = #{record.goodsSpescSalePrice,jdbcType=DECIMAL}"); + sql.SET("goods_vpd_id = #{record.goodsVpdId,jdbcType=BIGINT}"); + sql.SET("goods_vpd_key = #{record.goodsVpdKey,jdbcType=VARCHAR}"); + sql.SET("goods_vpd_source = #{record.goodsVpdSource,jdbcType=INTEGER}"); + sql.SET("goods_count = #{record.goodsCount,jdbcType=INTEGER}"); + sql.SET("total_price = #{record.totalPrice,jdbcType=DECIMAL}"); + sql.SET("total_deduction_price = #{record.totalDeductionPrice,jdbcType=DECIMAL}"); + sql.SET("coupon_discount_price = #{record.couponDiscountPrice,jdbcType=DECIMAL}"); + sql.SET("integral_discount_price = #{record.integralDiscountPrice,jdbcType=DECIMAL}"); + sql.SET("pay_real_price = #{record.payRealPrice,jdbcType=DECIMAL}"); + sql.SET("pay_channel = #{record.payChannel,jdbcType=INTEGER}"); + sql.SET("pay_serial_no = #{record.paySerialNo,jdbcType=VARCHAR}"); + sql.SET("pay_type = #{record.payType,jdbcType=INTEGER}"); + sql.SET("`status` = #{record.status,jdbcType=INTEGER}"); + sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}"); + sql.SET("pay_time = #{record.payTime,jdbcType=TIMESTAMP}"); + sql.SET("cancel_time = #{record.cancelTime,jdbcType=TIMESTAMP}"); + sql.SET("refund_time = #{record.refundTime,jdbcType=TIMESTAMP}"); + sql.SET("finish_time = #{record.finishTime,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}"); + + BsOrderMemberExample example = (BsOrderMemberExample) parameter.get("example"); + applyWhere(sql, example, true); + return sql.toString(); + } + + public String updateByPrimaryKeySelective(BsOrderMember record) { + SQL sql = new SQL(); + sql.UPDATE("bs_order_member"); + + if (record.getOrderNo() != null) { + sql.SET("order_no = #{orderNo,jdbcType=VARCHAR}"); + } + + if (record.getChildOrderNo() != null) { + sql.SET("child_order_no = #{childOrderNo,jdbcType=VARCHAR}"); + } + + if (record.getMerId() != null) { + sql.SET("mer_id = #{merId,jdbcType=BIGINT}"); + } + + if (record.getPlatformCode() != null) { + sql.SET("platform_code = #{platformCode,jdbcType=VARCHAR}"); + } + + if (record.getUserId() != null) { + sql.SET("user_id = #{userId,jdbcType=BIGINT}"); + } + + if (record.getUserPhone() != null) { + sql.SET("user_phone = #{userPhone,jdbcType=VARCHAR}"); + } + + if (record.getGoodsId() != null) { + sql.SET("goods_id = #{goodsId,jdbcType=BIGINT}"); + } + + if (record.getGoodsName() != null) { + sql.SET("goods_name = #{goodsName,jdbcType=VARCHAR}"); + } + + if (record.getGoodsTypeId() != null) { + sql.SET("goods_type_id = #{goodsTypeId,jdbcType=BIGINT}"); + } + + if (record.getGoodsTypeName() != null) { + sql.SET("goods_type_name = #{goodsTypeName,jdbcType=VARCHAR}"); + } + + if (record.getGoodsBrandId() != null) { + sql.SET("goods_brand_id = #{goodsBrandId,jdbcType=BIGINT}"); + } + + if (record.getGoodsBrandName() != null) { + sql.SET("goods_brand_name = #{goodsBrandName,jdbcType=VARCHAR}"); + } + + if (record.getGoodsSpecsId() != null) { + sql.SET("goods_specs_id = #{goodsSpecsId,jdbcType=BIGINT}"); + } + + if (record.getGoodsSpecsName() != null) { + sql.SET("goods_specs_name = #{goodsSpecsName,jdbcType=VARCHAR}"); + } + + if (record.getGoodsSpescOriginalPrice() != null) { + sql.SET("goods_spesc_original_price = #{goodsSpescOriginalPrice,jdbcType=DECIMAL}"); + } + + if (record.getGoodsSpescSalePrice() != null) { + sql.SET("goods_spesc_sale_price = #{goodsSpescSalePrice,jdbcType=DECIMAL}"); + } + + if (record.getGoodsVpdId() != null) { + sql.SET("goods_vpd_id = #{goodsVpdId,jdbcType=BIGINT}"); + } + + if (record.getGoodsVpdKey() != null) { + sql.SET("goods_vpd_key = #{goodsVpdKey,jdbcType=VARCHAR}"); + } + + if (record.getGoodsVpdSource() != null) { + sql.SET("goods_vpd_source = #{goodsVpdSource,jdbcType=INTEGER}"); + } + + if (record.getGoodsCount() != null) { + sql.SET("goods_count = #{goodsCount,jdbcType=INTEGER}"); + } + + if (record.getTotalPrice() != null) { + sql.SET("total_price = #{totalPrice,jdbcType=DECIMAL}"); + } + + if (record.getTotalDeductionPrice() != null) { + sql.SET("total_deduction_price = #{totalDeductionPrice,jdbcType=DECIMAL}"); + } + + if (record.getCouponDiscountPrice() != null) { + sql.SET("coupon_discount_price = #{couponDiscountPrice,jdbcType=DECIMAL}"); + } + + if (record.getIntegralDiscountPrice() != null) { + sql.SET("integral_discount_price = #{integralDiscountPrice,jdbcType=DECIMAL}"); + } + + if (record.getPayRealPrice() != null) { + sql.SET("pay_real_price = #{payRealPrice,jdbcType=DECIMAL}"); + } + + if (record.getPayChannel() != null) { + sql.SET("pay_channel = #{payChannel,jdbcType=INTEGER}"); + } + + if (record.getPaySerialNo() != null) { + sql.SET("pay_serial_no = #{paySerialNo,jdbcType=VARCHAR}"); + } + + if (record.getPayType() != null) { + sql.SET("pay_type = #{payType,jdbcType=INTEGER}"); + } + + if (record.getStatus() != null) { + sql.SET("`status` = #{status,jdbcType=INTEGER}"); + } + + if (record.getCreateTime() != null) { + sql.SET("create_time = #{createTime,jdbcType=TIMESTAMP}"); + } + + if (record.getPayTime() != null) { + sql.SET("pay_time = #{payTime,jdbcType=TIMESTAMP}"); + } + + if (record.getCancelTime() != null) { + sql.SET("cancel_time = #{cancelTime,jdbcType=TIMESTAMP}"); + } + + if (record.getRefundTime() != null) { + sql.SET("refund_time = #{refundTime,jdbcType=TIMESTAMP}"); + } + + if (record.getFinishTime() != null) { + sql.SET("finish_time = #{finishTime,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, BsOrderMemberExample 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/service/src/main/java/com/hfkj/dao/BsOrderStarbucksMapper.java b/service/src/main/java/com/hfkj/dao/BsOrderStarbucksMapper.java index 4f6a741..28de64b 100644 --- a/service/src/main/java/com/hfkj/dao/BsOrderStarbucksMapper.java +++ b/service/src/main/java/com/hfkj/dao/BsOrderStarbucksMapper.java @@ -39,27 +39,27 @@ public interface BsOrderStarbucksMapper extends BsOrderStarbucksMapperExt { int deleteByPrimaryKey(Long id); @Insert({ - "insert into bs_order_starbucks (store_code, platform_unique_id, ", - "product_id, cup_size, ", - "temperature, cream, ", - "espresso, milk, ", - "milk_bubble, num, ", - "img, `name`, order_no, ", - "child_order_no, mer_id, ", - "user_id, user_phone, ", + "insert into bs_order_starbucks (store_code, platform_code, ", + "platform_unique_id, product_id, ", + "cup_size, temperature, ", + "cream, espresso, ", + "milk, milk_bubble, ", + "num, img, `name`, ", + "order_no, child_order_no, ", + "mer_id, user_id, user_phone, ", "price, store_address, ", "store_name, pay_type, ", "`status`, create_time, ", "update_time, ext_1, ", "ext_2, ext_3)", - "values (#{storeCode,jdbcType=VARCHAR}, #{platformUniqueId,jdbcType=VARCHAR}, ", - "#{productId,jdbcType=INTEGER}, #{cupSize,jdbcType=VARCHAR}, ", - "#{temperature,jdbcType=VARCHAR}, #{cream,jdbcType=VARCHAR}, ", - "#{espresso,jdbcType=VARCHAR}, #{milk,jdbcType=VARCHAR}, ", - "#{milkBubble,jdbcType=VARCHAR}, #{num,jdbcType=INTEGER}, ", - "#{img,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{orderNo,jdbcType=VARCHAR}, ", - "#{childOrderNo,jdbcType=VARCHAR}, #{merId,jdbcType=BIGINT}, ", - "#{userId,jdbcType=BIGINT}, #{userPhone,jdbcType=VARCHAR}, ", + "values (#{storeCode,jdbcType=VARCHAR}, #{platformCode,jdbcType=VARCHAR}, ", + "#{platformUniqueId,jdbcType=VARCHAR}, #{productId,jdbcType=INTEGER}, ", + "#{cupSize,jdbcType=VARCHAR}, #{temperature,jdbcType=VARCHAR}, ", + "#{cream,jdbcType=VARCHAR}, #{espresso,jdbcType=VARCHAR}, ", + "#{milk,jdbcType=VARCHAR}, #{milkBubble,jdbcType=VARCHAR}, ", + "#{num,jdbcType=INTEGER}, #{img,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, ", + "#{orderNo,jdbcType=VARCHAR}, #{childOrderNo,jdbcType=VARCHAR}, ", + "#{merId,jdbcType=BIGINT}, #{userId,jdbcType=BIGINT}, #{userPhone,jdbcType=VARCHAR}, ", "#{price,jdbcType=DECIMAL}, #{storeAddress,jdbcType=VARCHAR}, ", "#{storeName,jdbcType=VARCHAR}, #{payType,jdbcType=INTEGER}, ", "#{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, ", @@ -77,6 +77,7 @@ public interface BsOrderStarbucksMapper extends BsOrderStarbucksMapperExt { @Results({ @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), @Result(column="store_code", property="storeCode", jdbcType=JdbcType.VARCHAR), + @Result(column="platform_code", property="platformCode", jdbcType=JdbcType.VARCHAR), @Result(column="platform_unique_id", property="platformUniqueId", jdbcType=JdbcType.VARCHAR), @Result(column="product_id", property="productId", jdbcType=JdbcType.INTEGER), @Result(column="cup_size", property="cupSize", jdbcType=JdbcType.VARCHAR), @@ -108,16 +109,17 @@ public interface BsOrderStarbucksMapper extends BsOrderStarbucksMapperExt { @Select({ "select", - "id, store_code, platform_unique_id, product_id, cup_size, temperature, cream, ", - "espresso, milk, milk_bubble, num, img, `name`, order_no, child_order_no, mer_id, ", - "user_id, user_phone, price, store_address, store_name, pay_type, `status`, create_time, ", - "update_time, ext_1, ext_2, ext_3", + "id, store_code, platform_code, platform_unique_id, product_id, cup_size, temperature, ", + "cream, espresso, milk, milk_bubble, num, img, `name`, order_no, child_order_no, ", + "mer_id, user_id, user_phone, price, store_address, store_name, pay_type, `status`, ", + "create_time, update_time, ext_1, ext_2, ext_3", "from bs_order_starbucks", "where id = #{id,jdbcType=BIGINT}" }) @Results({ @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), @Result(column="store_code", property="storeCode", jdbcType=JdbcType.VARCHAR), + @Result(column="platform_code", property="platformCode", jdbcType=JdbcType.VARCHAR), @Result(column="platform_unique_id", property="platformUniqueId", jdbcType=JdbcType.VARCHAR), @Result(column="product_id", property="productId", jdbcType=JdbcType.INTEGER), @Result(column="cup_size", property="cupSize", jdbcType=JdbcType.VARCHAR), @@ -159,6 +161,7 @@ public interface BsOrderStarbucksMapper extends BsOrderStarbucksMapperExt { @Update({ "update bs_order_starbucks", "set store_code = #{storeCode,jdbcType=VARCHAR},", + "platform_code = #{platformCode,jdbcType=VARCHAR},", "platform_unique_id = #{platformUniqueId,jdbcType=VARCHAR},", "product_id = #{productId,jdbcType=INTEGER},", "cup_size = #{cupSize,jdbcType=VARCHAR},", diff --git a/service/src/main/java/com/hfkj/dao/BsOrderStarbucksSqlProvider.java b/service/src/main/java/com/hfkj/dao/BsOrderStarbucksSqlProvider.java index e4490fd..780ba8f 100644 --- a/service/src/main/java/com/hfkj/dao/BsOrderStarbucksSqlProvider.java +++ b/service/src/main/java/com/hfkj/dao/BsOrderStarbucksSqlProvider.java @@ -32,6 +32,10 @@ public class BsOrderStarbucksSqlProvider { sql.VALUES("store_code", "#{storeCode,jdbcType=VARCHAR}"); } + if (record.getPlatformCode() != null) { + sql.VALUES("platform_code", "#{platformCode,jdbcType=VARCHAR}"); + } + if (record.getPlatformUniqueId() != null) { sql.VALUES("platform_unique_id", "#{platformUniqueId,jdbcType=VARCHAR}"); } @@ -147,6 +151,7 @@ public class BsOrderStarbucksSqlProvider { sql.SELECT("id"); } sql.SELECT("store_code"); + sql.SELECT("platform_code"); sql.SELECT("platform_unique_id"); sql.SELECT("product_id"); sql.SELECT("cup_size"); @@ -198,6 +203,10 @@ public class BsOrderStarbucksSqlProvider { sql.SET("store_code = #{record.storeCode,jdbcType=VARCHAR}"); } + if (record.getPlatformCode() != null) { + sql.SET("platform_code = #{record.platformCode,jdbcType=VARCHAR}"); + } + if (record.getPlatformUniqueId() != null) { sql.SET("platform_unique_id = #{record.platformUniqueId,jdbcType=VARCHAR}"); } @@ -312,6 +321,7 @@ public class BsOrderStarbucksSqlProvider { sql.SET("id = #{record.id,jdbcType=BIGINT}"); sql.SET("store_code = #{record.storeCode,jdbcType=VARCHAR}"); + sql.SET("platform_code = #{record.platformCode,jdbcType=VARCHAR}"); sql.SET("platform_unique_id = #{record.platformUniqueId,jdbcType=VARCHAR}"); sql.SET("product_id = #{record.productId,jdbcType=INTEGER}"); sql.SET("cup_size = #{record.cupSize,jdbcType=VARCHAR}"); @@ -352,6 +362,10 @@ public class BsOrderStarbucksSqlProvider { sql.SET("store_code = #{storeCode,jdbcType=VARCHAR}"); } + if (record.getPlatformCode() != null) { + sql.SET("platform_code = #{platformCode,jdbcType=VARCHAR}"); + } + if (record.getPlatformUniqueId() != null) { sql.SET("platform_unique_id = #{platformUniqueId,jdbcType=VARCHAR}"); } diff --git a/service/src/main/java/com/hfkj/dao/SecConfigMapper.java b/service/src/main/java/com/hfkj/dao/SecConfigMapper.java new file mode 100644 index 0000000..6655c4f --- /dev/null +++ b/service/src/main/java/com/hfkj/dao/SecConfigMapper.java @@ -0,0 +1,89 @@ +package com.hfkj.dao; + +import com.hfkj.entity.SecConfig; +import com.hfkj.entity.SecConfigExample; +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 SecConfigMapper extends SecConfigMapperExt { + @SelectProvider(type=SecConfigSqlProvider.class, method="countByExample") + long countByExample(SecConfigExample example); + + @DeleteProvider(type=SecConfigSqlProvider.class, method="deleteByExample") + int deleteByExample(SecConfigExample example); + + @Delete({ + "delete from sec_config", + "where id = #{id,jdbcType=INTEGER}" + }) + int deleteByPrimaryKey(Integer id); + + @Insert({ + "insert into sec_config (code_type, code_value)", + "values (#{codeType,jdbcType=VARCHAR}, #{codeValue,jdbcType=VARCHAR})" + }) + @Options(useGeneratedKeys=true,keyProperty="id") + int insert(SecConfig record); + + @InsertProvider(type=SecConfigSqlProvider.class, method="insertSelective") + @Options(useGeneratedKeys=true,keyProperty="id") + int insertSelective(SecConfig record); + + @SelectProvider(type=SecConfigSqlProvider.class, method="selectByExample") + @Results({ + @Result(column="id", property="id", jdbcType=JdbcType.INTEGER, id=true), + @Result(column="code_type", property="codeType", jdbcType=JdbcType.VARCHAR), + @Result(column="code_value", property="codeValue", jdbcType=JdbcType.VARCHAR) + }) + List selectByExample(SecConfigExample example); + + @Select({ + "select", + "id, code_type, code_value", + "from sec_config", + "where id = #{id,jdbcType=INTEGER}" + }) + @Results({ + @Result(column="id", property="id", jdbcType=JdbcType.INTEGER, id=true), + @Result(column="code_type", property="codeType", jdbcType=JdbcType.VARCHAR), + @Result(column="code_value", property="codeValue", jdbcType=JdbcType.VARCHAR) + }) + SecConfig selectByPrimaryKey(Integer id); + + @UpdateProvider(type=SecConfigSqlProvider.class, method="updateByExampleSelective") + int updateByExampleSelective(@Param("record") SecConfig record, @Param("example") SecConfigExample example); + + @UpdateProvider(type=SecConfigSqlProvider.class, method="updateByExample") + int updateByExample(@Param("record") SecConfig record, @Param("example") SecConfigExample example); + + @UpdateProvider(type=SecConfigSqlProvider.class, method="updateByPrimaryKeySelective") + int updateByPrimaryKeySelective(SecConfig record); + + @Update({ + "update sec_config", + "set code_type = #{codeType,jdbcType=VARCHAR},", + "code_value = #{codeValue,jdbcType=VARCHAR}", + "where id = #{id,jdbcType=INTEGER}" + }) + int updateByPrimaryKey(SecConfig record); +} \ No newline at end of file diff --git a/service/src/main/java/com/hfkj/dao/SecConfigMapperExt.java b/service/src/main/java/com/hfkj/dao/SecConfigMapperExt.java new file mode 100644 index 0000000..0fde19d --- /dev/null +++ b/service/src/main/java/com/hfkj/dao/SecConfigMapperExt.java @@ -0,0 +1,7 @@ +package com.hfkj.dao; + +/** + * mapper扩展类 + */ +public interface SecConfigMapperExt { +} \ No newline at end of file diff --git a/service/src/main/java/com/hfkj/dao/SecConfigSqlProvider.java b/service/src/main/java/com/hfkj/dao/SecConfigSqlProvider.java new file mode 100644 index 0000000..4db36e1 --- /dev/null +++ b/service/src/main/java/com/hfkj/dao/SecConfigSqlProvider.java @@ -0,0 +1,206 @@ +package com.hfkj.dao; + +import com.hfkj.entity.SecConfig; +import com.hfkj.entity.SecConfigExample.Criteria; +import com.hfkj.entity.SecConfigExample.Criterion; +import com.hfkj.entity.SecConfigExample; +import java.util.List; +import java.util.Map; +import org.apache.ibatis.jdbc.SQL; + +public class SecConfigSqlProvider { + + public String countByExample(SecConfigExample example) { + SQL sql = new SQL(); + sql.SELECT("count(*)").FROM("sec_config"); + applyWhere(sql, example, false); + return sql.toString(); + } + + public String deleteByExample(SecConfigExample example) { + SQL sql = new SQL(); + sql.DELETE_FROM("sec_config"); + applyWhere(sql, example, false); + return sql.toString(); + } + + public String insertSelective(SecConfig record) { + SQL sql = new SQL(); + sql.INSERT_INTO("sec_config"); + + if (record.getCodeType() != null) { + sql.VALUES("code_type", "#{codeType,jdbcType=VARCHAR}"); + } + + if (record.getCodeValue() != null) { + sql.VALUES("code_value", "#{codeValue,jdbcType=VARCHAR}"); + } + + return sql.toString(); + } + + public String selectByExample(SecConfigExample example) { + SQL sql = new SQL(); + if (example != null && example.isDistinct()) { + sql.SELECT_DISTINCT("id"); + } else { + sql.SELECT("id"); + } + sql.SELECT("code_type"); + sql.SELECT("code_value"); + sql.FROM("sec_config"); + applyWhere(sql, example, false); + + if (example != null && example.getOrderByClause() != null) { + sql.ORDER_BY(example.getOrderByClause()); + } + + return sql.toString(); + } + + public String updateByExampleSelective(Map parameter) { + SecConfig record = (SecConfig) parameter.get("record"); + SecConfigExample example = (SecConfigExample) parameter.get("example"); + + SQL sql = new SQL(); + sql.UPDATE("sec_config"); + + if (record.getId() != null) { + sql.SET("id = #{record.id,jdbcType=INTEGER}"); + } + + if (record.getCodeType() != null) { + sql.SET("code_type = #{record.codeType,jdbcType=VARCHAR}"); + } + + if (record.getCodeValue() != null) { + sql.SET("code_value = #{record.codeValue,jdbcType=VARCHAR}"); + } + + applyWhere(sql, example, true); + return sql.toString(); + } + + public String updateByExample(Map parameter) { + SQL sql = new SQL(); + sql.UPDATE("sec_config"); + + sql.SET("id = #{record.id,jdbcType=INTEGER}"); + sql.SET("code_type = #{record.codeType,jdbcType=VARCHAR}"); + sql.SET("code_value = #{record.codeValue,jdbcType=VARCHAR}"); + + SecConfigExample example = (SecConfigExample) parameter.get("example"); + applyWhere(sql, example, true); + return sql.toString(); + } + + public String updateByPrimaryKeySelective(SecConfig record) { + SQL sql = new SQL(); + sql.UPDATE("sec_config"); + + if (record.getCodeType() != null) { + sql.SET("code_type = #{codeType,jdbcType=VARCHAR}"); + } + + if (record.getCodeValue() != null) { + sql.SET("code_value = #{codeValue,jdbcType=VARCHAR}"); + } + + sql.WHERE("id = #{id,jdbcType=INTEGER}"); + + return sql.toString(); + } + + protected void applyWhere(SQL sql, SecConfigExample 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/service/src/main/java/com/hfkj/dao/SecUserMapper.java b/service/src/main/java/com/hfkj/dao/SecUserMapper.java index 0d7529f..12b84bc 100644 --- a/service/src/main/java/com/hfkj/dao/SecUserMapper.java +++ b/service/src/main/java/com/hfkj/dao/SecUserMapper.java @@ -41,16 +41,16 @@ public interface SecUserMapper extends SecUserMapperExt { @Insert({ "insert into sec_user (avatar, user_name, ", "login_name, `password`, ", - "telephone, object_type, ", - "object_id, role_id, ", - "`status`, create_time, ", + "telephone, platform_code, ", + "object_type, object_id, ", + "role_id, `status`, create_time, ", "update_time, ext_1, ", "ext_2, ext_3)", "values (#{avatar,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR}, ", "#{loginName,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, ", - "#{telephone,jdbcType=VARCHAR}, #{objectType,jdbcType=INTEGER}, ", - "#{objectId,jdbcType=BIGINT}, #{roleId,jdbcType=BIGINT}, ", - "#{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, ", + "#{telephone,jdbcType=VARCHAR}, #{platformCode,jdbcType=VARCHAR}, ", + "#{objectType,jdbcType=INTEGER}, #{objectId,jdbcType=BIGINT}, ", + "#{roleId,jdbcType=BIGINT}, #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, ", "#{updateTime,jdbcType=TIMESTAMP}, #{ext1,jdbcType=VARCHAR}, ", "#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" }) @@ -69,6 +69,7 @@ public interface SecUserMapper extends SecUserMapperExt { @Result(column="login_name", property="loginName", jdbcType=JdbcType.VARCHAR), @Result(column="password", property="password", jdbcType=JdbcType.VARCHAR), @Result(column="telephone", property="telephone", jdbcType=JdbcType.VARCHAR), + @Result(column="platform_code", property="platformCode", jdbcType=JdbcType.VARCHAR), @Result(column="object_type", property="objectType", jdbcType=JdbcType.INTEGER), @Result(column="object_id", property="objectId", jdbcType=JdbcType.BIGINT), @Result(column="role_id", property="roleId", jdbcType=JdbcType.BIGINT), @@ -83,8 +84,8 @@ public interface SecUserMapper extends SecUserMapperExt { @Select({ "select", - "id, avatar, user_name, login_name, `password`, telephone, object_type, object_id, ", - "role_id, `status`, create_time, update_time, ext_1, ext_2, ext_3", + "id, avatar, user_name, login_name, `password`, telephone, platform_code, object_type, ", + "object_id, role_id, `status`, create_time, update_time, ext_1, ext_2, ext_3", "from sec_user", "where id = #{id,jdbcType=BIGINT}" }) @@ -95,6 +96,7 @@ public interface SecUserMapper extends SecUserMapperExt { @Result(column="login_name", property="loginName", jdbcType=JdbcType.VARCHAR), @Result(column="password", property="password", jdbcType=JdbcType.VARCHAR), @Result(column="telephone", property="telephone", jdbcType=JdbcType.VARCHAR), + @Result(column="platform_code", property="platformCode", jdbcType=JdbcType.VARCHAR), @Result(column="object_type", property="objectType", jdbcType=JdbcType.INTEGER), @Result(column="object_id", property="objectId", jdbcType=JdbcType.BIGINT), @Result(column="role_id", property="roleId", jdbcType=JdbcType.BIGINT), @@ -123,6 +125,7 @@ public interface SecUserMapper extends SecUserMapperExt { "login_name = #{loginName,jdbcType=VARCHAR},", "`password` = #{password,jdbcType=VARCHAR},", "telephone = #{telephone,jdbcType=VARCHAR},", + "platform_code = #{platformCode,jdbcType=VARCHAR},", "object_type = #{objectType,jdbcType=INTEGER},", "object_id = #{objectId,jdbcType=BIGINT},", "role_id = #{roleId,jdbcType=BIGINT},", diff --git a/service/src/main/java/com/hfkj/dao/SecUserSqlProvider.java b/service/src/main/java/com/hfkj/dao/SecUserSqlProvider.java index 0ed635d..9064af7 100644 --- a/service/src/main/java/com/hfkj/dao/SecUserSqlProvider.java +++ b/service/src/main/java/com/hfkj/dao/SecUserSqlProvider.java @@ -48,6 +48,10 @@ public class SecUserSqlProvider { sql.VALUES("telephone", "#{telephone,jdbcType=VARCHAR}"); } + if (record.getPlatformCode() != null) { + sql.VALUES("platform_code", "#{platformCode,jdbcType=VARCHAR}"); + } + if (record.getObjectType() != null) { sql.VALUES("object_type", "#{objectType,jdbcType=INTEGER}"); } @@ -99,6 +103,7 @@ public class SecUserSqlProvider { sql.SELECT("login_name"); sql.SELECT("`password`"); sql.SELECT("telephone"); + sql.SELECT("platform_code"); sql.SELECT("object_type"); sql.SELECT("object_id"); sql.SELECT("role_id"); @@ -149,6 +154,10 @@ public class SecUserSqlProvider { sql.SET("telephone = #{record.telephone,jdbcType=VARCHAR}"); } + if (record.getPlatformCode() != null) { + sql.SET("platform_code = #{record.platformCode,jdbcType=VARCHAR}"); + } + if (record.getObjectType() != null) { sql.SET("object_type = #{record.objectType,jdbcType=INTEGER}"); } @@ -199,6 +208,7 @@ public class SecUserSqlProvider { sql.SET("login_name = #{record.loginName,jdbcType=VARCHAR}"); sql.SET("`password` = #{record.password,jdbcType=VARCHAR}"); sql.SET("telephone = #{record.telephone,jdbcType=VARCHAR}"); + sql.SET("platform_code = #{record.platformCode,jdbcType=VARCHAR}"); sql.SET("object_type = #{record.objectType,jdbcType=INTEGER}"); sql.SET("object_id = #{record.objectId,jdbcType=BIGINT}"); sql.SET("role_id = #{record.roleId,jdbcType=BIGINT}"); @@ -238,6 +248,10 @@ public class SecUserSqlProvider { sql.SET("telephone = #{telephone,jdbcType=VARCHAR}"); } + if (record.getPlatformCode() != null) { + sql.SET("platform_code = #{platformCode,jdbcType=VARCHAR}"); + } + if (record.getObjectType() != null) { sql.SET("object_type = #{objectType,jdbcType=INTEGER}"); } diff --git a/service/src/main/java/com/hfkj/entity/BsOrderCinema.java b/service/src/main/java/com/hfkj/entity/BsOrderCinema.java index ac0b405..6d9488a 100644 --- a/service/src/main/java/com/hfkj/entity/BsOrderCinema.java +++ b/service/src/main/java/com/hfkj/entity/BsOrderCinema.java @@ -14,179 +14,77 @@ import java.util.Date; * **/ public class BsOrderCinema implements Serializable { - /** - * 主键 - */ private Long id; - /** - * 0:特惠出票 5:快速出票 - */ private Integer drawMode; - /** - * 是否接受调座 - */ private Boolean acceptAdjust; - /** - * 影院Id - */ private Integer cinemaId; - /** - * 场次id - */ private Long showId; - /** - * 影片id - */ private Integer filmId; - /** - * 座位数量 - */ private Integer seatsCount; - /** - * 原始座位id,多个座位用英文,号分割 - */ private String seats; - /** - * 产品图片 - */ private String img; - /** - * 商品名称 - */ private String goodsName; - /** - * 商品规格名称 - */ private String goodsSpecsName; /** - * 交易订单号 + * 登录平台code */ + private String platformCode; + private String orderNo; - /** - * 子订单号 - */ private String childOrderNo; - /** - * 渠道订单号 - */ private String channelOrderNo; - /** - * 商户id - */ private Long merId; - /** - * 用户id - */ private Long userId; - /** - * 用户手机号 - */ private String userPhone; - /** - * 交易金额 - */ private BigDecimal totalPrice; - /** - * 总优惠金额(优惠券优惠金额 + 积分抵扣) - */ private BigDecimal totalDeductionPrice; - /** - * 优惠券优惠金额 - */ private BigDecimal couponDiscountPrice; - /** - * 积分抵扣优惠金额 - */ private Long integralDiscountPrice; - /** - * 实付金额 - */ private BigDecimal payRealPrice; - /** - * 支付渠道与bs_order订单表同步 - */ private Integer payChannel; - /** - * 客户支付流水号 - */ private String paySerialNo; - /** - * 支付方式与bs_order订单表同步 - */ private Integer payType; - /** - * 订单状态 -0:待付款 -5:待出票 -10:已出票 -15:交易成功 --5:已取消 - */ private Integer status; - /** - * 创建时间 - */ private Date createTime; - /** - * 支付时间 - */ private Date payTime; - /** - * 取消时间 - */ private Date cancelTime; - /** - * 退款时间 - */ private Date refundTime; - /** - * 完成时间 - */ private Date finishTime; - /** - * 更新时间 - */ private Date updateTime; - /** - * 异常状态 0:正常 1:异常 - */ private Boolean exceptionStatus; - /** - * 异常内容 - */ private String exceptionMsg; private String ext1; @@ -285,6 +183,14 @@ public class BsOrderCinema implements Serializable { this.goodsSpecsName = goodsSpecsName; } + public String getPlatformCode() { + return platformCode; + } + + public void setPlatformCode(String platformCode) { + this.platformCode = platformCode; + } + public String getOrderNo() { return orderNo; } @@ -516,6 +422,7 @@ public class BsOrderCinema implements Serializable { && (this.getImg() == null ? other.getImg() == null : this.getImg().equals(other.getImg())) && (this.getGoodsName() == null ? other.getGoodsName() == null : this.getGoodsName().equals(other.getGoodsName())) && (this.getGoodsSpecsName() == null ? other.getGoodsSpecsName() == null : this.getGoodsSpecsName().equals(other.getGoodsSpecsName())) + && (this.getPlatformCode() == null ? other.getPlatformCode() == null : this.getPlatformCode().equals(other.getPlatformCode())) && (this.getOrderNo() == null ? other.getOrderNo() == null : this.getOrderNo().equals(other.getOrderNo())) && (this.getChildOrderNo() == null ? other.getChildOrderNo() == null : this.getChildOrderNo().equals(other.getChildOrderNo())) && (this.getChannelOrderNo() == null ? other.getChannelOrderNo() == null : this.getChannelOrderNo().equals(other.getChannelOrderNo())) @@ -559,6 +466,7 @@ public class BsOrderCinema implements Serializable { result = prime * result + ((getImg() == null) ? 0 : getImg().hashCode()); result = prime * result + ((getGoodsName() == null) ? 0 : getGoodsName().hashCode()); result = prime * result + ((getGoodsSpecsName() == null) ? 0 : getGoodsSpecsName().hashCode()); + result = prime * result + ((getPlatformCode() == null) ? 0 : getPlatformCode().hashCode()); result = prime * result + ((getOrderNo() == null) ? 0 : getOrderNo().hashCode()); result = prime * result + ((getChildOrderNo() == null) ? 0 : getChildOrderNo().hashCode()); result = prime * result + ((getChannelOrderNo() == null) ? 0 : getChannelOrderNo().hashCode()); @@ -605,6 +513,7 @@ public class BsOrderCinema implements Serializable { sb.append(", img=").append(img); sb.append(", goodsName=").append(goodsName); sb.append(", goodsSpecsName=").append(goodsSpecsName); + sb.append(", platformCode=").append(platformCode); sb.append(", orderNo=").append(orderNo); sb.append(", childOrderNo=").append(childOrderNo); sb.append(", channelOrderNo=").append(channelOrderNo); diff --git a/service/src/main/java/com/hfkj/entity/BsOrderCinemaExample.java b/service/src/main/java/com/hfkj/entity/BsOrderCinemaExample.java index 6ebcc4b..d40bed8 100644 --- a/service/src/main/java/com/hfkj/entity/BsOrderCinemaExample.java +++ b/service/src/main/java/com/hfkj/entity/BsOrderCinemaExample.java @@ -826,6 +826,76 @@ public class BsOrderCinemaExample { return (Criteria) this; } + public Criteria andPlatformCodeIsNull() { + addCriterion("platform_code is null"); + return (Criteria) this; + } + + public Criteria andPlatformCodeIsNotNull() { + addCriterion("platform_code is not null"); + return (Criteria) this; + } + + public Criteria andPlatformCodeEqualTo(String value) { + addCriterion("platform_code =", value, "platformCode"); + return (Criteria) this; + } + + public Criteria andPlatformCodeNotEqualTo(String value) { + addCriterion("platform_code <>", value, "platformCode"); + return (Criteria) this; + } + + public Criteria andPlatformCodeGreaterThan(String value) { + addCriterion("platform_code >", value, "platformCode"); + return (Criteria) this; + } + + public Criteria andPlatformCodeGreaterThanOrEqualTo(String value) { + addCriterion("platform_code >=", value, "platformCode"); + return (Criteria) this; + } + + public Criteria andPlatformCodeLessThan(String value) { + addCriterion("platform_code <", value, "platformCode"); + return (Criteria) this; + } + + public Criteria andPlatformCodeLessThanOrEqualTo(String value) { + addCriterion("platform_code <=", value, "platformCode"); + return (Criteria) this; + } + + public Criteria andPlatformCodeLike(String value) { + addCriterion("platform_code like", value, "platformCode"); + return (Criteria) this; + } + + public Criteria andPlatformCodeNotLike(String value) { + addCriterion("platform_code not like", value, "platformCode"); + return (Criteria) this; + } + + public Criteria andPlatformCodeIn(List values) { + addCriterion("platform_code in", values, "platformCode"); + return (Criteria) this; + } + + public Criteria andPlatformCodeNotIn(List values) { + addCriterion("platform_code not in", values, "platformCode"); + return (Criteria) this; + } + + public Criteria andPlatformCodeBetween(String value1, String value2) { + addCriterion("platform_code between", value1, value2, "platformCode"); + return (Criteria) this; + } + + public Criteria andPlatformCodeNotBetween(String value1, String value2) { + addCriterion("platform_code not between", value1, value2, "platformCode"); + return (Criteria) this; + } + public Criteria andOrderNoIsNull() { addCriterion("order_no is null"); return (Criteria) this; diff --git a/service/src/main/java/com/hfkj/entity/BsOrderCoupon.java b/service/src/main/java/com/hfkj/entity/BsOrderCoupon.java index d2dd489..e94183f 100644 --- a/service/src/main/java/com/hfkj/entity/BsOrderCoupon.java +++ b/service/src/main/java/com/hfkj/entity/BsOrderCoupon.java @@ -34,6 +34,11 @@ public class BsOrderCoupon implements Serializable { */ private Long merId; + /** + * 登录平台code + */ + private String platformCode; + /** * 用户id */ @@ -229,6 +234,14 @@ public class BsOrderCoupon implements Serializable { this.merId = merId; } + public String getPlatformCode() { + return platformCode; + } + + public void setPlatformCode(String platformCode) { + this.platformCode = platformCode; + } + public Long getUserId() { return userId; } @@ -517,6 +530,7 @@ public class BsOrderCoupon implements Serializable { && (this.getOrderNo() == null ? other.getOrderNo() == null : this.getOrderNo().equals(other.getOrderNo())) && (this.getChildOrderNo() == null ? other.getChildOrderNo() == null : this.getChildOrderNo().equals(other.getChildOrderNo())) && (this.getMerId() == null ? other.getMerId() == null : this.getMerId().equals(other.getMerId())) + && (this.getPlatformCode() == null ? other.getPlatformCode() == null : this.getPlatformCode().equals(other.getPlatformCode())) && (this.getUserId() == null ? other.getUserId() == null : this.getUserId().equals(other.getUserId())) && (this.getUserPhone() == null ? other.getUserPhone() == null : this.getUserPhone().equals(other.getUserPhone())) && (this.getGoodsId() == null ? other.getGoodsId() == null : this.getGoodsId().equals(other.getGoodsId())) @@ -561,6 +575,7 @@ public class BsOrderCoupon implements Serializable { result = prime * result + ((getOrderNo() == null) ? 0 : getOrderNo().hashCode()); result = prime * result + ((getChildOrderNo() == null) ? 0 : getChildOrderNo().hashCode()); result = prime * result + ((getMerId() == null) ? 0 : getMerId().hashCode()); + result = prime * result + ((getPlatformCode() == null) ? 0 : getPlatformCode().hashCode()); result = prime * result + ((getUserId() == null) ? 0 : getUserId().hashCode()); result = prime * result + ((getUserPhone() == null) ? 0 : getUserPhone().hashCode()); result = prime * result + ((getGoodsId() == null) ? 0 : getGoodsId().hashCode()); @@ -608,6 +623,7 @@ public class BsOrderCoupon implements Serializable { sb.append(", orderNo=").append(orderNo); sb.append(", childOrderNo=").append(childOrderNo); sb.append(", merId=").append(merId); + sb.append(", platformCode=").append(platformCode); sb.append(", userId=").append(userId); sb.append(", userPhone=").append(userPhone); sb.append(", goodsId=").append(goodsId); diff --git a/service/src/main/java/com/hfkj/entity/BsOrderCouponExample.java b/service/src/main/java/com/hfkj/entity/BsOrderCouponExample.java index c13f03d..a9ea0de 100644 --- a/service/src/main/java/com/hfkj/entity/BsOrderCouponExample.java +++ b/service/src/main/java/com/hfkj/entity/BsOrderCouponExample.java @@ -386,6 +386,76 @@ public class BsOrderCouponExample { return (Criteria) this; } + public Criteria andPlatformCodeIsNull() { + addCriterion("platform_code is null"); + return (Criteria) this; + } + + public Criteria andPlatformCodeIsNotNull() { + addCriterion("platform_code is not null"); + return (Criteria) this; + } + + public Criteria andPlatformCodeEqualTo(String value) { + addCriterion("platform_code =", value, "platformCode"); + return (Criteria) this; + } + + public Criteria andPlatformCodeNotEqualTo(String value) { + addCriterion("platform_code <>", value, "platformCode"); + return (Criteria) this; + } + + public Criteria andPlatformCodeGreaterThan(String value) { + addCriterion("platform_code >", value, "platformCode"); + return (Criteria) this; + } + + public Criteria andPlatformCodeGreaterThanOrEqualTo(String value) { + addCriterion("platform_code >=", value, "platformCode"); + return (Criteria) this; + } + + public Criteria andPlatformCodeLessThan(String value) { + addCriterion("platform_code <", value, "platformCode"); + return (Criteria) this; + } + + public Criteria andPlatformCodeLessThanOrEqualTo(String value) { + addCriterion("platform_code <=", value, "platformCode"); + return (Criteria) this; + } + + public Criteria andPlatformCodeLike(String value) { + addCriterion("platform_code like", value, "platformCode"); + return (Criteria) this; + } + + public Criteria andPlatformCodeNotLike(String value) { + addCriterion("platform_code not like", value, "platformCode"); + return (Criteria) this; + } + + public Criteria andPlatformCodeIn(List values) { + addCriterion("platform_code in", values, "platformCode"); + return (Criteria) this; + } + + public Criteria andPlatformCodeNotIn(List values) { + addCriterion("platform_code not in", values, "platformCode"); + return (Criteria) this; + } + + public Criteria andPlatformCodeBetween(String value1, String value2) { + addCriterion("platform_code between", value1, value2, "platformCode"); + return (Criteria) this; + } + + public Criteria andPlatformCodeNotBetween(String value1, String value2) { + addCriterion("platform_code not between", value1, value2, "platformCode"); + return (Criteria) this; + } + public Criteria andUserIdIsNull() { addCriterion("user_id is null"); return (Criteria) this; diff --git a/service/src/main/java/com/hfkj/entity/BsOrderGoods.java b/service/src/main/java/com/hfkj/entity/BsOrderGoods.java index 2517b9a..8e99555 100644 --- a/service/src/main/java/com/hfkj/entity/BsOrderGoods.java +++ b/service/src/main/java/com/hfkj/entity/BsOrderGoods.java @@ -144,6 +144,11 @@ public class BsOrderGoods implements Serializable { */ private Long integralDiscountPrice; + /** + * 登录平台code + */ + private String platformCode; + /** * 实付金额 */ @@ -435,6 +440,14 @@ public class BsOrderGoods implements Serializable { this.integralDiscountPrice = integralDiscountPrice; } + public String getPlatformCode() { + return platformCode; + } + + public void setPlatformCode(String platformCode) { + this.platformCode = platformCode; + } + public BigDecimal getPayRealPrice() { return payRealPrice; } @@ -617,6 +630,7 @@ public class BsOrderGoods implements Serializable { && (this.getTotalDeductionPrice() == null ? other.getTotalDeductionPrice() == null : this.getTotalDeductionPrice().equals(other.getTotalDeductionPrice())) && (this.getCouponDiscountPrice() == null ? other.getCouponDiscountPrice() == null : this.getCouponDiscountPrice().equals(other.getCouponDiscountPrice())) && (this.getIntegralDiscountPrice() == null ? other.getIntegralDiscountPrice() == null : this.getIntegralDiscountPrice().equals(other.getIntegralDiscountPrice())) + && (this.getPlatformCode() == null ? other.getPlatformCode() == null : this.getPlatformCode().equals(other.getPlatformCode())) && (this.getPayRealPrice() == null ? other.getPayRealPrice() == null : this.getPayRealPrice().equals(other.getPayRealPrice())) && (this.getPayChannel() == null ? other.getPayChannel() == null : this.getPayChannel().equals(other.getPayChannel())) && (this.getPaySerialNo() == null ? other.getPaySerialNo() == null : this.getPaySerialNo().equals(other.getPaySerialNo())) @@ -667,6 +681,7 @@ public class BsOrderGoods implements Serializable { result = prime * result + ((getTotalDeductionPrice() == null) ? 0 : getTotalDeductionPrice().hashCode()); result = prime * result + ((getCouponDiscountPrice() == null) ? 0 : getCouponDiscountPrice().hashCode()); result = prime * result + ((getIntegralDiscountPrice() == null) ? 0 : getIntegralDiscountPrice().hashCode()); + result = prime * result + ((getPlatformCode() == null) ? 0 : getPlatformCode().hashCode()); result = prime * result + ((getPayRealPrice() == null) ? 0 : getPayRealPrice().hashCode()); result = prime * result + ((getPayChannel() == null) ? 0 : getPayChannel().hashCode()); result = prime * result + ((getPaySerialNo() == null) ? 0 : getPaySerialNo().hashCode()); @@ -720,6 +735,7 @@ public class BsOrderGoods implements Serializable { sb.append(", totalDeductionPrice=").append(totalDeductionPrice); sb.append(", couponDiscountPrice=").append(couponDiscountPrice); sb.append(", integralDiscountPrice=").append(integralDiscountPrice); + sb.append(", platformCode=").append(platformCode); sb.append(", payRealPrice=").append(payRealPrice); sb.append(", payChannel=").append(payChannel); sb.append(", paySerialNo=").append(paySerialNo); diff --git a/service/src/main/java/com/hfkj/entity/BsOrderGoodsExample.java b/service/src/main/java/com/hfkj/entity/BsOrderGoodsExample.java index 11b275c..e88b952 100644 --- a/service/src/main/java/com/hfkj/entity/BsOrderGoodsExample.java +++ b/service/src/main/java/com/hfkj/entity/BsOrderGoodsExample.java @@ -1796,6 +1796,76 @@ public class BsOrderGoodsExample { return (Criteria) this; } + public Criteria andPlatformCodeIsNull() { + addCriterion("platform_code is null"); + return (Criteria) this; + } + + public Criteria andPlatformCodeIsNotNull() { + addCriterion("platform_code is not null"); + return (Criteria) this; + } + + public Criteria andPlatformCodeEqualTo(String value) { + addCriterion("platform_code =", value, "platformCode"); + return (Criteria) this; + } + + public Criteria andPlatformCodeNotEqualTo(String value) { + addCriterion("platform_code <>", value, "platformCode"); + return (Criteria) this; + } + + public Criteria andPlatformCodeGreaterThan(String value) { + addCriterion("platform_code >", value, "platformCode"); + return (Criteria) this; + } + + public Criteria andPlatformCodeGreaterThanOrEqualTo(String value) { + addCriterion("platform_code >=", value, "platformCode"); + return (Criteria) this; + } + + public Criteria andPlatformCodeLessThan(String value) { + addCriterion("platform_code <", value, "platformCode"); + return (Criteria) this; + } + + public Criteria andPlatformCodeLessThanOrEqualTo(String value) { + addCriterion("platform_code <=", value, "platformCode"); + return (Criteria) this; + } + + public Criteria andPlatformCodeLike(String value) { + addCriterion("platform_code like", value, "platformCode"); + return (Criteria) this; + } + + public Criteria andPlatformCodeNotLike(String value) { + addCriterion("platform_code not like", value, "platformCode"); + return (Criteria) this; + } + + public Criteria andPlatformCodeIn(List values) { + addCriterion("platform_code in", values, "platformCode"); + return (Criteria) this; + } + + public Criteria andPlatformCodeNotIn(List values) { + addCriterion("platform_code not in", values, "platformCode"); + return (Criteria) this; + } + + public Criteria andPlatformCodeBetween(String value1, String value2) { + addCriterion("platform_code between", value1, value2, "platformCode"); + return (Criteria) this; + } + + public Criteria andPlatformCodeNotBetween(String value1, String value2) { + addCriterion("platform_code not between", value1, value2, "platformCode"); + return (Criteria) this; + } + public Criteria andPayRealPriceIsNull() { addCriterion("pay_real_price is null"); return (Criteria) this; diff --git a/service/src/main/java/com/hfkj/entity/BsOrderMember.java b/service/src/main/java/com/hfkj/entity/BsOrderMember.java new file mode 100644 index 0000000..8747202 --- /dev/null +++ b/service/src/main/java/com/hfkj/entity/BsOrderMember.java @@ -0,0 +1,665 @@ +package com.hfkj.entity; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * bs_order_member + * @author + */ +/** + * + * 代码由工具生成 + * + **/ +public class BsOrderMember implements Serializable { + /** + * 主键 + */ + private Long id; + + /** + * 交易订单号 + */ + private String orderNo; + + /** + * 子订单号 + */ + private String childOrderNo; + + /** + * 商户id + */ + private Long merId; + + /** + * 登录平台code + */ + private String platformCode; + + /** + * 用户id + */ + private Long userId; + + /** + * 用户手机号 + */ + private String userPhone; + + /** + * 商品id + */ + private Long goodsId; + + /** + * 商品名称 + */ + private String goodsName; + + /** + * 商品类型id + */ + private Long goodsTypeId; + + /** + * 商品类型名称 + */ + private String goodsTypeName; + + /** + * 商品品牌id + */ + private Long goodsBrandId; + + /** + * 商品品牌名称 + */ + private String goodsBrandName; + + /** + * 商品规格id + */ + private Long goodsSpecsId; + + /** + * 商品规格名称 + */ + private String goodsSpecsName; + + /** + * 商品规格原价 + */ + private BigDecimal goodsSpescOriginalPrice; + + /** + * 商品规格销售价 + */ + private BigDecimal goodsSpescSalePrice; + + /** + * 商品虚拟id + */ + private Long goodsVpdId; + + /** + * 商品虚拟key + */ + private String goodsVpdKey; + + /** + * 商品虚拟来源 + */ + private Integer goodsVpdSource; + + /** + * 商品数量 + */ + private Integer goodsCount; + + /** + * 交易金额 + */ + private BigDecimal totalPrice; + + /** + * 总优惠金额(优惠券优惠金额 + 积分抵扣) + */ + private BigDecimal totalDeductionPrice; + + /** + * 优惠券优惠金额 + */ + private BigDecimal couponDiscountPrice; + + /** + * 积分抵扣优惠金额 + */ + private Long integralDiscountPrice; + + /** + * 实付金额 + */ + private BigDecimal payRealPrice; + + /** + * 支付渠道与bs_order订单表同步 + */ + private Integer payChannel; + + /** + * 客户支付流水号 + */ + private String paySerialNo; + + /** + * 支付方式与bs_order订单表同步 + */ + private Integer payType; + + /** + * 状态与子订单状态同步 + */ + private Integer status; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 支付时间 + */ + private Date payTime; + + /** + * 取消时间 + */ + private Date cancelTime; + + /** + * 退款时间 + */ + private Date refundTime; + + /** + * 完成时间 + */ + private Date finishTime; + + /** + * 更新时间 + */ + private Date updateTime; + + private String ext1; + + private String ext2; + + private String ext3; + + private static final long serialVersionUID = 1L; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getOrderNo() { + return orderNo; + } + + public void setOrderNo(String orderNo) { + this.orderNo = orderNo; + } + + public String getChildOrderNo() { + return childOrderNo; + } + + public void setChildOrderNo(String childOrderNo) { + this.childOrderNo = childOrderNo; + } + + public Long getMerId() { + return merId; + } + + public void setMerId(Long merId) { + this.merId = merId; + } + + public String getPlatformCode() { + return platformCode; + } + + public void setPlatformCode(String platformCode) { + this.platformCode = platformCode; + } + + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + + public String getUserPhone() { + return userPhone; + } + + public void setUserPhone(String userPhone) { + this.userPhone = userPhone; + } + + public Long getGoodsId() { + return goodsId; + } + + public void setGoodsId(Long goodsId) { + this.goodsId = goodsId; + } + + public String getGoodsName() { + return goodsName; + } + + public void setGoodsName(String goodsName) { + this.goodsName = goodsName; + } + + public Long getGoodsTypeId() { + return goodsTypeId; + } + + public void setGoodsTypeId(Long goodsTypeId) { + this.goodsTypeId = goodsTypeId; + } + + public String getGoodsTypeName() { + return goodsTypeName; + } + + public void setGoodsTypeName(String goodsTypeName) { + this.goodsTypeName = goodsTypeName; + } + + public Long getGoodsBrandId() { + return goodsBrandId; + } + + public void setGoodsBrandId(Long goodsBrandId) { + this.goodsBrandId = goodsBrandId; + } + + public String getGoodsBrandName() { + return goodsBrandName; + } + + public void setGoodsBrandName(String goodsBrandName) { + this.goodsBrandName = goodsBrandName; + } + + public Long getGoodsSpecsId() { + return goodsSpecsId; + } + + public void setGoodsSpecsId(Long goodsSpecsId) { + this.goodsSpecsId = goodsSpecsId; + } + + public String getGoodsSpecsName() { + return goodsSpecsName; + } + + public void setGoodsSpecsName(String goodsSpecsName) { + this.goodsSpecsName = goodsSpecsName; + } + + public BigDecimal getGoodsSpescOriginalPrice() { + return goodsSpescOriginalPrice; + } + + public void setGoodsSpescOriginalPrice(BigDecimal goodsSpescOriginalPrice) { + this.goodsSpescOriginalPrice = goodsSpescOriginalPrice; + } + + public BigDecimal getGoodsSpescSalePrice() { + return goodsSpescSalePrice; + } + + public void setGoodsSpescSalePrice(BigDecimal goodsSpescSalePrice) { + this.goodsSpescSalePrice = goodsSpescSalePrice; + } + + public Long getGoodsVpdId() { + return goodsVpdId; + } + + public void setGoodsVpdId(Long goodsVpdId) { + this.goodsVpdId = goodsVpdId; + } + + public String getGoodsVpdKey() { + return goodsVpdKey; + } + + public void setGoodsVpdKey(String goodsVpdKey) { + this.goodsVpdKey = goodsVpdKey; + } + + public Integer getGoodsVpdSource() { + return goodsVpdSource; + } + + public void setGoodsVpdSource(Integer goodsVpdSource) { + this.goodsVpdSource = goodsVpdSource; + } + + public Integer getGoodsCount() { + return goodsCount; + } + + public void setGoodsCount(Integer goodsCount) { + this.goodsCount = goodsCount; + } + + public BigDecimal getTotalPrice() { + return totalPrice; + } + + public void setTotalPrice(BigDecimal totalPrice) { + this.totalPrice = totalPrice; + } + + public BigDecimal getTotalDeductionPrice() { + return totalDeductionPrice; + } + + public void setTotalDeductionPrice(BigDecimal totalDeductionPrice) { + this.totalDeductionPrice = totalDeductionPrice; + } + + public BigDecimal getCouponDiscountPrice() { + return couponDiscountPrice; + } + + public void setCouponDiscountPrice(BigDecimal couponDiscountPrice) { + this.couponDiscountPrice = couponDiscountPrice; + } + + public Long getIntegralDiscountPrice() { + return integralDiscountPrice; + } + + public void setIntegralDiscountPrice(Long integralDiscountPrice) { + this.integralDiscountPrice = integralDiscountPrice; + } + + public BigDecimal getPayRealPrice() { + return payRealPrice; + } + + public void setPayRealPrice(BigDecimal payRealPrice) { + this.payRealPrice = payRealPrice; + } + + public Integer getPayChannel() { + return payChannel; + } + + public void setPayChannel(Integer payChannel) { + this.payChannel = payChannel; + } + + public String getPaySerialNo() { + return paySerialNo; + } + + public void setPaySerialNo(String paySerialNo) { + this.paySerialNo = paySerialNo; + } + + public Integer getPayType() { + return payType; + } + + public void setPayType(Integer payType) { + this.payType = payType; + } + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public Date getPayTime() { + return payTime; + } + + public void setPayTime(Date payTime) { + this.payTime = payTime; + } + + public Date getCancelTime() { + return cancelTime; + } + + public void setCancelTime(Date cancelTime) { + this.cancelTime = cancelTime; + } + + public Date getRefundTime() { + return refundTime; + } + + public void setRefundTime(Date refundTime) { + this.refundTime = refundTime; + } + + public Date getFinishTime() { + return finishTime; + } + + public void setFinishTime(Date finishTime) { + this.finishTime = finishTime; + } + + 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; + } + BsOrderMember other = (BsOrderMember) that; + return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) + && (this.getOrderNo() == null ? other.getOrderNo() == null : this.getOrderNo().equals(other.getOrderNo())) + && (this.getChildOrderNo() == null ? other.getChildOrderNo() == null : this.getChildOrderNo().equals(other.getChildOrderNo())) + && (this.getMerId() == null ? other.getMerId() == null : this.getMerId().equals(other.getMerId())) + && (this.getPlatformCode() == null ? other.getPlatformCode() == null : this.getPlatformCode().equals(other.getPlatformCode())) + && (this.getUserId() == null ? other.getUserId() == null : this.getUserId().equals(other.getUserId())) + && (this.getUserPhone() == null ? other.getUserPhone() == null : this.getUserPhone().equals(other.getUserPhone())) + && (this.getGoodsId() == null ? other.getGoodsId() == null : this.getGoodsId().equals(other.getGoodsId())) + && (this.getGoodsName() == null ? other.getGoodsName() == null : this.getGoodsName().equals(other.getGoodsName())) + && (this.getGoodsTypeId() == null ? other.getGoodsTypeId() == null : this.getGoodsTypeId().equals(other.getGoodsTypeId())) + && (this.getGoodsTypeName() == null ? other.getGoodsTypeName() == null : this.getGoodsTypeName().equals(other.getGoodsTypeName())) + && (this.getGoodsBrandId() == null ? other.getGoodsBrandId() == null : this.getGoodsBrandId().equals(other.getGoodsBrandId())) + && (this.getGoodsBrandName() == null ? other.getGoodsBrandName() == null : this.getGoodsBrandName().equals(other.getGoodsBrandName())) + && (this.getGoodsSpecsId() == null ? other.getGoodsSpecsId() == null : this.getGoodsSpecsId().equals(other.getGoodsSpecsId())) + && (this.getGoodsSpecsName() == null ? other.getGoodsSpecsName() == null : this.getGoodsSpecsName().equals(other.getGoodsSpecsName())) + && (this.getGoodsSpescOriginalPrice() == null ? other.getGoodsSpescOriginalPrice() == null : this.getGoodsSpescOriginalPrice().equals(other.getGoodsSpescOriginalPrice())) + && (this.getGoodsSpescSalePrice() == null ? other.getGoodsSpescSalePrice() == null : this.getGoodsSpescSalePrice().equals(other.getGoodsSpescSalePrice())) + && (this.getGoodsVpdId() == null ? other.getGoodsVpdId() == null : this.getGoodsVpdId().equals(other.getGoodsVpdId())) + && (this.getGoodsVpdKey() == null ? other.getGoodsVpdKey() == null : this.getGoodsVpdKey().equals(other.getGoodsVpdKey())) + && (this.getGoodsVpdSource() == null ? other.getGoodsVpdSource() == null : this.getGoodsVpdSource().equals(other.getGoodsVpdSource())) + && (this.getGoodsCount() == null ? other.getGoodsCount() == null : this.getGoodsCount().equals(other.getGoodsCount())) + && (this.getTotalPrice() == null ? other.getTotalPrice() == null : this.getTotalPrice().equals(other.getTotalPrice())) + && (this.getTotalDeductionPrice() == null ? other.getTotalDeductionPrice() == null : this.getTotalDeductionPrice().equals(other.getTotalDeductionPrice())) + && (this.getCouponDiscountPrice() == null ? other.getCouponDiscountPrice() == null : this.getCouponDiscountPrice().equals(other.getCouponDiscountPrice())) + && (this.getIntegralDiscountPrice() == null ? other.getIntegralDiscountPrice() == null : this.getIntegralDiscountPrice().equals(other.getIntegralDiscountPrice())) + && (this.getPayRealPrice() == null ? other.getPayRealPrice() == null : this.getPayRealPrice().equals(other.getPayRealPrice())) + && (this.getPayChannel() == null ? other.getPayChannel() == null : this.getPayChannel().equals(other.getPayChannel())) + && (this.getPaySerialNo() == null ? other.getPaySerialNo() == null : this.getPaySerialNo().equals(other.getPaySerialNo())) + && (this.getPayType() == null ? other.getPayType() == null : this.getPayType().equals(other.getPayType())) + && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus())) + && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime())) + && (this.getPayTime() == null ? other.getPayTime() == null : this.getPayTime().equals(other.getPayTime())) + && (this.getCancelTime() == null ? other.getCancelTime() == null : this.getCancelTime().equals(other.getCancelTime())) + && (this.getRefundTime() == null ? other.getRefundTime() == null : this.getRefundTime().equals(other.getRefundTime())) + && (this.getFinishTime() == null ? other.getFinishTime() == null : this.getFinishTime().equals(other.getFinishTime())) + && (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 + ((getOrderNo() == null) ? 0 : getOrderNo().hashCode()); + result = prime * result + ((getChildOrderNo() == null) ? 0 : getChildOrderNo().hashCode()); + result = prime * result + ((getMerId() == null) ? 0 : getMerId().hashCode()); + result = prime * result + ((getPlatformCode() == null) ? 0 : getPlatformCode().hashCode()); + result = prime * result + ((getUserId() == null) ? 0 : getUserId().hashCode()); + result = prime * result + ((getUserPhone() == null) ? 0 : getUserPhone().hashCode()); + result = prime * result + ((getGoodsId() == null) ? 0 : getGoodsId().hashCode()); + result = prime * result + ((getGoodsName() == null) ? 0 : getGoodsName().hashCode()); + result = prime * result + ((getGoodsTypeId() == null) ? 0 : getGoodsTypeId().hashCode()); + result = prime * result + ((getGoodsTypeName() == null) ? 0 : getGoodsTypeName().hashCode()); + result = prime * result + ((getGoodsBrandId() == null) ? 0 : getGoodsBrandId().hashCode()); + result = prime * result + ((getGoodsBrandName() == null) ? 0 : getGoodsBrandName().hashCode()); + result = prime * result + ((getGoodsSpecsId() == null) ? 0 : getGoodsSpecsId().hashCode()); + result = prime * result + ((getGoodsSpecsName() == null) ? 0 : getGoodsSpecsName().hashCode()); + result = prime * result + ((getGoodsSpescOriginalPrice() == null) ? 0 : getGoodsSpescOriginalPrice().hashCode()); + result = prime * result + ((getGoodsSpescSalePrice() == null) ? 0 : getGoodsSpescSalePrice().hashCode()); + result = prime * result + ((getGoodsVpdId() == null) ? 0 : getGoodsVpdId().hashCode()); + result = prime * result + ((getGoodsVpdKey() == null) ? 0 : getGoodsVpdKey().hashCode()); + result = prime * result + ((getGoodsVpdSource() == null) ? 0 : getGoodsVpdSource().hashCode()); + result = prime * result + ((getGoodsCount() == null) ? 0 : getGoodsCount().hashCode()); + result = prime * result + ((getTotalPrice() == null) ? 0 : getTotalPrice().hashCode()); + result = prime * result + ((getTotalDeductionPrice() == null) ? 0 : getTotalDeductionPrice().hashCode()); + result = prime * result + ((getCouponDiscountPrice() == null) ? 0 : getCouponDiscountPrice().hashCode()); + result = prime * result + ((getIntegralDiscountPrice() == null) ? 0 : getIntegralDiscountPrice().hashCode()); + result = prime * result + ((getPayRealPrice() == null) ? 0 : getPayRealPrice().hashCode()); + result = prime * result + ((getPayChannel() == null) ? 0 : getPayChannel().hashCode()); + result = prime * result + ((getPaySerialNo() == null) ? 0 : getPaySerialNo().hashCode()); + result = prime * result + ((getPayType() == null) ? 0 : getPayType().hashCode()); + result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode()); + result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode()); + result = prime * result + ((getPayTime() == null) ? 0 : getPayTime().hashCode()); + result = prime * result + ((getCancelTime() == null) ? 0 : getCancelTime().hashCode()); + result = prime * result + ((getRefundTime() == null) ? 0 : getRefundTime().hashCode()); + result = prime * result + ((getFinishTime() == null) ? 0 : getFinishTime().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(", orderNo=").append(orderNo); + sb.append(", childOrderNo=").append(childOrderNo); + sb.append(", merId=").append(merId); + sb.append(", platformCode=").append(platformCode); + sb.append(", userId=").append(userId); + sb.append(", userPhone=").append(userPhone); + sb.append(", goodsId=").append(goodsId); + sb.append(", goodsName=").append(goodsName); + sb.append(", goodsTypeId=").append(goodsTypeId); + sb.append(", goodsTypeName=").append(goodsTypeName); + sb.append(", goodsBrandId=").append(goodsBrandId); + sb.append(", goodsBrandName=").append(goodsBrandName); + sb.append(", goodsSpecsId=").append(goodsSpecsId); + sb.append(", goodsSpecsName=").append(goodsSpecsName); + sb.append(", goodsSpescOriginalPrice=").append(goodsSpescOriginalPrice); + sb.append(", goodsSpescSalePrice=").append(goodsSpescSalePrice); + sb.append(", goodsVpdId=").append(goodsVpdId); + sb.append(", goodsVpdKey=").append(goodsVpdKey); + sb.append(", goodsVpdSource=").append(goodsVpdSource); + sb.append(", goodsCount=").append(goodsCount); + sb.append(", totalPrice=").append(totalPrice); + sb.append(", totalDeductionPrice=").append(totalDeductionPrice); + sb.append(", couponDiscountPrice=").append(couponDiscountPrice); + sb.append(", integralDiscountPrice=").append(integralDiscountPrice); + sb.append(", payRealPrice=").append(payRealPrice); + sb.append(", payChannel=").append(payChannel); + sb.append(", paySerialNo=").append(paySerialNo); + sb.append(", payType=").append(payType); + sb.append(", status=").append(status); + sb.append(", createTime=").append(createTime); + sb.append(", payTime=").append(payTime); + sb.append(", cancelTime=").append(cancelTime); + sb.append(", refundTime=").append(refundTime); + sb.append(", finishTime=").append(finishTime); + 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/service/src/main/java/com/hfkj/entity/BsOrderMemberExample.java b/service/src/main/java/com/hfkj/entity/BsOrderMemberExample.java new file mode 100644 index 0000000..10d8597 --- /dev/null +++ b/service/src/main/java/com/hfkj/entity/BsOrderMemberExample.java @@ -0,0 +1,2694 @@ +package com.hfkj.entity; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class BsOrderMemberExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + private Integer limit; + + private Long offset; + + public BsOrderMemberExample() { + 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 andOrderNoIsNull() { + addCriterion("order_no is null"); + return (Criteria) this; + } + + public Criteria andOrderNoIsNotNull() { + addCriterion("order_no is not null"); + return (Criteria) this; + } + + public Criteria andOrderNoEqualTo(String value) { + addCriterion("order_no =", value, "orderNo"); + return (Criteria) this; + } + + public Criteria andOrderNoNotEqualTo(String value) { + addCriterion("order_no <>", value, "orderNo"); + return (Criteria) this; + } + + public Criteria andOrderNoGreaterThan(String value) { + addCriterion("order_no >", value, "orderNo"); + return (Criteria) this; + } + + public Criteria andOrderNoGreaterThanOrEqualTo(String value) { + addCriterion("order_no >=", value, "orderNo"); + return (Criteria) this; + } + + public Criteria andOrderNoLessThan(String value) { + addCriterion("order_no <", value, "orderNo"); + return (Criteria) this; + } + + public Criteria andOrderNoLessThanOrEqualTo(String value) { + addCriterion("order_no <=", value, "orderNo"); + return (Criteria) this; + } + + public Criteria andOrderNoLike(String value) { + addCriterion("order_no like", value, "orderNo"); + return (Criteria) this; + } + + public Criteria andOrderNoNotLike(String value) { + addCriterion("order_no not like", value, "orderNo"); + return (Criteria) this; + } + + public Criteria andOrderNoIn(List values) { + addCriterion("order_no in", values, "orderNo"); + return (Criteria) this; + } + + public Criteria andOrderNoNotIn(List values) { + addCriterion("order_no not in", values, "orderNo"); + return (Criteria) this; + } + + public Criteria andOrderNoBetween(String value1, String value2) { + addCriterion("order_no between", value1, value2, "orderNo"); + return (Criteria) this; + } + + public Criteria andOrderNoNotBetween(String value1, String value2) { + addCriterion("order_no not between", value1, value2, "orderNo"); + return (Criteria) this; + } + + public Criteria andChildOrderNoIsNull() { + addCriterion("child_order_no is null"); + return (Criteria) this; + } + + public Criteria andChildOrderNoIsNotNull() { + addCriterion("child_order_no is not null"); + return (Criteria) this; + } + + public Criteria andChildOrderNoEqualTo(String value) { + addCriterion("child_order_no =", value, "childOrderNo"); + return (Criteria) this; + } + + public Criteria andChildOrderNoNotEqualTo(String value) { + addCriterion("child_order_no <>", value, "childOrderNo"); + return (Criteria) this; + } + + public Criteria andChildOrderNoGreaterThan(String value) { + addCriterion("child_order_no >", value, "childOrderNo"); + return (Criteria) this; + } + + public Criteria andChildOrderNoGreaterThanOrEqualTo(String value) { + addCriterion("child_order_no >=", value, "childOrderNo"); + return (Criteria) this; + } + + public Criteria andChildOrderNoLessThan(String value) { + addCriterion("child_order_no <", value, "childOrderNo"); + return (Criteria) this; + } + + public Criteria andChildOrderNoLessThanOrEqualTo(String value) { + addCriterion("child_order_no <=", value, "childOrderNo"); + return (Criteria) this; + } + + public Criteria andChildOrderNoLike(String value) { + addCriterion("child_order_no like", value, "childOrderNo"); + return (Criteria) this; + } + + public Criteria andChildOrderNoNotLike(String value) { + addCriterion("child_order_no not like", value, "childOrderNo"); + return (Criteria) this; + } + + public Criteria andChildOrderNoIn(List values) { + addCriterion("child_order_no in", values, "childOrderNo"); + return (Criteria) this; + } + + public Criteria andChildOrderNoNotIn(List values) { + addCriterion("child_order_no not in", values, "childOrderNo"); + return (Criteria) this; + } + + public Criteria andChildOrderNoBetween(String value1, String value2) { + addCriterion("child_order_no between", value1, value2, "childOrderNo"); + return (Criteria) this; + } + + public Criteria andChildOrderNoNotBetween(String value1, String value2) { + addCriterion("child_order_no not between", value1, value2, "childOrderNo"); + return (Criteria) this; + } + + public Criteria andMerIdIsNull() { + addCriterion("mer_id is null"); + return (Criteria) this; + } + + public Criteria andMerIdIsNotNull() { + addCriterion("mer_id is not null"); + return (Criteria) this; + } + + public Criteria andMerIdEqualTo(Long value) { + addCriterion("mer_id =", value, "merId"); + return (Criteria) this; + } + + public Criteria andMerIdNotEqualTo(Long value) { + addCriterion("mer_id <>", value, "merId"); + return (Criteria) this; + } + + public Criteria andMerIdGreaterThan(Long value) { + addCriterion("mer_id >", value, "merId"); + return (Criteria) this; + } + + public Criteria andMerIdGreaterThanOrEqualTo(Long value) { + addCriterion("mer_id >=", value, "merId"); + return (Criteria) this; + } + + public Criteria andMerIdLessThan(Long value) { + addCriterion("mer_id <", value, "merId"); + return (Criteria) this; + } + + public Criteria andMerIdLessThanOrEqualTo(Long value) { + addCriterion("mer_id <=", value, "merId"); + return (Criteria) this; + } + + public Criteria andMerIdIn(List values) { + addCriterion("mer_id in", values, "merId"); + return (Criteria) this; + } + + public Criteria andMerIdNotIn(List values) { + addCriterion("mer_id not in", values, "merId"); + return (Criteria) this; + } + + public Criteria andMerIdBetween(Long value1, Long value2) { + addCriterion("mer_id between", value1, value2, "merId"); + return (Criteria) this; + } + + public Criteria andMerIdNotBetween(Long value1, Long value2) { + addCriterion("mer_id not between", value1, value2, "merId"); + return (Criteria) this; + } + + public Criteria andPlatformCodeIsNull() { + addCriterion("platform_code is null"); + return (Criteria) this; + } + + public Criteria andPlatformCodeIsNotNull() { + addCriterion("platform_code is not null"); + return (Criteria) this; + } + + public Criteria andPlatformCodeEqualTo(String value) { + addCriterion("platform_code =", value, "platformCode"); + return (Criteria) this; + } + + public Criteria andPlatformCodeNotEqualTo(String value) { + addCriterion("platform_code <>", value, "platformCode"); + return (Criteria) this; + } + + public Criteria andPlatformCodeGreaterThan(String value) { + addCriterion("platform_code >", value, "platformCode"); + return (Criteria) this; + } + + public Criteria andPlatformCodeGreaterThanOrEqualTo(String value) { + addCriterion("platform_code >=", value, "platformCode"); + return (Criteria) this; + } + + public Criteria andPlatformCodeLessThan(String value) { + addCriterion("platform_code <", value, "platformCode"); + return (Criteria) this; + } + + public Criteria andPlatformCodeLessThanOrEqualTo(String value) { + addCriterion("platform_code <=", value, "platformCode"); + return (Criteria) this; + } + + public Criteria andPlatformCodeLike(String value) { + addCriterion("platform_code like", value, "platformCode"); + return (Criteria) this; + } + + public Criteria andPlatformCodeNotLike(String value) { + addCriterion("platform_code not like", value, "platformCode"); + return (Criteria) this; + } + + public Criteria andPlatformCodeIn(List values) { + addCriterion("platform_code in", values, "platformCode"); + return (Criteria) this; + } + + public Criteria andPlatformCodeNotIn(List values) { + addCriterion("platform_code not in", values, "platformCode"); + return (Criteria) this; + } + + public Criteria andPlatformCodeBetween(String value1, String value2) { + addCriterion("platform_code between", value1, value2, "platformCode"); + return (Criteria) this; + } + + public Criteria andPlatformCodeNotBetween(String value1, String value2) { + addCriterion("platform_code not between", value1, value2, "platformCode"); + return (Criteria) this; + } + + public Criteria andUserIdIsNull() { + addCriterion("user_id is null"); + return (Criteria) this; + } + + public Criteria andUserIdIsNotNull() { + addCriterion("user_id is not null"); + return (Criteria) this; + } + + public Criteria andUserIdEqualTo(Long value) { + addCriterion("user_id =", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdNotEqualTo(Long value) { + addCriterion("user_id <>", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdGreaterThan(Long value) { + addCriterion("user_id >", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdGreaterThanOrEqualTo(Long value) { + addCriterion("user_id >=", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdLessThan(Long value) { + addCriterion("user_id <", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdLessThanOrEqualTo(Long value) { + addCriterion("user_id <=", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdIn(List values) { + addCriterion("user_id in", values, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdNotIn(List values) { + addCriterion("user_id not in", values, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdBetween(Long value1, Long value2) { + addCriterion("user_id between", value1, value2, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdNotBetween(Long value1, Long value2) { + addCriterion("user_id not between", value1, value2, "userId"); + return (Criteria) this; + } + + public Criteria andUserPhoneIsNull() { + addCriterion("user_phone is null"); + return (Criteria) this; + } + + public Criteria andUserPhoneIsNotNull() { + addCriterion("user_phone is not null"); + return (Criteria) this; + } + + public Criteria andUserPhoneEqualTo(String value) { + addCriterion("user_phone =", value, "userPhone"); + return (Criteria) this; + } + + public Criteria andUserPhoneNotEqualTo(String value) { + addCriterion("user_phone <>", value, "userPhone"); + return (Criteria) this; + } + + public Criteria andUserPhoneGreaterThan(String value) { + addCriterion("user_phone >", value, "userPhone"); + return (Criteria) this; + } + + public Criteria andUserPhoneGreaterThanOrEqualTo(String value) { + addCriterion("user_phone >=", value, "userPhone"); + return (Criteria) this; + } + + public Criteria andUserPhoneLessThan(String value) { + addCriterion("user_phone <", value, "userPhone"); + return (Criteria) this; + } + + public Criteria andUserPhoneLessThanOrEqualTo(String value) { + addCriterion("user_phone <=", value, "userPhone"); + return (Criteria) this; + } + + public Criteria andUserPhoneLike(String value) { + addCriterion("user_phone like", value, "userPhone"); + return (Criteria) this; + } + + public Criteria andUserPhoneNotLike(String value) { + addCriterion("user_phone not like", value, "userPhone"); + return (Criteria) this; + } + + public Criteria andUserPhoneIn(List values) { + addCriterion("user_phone in", values, "userPhone"); + return (Criteria) this; + } + + public Criteria andUserPhoneNotIn(List values) { + addCriterion("user_phone not in", values, "userPhone"); + return (Criteria) this; + } + + public Criteria andUserPhoneBetween(String value1, String value2) { + addCriterion("user_phone between", value1, value2, "userPhone"); + return (Criteria) this; + } + + public Criteria andUserPhoneNotBetween(String value1, String value2) { + addCriterion("user_phone not between", value1, value2, "userPhone"); + return (Criteria) this; + } + + public Criteria andGoodsIdIsNull() { + addCriterion("goods_id is null"); + return (Criteria) this; + } + + public Criteria andGoodsIdIsNotNull() { + addCriterion("goods_id is not null"); + return (Criteria) this; + } + + public Criteria andGoodsIdEqualTo(Long value) { + addCriterion("goods_id =", value, "goodsId"); + return (Criteria) this; + } + + public Criteria andGoodsIdNotEqualTo(Long value) { + addCriterion("goods_id <>", value, "goodsId"); + return (Criteria) this; + } + + public Criteria andGoodsIdGreaterThan(Long value) { + addCriterion("goods_id >", value, "goodsId"); + return (Criteria) this; + } + + public Criteria andGoodsIdGreaterThanOrEqualTo(Long value) { + addCriterion("goods_id >=", value, "goodsId"); + return (Criteria) this; + } + + public Criteria andGoodsIdLessThan(Long value) { + addCriterion("goods_id <", value, "goodsId"); + return (Criteria) this; + } + + public Criteria andGoodsIdLessThanOrEqualTo(Long value) { + addCriterion("goods_id <=", value, "goodsId"); + return (Criteria) this; + } + + public Criteria andGoodsIdIn(List values) { + addCriterion("goods_id in", values, "goodsId"); + return (Criteria) this; + } + + public Criteria andGoodsIdNotIn(List values) { + addCriterion("goods_id not in", values, "goodsId"); + return (Criteria) this; + } + + public Criteria andGoodsIdBetween(Long value1, Long value2) { + addCriterion("goods_id between", value1, value2, "goodsId"); + return (Criteria) this; + } + + public Criteria andGoodsIdNotBetween(Long value1, Long value2) { + addCriterion("goods_id not between", value1, value2, "goodsId"); + return (Criteria) this; + } + + public Criteria andGoodsNameIsNull() { + addCriterion("goods_name is null"); + return (Criteria) this; + } + + public Criteria andGoodsNameIsNotNull() { + addCriterion("goods_name is not null"); + return (Criteria) this; + } + + public Criteria andGoodsNameEqualTo(String value) { + addCriterion("goods_name =", value, "goodsName"); + return (Criteria) this; + } + + public Criteria andGoodsNameNotEqualTo(String value) { + addCriterion("goods_name <>", value, "goodsName"); + return (Criteria) this; + } + + public Criteria andGoodsNameGreaterThan(String value) { + addCriterion("goods_name >", value, "goodsName"); + return (Criteria) this; + } + + public Criteria andGoodsNameGreaterThanOrEqualTo(String value) { + addCriterion("goods_name >=", value, "goodsName"); + return (Criteria) this; + } + + public Criteria andGoodsNameLessThan(String value) { + addCriterion("goods_name <", value, "goodsName"); + return (Criteria) this; + } + + public Criteria andGoodsNameLessThanOrEqualTo(String value) { + addCriterion("goods_name <=", value, "goodsName"); + return (Criteria) this; + } + + public Criteria andGoodsNameLike(String value) { + addCriterion("goods_name like", value, "goodsName"); + return (Criteria) this; + } + + public Criteria andGoodsNameNotLike(String value) { + addCriterion("goods_name not like", value, "goodsName"); + return (Criteria) this; + } + + public Criteria andGoodsNameIn(List values) { + addCriterion("goods_name in", values, "goodsName"); + return (Criteria) this; + } + + public Criteria andGoodsNameNotIn(List values) { + addCriterion("goods_name not in", values, "goodsName"); + return (Criteria) this; + } + + public Criteria andGoodsNameBetween(String value1, String value2) { + addCriterion("goods_name between", value1, value2, "goodsName"); + return (Criteria) this; + } + + public Criteria andGoodsNameNotBetween(String value1, String value2) { + addCriterion("goods_name not between", value1, value2, "goodsName"); + return (Criteria) this; + } + + public Criteria andGoodsTypeIdIsNull() { + addCriterion("goods_type_id is null"); + return (Criteria) this; + } + + public Criteria andGoodsTypeIdIsNotNull() { + addCriterion("goods_type_id is not null"); + return (Criteria) this; + } + + public Criteria andGoodsTypeIdEqualTo(Long value) { + addCriterion("goods_type_id =", value, "goodsTypeId"); + return (Criteria) this; + } + + public Criteria andGoodsTypeIdNotEqualTo(Long value) { + addCriterion("goods_type_id <>", value, "goodsTypeId"); + return (Criteria) this; + } + + public Criteria andGoodsTypeIdGreaterThan(Long value) { + addCriterion("goods_type_id >", value, "goodsTypeId"); + return (Criteria) this; + } + + public Criteria andGoodsTypeIdGreaterThanOrEqualTo(Long value) { + addCriterion("goods_type_id >=", value, "goodsTypeId"); + return (Criteria) this; + } + + public Criteria andGoodsTypeIdLessThan(Long value) { + addCriterion("goods_type_id <", value, "goodsTypeId"); + return (Criteria) this; + } + + public Criteria andGoodsTypeIdLessThanOrEqualTo(Long value) { + addCriterion("goods_type_id <=", value, "goodsTypeId"); + return (Criteria) this; + } + + public Criteria andGoodsTypeIdIn(List values) { + addCriterion("goods_type_id in", values, "goodsTypeId"); + return (Criteria) this; + } + + public Criteria andGoodsTypeIdNotIn(List values) { + addCriterion("goods_type_id not in", values, "goodsTypeId"); + return (Criteria) this; + } + + public Criteria andGoodsTypeIdBetween(Long value1, Long value2) { + addCriterion("goods_type_id between", value1, value2, "goodsTypeId"); + return (Criteria) this; + } + + public Criteria andGoodsTypeIdNotBetween(Long value1, Long value2) { + addCriterion("goods_type_id not between", value1, value2, "goodsTypeId"); + return (Criteria) this; + } + + public Criteria andGoodsTypeNameIsNull() { + addCriterion("goods_type_name is null"); + return (Criteria) this; + } + + public Criteria andGoodsTypeNameIsNotNull() { + addCriterion("goods_type_name is not null"); + return (Criteria) this; + } + + public Criteria andGoodsTypeNameEqualTo(String value) { + addCriterion("goods_type_name =", value, "goodsTypeName"); + return (Criteria) this; + } + + public Criteria andGoodsTypeNameNotEqualTo(String value) { + addCriterion("goods_type_name <>", value, "goodsTypeName"); + return (Criteria) this; + } + + public Criteria andGoodsTypeNameGreaterThan(String value) { + addCriterion("goods_type_name >", value, "goodsTypeName"); + return (Criteria) this; + } + + public Criteria andGoodsTypeNameGreaterThanOrEqualTo(String value) { + addCriterion("goods_type_name >=", value, "goodsTypeName"); + return (Criteria) this; + } + + public Criteria andGoodsTypeNameLessThan(String value) { + addCriterion("goods_type_name <", value, "goodsTypeName"); + return (Criteria) this; + } + + public Criteria andGoodsTypeNameLessThanOrEqualTo(String value) { + addCriterion("goods_type_name <=", value, "goodsTypeName"); + return (Criteria) this; + } + + public Criteria andGoodsTypeNameLike(String value) { + addCriterion("goods_type_name like", value, "goodsTypeName"); + return (Criteria) this; + } + + public Criteria andGoodsTypeNameNotLike(String value) { + addCriterion("goods_type_name not like", value, "goodsTypeName"); + return (Criteria) this; + } + + public Criteria andGoodsTypeNameIn(List values) { + addCriterion("goods_type_name in", values, "goodsTypeName"); + return (Criteria) this; + } + + public Criteria andGoodsTypeNameNotIn(List values) { + addCriterion("goods_type_name not in", values, "goodsTypeName"); + return (Criteria) this; + } + + public Criteria andGoodsTypeNameBetween(String value1, String value2) { + addCriterion("goods_type_name between", value1, value2, "goodsTypeName"); + return (Criteria) this; + } + + public Criteria andGoodsTypeNameNotBetween(String value1, String value2) { + addCriterion("goods_type_name not between", value1, value2, "goodsTypeName"); + return (Criteria) this; + } + + public Criteria andGoodsBrandIdIsNull() { + addCriterion("goods_brand_id is null"); + return (Criteria) this; + } + + public Criteria andGoodsBrandIdIsNotNull() { + addCriterion("goods_brand_id is not null"); + return (Criteria) this; + } + + public Criteria andGoodsBrandIdEqualTo(Long value) { + addCriterion("goods_brand_id =", value, "goodsBrandId"); + return (Criteria) this; + } + + public Criteria andGoodsBrandIdNotEqualTo(Long value) { + addCriterion("goods_brand_id <>", value, "goodsBrandId"); + return (Criteria) this; + } + + public Criteria andGoodsBrandIdGreaterThan(Long value) { + addCriterion("goods_brand_id >", value, "goodsBrandId"); + return (Criteria) this; + } + + public Criteria andGoodsBrandIdGreaterThanOrEqualTo(Long value) { + addCriterion("goods_brand_id >=", value, "goodsBrandId"); + return (Criteria) this; + } + + public Criteria andGoodsBrandIdLessThan(Long value) { + addCriterion("goods_brand_id <", value, "goodsBrandId"); + return (Criteria) this; + } + + public Criteria andGoodsBrandIdLessThanOrEqualTo(Long value) { + addCriterion("goods_brand_id <=", value, "goodsBrandId"); + return (Criteria) this; + } + + public Criteria andGoodsBrandIdIn(List values) { + addCriterion("goods_brand_id in", values, "goodsBrandId"); + return (Criteria) this; + } + + public Criteria andGoodsBrandIdNotIn(List values) { + addCriterion("goods_brand_id not in", values, "goodsBrandId"); + return (Criteria) this; + } + + public Criteria andGoodsBrandIdBetween(Long value1, Long value2) { + addCriterion("goods_brand_id between", value1, value2, "goodsBrandId"); + return (Criteria) this; + } + + public Criteria andGoodsBrandIdNotBetween(Long value1, Long value2) { + addCriterion("goods_brand_id not between", value1, value2, "goodsBrandId"); + return (Criteria) this; + } + + public Criteria andGoodsBrandNameIsNull() { + addCriterion("goods_brand_name is null"); + return (Criteria) this; + } + + public Criteria andGoodsBrandNameIsNotNull() { + addCriterion("goods_brand_name is not null"); + return (Criteria) this; + } + + public Criteria andGoodsBrandNameEqualTo(String value) { + addCriterion("goods_brand_name =", value, "goodsBrandName"); + return (Criteria) this; + } + + public Criteria andGoodsBrandNameNotEqualTo(String value) { + addCriterion("goods_brand_name <>", value, "goodsBrandName"); + return (Criteria) this; + } + + public Criteria andGoodsBrandNameGreaterThan(String value) { + addCriterion("goods_brand_name >", value, "goodsBrandName"); + return (Criteria) this; + } + + public Criteria andGoodsBrandNameGreaterThanOrEqualTo(String value) { + addCriterion("goods_brand_name >=", value, "goodsBrandName"); + return (Criteria) this; + } + + public Criteria andGoodsBrandNameLessThan(String value) { + addCriterion("goods_brand_name <", value, "goodsBrandName"); + return (Criteria) this; + } + + public Criteria andGoodsBrandNameLessThanOrEqualTo(String value) { + addCriterion("goods_brand_name <=", value, "goodsBrandName"); + return (Criteria) this; + } + + public Criteria andGoodsBrandNameLike(String value) { + addCriterion("goods_brand_name like", value, "goodsBrandName"); + return (Criteria) this; + } + + public Criteria andGoodsBrandNameNotLike(String value) { + addCriterion("goods_brand_name not like", value, "goodsBrandName"); + return (Criteria) this; + } + + public Criteria andGoodsBrandNameIn(List values) { + addCriterion("goods_brand_name in", values, "goodsBrandName"); + return (Criteria) this; + } + + public Criteria andGoodsBrandNameNotIn(List values) { + addCriterion("goods_brand_name not in", values, "goodsBrandName"); + return (Criteria) this; + } + + public Criteria andGoodsBrandNameBetween(String value1, String value2) { + addCriterion("goods_brand_name between", value1, value2, "goodsBrandName"); + return (Criteria) this; + } + + public Criteria andGoodsBrandNameNotBetween(String value1, String value2) { + addCriterion("goods_brand_name not between", value1, value2, "goodsBrandName"); + return (Criteria) this; + } + + public Criteria andGoodsSpecsIdIsNull() { + addCriterion("goods_specs_id is null"); + return (Criteria) this; + } + + public Criteria andGoodsSpecsIdIsNotNull() { + addCriterion("goods_specs_id is not null"); + return (Criteria) this; + } + + public Criteria andGoodsSpecsIdEqualTo(Long value) { + addCriterion("goods_specs_id =", value, "goodsSpecsId"); + return (Criteria) this; + } + + public Criteria andGoodsSpecsIdNotEqualTo(Long value) { + addCriterion("goods_specs_id <>", value, "goodsSpecsId"); + return (Criteria) this; + } + + public Criteria andGoodsSpecsIdGreaterThan(Long value) { + addCriterion("goods_specs_id >", value, "goodsSpecsId"); + return (Criteria) this; + } + + public Criteria andGoodsSpecsIdGreaterThanOrEqualTo(Long value) { + addCriterion("goods_specs_id >=", value, "goodsSpecsId"); + return (Criteria) this; + } + + public Criteria andGoodsSpecsIdLessThan(Long value) { + addCriterion("goods_specs_id <", value, "goodsSpecsId"); + return (Criteria) this; + } + + public Criteria andGoodsSpecsIdLessThanOrEqualTo(Long value) { + addCriterion("goods_specs_id <=", value, "goodsSpecsId"); + return (Criteria) this; + } + + public Criteria andGoodsSpecsIdIn(List values) { + addCriterion("goods_specs_id in", values, "goodsSpecsId"); + return (Criteria) this; + } + + public Criteria andGoodsSpecsIdNotIn(List values) { + addCriterion("goods_specs_id not in", values, "goodsSpecsId"); + return (Criteria) this; + } + + public Criteria andGoodsSpecsIdBetween(Long value1, Long value2) { + addCriterion("goods_specs_id between", value1, value2, "goodsSpecsId"); + return (Criteria) this; + } + + public Criteria andGoodsSpecsIdNotBetween(Long value1, Long value2) { + addCriterion("goods_specs_id not between", value1, value2, "goodsSpecsId"); + return (Criteria) this; + } + + public Criteria andGoodsSpecsNameIsNull() { + addCriterion("goods_specs_name is null"); + return (Criteria) this; + } + + public Criteria andGoodsSpecsNameIsNotNull() { + addCriterion("goods_specs_name is not null"); + return (Criteria) this; + } + + public Criteria andGoodsSpecsNameEqualTo(String value) { + addCriterion("goods_specs_name =", value, "goodsSpecsName"); + return (Criteria) this; + } + + public Criteria andGoodsSpecsNameNotEqualTo(String value) { + addCriterion("goods_specs_name <>", value, "goodsSpecsName"); + return (Criteria) this; + } + + public Criteria andGoodsSpecsNameGreaterThan(String value) { + addCriterion("goods_specs_name >", value, "goodsSpecsName"); + return (Criteria) this; + } + + public Criteria andGoodsSpecsNameGreaterThanOrEqualTo(String value) { + addCriterion("goods_specs_name >=", value, "goodsSpecsName"); + return (Criteria) this; + } + + public Criteria andGoodsSpecsNameLessThan(String value) { + addCriterion("goods_specs_name <", value, "goodsSpecsName"); + return (Criteria) this; + } + + public Criteria andGoodsSpecsNameLessThanOrEqualTo(String value) { + addCriterion("goods_specs_name <=", value, "goodsSpecsName"); + return (Criteria) this; + } + + public Criteria andGoodsSpecsNameLike(String value) { + addCriterion("goods_specs_name like", value, "goodsSpecsName"); + return (Criteria) this; + } + + public Criteria andGoodsSpecsNameNotLike(String value) { + addCriterion("goods_specs_name not like", value, "goodsSpecsName"); + return (Criteria) this; + } + + public Criteria andGoodsSpecsNameIn(List values) { + addCriterion("goods_specs_name in", values, "goodsSpecsName"); + return (Criteria) this; + } + + public Criteria andGoodsSpecsNameNotIn(List values) { + addCriterion("goods_specs_name not in", values, "goodsSpecsName"); + return (Criteria) this; + } + + public Criteria andGoodsSpecsNameBetween(String value1, String value2) { + addCriterion("goods_specs_name between", value1, value2, "goodsSpecsName"); + return (Criteria) this; + } + + public Criteria andGoodsSpecsNameNotBetween(String value1, String value2) { + addCriterion("goods_specs_name not between", value1, value2, "goodsSpecsName"); + return (Criteria) this; + } + + public Criteria andGoodsSpescOriginalPriceIsNull() { + addCriterion("goods_spesc_original_price is null"); + return (Criteria) this; + } + + public Criteria andGoodsSpescOriginalPriceIsNotNull() { + addCriterion("goods_spesc_original_price is not null"); + return (Criteria) this; + } + + public Criteria andGoodsSpescOriginalPriceEqualTo(BigDecimal value) { + addCriterion("goods_spesc_original_price =", value, "goodsSpescOriginalPrice"); + return (Criteria) this; + } + + public Criteria andGoodsSpescOriginalPriceNotEqualTo(BigDecimal value) { + addCriterion("goods_spesc_original_price <>", value, "goodsSpescOriginalPrice"); + return (Criteria) this; + } + + public Criteria andGoodsSpescOriginalPriceGreaterThan(BigDecimal value) { + addCriterion("goods_spesc_original_price >", value, "goodsSpescOriginalPrice"); + return (Criteria) this; + } + + public Criteria andGoodsSpescOriginalPriceGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("goods_spesc_original_price >=", value, "goodsSpescOriginalPrice"); + return (Criteria) this; + } + + public Criteria andGoodsSpescOriginalPriceLessThan(BigDecimal value) { + addCriterion("goods_spesc_original_price <", value, "goodsSpescOriginalPrice"); + return (Criteria) this; + } + + public Criteria andGoodsSpescOriginalPriceLessThanOrEqualTo(BigDecimal value) { + addCriterion("goods_spesc_original_price <=", value, "goodsSpescOriginalPrice"); + return (Criteria) this; + } + + public Criteria andGoodsSpescOriginalPriceIn(List values) { + addCriterion("goods_spesc_original_price in", values, "goodsSpescOriginalPrice"); + return (Criteria) this; + } + + public Criteria andGoodsSpescOriginalPriceNotIn(List values) { + addCriterion("goods_spesc_original_price not in", values, "goodsSpescOriginalPrice"); + return (Criteria) this; + } + + public Criteria andGoodsSpescOriginalPriceBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("goods_spesc_original_price between", value1, value2, "goodsSpescOriginalPrice"); + return (Criteria) this; + } + + public Criteria andGoodsSpescOriginalPriceNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("goods_spesc_original_price not between", value1, value2, "goodsSpescOriginalPrice"); + return (Criteria) this; + } + + public Criteria andGoodsSpescSalePriceIsNull() { + addCriterion("goods_spesc_sale_price is null"); + return (Criteria) this; + } + + public Criteria andGoodsSpescSalePriceIsNotNull() { + addCriterion("goods_spesc_sale_price is not null"); + return (Criteria) this; + } + + public Criteria andGoodsSpescSalePriceEqualTo(BigDecimal value) { + addCriterion("goods_spesc_sale_price =", value, "goodsSpescSalePrice"); + return (Criteria) this; + } + + public Criteria andGoodsSpescSalePriceNotEqualTo(BigDecimal value) { + addCriterion("goods_spesc_sale_price <>", value, "goodsSpescSalePrice"); + return (Criteria) this; + } + + public Criteria andGoodsSpescSalePriceGreaterThan(BigDecimal value) { + addCriterion("goods_spesc_sale_price >", value, "goodsSpescSalePrice"); + return (Criteria) this; + } + + public Criteria andGoodsSpescSalePriceGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("goods_spesc_sale_price >=", value, "goodsSpescSalePrice"); + return (Criteria) this; + } + + public Criteria andGoodsSpescSalePriceLessThan(BigDecimal value) { + addCriterion("goods_spesc_sale_price <", value, "goodsSpescSalePrice"); + return (Criteria) this; + } + + public Criteria andGoodsSpescSalePriceLessThanOrEqualTo(BigDecimal value) { + addCriterion("goods_spesc_sale_price <=", value, "goodsSpescSalePrice"); + return (Criteria) this; + } + + public Criteria andGoodsSpescSalePriceIn(List values) { + addCriterion("goods_spesc_sale_price in", values, "goodsSpescSalePrice"); + return (Criteria) this; + } + + public Criteria andGoodsSpescSalePriceNotIn(List values) { + addCriterion("goods_spesc_sale_price not in", values, "goodsSpescSalePrice"); + return (Criteria) this; + } + + public Criteria andGoodsSpescSalePriceBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("goods_spesc_sale_price between", value1, value2, "goodsSpescSalePrice"); + return (Criteria) this; + } + + public Criteria andGoodsSpescSalePriceNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("goods_spesc_sale_price not between", value1, value2, "goodsSpescSalePrice"); + return (Criteria) this; + } + + public Criteria andGoodsVpdIdIsNull() { + addCriterion("goods_vpd_id is null"); + return (Criteria) this; + } + + public Criteria andGoodsVpdIdIsNotNull() { + addCriterion("goods_vpd_id is not null"); + return (Criteria) this; + } + + public Criteria andGoodsVpdIdEqualTo(Long value) { + addCriterion("goods_vpd_id =", value, "goodsVpdId"); + return (Criteria) this; + } + + public Criteria andGoodsVpdIdNotEqualTo(Long value) { + addCriterion("goods_vpd_id <>", value, "goodsVpdId"); + return (Criteria) this; + } + + public Criteria andGoodsVpdIdGreaterThan(Long value) { + addCriterion("goods_vpd_id >", value, "goodsVpdId"); + return (Criteria) this; + } + + public Criteria andGoodsVpdIdGreaterThanOrEqualTo(Long value) { + addCriterion("goods_vpd_id >=", value, "goodsVpdId"); + return (Criteria) this; + } + + public Criteria andGoodsVpdIdLessThan(Long value) { + addCriterion("goods_vpd_id <", value, "goodsVpdId"); + return (Criteria) this; + } + + public Criteria andGoodsVpdIdLessThanOrEqualTo(Long value) { + addCriterion("goods_vpd_id <=", value, "goodsVpdId"); + return (Criteria) this; + } + + public Criteria andGoodsVpdIdIn(List values) { + addCriterion("goods_vpd_id in", values, "goodsVpdId"); + return (Criteria) this; + } + + public Criteria andGoodsVpdIdNotIn(List values) { + addCriterion("goods_vpd_id not in", values, "goodsVpdId"); + return (Criteria) this; + } + + public Criteria andGoodsVpdIdBetween(Long value1, Long value2) { + addCriterion("goods_vpd_id between", value1, value2, "goodsVpdId"); + return (Criteria) this; + } + + public Criteria andGoodsVpdIdNotBetween(Long value1, Long value2) { + addCriterion("goods_vpd_id not between", value1, value2, "goodsVpdId"); + return (Criteria) this; + } + + public Criteria andGoodsVpdKeyIsNull() { + addCriterion("goods_vpd_key is null"); + return (Criteria) this; + } + + public Criteria andGoodsVpdKeyIsNotNull() { + addCriterion("goods_vpd_key is not null"); + return (Criteria) this; + } + + public Criteria andGoodsVpdKeyEqualTo(String value) { + addCriterion("goods_vpd_key =", value, "goodsVpdKey"); + return (Criteria) this; + } + + public Criteria andGoodsVpdKeyNotEqualTo(String value) { + addCriterion("goods_vpd_key <>", value, "goodsVpdKey"); + return (Criteria) this; + } + + public Criteria andGoodsVpdKeyGreaterThan(String value) { + addCriterion("goods_vpd_key >", value, "goodsVpdKey"); + return (Criteria) this; + } + + public Criteria andGoodsVpdKeyGreaterThanOrEqualTo(String value) { + addCriterion("goods_vpd_key >=", value, "goodsVpdKey"); + return (Criteria) this; + } + + public Criteria andGoodsVpdKeyLessThan(String value) { + addCriterion("goods_vpd_key <", value, "goodsVpdKey"); + return (Criteria) this; + } + + public Criteria andGoodsVpdKeyLessThanOrEqualTo(String value) { + addCriterion("goods_vpd_key <=", value, "goodsVpdKey"); + return (Criteria) this; + } + + public Criteria andGoodsVpdKeyLike(String value) { + addCriterion("goods_vpd_key like", value, "goodsVpdKey"); + return (Criteria) this; + } + + public Criteria andGoodsVpdKeyNotLike(String value) { + addCriterion("goods_vpd_key not like", value, "goodsVpdKey"); + return (Criteria) this; + } + + public Criteria andGoodsVpdKeyIn(List values) { + addCriterion("goods_vpd_key in", values, "goodsVpdKey"); + return (Criteria) this; + } + + public Criteria andGoodsVpdKeyNotIn(List values) { + addCriterion("goods_vpd_key not in", values, "goodsVpdKey"); + return (Criteria) this; + } + + public Criteria andGoodsVpdKeyBetween(String value1, String value2) { + addCriterion("goods_vpd_key between", value1, value2, "goodsVpdKey"); + return (Criteria) this; + } + + public Criteria andGoodsVpdKeyNotBetween(String value1, String value2) { + addCriterion("goods_vpd_key not between", value1, value2, "goodsVpdKey"); + return (Criteria) this; + } + + public Criteria andGoodsVpdSourceIsNull() { + addCriterion("goods_vpd_source is null"); + return (Criteria) this; + } + + public Criteria andGoodsVpdSourceIsNotNull() { + addCriterion("goods_vpd_source is not null"); + return (Criteria) this; + } + + public Criteria andGoodsVpdSourceEqualTo(Integer value) { + addCriterion("goods_vpd_source =", value, "goodsVpdSource"); + return (Criteria) this; + } + + public Criteria andGoodsVpdSourceNotEqualTo(Integer value) { + addCriterion("goods_vpd_source <>", value, "goodsVpdSource"); + return (Criteria) this; + } + + public Criteria andGoodsVpdSourceGreaterThan(Integer value) { + addCriterion("goods_vpd_source >", value, "goodsVpdSource"); + return (Criteria) this; + } + + public Criteria andGoodsVpdSourceGreaterThanOrEqualTo(Integer value) { + addCriterion("goods_vpd_source >=", value, "goodsVpdSource"); + return (Criteria) this; + } + + public Criteria andGoodsVpdSourceLessThan(Integer value) { + addCriterion("goods_vpd_source <", value, "goodsVpdSource"); + return (Criteria) this; + } + + public Criteria andGoodsVpdSourceLessThanOrEqualTo(Integer value) { + addCriterion("goods_vpd_source <=", value, "goodsVpdSource"); + return (Criteria) this; + } + + public Criteria andGoodsVpdSourceIn(List values) { + addCriterion("goods_vpd_source in", values, "goodsVpdSource"); + return (Criteria) this; + } + + public Criteria andGoodsVpdSourceNotIn(List values) { + addCriterion("goods_vpd_source not in", values, "goodsVpdSource"); + return (Criteria) this; + } + + public Criteria andGoodsVpdSourceBetween(Integer value1, Integer value2) { + addCriterion("goods_vpd_source between", value1, value2, "goodsVpdSource"); + return (Criteria) this; + } + + public Criteria andGoodsVpdSourceNotBetween(Integer value1, Integer value2) { + addCriterion("goods_vpd_source not between", value1, value2, "goodsVpdSource"); + return (Criteria) this; + } + + public Criteria andGoodsCountIsNull() { + addCriterion("goods_count is null"); + return (Criteria) this; + } + + public Criteria andGoodsCountIsNotNull() { + addCriterion("goods_count is not null"); + return (Criteria) this; + } + + public Criteria andGoodsCountEqualTo(Integer value) { + addCriterion("goods_count =", value, "goodsCount"); + return (Criteria) this; + } + + public Criteria andGoodsCountNotEqualTo(Integer value) { + addCriterion("goods_count <>", value, "goodsCount"); + return (Criteria) this; + } + + public Criteria andGoodsCountGreaterThan(Integer value) { + addCriterion("goods_count >", value, "goodsCount"); + return (Criteria) this; + } + + public Criteria andGoodsCountGreaterThanOrEqualTo(Integer value) { + addCriterion("goods_count >=", value, "goodsCount"); + return (Criteria) this; + } + + public Criteria andGoodsCountLessThan(Integer value) { + addCriterion("goods_count <", value, "goodsCount"); + return (Criteria) this; + } + + public Criteria andGoodsCountLessThanOrEqualTo(Integer value) { + addCriterion("goods_count <=", value, "goodsCount"); + return (Criteria) this; + } + + public Criteria andGoodsCountIn(List values) { + addCriterion("goods_count in", values, "goodsCount"); + return (Criteria) this; + } + + public Criteria andGoodsCountNotIn(List values) { + addCriterion("goods_count not in", values, "goodsCount"); + return (Criteria) this; + } + + public Criteria andGoodsCountBetween(Integer value1, Integer value2) { + addCriterion("goods_count between", value1, value2, "goodsCount"); + return (Criteria) this; + } + + public Criteria andGoodsCountNotBetween(Integer value1, Integer value2) { + addCriterion("goods_count not between", value1, value2, "goodsCount"); + return (Criteria) this; + } + + public Criteria andTotalPriceIsNull() { + addCriterion("total_price is null"); + return (Criteria) this; + } + + public Criteria andTotalPriceIsNotNull() { + addCriterion("total_price is not null"); + return (Criteria) this; + } + + public Criteria andTotalPriceEqualTo(BigDecimal value) { + addCriterion("total_price =", value, "totalPrice"); + return (Criteria) this; + } + + public Criteria andTotalPriceNotEqualTo(BigDecimal value) { + addCriterion("total_price <>", value, "totalPrice"); + return (Criteria) this; + } + + public Criteria andTotalPriceGreaterThan(BigDecimal value) { + addCriterion("total_price >", value, "totalPrice"); + return (Criteria) this; + } + + public Criteria andTotalPriceGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("total_price >=", value, "totalPrice"); + return (Criteria) this; + } + + public Criteria andTotalPriceLessThan(BigDecimal value) { + addCriterion("total_price <", value, "totalPrice"); + return (Criteria) this; + } + + public Criteria andTotalPriceLessThanOrEqualTo(BigDecimal value) { + addCriterion("total_price <=", value, "totalPrice"); + return (Criteria) this; + } + + public Criteria andTotalPriceIn(List values) { + addCriterion("total_price in", values, "totalPrice"); + return (Criteria) this; + } + + public Criteria andTotalPriceNotIn(List values) { + addCriterion("total_price not in", values, "totalPrice"); + return (Criteria) this; + } + + public Criteria andTotalPriceBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("total_price between", value1, value2, "totalPrice"); + return (Criteria) this; + } + + public Criteria andTotalPriceNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("total_price not between", value1, value2, "totalPrice"); + return (Criteria) this; + } + + public Criteria andTotalDeductionPriceIsNull() { + addCriterion("total_deduction_price is null"); + return (Criteria) this; + } + + public Criteria andTotalDeductionPriceIsNotNull() { + addCriterion("total_deduction_price is not null"); + return (Criteria) this; + } + + public Criteria andTotalDeductionPriceEqualTo(BigDecimal value) { + addCriterion("total_deduction_price =", value, "totalDeductionPrice"); + return (Criteria) this; + } + + public Criteria andTotalDeductionPriceNotEqualTo(BigDecimal value) { + addCriterion("total_deduction_price <>", value, "totalDeductionPrice"); + return (Criteria) this; + } + + public Criteria andTotalDeductionPriceGreaterThan(BigDecimal value) { + addCriterion("total_deduction_price >", value, "totalDeductionPrice"); + return (Criteria) this; + } + + public Criteria andTotalDeductionPriceGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("total_deduction_price >=", value, "totalDeductionPrice"); + return (Criteria) this; + } + + public Criteria andTotalDeductionPriceLessThan(BigDecimal value) { + addCriterion("total_deduction_price <", value, "totalDeductionPrice"); + return (Criteria) this; + } + + public Criteria andTotalDeductionPriceLessThanOrEqualTo(BigDecimal value) { + addCriterion("total_deduction_price <=", value, "totalDeductionPrice"); + return (Criteria) this; + } + + public Criteria andTotalDeductionPriceIn(List values) { + addCriterion("total_deduction_price in", values, "totalDeductionPrice"); + return (Criteria) this; + } + + public Criteria andTotalDeductionPriceNotIn(List values) { + addCriterion("total_deduction_price not in", values, "totalDeductionPrice"); + return (Criteria) this; + } + + public Criteria andTotalDeductionPriceBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("total_deduction_price between", value1, value2, "totalDeductionPrice"); + return (Criteria) this; + } + + public Criteria andTotalDeductionPriceNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("total_deduction_price not between", value1, value2, "totalDeductionPrice"); + return (Criteria) this; + } + + public Criteria andCouponDiscountPriceIsNull() { + addCriterion("coupon_discount_price is null"); + return (Criteria) this; + } + + public Criteria andCouponDiscountPriceIsNotNull() { + addCriterion("coupon_discount_price is not null"); + return (Criteria) this; + } + + public Criteria andCouponDiscountPriceEqualTo(BigDecimal value) { + addCriterion("coupon_discount_price =", value, "couponDiscountPrice"); + return (Criteria) this; + } + + public Criteria andCouponDiscountPriceNotEqualTo(BigDecimal value) { + addCriterion("coupon_discount_price <>", value, "couponDiscountPrice"); + return (Criteria) this; + } + + public Criteria andCouponDiscountPriceGreaterThan(BigDecimal value) { + addCriterion("coupon_discount_price >", value, "couponDiscountPrice"); + return (Criteria) this; + } + + public Criteria andCouponDiscountPriceGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("coupon_discount_price >=", value, "couponDiscountPrice"); + return (Criteria) this; + } + + public Criteria andCouponDiscountPriceLessThan(BigDecimal value) { + addCriterion("coupon_discount_price <", value, "couponDiscountPrice"); + return (Criteria) this; + } + + public Criteria andCouponDiscountPriceLessThanOrEqualTo(BigDecimal value) { + addCriterion("coupon_discount_price <=", value, "couponDiscountPrice"); + return (Criteria) this; + } + + public Criteria andCouponDiscountPriceIn(List values) { + addCriterion("coupon_discount_price in", values, "couponDiscountPrice"); + return (Criteria) this; + } + + public Criteria andCouponDiscountPriceNotIn(List values) { + addCriterion("coupon_discount_price not in", values, "couponDiscountPrice"); + return (Criteria) this; + } + + public Criteria andCouponDiscountPriceBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("coupon_discount_price between", value1, value2, "couponDiscountPrice"); + return (Criteria) this; + } + + public Criteria andCouponDiscountPriceNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("coupon_discount_price not between", value1, value2, "couponDiscountPrice"); + return (Criteria) this; + } + + public Criteria andIntegralDiscountPriceIsNull() { + addCriterion("integral_discount_price is null"); + return (Criteria) this; + } + + public Criteria andIntegralDiscountPriceIsNotNull() { + addCriterion("integral_discount_price is not null"); + return (Criteria) this; + } + + public Criteria andIntegralDiscountPriceEqualTo(Long value) { + addCriterion("integral_discount_price =", value, "integralDiscountPrice"); + return (Criteria) this; + } + + public Criteria andIntegralDiscountPriceNotEqualTo(Long value) { + addCriterion("integral_discount_price <>", value, "integralDiscountPrice"); + return (Criteria) this; + } + + public Criteria andIntegralDiscountPriceGreaterThan(Long value) { + addCriterion("integral_discount_price >", value, "integralDiscountPrice"); + return (Criteria) this; + } + + public Criteria andIntegralDiscountPriceGreaterThanOrEqualTo(Long value) { + addCriterion("integral_discount_price >=", value, "integralDiscountPrice"); + return (Criteria) this; + } + + public Criteria andIntegralDiscountPriceLessThan(Long value) { + addCriterion("integral_discount_price <", value, "integralDiscountPrice"); + return (Criteria) this; + } + + public Criteria andIntegralDiscountPriceLessThanOrEqualTo(Long value) { + addCriterion("integral_discount_price <=", value, "integralDiscountPrice"); + return (Criteria) this; + } + + public Criteria andIntegralDiscountPriceIn(List values) { + addCriterion("integral_discount_price in", values, "integralDiscountPrice"); + return (Criteria) this; + } + + public Criteria andIntegralDiscountPriceNotIn(List values) { + addCriterion("integral_discount_price not in", values, "integralDiscountPrice"); + return (Criteria) this; + } + + public Criteria andIntegralDiscountPriceBetween(Long value1, Long value2) { + addCriterion("integral_discount_price between", value1, value2, "integralDiscountPrice"); + return (Criteria) this; + } + + public Criteria andIntegralDiscountPriceNotBetween(Long value1, Long value2) { + addCriterion("integral_discount_price not between", value1, value2, "integralDiscountPrice"); + return (Criteria) this; + } + + public Criteria andPayRealPriceIsNull() { + addCriterion("pay_real_price is null"); + return (Criteria) this; + } + + public Criteria andPayRealPriceIsNotNull() { + addCriterion("pay_real_price is not null"); + return (Criteria) this; + } + + public Criteria andPayRealPriceEqualTo(BigDecimal value) { + addCriterion("pay_real_price =", value, "payRealPrice"); + return (Criteria) this; + } + + public Criteria andPayRealPriceNotEqualTo(BigDecimal value) { + addCriterion("pay_real_price <>", value, "payRealPrice"); + return (Criteria) this; + } + + public Criteria andPayRealPriceGreaterThan(BigDecimal value) { + addCriterion("pay_real_price >", value, "payRealPrice"); + return (Criteria) this; + } + + public Criteria andPayRealPriceGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("pay_real_price >=", value, "payRealPrice"); + return (Criteria) this; + } + + public Criteria andPayRealPriceLessThan(BigDecimal value) { + addCriterion("pay_real_price <", value, "payRealPrice"); + return (Criteria) this; + } + + public Criteria andPayRealPriceLessThanOrEqualTo(BigDecimal value) { + addCriterion("pay_real_price <=", value, "payRealPrice"); + return (Criteria) this; + } + + public Criteria andPayRealPriceIn(List values) { + addCriterion("pay_real_price in", values, "payRealPrice"); + return (Criteria) this; + } + + public Criteria andPayRealPriceNotIn(List values) { + addCriterion("pay_real_price not in", values, "payRealPrice"); + return (Criteria) this; + } + + public Criteria andPayRealPriceBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("pay_real_price between", value1, value2, "payRealPrice"); + return (Criteria) this; + } + + public Criteria andPayRealPriceNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("pay_real_price not between", value1, value2, "payRealPrice"); + return (Criteria) this; + } + + public Criteria andPayChannelIsNull() { + addCriterion("pay_channel is null"); + return (Criteria) this; + } + + public Criteria andPayChannelIsNotNull() { + addCriterion("pay_channel is not null"); + return (Criteria) this; + } + + public Criteria andPayChannelEqualTo(Integer value) { + addCriterion("pay_channel =", value, "payChannel"); + return (Criteria) this; + } + + public Criteria andPayChannelNotEqualTo(Integer value) { + addCriterion("pay_channel <>", value, "payChannel"); + return (Criteria) this; + } + + public Criteria andPayChannelGreaterThan(Integer value) { + addCriterion("pay_channel >", value, "payChannel"); + return (Criteria) this; + } + + public Criteria andPayChannelGreaterThanOrEqualTo(Integer value) { + addCriterion("pay_channel >=", value, "payChannel"); + return (Criteria) this; + } + + public Criteria andPayChannelLessThan(Integer value) { + addCriterion("pay_channel <", value, "payChannel"); + return (Criteria) this; + } + + public Criteria andPayChannelLessThanOrEqualTo(Integer value) { + addCriterion("pay_channel <=", value, "payChannel"); + return (Criteria) this; + } + + public Criteria andPayChannelIn(List values) { + addCriterion("pay_channel in", values, "payChannel"); + return (Criteria) this; + } + + public Criteria andPayChannelNotIn(List values) { + addCriterion("pay_channel not in", values, "payChannel"); + return (Criteria) this; + } + + public Criteria andPayChannelBetween(Integer value1, Integer value2) { + addCriterion("pay_channel between", value1, value2, "payChannel"); + return (Criteria) this; + } + + public Criteria andPayChannelNotBetween(Integer value1, Integer value2) { + addCriterion("pay_channel not between", value1, value2, "payChannel"); + return (Criteria) this; + } + + public Criteria andPaySerialNoIsNull() { + addCriterion("pay_serial_no is null"); + return (Criteria) this; + } + + public Criteria andPaySerialNoIsNotNull() { + addCriterion("pay_serial_no is not null"); + return (Criteria) this; + } + + public Criteria andPaySerialNoEqualTo(String value) { + addCriterion("pay_serial_no =", value, "paySerialNo"); + return (Criteria) this; + } + + public Criteria andPaySerialNoNotEqualTo(String value) { + addCriterion("pay_serial_no <>", value, "paySerialNo"); + return (Criteria) this; + } + + public Criteria andPaySerialNoGreaterThan(String value) { + addCriterion("pay_serial_no >", value, "paySerialNo"); + return (Criteria) this; + } + + public Criteria andPaySerialNoGreaterThanOrEqualTo(String value) { + addCriterion("pay_serial_no >=", value, "paySerialNo"); + return (Criteria) this; + } + + public Criteria andPaySerialNoLessThan(String value) { + addCriterion("pay_serial_no <", value, "paySerialNo"); + return (Criteria) this; + } + + public Criteria andPaySerialNoLessThanOrEqualTo(String value) { + addCriterion("pay_serial_no <=", value, "paySerialNo"); + return (Criteria) this; + } + + public Criteria andPaySerialNoLike(String value) { + addCriterion("pay_serial_no like", value, "paySerialNo"); + return (Criteria) this; + } + + public Criteria andPaySerialNoNotLike(String value) { + addCriterion("pay_serial_no not like", value, "paySerialNo"); + return (Criteria) this; + } + + public Criteria andPaySerialNoIn(List values) { + addCriterion("pay_serial_no in", values, "paySerialNo"); + return (Criteria) this; + } + + public Criteria andPaySerialNoNotIn(List values) { + addCriterion("pay_serial_no not in", values, "paySerialNo"); + return (Criteria) this; + } + + public Criteria andPaySerialNoBetween(String value1, String value2) { + addCriterion("pay_serial_no between", value1, value2, "paySerialNo"); + return (Criteria) this; + } + + public Criteria andPaySerialNoNotBetween(String value1, String value2) { + addCriterion("pay_serial_no not between", value1, value2, "paySerialNo"); + return (Criteria) this; + } + + public Criteria andPayTypeIsNull() { + addCriterion("pay_type is null"); + return (Criteria) this; + } + + public Criteria andPayTypeIsNotNull() { + addCriterion("pay_type is not null"); + return (Criteria) this; + } + + public Criteria andPayTypeEqualTo(Integer value) { + addCriterion("pay_type =", value, "payType"); + return (Criteria) this; + } + + public Criteria andPayTypeNotEqualTo(Integer value) { + addCriterion("pay_type <>", value, "payType"); + return (Criteria) this; + } + + public Criteria andPayTypeGreaterThan(Integer value) { + addCriterion("pay_type >", value, "payType"); + return (Criteria) this; + } + + public Criteria andPayTypeGreaterThanOrEqualTo(Integer value) { + addCriterion("pay_type >=", value, "payType"); + return (Criteria) this; + } + + public Criteria andPayTypeLessThan(Integer value) { + addCriterion("pay_type <", value, "payType"); + return (Criteria) this; + } + + public Criteria andPayTypeLessThanOrEqualTo(Integer value) { + addCriterion("pay_type <=", value, "payType"); + return (Criteria) this; + } + + public Criteria andPayTypeIn(List values) { + addCriterion("pay_type in", values, "payType"); + return (Criteria) this; + } + + public Criteria andPayTypeNotIn(List values) { + addCriterion("pay_type not in", values, "payType"); + return (Criteria) this; + } + + public Criteria andPayTypeBetween(Integer value1, Integer value2) { + addCriterion("pay_type between", value1, value2, "payType"); + return (Criteria) this; + } + + public Criteria andPayTypeNotBetween(Integer value1, Integer value2) { + addCriterion("pay_type not between", value1, value2, "payType"); + return (Criteria) this; + } + + public Criteria andStatusIsNull() { + addCriterion("`status` is null"); + return (Criteria) this; + } + + public Criteria andStatusIsNotNull() { + addCriterion("`status` is not null"); + return (Criteria) this; + } + + public Criteria andStatusEqualTo(Integer value) { + addCriterion("`status` =", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusNotEqualTo(Integer value) { + addCriterion("`status` <>", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusGreaterThan(Integer value) { + addCriterion("`status` >", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusGreaterThanOrEqualTo(Integer value) { + addCriterion("`status` >=", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusLessThan(Integer value) { + addCriterion("`status` <", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusLessThanOrEqualTo(Integer value) { + addCriterion("`status` <=", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusIn(List values) { + addCriterion("`status` in", values, "status"); + return (Criteria) this; + } + + public Criteria andStatusNotIn(List values) { + addCriterion("`status` not in", values, "status"); + return (Criteria) this; + } + + public Criteria andStatusBetween(Integer value1, Integer value2) { + addCriterion("`status` between", value1, value2, "status"); + return (Criteria) this; + } + + public Criteria andStatusNotBetween(Integer value1, Integer value2) { + addCriterion("`status` not between", value1, value2, "status"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNull() { + addCriterion("create_time is null"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNotNull() { + addCriterion("create_time is not null"); + return (Criteria) this; + } + + public Criteria andCreateTimeEqualTo(Date value) { + addCriterion("create_time =", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotEqualTo(Date value) { + addCriterion("create_time <>", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThan(Date value) { + addCriterion("create_time >", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("create_time >=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThan(Date value) { + addCriterion("create_time <", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThanOrEqualTo(Date value) { + addCriterion("create_time <=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeIn(List values) { + addCriterion("create_time in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotIn(List values) { + addCriterion("create_time not in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeBetween(Date value1, Date value2) { + addCriterion("create_time between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotBetween(Date value1, Date value2) { + addCriterion("create_time not between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andPayTimeIsNull() { + addCriterion("pay_time is null"); + return (Criteria) this; + } + + public Criteria andPayTimeIsNotNull() { + addCriterion("pay_time is not null"); + return (Criteria) this; + } + + public Criteria andPayTimeEqualTo(Date value) { + addCriterion("pay_time =", value, "payTime"); + return (Criteria) this; + } + + public Criteria andPayTimeNotEqualTo(Date value) { + addCriterion("pay_time <>", value, "payTime"); + return (Criteria) this; + } + + public Criteria andPayTimeGreaterThan(Date value) { + addCriterion("pay_time >", value, "payTime"); + return (Criteria) this; + } + + public Criteria andPayTimeGreaterThanOrEqualTo(Date value) { + addCriterion("pay_time >=", value, "payTime"); + return (Criteria) this; + } + + public Criteria andPayTimeLessThan(Date value) { + addCriterion("pay_time <", value, "payTime"); + return (Criteria) this; + } + + public Criteria andPayTimeLessThanOrEqualTo(Date value) { + addCriterion("pay_time <=", value, "payTime"); + return (Criteria) this; + } + + public Criteria andPayTimeIn(List values) { + addCriterion("pay_time in", values, "payTime"); + return (Criteria) this; + } + + public Criteria andPayTimeNotIn(List values) { + addCriterion("pay_time not in", values, "payTime"); + return (Criteria) this; + } + + public Criteria andPayTimeBetween(Date value1, Date value2) { + addCriterion("pay_time between", value1, value2, "payTime"); + return (Criteria) this; + } + + public Criteria andPayTimeNotBetween(Date value1, Date value2) { + addCriterion("pay_time not between", value1, value2, "payTime"); + return (Criteria) this; + } + + public Criteria andCancelTimeIsNull() { + addCriterion("cancel_time is null"); + return (Criteria) this; + } + + public Criteria andCancelTimeIsNotNull() { + addCriterion("cancel_time is not null"); + return (Criteria) this; + } + + public Criteria andCancelTimeEqualTo(Date value) { + addCriterion("cancel_time =", value, "cancelTime"); + return (Criteria) this; + } + + public Criteria andCancelTimeNotEqualTo(Date value) { + addCriterion("cancel_time <>", value, "cancelTime"); + return (Criteria) this; + } + + public Criteria andCancelTimeGreaterThan(Date value) { + addCriterion("cancel_time >", value, "cancelTime"); + return (Criteria) this; + } + + public Criteria andCancelTimeGreaterThanOrEqualTo(Date value) { + addCriterion("cancel_time >=", value, "cancelTime"); + return (Criteria) this; + } + + public Criteria andCancelTimeLessThan(Date value) { + addCriterion("cancel_time <", value, "cancelTime"); + return (Criteria) this; + } + + public Criteria andCancelTimeLessThanOrEqualTo(Date value) { + addCriterion("cancel_time <=", value, "cancelTime"); + return (Criteria) this; + } + + public Criteria andCancelTimeIn(List values) { + addCriterion("cancel_time in", values, "cancelTime"); + return (Criteria) this; + } + + public Criteria andCancelTimeNotIn(List values) { + addCriterion("cancel_time not in", values, "cancelTime"); + return (Criteria) this; + } + + public Criteria andCancelTimeBetween(Date value1, Date value2) { + addCriterion("cancel_time between", value1, value2, "cancelTime"); + return (Criteria) this; + } + + public Criteria andCancelTimeNotBetween(Date value1, Date value2) { + addCriterion("cancel_time not between", value1, value2, "cancelTime"); + return (Criteria) this; + } + + public Criteria andRefundTimeIsNull() { + addCriterion("refund_time is null"); + return (Criteria) this; + } + + public Criteria andRefundTimeIsNotNull() { + addCriterion("refund_time is not null"); + return (Criteria) this; + } + + public Criteria andRefundTimeEqualTo(Date value) { + addCriterion("refund_time =", value, "refundTime"); + return (Criteria) this; + } + + public Criteria andRefundTimeNotEqualTo(Date value) { + addCriterion("refund_time <>", value, "refundTime"); + return (Criteria) this; + } + + public Criteria andRefundTimeGreaterThan(Date value) { + addCriterion("refund_time >", value, "refundTime"); + return (Criteria) this; + } + + public Criteria andRefundTimeGreaterThanOrEqualTo(Date value) { + addCriterion("refund_time >=", value, "refundTime"); + return (Criteria) this; + } + + public Criteria andRefundTimeLessThan(Date value) { + addCriterion("refund_time <", value, "refundTime"); + return (Criteria) this; + } + + public Criteria andRefundTimeLessThanOrEqualTo(Date value) { + addCriterion("refund_time <=", value, "refundTime"); + return (Criteria) this; + } + + public Criteria andRefundTimeIn(List values) { + addCriterion("refund_time in", values, "refundTime"); + return (Criteria) this; + } + + public Criteria andRefundTimeNotIn(List values) { + addCriterion("refund_time not in", values, "refundTime"); + return (Criteria) this; + } + + public Criteria andRefundTimeBetween(Date value1, Date value2) { + addCriterion("refund_time between", value1, value2, "refundTime"); + return (Criteria) this; + } + + public Criteria andRefundTimeNotBetween(Date value1, Date value2) { + addCriterion("refund_time not between", value1, value2, "refundTime"); + return (Criteria) this; + } + + public Criteria andFinishTimeIsNull() { + addCriterion("finish_time is null"); + return (Criteria) this; + } + + public Criteria andFinishTimeIsNotNull() { + addCriterion("finish_time is not null"); + return (Criteria) this; + } + + public Criteria andFinishTimeEqualTo(Date value) { + addCriterion("finish_time =", value, "finishTime"); + return (Criteria) this; + } + + public Criteria andFinishTimeNotEqualTo(Date value) { + addCriterion("finish_time <>", value, "finishTime"); + return (Criteria) this; + } + + public Criteria andFinishTimeGreaterThan(Date value) { + addCriterion("finish_time >", value, "finishTime"); + return (Criteria) this; + } + + public Criteria andFinishTimeGreaterThanOrEqualTo(Date value) { + addCriterion("finish_time >=", value, "finishTime"); + return (Criteria) this; + } + + public Criteria andFinishTimeLessThan(Date value) { + addCriterion("finish_time <", value, "finishTime"); + return (Criteria) this; + } + + public Criteria andFinishTimeLessThanOrEqualTo(Date value) { + addCriterion("finish_time <=", value, "finishTime"); + return (Criteria) this; + } + + public Criteria andFinishTimeIn(List values) { + addCriterion("finish_time in", values, "finishTime"); + return (Criteria) this; + } + + public Criteria andFinishTimeNotIn(List values) { + addCriterion("finish_time not in", values, "finishTime"); + return (Criteria) this; + } + + public Criteria andFinishTimeBetween(Date value1, Date value2) { + addCriterion("finish_time between", value1, value2, "finishTime"); + return (Criteria) this; + } + + public Criteria andFinishTimeNotBetween(Date value1, Date value2) { + addCriterion("finish_time not between", value1, value2, "finishTime"); + 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/service/src/main/java/com/hfkj/entity/BsOrderStarbucks.java b/service/src/main/java/com/hfkj/entity/BsOrderStarbucks.java index 4851d73..19ff7d3 100644 --- a/service/src/main/java/com/hfkj/entity/BsOrderStarbucks.java +++ b/service/src/main/java/com/hfkj/entity/BsOrderStarbucks.java @@ -18,6 +18,11 @@ public class BsOrderStarbucks implements Serializable { private String storeCode; + /** + * 登录平台code + */ + private String platformCode; + private String platformUniqueId; private Integer productId; @@ -94,6 +99,14 @@ public class BsOrderStarbucks implements Serializable { this.storeCode = storeCode; } + public String getPlatformCode() { + return platformCode; + } + + public void setPlatformCode(String platformCode) { + this.platformCode = platformCode; + } + public String getPlatformUniqueId() { return platformUniqueId; } @@ -316,6 +329,7 @@ public class BsOrderStarbucks implements Serializable { BsOrderStarbucks other = (BsOrderStarbucks) that; return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) && (this.getStoreCode() == null ? other.getStoreCode() == null : this.getStoreCode().equals(other.getStoreCode())) + && (this.getPlatformCode() == null ? other.getPlatformCode() == null : this.getPlatformCode().equals(other.getPlatformCode())) && (this.getPlatformUniqueId() == null ? other.getPlatformUniqueId() == null : this.getPlatformUniqueId().equals(other.getPlatformUniqueId())) && (this.getProductId() == null ? other.getProductId() == null : this.getProductId().equals(other.getProductId())) && (this.getCupSize() == null ? other.getCupSize() == null : this.getCupSize().equals(other.getCupSize())) @@ -350,6 +364,7 @@ public class BsOrderStarbucks implements Serializable { int result = 1; result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); result = prime * result + ((getStoreCode() == null) ? 0 : getStoreCode().hashCode()); + result = prime * result + ((getPlatformCode() == null) ? 0 : getPlatformCode().hashCode()); result = prime * result + ((getPlatformUniqueId() == null) ? 0 : getPlatformUniqueId().hashCode()); result = prime * result + ((getProductId() == null) ? 0 : getProductId().hashCode()); result = prime * result + ((getCupSize() == null) ? 0 : getCupSize().hashCode()); @@ -387,6 +402,7 @@ public class BsOrderStarbucks implements Serializable { sb.append("Hash = ").append(hashCode()); sb.append(", id=").append(id); sb.append(", storeCode=").append(storeCode); + sb.append(", platformCode=").append(platformCode); sb.append(", platformUniqueId=").append(platformUniqueId); sb.append(", productId=").append(productId); sb.append(", cupSize=").append(cupSize); diff --git a/service/src/main/java/com/hfkj/entity/BsOrderStarbucksExample.java b/service/src/main/java/com/hfkj/entity/BsOrderStarbucksExample.java index ab1d896..c1ce216 100644 --- a/service/src/main/java/com/hfkj/entity/BsOrderStarbucksExample.java +++ b/service/src/main/java/com/hfkj/entity/BsOrderStarbucksExample.java @@ -256,6 +256,76 @@ public class BsOrderStarbucksExample { return (Criteria) this; } + public Criteria andPlatformCodeIsNull() { + addCriterion("platform_code is null"); + return (Criteria) this; + } + + public Criteria andPlatformCodeIsNotNull() { + addCriterion("platform_code is not null"); + return (Criteria) this; + } + + public Criteria andPlatformCodeEqualTo(String value) { + addCriterion("platform_code =", value, "platformCode"); + return (Criteria) this; + } + + public Criteria andPlatformCodeNotEqualTo(String value) { + addCriterion("platform_code <>", value, "platformCode"); + return (Criteria) this; + } + + public Criteria andPlatformCodeGreaterThan(String value) { + addCriterion("platform_code >", value, "platformCode"); + return (Criteria) this; + } + + public Criteria andPlatformCodeGreaterThanOrEqualTo(String value) { + addCriterion("platform_code >=", value, "platformCode"); + return (Criteria) this; + } + + public Criteria andPlatformCodeLessThan(String value) { + addCriterion("platform_code <", value, "platformCode"); + return (Criteria) this; + } + + public Criteria andPlatformCodeLessThanOrEqualTo(String value) { + addCriterion("platform_code <=", value, "platformCode"); + return (Criteria) this; + } + + public Criteria andPlatformCodeLike(String value) { + addCriterion("platform_code like", value, "platformCode"); + return (Criteria) this; + } + + public Criteria andPlatformCodeNotLike(String value) { + addCriterion("platform_code not like", value, "platformCode"); + return (Criteria) this; + } + + public Criteria andPlatformCodeIn(List values) { + addCriterion("platform_code in", values, "platformCode"); + return (Criteria) this; + } + + public Criteria andPlatformCodeNotIn(List values) { + addCriterion("platform_code not in", values, "platformCode"); + return (Criteria) this; + } + + public Criteria andPlatformCodeBetween(String value1, String value2) { + addCriterion("platform_code between", value1, value2, "platformCode"); + return (Criteria) this; + } + + public Criteria andPlatformCodeNotBetween(String value1, String value2) { + addCriterion("platform_code not between", value1, value2, "platformCode"); + return (Criteria) this; + } + public Criteria andPlatformUniqueIdIsNull() { addCriterion("platform_unique_id is null"); return (Criteria) this; diff --git a/service/src/main/java/com/hfkj/entity/SecConfig.java b/service/src/main/java/com/hfkj/entity/SecConfig.java new file mode 100644 index 0000000..8c1239e --- /dev/null +++ b/service/src/main/java/com/hfkj/entity/SecConfig.java @@ -0,0 +1,87 @@ +package com.hfkj.entity; + +import java.io.Serializable; + +/** + * sec_config + * @author + */ +/** + * + * 代码由工具生成 + * + **/ +public class SecConfig implements Serializable { + private Integer id; + + private String codeType; + + private String codeValue; + + private static final long serialVersionUID = 1L; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getCodeType() { + return codeType; + } + + public void setCodeType(String codeType) { + this.codeType = codeType; + } + + public String getCodeValue() { + return codeValue; + } + + public void setCodeValue(String codeValue) { + this.codeValue = codeValue; + } + + @Override + public boolean equals(Object that) { + if (this == that) { + return true; + } + if (that == null) { + return false; + } + if (getClass() != that.getClass()) { + return false; + } + SecConfig other = (SecConfig) that; + return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) + && (this.getCodeType() == null ? other.getCodeType() == null : this.getCodeType().equals(other.getCodeType())) + && (this.getCodeValue() == null ? other.getCodeValue() == null : this.getCodeValue().equals(other.getCodeValue())); + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); + result = prime * result + ((getCodeType() == null) ? 0 : getCodeType().hashCode()); + result = prime * result + ((getCodeValue() == null) ? 0 : getCodeValue().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(", codeType=").append(codeType); + sb.append(", codeValue=").append(codeValue); + sb.append(", serialVersionUID=").append(serialVersionUID); + sb.append("]"); + return sb.toString(); + } +} \ No newline at end of file diff --git a/service/src/main/java/com/hfkj/entity/SecConfigExample.java b/service/src/main/java/com/hfkj/entity/SecConfigExample.java new file mode 100644 index 0000000..8c602d1 --- /dev/null +++ b/service/src/main/java/com/hfkj/entity/SecConfigExample.java @@ -0,0 +1,422 @@ +package com.hfkj.entity; + +import java.util.ArrayList; +import java.util.List; + +public class SecConfigExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + private Integer limit; + + private Long offset; + + public SecConfigExample() { + 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(Integer value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(Integer value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(Integer value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(Integer value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(Integer value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(Integer 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(Integer value1, Integer value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(Integer value1, Integer value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andCodeTypeIsNull() { + addCriterion("code_type is null"); + return (Criteria) this; + } + + public Criteria andCodeTypeIsNotNull() { + addCriterion("code_type is not null"); + return (Criteria) this; + } + + public Criteria andCodeTypeEqualTo(String value) { + addCriterion("code_type =", value, "codeType"); + return (Criteria) this; + } + + public Criteria andCodeTypeNotEqualTo(String value) { + addCriterion("code_type <>", value, "codeType"); + return (Criteria) this; + } + + public Criteria andCodeTypeGreaterThan(String value) { + addCriterion("code_type >", value, "codeType"); + return (Criteria) this; + } + + public Criteria andCodeTypeGreaterThanOrEqualTo(String value) { + addCriterion("code_type >=", value, "codeType"); + return (Criteria) this; + } + + public Criteria andCodeTypeLessThan(String value) { + addCriterion("code_type <", value, "codeType"); + return (Criteria) this; + } + + public Criteria andCodeTypeLessThanOrEqualTo(String value) { + addCriterion("code_type <=", value, "codeType"); + return (Criteria) this; + } + + public Criteria andCodeTypeLike(String value) { + addCriterion("code_type like", value, "codeType"); + return (Criteria) this; + } + + public Criteria andCodeTypeNotLike(String value) { + addCriterion("code_type not like", value, "codeType"); + return (Criteria) this; + } + + public Criteria andCodeTypeIn(List values) { + addCriterion("code_type in", values, "codeType"); + return (Criteria) this; + } + + public Criteria andCodeTypeNotIn(List values) { + addCriterion("code_type not in", values, "codeType"); + return (Criteria) this; + } + + public Criteria andCodeTypeBetween(String value1, String value2) { + addCriterion("code_type between", value1, value2, "codeType"); + return (Criteria) this; + } + + public Criteria andCodeTypeNotBetween(String value1, String value2) { + addCriterion("code_type not between", value1, value2, "codeType"); + return (Criteria) this; + } + + public Criteria andCodeValueIsNull() { + addCriterion("code_value is null"); + return (Criteria) this; + } + + public Criteria andCodeValueIsNotNull() { + addCriterion("code_value is not null"); + return (Criteria) this; + } + + public Criteria andCodeValueEqualTo(String value) { + addCriterion("code_value =", value, "codeValue"); + return (Criteria) this; + } + + public Criteria andCodeValueNotEqualTo(String value) { + addCriterion("code_value <>", value, "codeValue"); + return (Criteria) this; + } + + public Criteria andCodeValueGreaterThan(String value) { + addCriterion("code_value >", value, "codeValue"); + return (Criteria) this; + } + + public Criteria andCodeValueGreaterThanOrEqualTo(String value) { + addCriterion("code_value >=", value, "codeValue"); + return (Criteria) this; + } + + public Criteria andCodeValueLessThan(String value) { + addCriterion("code_value <", value, "codeValue"); + return (Criteria) this; + } + + public Criteria andCodeValueLessThanOrEqualTo(String value) { + addCriterion("code_value <=", value, "codeValue"); + return (Criteria) this; + } + + public Criteria andCodeValueLike(String value) { + addCriterion("code_value like", value, "codeValue"); + return (Criteria) this; + } + + public Criteria andCodeValueNotLike(String value) { + addCriterion("code_value not like", value, "codeValue"); + return (Criteria) this; + } + + public Criteria andCodeValueIn(List values) { + addCriterion("code_value in", values, "codeValue"); + return (Criteria) this; + } + + public Criteria andCodeValueNotIn(List values) { + addCriterion("code_value not in", values, "codeValue"); + return (Criteria) this; + } + + public Criteria andCodeValueBetween(String value1, String value2) { + addCriterion("code_value between", value1, value2, "codeValue"); + return (Criteria) this; + } + + public Criteria andCodeValueNotBetween(String value1, String value2) { + addCriterion("code_value not between", value1, value2, "codeValue"); + 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/service/src/main/java/com/hfkj/entity/SecUser.java b/service/src/main/java/com/hfkj/entity/SecUser.java index 3fbe97a..8de30e6 100644 --- a/service/src/main/java/com/hfkj/entity/SecUser.java +++ b/service/src/main/java/com/hfkj/entity/SecUser.java @@ -43,6 +43,11 @@ public class SecUser implements Serializable { */ private String telephone; + /** + * 登录平台code + */ + private String platformCode; + /** * 对象类型 */ @@ -59,7 +64,7 @@ public class SecUser implements Serializable { private Long roleId; /** - * 状态 0:删除 1:可用 2:禁用 + * 状态 0:删除 1:可用 */ private Integer status; @@ -129,6 +134,14 @@ public class SecUser implements Serializable { this.telephone = telephone; } + public String getPlatformCode() { + return platformCode; + } + + public void setPlatformCode(String platformCode) { + this.platformCode = platformCode; + } + public Integer getObjectType() { return objectType; } @@ -219,6 +232,7 @@ public class SecUser implements Serializable { && (this.getLoginName() == null ? other.getLoginName() == null : this.getLoginName().equals(other.getLoginName())) && (this.getPassword() == null ? other.getPassword() == null : this.getPassword().equals(other.getPassword())) && (this.getTelephone() == null ? other.getTelephone() == null : this.getTelephone().equals(other.getTelephone())) + && (this.getPlatformCode() == null ? other.getPlatformCode() == null : this.getPlatformCode().equals(other.getPlatformCode())) && (this.getObjectType() == null ? other.getObjectType() == null : this.getObjectType().equals(other.getObjectType())) && (this.getObjectId() == null ? other.getObjectId() == null : this.getObjectId().equals(other.getObjectId())) && (this.getRoleId() == null ? other.getRoleId() == null : this.getRoleId().equals(other.getRoleId())) @@ -240,6 +254,7 @@ public class SecUser implements Serializable { result = prime * result + ((getLoginName() == null) ? 0 : getLoginName().hashCode()); result = prime * result + ((getPassword() == null) ? 0 : getPassword().hashCode()); result = prime * result + ((getTelephone() == null) ? 0 : getTelephone().hashCode()); + result = prime * result + ((getPlatformCode() == null) ? 0 : getPlatformCode().hashCode()); result = prime * result + ((getObjectType() == null) ? 0 : getObjectType().hashCode()); result = prime * result + ((getObjectId() == null) ? 0 : getObjectId().hashCode()); result = prime * result + ((getRoleId() == null) ? 0 : getRoleId().hashCode()); @@ -264,6 +279,7 @@ public class SecUser implements Serializable { sb.append(", loginName=").append(loginName); sb.append(", password=").append(password); sb.append(", telephone=").append(telephone); + sb.append(", platformCode=").append(platformCode); sb.append(", objectType=").append(objectType); sb.append(", objectId=").append(objectId); sb.append(", roleId=").append(roleId); diff --git a/service/src/main/java/com/hfkj/entity/SecUserExample.java b/service/src/main/java/com/hfkj/entity/SecUserExample.java index 8314f2f..850a9c0 100644 --- a/service/src/main/java/com/hfkj/entity/SecUserExample.java +++ b/service/src/main/java/com/hfkj/entity/SecUserExample.java @@ -535,6 +535,76 @@ public class SecUserExample { return (Criteria) this; } + public Criteria andPlatformCodeIsNull() { + addCriterion("platform_code is null"); + return (Criteria) this; + } + + public Criteria andPlatformCodeIsNotNull() { + addCriterion("platform_code is not null"); + return (Criteria) this; + } + + public Criteria andPlatformCodeEqualTo(String value) { + addCriterion("platform_code =", value, "platformCode"); + return (Criteria) this; + } + + public Criteria andPlatformCodeNotEqualTo(String value) { + addCriterion("platform_code <>", value, "platformCode"); + return (Criteria) this; + } + + public Criteria andPlatformCodeGreaterThan(String value) { + addCriterion("platform_code >", value, "platformCode"); + return (Criteria) this; + } + + public Criteria andPlatformCodeGreaterThanOrEqualTo(String value) { + addCriterion("platform_code >=", value, "platformCode"); + return (Criteria) this; + } + + public Criteria andPlatformCodeLessThan(String value) { + addCriterion("platform_code <", value, "platformCode"); + return (Criteria) this; + } + + public Criteria andPlatformCodeLessThanOrEqualTo(String value) { + addCriterion("platform_code <=", value, "platformCode"); + return (Criteria) this; + } + + public Criteria andPlatformCodeLike(String value) { + addCriterion("platform_code like", value, "platformCode"); + return (Criteria) this; + } + + public Criteria andPlatformCodeNotLike(String value) { + addCriterion("platform_code not like", value, "platformCode"); + return (Criteria) this; + } + + public Criteria andPlatformCodeIn(List values) { + addCriterion("platform_code in", values, "platformCode"); + return (Criteria) this; + } + + public Criteria andPlatformCodeNotIn(List values) { + addCriterion("platform_code not in", values, "platformCode"); + return (Criteria) this; + } + + public Criteria andPlatformCodeBetween(String value1, String value2) { + addCriterion("platform_code between", value1, value2, "platformCode"); + return (Criteria) this; + } + + public Criteria andPlatformCodeNotBetween(String value1, String value2) { + addCriterion("platform_code not between", value1, value2, "platformCode"); + return (Criteria) this; + } + public Criteria andObjectTypeIsNull() { addCriterion("object_type is null"); return (Criteria) this; diff --git a/service/src/main/java/com/hfkj/haioil/HaiOilService.java b/service/src/main/java/com/hfkj/haioil/HaiOilService.java new file mode 100644 index 0000000..ef02a5b --- /dev/null +++ b/service/src/main/java/com/hfkj/haioil/HaiOilService.java @@ -0,0 +1,67 @@ +package com.hfkj.haioil; + +import com.alibaba.fastjson.JSONObject; +import com.hfkj.common.exception.ErrorCode; +import com.hfkj.common.exception.ErrorHelp; +import com.hfkj.common.exception.SysCode; +import com.hfkj.common.utils.HttpsUtils; +import com.hfkj.common.utils.SignatureUtil; +import com.hfkj.config.CommonSysConst; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.Date; +import java.util.Map; +import java.util.Objects; + +public class HaiOilService { + + private static Logger log = LoggerFactory.getLogger(HaiOilService.class); + + + /** + * @MethodName pushPk + * @Description: 推送优惠券包 + * @param map + * @return: com.alibaba.fastjson.JSONObject + * @Author: Sum1Dream + * @Date: 2024/9/9 下午2:57 + */ + public static JSONObject pushPk(Map map) throws Exception { + + JSONObject object = request("/openapi/discount/pushPk" , map); + + if (Objects.equals(object.getString("return_code"), "000000")) { + return object; + } else { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "请求失败!"); + } + + } + + /** + * 请求 + * @param postUrl 接口请求地址 + * @param param 参数 + * @return + * @throws Exception + */ + public static JSONObject request(String postUrl, Map param) throws Exception { + + log.info("============ 嗨加油请求-START ============="); + param.put("appId", CommonSysConst.getSysConfig().getHaiOilAppid()); + param.put("reqId", new Date().getTime()); + param.put("sign", SignatureUtil.createSign(param , CommonSysConst.getSysConfig().getHaiOilAppSecret())); + + log.info("请求接口:" + postUrl); + log.info("请求参数:" + JSONObject.toJSONString(param)); + + JSONObject response = HttpsUtils.doPost(CommonSysConst.getSysConfig().getHaiOilPostUrl()+ postUrl, JSONObject.toJSONString(param)); + + log.info("响应参数:" + response.toJSONString()); + log.info("============ 嗨加油请求-END =============="); + return response; + + } + +} diff --git a/service/src/main/java/com/hfkj/model/order/OrderCouponModel.java b/service/src/main/java/com/hfkj/model/order/OrderCouponModel.java index bf7ab54..442c2dc 100644 --- a/service/src/main/java/com/hfkj/model/order/OrderCouponModel.java +++ b/service/src/main/java/com/hfkj/model/order/OrderCouponModel.java @@ -120,4 +120,8 @@ public class OrderCouponModel { @ExcelProperty("是否异常") public String exceptionStatus; + @ColumnWidth(20) + @ExcelProperty("平台") + public String platformCode; + } diff --git a/service/src/main/java/com/hfkj/model/order/orderExport/OrderGoodsExportModel.java b/service/src/main/java/com/hfkj/model/order/orderExport/OrderGoodsExportModel.java index dc67d5e..aff4506 100644 --- a/service/src/main/java/com/hfkj/model/order/orderExport/OrderGoodsExportModel.java +++ b/service/src/main/java/com/hfkj/model/order/orderExport/OrderGoodsExportModel.java @@ -109,7 +109,11 @@ public class OrderGoodsExportModel { public String logisticsStatusDesc; @ColumnWidth(20) - @ExcelProperty("完成时间") + @ExcelProperty("更新时间") + public Date updateTime; + + @ColumnWidth(20) + @ExcelProperty("确认收货时间") public Date finishTime; diff --git a/service/src/main/java/com/hfkj/qianzhu/channel/CinemaService.java b/service/src/main/java/com/hfkj/qianzhu/CinemaService.java similarity index 96% rename from service/src/main/java/com/hfkj/qianzhu/channel/CinemaService.java rename to service/src/main/java/com/hfkj/qianzhu/CinemaService.java index 3c2f557..5bf7e4d 100644 --- a/service/src/main/java/com/hfkj/qianzhu/channel/CinemaService.java +++ b/service/src/main/java/com/hfkj/qianzhu/CinemaService.java @@ -1,19 +1,12 @@ -package com.hfkj.qianzhu.channel; +package com.hfkj.qianzhu; -import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.hfkj.common.exception.ErrorCode; import com.hfkj.common.exception.ErrorHelp; import com.hfkj.common.exception.SysCode; -import com.hfkj.entity.BsProductConfig; -import com.hfkj.service.BsProductConfigService; -import com.hfkj.sysenum.order.OrderChildProductTypeEnum; -import javax.annotation.Resource; -import java.math.BigDecimal; import java.util.HashMap; import java.util.Map; -import java.util.Objects; /** * @ClassName CinemaService diff --git a/service/src/main/java/com/hfkj/qianzhu/channel/KfcService.java b/service/src/main/java/com/hfkj/qianzhu/KfcService.java similarity index 99% rename from service/src/main/java/com/hfkj/qianzhu/channel/KfcService.java rename to service/src/main/java/com/hfkj/qianzhu/KfcService.java index e6c6b04..d01e38a 100644 --- a/service/src/main/java/com/hfkj/qianzhu/channel/KfcService.java +++ b/service/src/main/java/com/hfkj/qianzhu/KfcService.java @@ -1,4 +1,4 @@ -package com.hfkj.qianzhu.channel; +package com.hfkj.qianzhu; import com.alibaba.fastjson.JSONObject; import com.hfkj.common.exception.ErrorCode; diff --git a/service/src/main/java/com/hfkj/qianzhu/channel/QianZhuService.java b/service/src/main/java/com/hfkj/qianzhu/QianZhuService.java similarity index 99% rename from service/src/main/java/com/hfkj/qianzhu/channel/QianZhuService.java rename to service/src/main/java/com/hfkj/qianzhu/QianZhuService.java index 1579417..ca77ba8 100644 --- a/service/src/main/java/com/hfkj/qianzhu/channel/QianZhuService.java +++ b/service/src/main/java/com/hfkj/qianzhu/QianZhuService.java @@ -1,4 +1,4 @@ -package com.hfkj.qianzhu.channel; +package com.hfkj.qianzhu; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; diff --git a/service/src/main/java/com/hfkj/qianzhu/channel/StarbucksService.java b/service/src/main/java/com/hfkj/qianzhu/StarbucksService.java similarity index 98% rename from service/src/main/java/com/hfkj/qianzhu/channel/StarbucksService.java rename to service/src/main/java/com/hfkj/qianzhu/StarbucksService.java index cdca58f..894f0f5 100644 --- a/service/src/main/java/com/hfkj/qianzhu/channel/StarbucksService.java +++ b/service/src/main/java/com/hfkj/qianzhu/StarbucksService.java @@ -1,4 +1,4 @@ -package com.hfkj.qianzhu.channel; +package com.hfkj.qianzhu; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; @@ -7,7 +7,6 @@ import com.hfkj.common.exception.ErrorHelp; import com.hfkj.common.exception.SysCode; import com.hfkj.common.utils.CommonUtil; import com.hfkj.common.utils.DateUtil; -import com.mysql.jdbc.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/service/src/main/java/com/hfkj/service/SecConfigService.java b/service/src/main/java/com/hfkj/service/SecConfigService.java new file mode 100644 index 0000000..b3d0cc4 --- /dev/null +++ b/service/src/main/java/com/hfkj/service/SecConfigService.java @@ -0,0 +1,52 @@ +package com.hfkj.service; +import com.hfkj.entity.SecConfig; + +/** + * @ClassName SecConfigService.java + * @author Sum1Dream + * @version 1.0.0 + * @Description //TODO + * @createTime 17:29 2021/6/23 + **/ +public interface SecConfigService { + + /** + * @Author Sum1Dream + * @Name create + * @Description // 创建 + * @Date 15:11 2024/4/19 + * @Param GoodsBrand + * @return void + */ + void create(SecConfig secConfig); + + /** + * @Author Sum1Dream + * @Name update + * @Description // 修改 + * @Date 15:12 2024/4/19 + * @Param GoodsBrand + * @return void + */ + void update(SecConfig secConfig); + + /** + * @Author Sum1Dream + * @Name delete + * @Description // 修改 + * @Date 15:12 2024/4/19 + * @Param id + * @return void + */ + void delete(Integer id); + + /** + * @Author Sum1Dream + * @Name queryDetail + * @Description // 根据ID查询产品类型详情 + * @Date 15:12 2024/4/19 + * @Param id + * @return com.hfkj.entity.GoodsBrand + */ + SecConfig queryDetail(Integer id); +} diff --git a/service/src/main/java/com/hfkj/service/coupon/impl/BsOrderCouponServiceImpl.java b/service/src/main/java/com/hfkj/service/coupon/impl/BsOrderCouponServiceImpl.java index 10215ae..145a8d5 100644 --- a/service/src/main/java/com/hfkj/service/coupon/impl/BsOrderCouponServiceImpl.java +++ b/service/src/main/java/com/hfkj/service/coupon/impl/BsOrderCouponServiceImpl.java @@ -7,6 +7,7 @@ import com.hfkj.entity.BsOrderCouponExample; import com.hfkj.model.order.OrderCouponModel; import com.hfkj.service.coupon.BsOrderCouponService; import org.apache.commons.collections4.MapUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -60,6 +61,9 @@ public class BsOrderCouponServiceImpl implements BsOrderCouponService { if (MapUtils.getLong(param, "createTimeE") != null) { param.put("createTimeE", DateUtil.date2String(new Date(MapUtils.getLong(param, "createTimeE")), DateUtil.Y_M_D_HMS)); } + if (StringUtils.isNotBlank(MapUtils.getString(param, "platformCode"))) { + param.put("platformCode", MapUtils.getString(param, "platformCode")); + } return orderCouponMapper.getOrderList(param); } diff --git a/service/src/main/java/com/hfkj/service/goods/BsOrderGoodsService.java b/service/src/main/java/com/hfkj/service/goods/BsOrderGoodsService.java index 62ece48..0539f1f 100644 --- a/service/src/main/java/com/hfkj/service/goods/BsOrderGoodsService.java +++ b/service/src/main/java/com/hfkj/service/goods/BsOrderGoodsService.java @@ -139,21 +139,6 @@ public interface BsOrderGoodsService { */ Object getLogisticsMsg(String logisticsNo , String mobile); - /** - * 更新缓存 - * @param logisticsNo - * @param logistics - * @return - */ - GoodsLogistics cache(String logisticsNo , GoodsLogistics logistics); - - /** - * 删除缓存 - * @param logisticsNo - * @return - */ - void cacheDelete(String logisticsNo); - /** * @Author Sum1Dream * @Name getLogisticsMsg diff --git a/service/src/main/java/com/hfkj/service/goods/BsOrderMemberService.java b/service/src/main/java/com/hfkj/service/goods/BsOrderMemberService.java new file mode 100644 index 0000000..d99bceb --- /dev/null +++ b/service/src/main/java/com/hfkj/service/goods/BsOrderMemberService.java @@ -0,0 +1,78 @@ +package com.hfkj.service.goods; + + +import com.hfkj.entity.BsOrderMember; + +import java.util.List; +import java.util.Map; + +public interface BsOrderMemberService { + + /** + * @MethodName create + * @Description: 创建 + * @param orderMember + * @Author: Sum1Dream + * @Date: 2024/9/5 下午4:18 + */ + void create(BsOrderMember orderMember); + + /** + * @MethodName update + * @Description: 更新 + * @param orderMember + * @Author: Sum1Dream + * @Date: 2024/9/5 下午4:19 + */ + void update(BsOrderMember orderMember); + + /** + * @MethodName delete + * @Description: 删除 + * @param id + * @param fullDelete + * @Author: Sum1Dream + * @Date: 2024/9/5 下午4:19 + */ + void delete(Long id , Boolean fullDelete); + + /** + * @MethodName queryDetail + * @Description: 查询详情 + * @param id + * @return: com.hfkj.entity.BsOrderMember + * @Author: Sum1Dream + * @Date: 2024/9/5 下午4:19 + */ + BsOrderMember queryDetail(Long id); + + /** + * @MethodName findGoodsOrder + * @Description: 根据订单号查询 + * @param orderNo + * @return: com.hfkj.entity.BsOrderMember + * @Author: Sum1Dream + * @Date: 2024/9/5 下午4:22 + */ + BsOrderMember findGoodsOrder(String orderNo); + + /** + * @MethodName queryDetailByMap + * @Description: 查询订单详情 + * @param map + * @return: com.hfkj.entity.BsOrderMember + * @Author: Sum1Dream + * @Date: 2024/9/5 下午4:27 + */ + BsOrderMember queryDetailByMap(Map map); + + /** + * @MethodName getList + * @Description: 查询订单列表 + * @param map + * @return: java.util.List + * @Author: Sum1Dream + * @Date: 2024/9/5 下午4:27 + */ + List getList(Map map); +} diff --git a/service/src/main/java/com/hfkj/service/goods/impl/BsOrderCinemaServiceImpl.java b/service/src/main/java/com/hfkj/service/goods/impl/BsOrderCinemaServiceImpl.java index 56b59af..674a091 100644 --- a/service/src/main/java/com/hfkj/service/goods/impl/BsOrderCinemaServiceImpl.java +++ b/service/src/main/java/com/hfkj/service/goods/impl/BsOrderCinemaServiceImpl.java @@ -80,7 +80,9 @@ public class BsOrderCinemaServiceImpl implements BsOrderCinemaService { if (StringUtils.isNotBlank(MapUtils.getString(map, "userPhone"))) { criteria.andUserPhoneEqualTo(MapUtils.getString(map, "userPhone")); } - + if (StringUtils.isNotBlank(MapUtils.getString(map, "platformCode"))) { + criteria.andPlatformCodeEqualTo(MapUtils.getString(map, "platformCode")); + } if (StringUtils.isNotBlank(MapUtils.getString(map, "goodsSpecsName"))) { criteria.andGoodsSpecsNameEqualTo(MapUtils.getString(map, "goodsSpecsName")); } diff --git a/service/src/main/java/com/hfkj/service/goods/impl/BsOrderGoodsServiceImpl.java b/service/src/main/java/com/hfkj/service/goods/impl/BsOrderGoodsServiceImpl.java index 5970ce6..c500a32 100644 --- a/service/src/main/java/com/hfkj/service/goods/impl/BsOrderGoodsServiceImpl.java +++ b/service/src/main/java/com/hfkj/service/goods/impl/BsOrderGoodsServiceImpl.java @@ -154,6 +154,9 @@ public class BsOrderGoodsServiceImpl implements BsOrderGoodsService { if (StringUtils.isNotBlank(MapUtils.getString(map, "goodsSpecsName"))) { criteria.andGoodsSpecsNameEqualTo(MapUtils.getString(map, "goodsSpecsName")); } + if (StringUtils.isNotBlank(MapUtils.getString(map, "platformCode"))) { + criteria.andPlatformCodeEqualTo(MapUtils.getString(map, "platformCode")); + } if (StringUtils.isNotBlank(MapUtils.getString(map, "goodsName"))) { criteria.andGoodsNameLike("%"+MapUtils.getString(map, "goodsName")+"%"); @@ -255,39 +258,19 @@ public class BsOrderGoodsServiceImpl implements BsOrderGoodsService { @Override public Object getLogisticsMsg(String logisticsNo , String mobile) { - Object data = redisUtil.get(CACHE_KEY + logisticsNo); - if (data == null) { - JSONObject jsonObjects = OrderUtil.getLogisticsMsg(logisticsNo , mobile); - if (jsonObjects == null) { - throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "暂未发货!"); - } - if (jsonObjects.getInteger("code") == 200 && jsonObjects.getBoolean("success")) { - GoodsLogistics logistics = editLogistics((JSONObject) jsonObjects.get("data")); - return cache(logisticsNo , logistics); - } - return jsonObjects; - } else { - return data; + JSONObject jsonObjects = OrderUtil.getLogisticsMsg(logisticsNo , mobile); + if (jsonObjects == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "暂未发货!"); } + System.out.println("======================================" + jsonObjects); + return editLogistics((JSONObject) jsonObjects.get("data")); } - @Override - public GoodsLogistics cache(String getLogisticsNo , GoodsLogistics logistics) { - // 缓存 - redisUtil.set(CACHE_KEY + getLogisticsNo, logistics, CACHE_TIME); - return logistics; - } - @Override - public void cacheDelete(String getLogisticsNo) { - // 缓存 - redisUtil.del(CACHE_KEY + getLogisticsNo); - } @Override public void confirmReceipt(Long orderGoodsId) { BsOrderGoods orderGoods = queryDetail(orderGoodsId); - if (orderGoods == null || orderGoods.getStatus() == 1 || orderGoods.getStatus() == 5 || @@ -302,6 +285,7 @@ public class BsOrderGoodsServiceImpl implements BsOrderGoodsService { orderService.childOrderComplete(orderGoods.getChildOrderNo()); orderGoods.setStatus(OrderChildStatusEnum.status3.getCode()); orderGoods.setUpdateTime(new Date()); + orderGoods.setFinishTime(new Date()); update(orderGoods); // 删除缓存 orderService.cacheDelete(orderGoods.getOrderNo()); diff --git a/service/src/main/java/com/hfkj/service/goods/impl/BsOrderMemberServiceImpl.java b/service/src/main/java/com/hfkj/service/goods/impl/BsOrderMemberServiceImpl.java new file mode 100644 index 0000000..45c0389 --- /dev/null +++ b/service/src/main/java/com/hfkj/service/goods/impl/BsOrderMemberServiceImpl.java @@ -0,0 +1,53 @@ +package com.hfkj.service.goods.impl; + +import com.hfkj.dao.BsOrderMemberMapper; +import com.hfkj.entity.BsOrderMember; +import com.hfkj.service.goods.BsOrderMemberService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; +import java.util.Map; + +@Service("bsOrderMemberService") +public class BsOrderMemberServiceImpl implements BsOrderMemberService { + + @Resource + private BsOrderMemberMapper bsOrderMemberMapper; + + @Override + public void create(BsOrderMember orderMember) { + bsOrderMemberMapper.insert(orderMember); + } + + @Override + public void update(BsOrderMember orderMember) { + bsOrderMemberMapper.updateByPrimaryKey(orderMember); + } + + @Override + public void delete(Long id, Boolean fullDelete) { + bsOrderMemberMapper.deleteByPrimaryKey(id); + } + + @Override + public BsOrderMember queryDetail(Long id) { + return bsOrderMemberMapper.selectByPrimaryKey(id); + } + + @Override + public BsOrderMember findGoodsOrder(String orderNo) { + return null; + } + + @Override + public BsOrderMember queryDetailByMap(Map map) { + return null; + } + + @Override + public List getList(Map map) { + return Collections.emptyList(); + } +} diff --git a/service/src/main/java/com/hfkj/service/goods/impl/BsOrderStarbucksServiceImpl.java b/service/src/main/java/com/hfkj/service/goods/impl/BsOrderStarbucksServiceImpl.java index 2beaa4b..af74557 100644 --- a/service/src/main/java/com/hfkj/service/goods/impl/BsOrderStarbucksServiceImpl.java +++ b/service/src/main/java/com/hfkj/service/goods/impl/BsOrderStarbucksServiceImpl.java @@ -77,6 +77,10 @@ public class BsOrderStarbucksServiceImpl implements BsOrderStarbucksService { criteria.andUserPhoneEqualTo(MapUtils.getString(map, "userPhone")); } + if (StringUtils.isNotBlank(MapUtils.getString(map, "platformCode"))) { + criteria.andPlatformCodeEqualTo(MapUtils.getString(map, "platformCode")); + } + if (MapUtils.getLong(map, "createTimeS") != null) { criteria.andCreateTimeGreaterThanOrEqualTo(new Date(MapUtils.getLong(map, "createTimeS"))); } diff --git a/service/src/main/java/com/hfkj/service/impl/SecConfigServiceImpl.java b/service/src/main/java/com/hfkj/service/impl/SecConfigServiceImpl.java new file mode 100644 index 0000000..ecc0cb1 --- /dev/null +++ b/service/src/main/java/com/hfkj/service/impl/SecConfigServiceImpl.java @@ -0,0 +1,34 @@ +package com.hfkj.service.impl; + +import com.hfkj.dao.SecConfigMapper; +import com.hfkj.entity.SecConfig; +import com.hfkj.service.SecConfigService; +import org.springframework.stereotype.Service; +import javax.annotation.Resource; + +@Service("secConfigService") +public class SecConfigServiceImpl implements SecConfigService { + + @Resource + private SecConfigMapper secConfigMapper; + + @Override + public void create(SecConfig secConfig) { + secConfigMapper.insert(secConfig); + } + + @Override + public void update(SecConfig secConfig) { + secConfigMapper.updateByPrimaryKeySelective(secConfig); + } + + @Override + public void delete(Integer id) { + secConfigMapper.deleteByPrimaryKey(id); + } + + @Override + public SecConfig queryDetail(Integer id) { + return secConfigMapper.selectByPrimaryKey(id); + } +} diff --git a/service/src/main/java/com/hfkj/service/order/OrderCreateService.java b/service/src/main/java/com/hfkj/service/order/OrderCreateService.java index a2102e2..d05f32a 100644 --- a/service/src/main/java/com/hfkj/service/order/OrderCreateService.java +++ b/service/src/main/java/com/hfkj/service/order/OrderCreateService.java @@ -7,14 +7,12 @@ import com.hfkj.common.exception.ErrorCode; import com.hfkj.common.exception.ErrorHelp; import com.hfkj.common.exception.SysCode; import com.hfkj.common.utils.RandomUtils; -import com.hfkj.common.utils.RedisUtil; import com.hfkj.common.utils.StarbucksUtil; import com.hfkj.entity.*; import com.hfkj.model.order.OrderChildModel; import com.hfkj.model.order.OrderModel; -import com.hfkj.qianzhu.channel.CinemaService; -import com.hfkj.qianzhu.channel.StarbucksService; -import com.hfkj.service.BsMerService; +import com.hfkj.qianzhu.CinemaService; +import com.hfkj.qianzhu.StarbucksService; import com.hfkj.service.BsProductConfigService; import com.hfkj.service.coupon.BsOrderCouponNoService; import com.hfkj.service.coupon.BsOrderCouponService; @@ -26,11 +24,7 @@ import com.hfkj.sysenum.order.*; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Isolation; -import org.springframework.transaction.annotation.Propagation; -import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.math.BigDecimal; @@ -73,6 +67,8 @@ public class OrderCreateService { private GoodsJumpService goodsJumpService; @Resource private BsOrderStarbucksService orderStarbucksService; + @Resource + private BsOrderMemberService orderMemberService; /** * 事务产品 @@ -116,12 +112,51 @@ public class OrderCreateService { } // 虚拟配置 orderChild.setBusiness(goodsVpd); + if (goodsVpd.getSource().equals(GoodsVpdSourceEnum.type2.getCode())) { + yuShang(order , orderChild , goodsVpd , goodsMsg , goodsSpecs , businessObj); + } else if (goodsVpd.getSource().equals(GoodsVpdSourceEnum.type4.getCode())) { + couponHlt(order , orderChild , goodsVpd , goodsMsg , goodsSpecs , businessObj); + } + + + return orderChild; + } + public void yuShang(OrderModel order, OrderChildModel orderChild , GoodsVpd goodsVpd , GoodsMsg goodsMsg , GoodsSpecs goodsSpecs , JSONObject businessObj ) { + // 创建娱尚订单 + BsOrderMember orderMember = new BsOrderMember(); + orderMember.setOrderNo(orderChild.getOrderNo()); + orderMember.setChildOrderNo(orderChild.getChildOrderNo()); + orderMember.setMerId(orderChild.getMerId()); + orderMember.setPlatformCode(businessObj.getString("platformCode")); + orderMember.setUserId(order.getUserId()); + orderMember.setUserPhone(order.getUserPhone()); + orderMember.setGoodsId(goodsMsg.getId()); + orderMember.setGoodsName(goodsMsg.getTitle()); + orderMember.setGoodsTypeId(goodsMsg.getGoodsType()); + orderMember.setGoodsTypeName(goodsMsg.getGoodsTypeName()); + orderMember.setGoodsBrandId(goodsMsg.getGoodsBrand()); + orderMember.setGoodsBrandName(goodsMsg.getGoodsBrandName()); + orderMember.setGoodsSpecsId(goodsSpecs.getId()); + orderMember.setGoodsSpecsName(goodsSpecs.getName()); + orderMember.setGoodsSpescOriginalPrice(goodsSpecs.getOriginalPrice()); + orderMember.setGoodsSpescSalePrice(goodsSpecs.getSalePrice()); + orderMember.setGoodsVpdId(goodsVpd.getId()); + orderMember.setGoodsVpdKey(goodsVpd.getKey()); + orderMember.setGoodsVpdSource(goodsVpd.getSource()); + orderMember.setGoodsCount(orderChild.getProductCount()); + orderMember.setStatus(OrderChildStatusEnum.status1.getCode()); + orderMemberService.create(orderMember); + + } + + public void couponHlt(OrderModel order, OrderChildModel orderChild , GoodsVpd goodsVpd , GoodsMsg goodsMsg , GoodsSpecs goodsSpecs , JSONObject businessObj ) throws Exception{ // 创建卡券订单 BsOrderCoupon orderCoupon = new BsOrderCoupon(); orderCoupon.setOrderNo(orderChild.getOrderNo()); orderCoupon.setChildOrderNo(orderChild.getChildOrderNo()); orderCoupon.setMerId(orderChild.getMerId()); + orderCoupon.setPlatformCode(businessObj.getString("platformCode")); orderCoupon.setUserId(order.getUserId()); orderCoupon.setUserPhone(order.getUserPhone()); orderCoupon.setGoodsId(goodsMsg.getId()); @@ -169,8 +204,6 @@ public class OrderCreateService { } orderCouponNoService.editData(orderCouponNo); } - - return orderChild; } public OrderChildModel goods(OrderModel order, OrderChildModel orderChild) throws Exception { @@ -226,6 +259,7 @@ public class OrderCreateService { orderGoods.setOrderNo(orderChild.getOrderNo()); orderGoods.setChildOrderNo(orderChild.getChildOrderNo()); orderGoods.setMerId(orderChild.getMerId()); + orderGoods.setPlatformCode(object.getString("platformCode")); orderGoods.setMerName(goodsMsg.getMerName()); orderGoods.setUserId(order.getUserId()); orderGoods.setUserPhone(order.getUserPhone()); @@ -316,6 +350,7 @@ public class OrderCreateService { bsOrderCinema.setOrderNo(orderChild.getOrderNo()); bsOrderCinema.setChildOrderNo(orderChild.getChildOrderNo()); bsOrderCinema.setMerId(productConfig.getMerId()); + bsOrderCinema.setPlatformCode(object.getString("platformCode")); bsOrderCinema.setUserId(order.getUserId()); bsOrderCinema.setUserPhone(object.getString("phone")); bsOrderCinema.setImg(data.getString("pic")); @@ -416,6 +451,7 @@ public class OrderCreateService { bsOrderStarbucks.setOrderNo(orderChild.getOrderNo()); bsOrderStarbucks.setChildOrderNo(orderChild.getChildOrderNo()); bsOrderStarbucks.setMerId(productConfig.getMerId()); + bsOrderStarbucks.setPlatformCode(object.getString("platformCode")); bsOrderStarbucks.setProductId(orderItemObject.getInteger("productId")); bsOrderStarbucks.setUserId(order.getUserId()); bsOrderStarbucks.setUserPhone(object.getString("phone")); diff --git a/service/src/main/java/com/hfkj/service/order/OrderPaySuccessService.java b/service/src/main/java/com/hfkj/service/order/OrderPaySuccessService.java index 3d6431b..a348871 100644 --- a/service/src/main/java/com/hfkj/service/order/OrderPaySuccessService.java +++ b/service/src/main/java/com/hfkj/service/order/OrderPaySuccessService.java @@ -9,8 +9,8 @@ import com.hfkj.common.utils.DateUtil; import com.hfkj.config.CommonSysConst; import com.hfkj.entity.*; import com.hfkj.model.order.OrderModel; -import com.hfkj.qianzhu.channel.CinemaService; -import com.hfkj.qianzhu.channel.StarbucksService; +import com.hfkj.qianzhu.CinemaService; +import com.hfkj.qianzhu.StarbucksService; import com.hfkj.service.coupon.BsOrderCouponNoService; import com.hfkj.service.coupon.BsOrderCouponService; import com.hfkj.service.coupon.channel.ChongQingCNPCCouponService; @@ -19,10 +19,10 @@ import com.hfkj.service.coupon.channel.PcytCNPCCouponConfig; import com.hfkj.service.coupon.channel.PetroConfig; import com.hfkj.service.goods.*; import com.hfkj.service.goods.impl.BsOrderStarbucksServiceImpl; -import com.hfkj.service.goods.impl.GoodsSpecsServiceImpl; import com.hfkj.service.hlt.HuiLianTongUnionCardService; import com.hfkj.sysenum.GoodsVpdSourceEnum; import com.hfkj.sysenum.order.*; +import com.hfkj.yushang.YuShangService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -114,6 +114,18 @@ public class OrderPaySuccessService { GoodsVpd vpd = goodsVpdService.queryDetailBySpecsId(childOrder.getProductSpecId()); if (vpd.getSource() == GoodsVpdSourceEnum.type1.getCode()) { + } else if (vpd.getSource() == GoodsVpdSourceEnum.type2.getCode()) { + + + Map map = new HashMap<>(); + map.put("productCode" , vpd.getKey()); + map.put("AppKey" , CommonSysConst.getSysConfig().getYuShangAppKey()); + map.put("BuyCount" , childOrder.getProductCount()); + map.put("MOrderID" , childOrder.getChildOrderNo()); + map.put("ChargeAccount" , childOrder.getChildOrderNo()); + // 推送给娱尚 + YuShangService.insertV2(map); + } else if (vpd.getSource() == GoodsVpdSourceEnum.type4.getCode()) { // 推送给汇联通 JSONObject returnParam = HuiLianTongCouponService.costRechargeOrder(couponNo.getChannelOrderNo()); diff --git a/service/src/main/java/com/hfkj/service/order/OrderRefundSuccessService.java b/service/src/main/java/com/hfkj/service/order/OrderRefundSuccessService.java index 0e53f11..37a628a 100644 --- a/service/src/main/java/com/hfkj/service/order/OrderRefundSuccessService.java +++ b/service/src/main/java/com/hfkj/service/order/OrderRefundSuccessService.java @@ -1,19 +1,11 @@ package com.hfkj.service.order; -import com.alibaba.fastjson.JSONObject; -import com.hfkj.common.exception.ErrorCode; -import com.hfkj.common.exception.ErrorHelp; -import com.hfkj.common.exception.SysCode; -import com.hfkj.config.CommonSysConst; -import com.hfkj.entity.BsOrderChild; -import com.hfkj.entity.BsOrderCinema; -import com.hfkj.entity.BsOrderCoupon; -import com.hfkj.entity.BsOrderGoods; +import com.hfkj.entity.*; import com.hfkj.model.order.OrderChildModel; -import com.hfkj.model.order.OrderModel; -import com.hfkj.qianzhu.channel.CinemaService; +import com.hfkj.qianzhu.CinemaService; import com.hfkj.service.coupon.BsOrderCouponService; import com.hfkj.service.goods.BsOrderCinemaService; +import com.hfkj.service.goods.BsOrderStarbucksService; import com.hfkj.service.goods.impl.BsOrderGoodsServiceImpl; import com.hfkj.sysenum.order.OrderChildProductTypeEnum; import com.hfkj.sysenum.order.OrderChildStatusEnum; @@ -23,7 +15,6 @@ import org.springframework.stereotype.Component; import javax.annotation.Resource; import java.util.Date; import java.util.HashMap; -import java.util.List; import java.util.Map; @@ -42,6 +33,8 @@ public class OrderRefundSuccessService { private BsOrderGoodsServiceImpl bsOrderGoodsService; @Resource private BsOrderCouponService orderCouponService; + @Resource + private BsOrderStarbucksService bsOrderStarbucksService; /** * 订单业务处理 @@ -123,4 +116,14 @@ public class OrderRefundSuccessService { } } + + public void starbucks(BsOrderChild childOrder) { + // 查询星巴克订单 + BsOrderStarbucks orderStarbucks = bsOrderStarbucksService.findGoodsOrder(childOrder.getOrderNo()); + if (orderStarbucks != null) { + orderStarbucks.setStatus(OrderChildStatusEnum.status4.getCode()); + orderStarbucks.setUpdateTime(new Date()); + bsOrderStarbucksService.update(orderStarbucks); + } + } } diff --git a/service/src/main/java/com/hfkj/service/order/impl/BsOrderChildServiceImpl.java b/service/src/main/java/com/hfkj/service/order/impl/BsOrderChildServiceImpl.java index d0acfb1..8f8267f 100644 --- a/service/src/main/java/com/hfkj/service/order/impl/BsOrderChildServiceImpl.java +++ b/service/src/main/java/com/hfkj/service/order/impl/BsOrderChildServiceImpl.java @@ -4,10 +4,9 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.hfkj.common.utils.StarbucksUtil; import com.hfkj.dao.BsOrderChildMapper; -import com.hfkj.dao.GoodsUserAddressMapper; import com.hfkj.entity.*; import com.hfkj.model.order.OrderChildModel; -import com.hfkj.qianzhu.channel.StarbucksService; +import com.hfkj.qianzhu.StarbucksService; import com.hfkj.service.BsProductConfigService; import com.hfkj.service.goods.*; import com.hfkj.service.goods.impl.BsOrderStarbucksServiceImpl; @@ -19,7 +18,6 @@ import com.hfkj.sysenum.order.OrderLogisticsStatusEnum; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/service/src/main/java/com/hfkj/service/order/impl/BsOrderServiceImpl.java b/service/src/main/java/com/hfkj/service/order/impl/BsOrderServiceImpl.java index 3e76adf..fe1f729 100644 --- a/service/src/main/java/com/hfkj/service/order/impl/BsOrderServiceImpl.java +++ b/service/src/main/java/com/hfkj/service/order/impl/BsOrderServiceImpl.java @@ -14,19 +14,14 @@ import com.hfkj.entity.*; import com.hfkj.model.order.OrderChildModel; import com.hfkj.model.order.OrderModel; import com.hfkj.mqtopic.OrderTopic; -import com.hfkj.qianzhu.channel.CinemaService; -import com.hfkj.qianzhu.channel.StarbucksService; +import com.hfkj.qianzhu.CinemaService; import com.hfkj.service.BsProductConfigService; -import com.hfkj.service.coupon.BsOrderCouponNoService; -import com.hfkj.service.coupon.BsOrderCouponService; import com.hfkj.service.discount.CouponDiscountService; import com.hfkj.service.discount.CouponDiscountUserRelService; import com.hfkj.service.goods.BsOrderCinemaService; -import com.hfkj.service.goods.BsOrderGoodsService; import com.hfkj.service.goods.BsOrderStarbucksService; import com.hfkj.service.order.*; import com.hfkj.service.user.UserIntegralService; -import com.hfkj.service.user.impl.PhgDataUserServiceImpl; import com.hfkj.sysenum.UserIntegralRecordOpUserTypeEnum; import com.hfkj.sysenum.UserIntegralRecordSourceTypeEnum; import com.hfkj.sysenum.order.OrderChildProductTypeEnum; diff --git a/service/src/main/java/com/hfkj/service/pay/huift/TradeService.java b/service/src/main/java/com/hfkj/service/pay/huift/TradeService.java index 6d652e4..58de550 100644 --- a/service/src/main/java/com/hfkj/service/pay/huift/TradeService.java +++ b/service/src/main/java/com/hfkj/service/pay/huift/TradeService.java @@ -8,6 +8,7 @@ import com.hfkj.common.utils.HttpsUtils; import com.hfkj.common.utils.RandomUtils; import com.hfkj.config.CommonSysConst; import com.hfkj.entity.BsOrder; +import com.hfkj.entity.BsOrderChild; import com.hfkj.model.order.OrderModel; import com.hfkj.service.order.BsOrderService; import com.hfkj.service.pay.huift.config.HuiftConfig; @@ -37,16 +38,16 @@ public class TradeService { * @return * @throws Exception */ - public JSONObject thirdPreOrder(OrderModel order) throws Exception { + public JSONObject thirdPreOrder(OrderModel order , String shopCode , String signSecret) throws Exception { Map param = new HashMap<>(); - param.put("shopCode", HuiftConfig.shopcode); + param.put("shopCode", shopCode); param.put("outTradeNo", order.getOrderNo()+"_"+RandomUtils.number(3,true)); param.put("transAmt", order.getPayRealPrice().multiply(new BigDecimal("100")).intValue()); param.put("callbackUrl", CommonSysConst.getSysConfig().getDomainName() + "/order/notify/huiftPay"); // param.put("remark", ""); // 备注 // param.put("outAppId", ""); param.put("outRedirectPath", CommonSysConst.getSysConfig().getDomainName()+"/cweb/#/order/order/orderList"); - param.put("sign", HuiftConfig.md5Encode(HuiftConfig.paramSort(param, HuiftConfig.signSecret).getBytes()).toLowerCase()); + param.put("sign", HuiftConfig.md5Encode(HuiftConfig.paramSort(param, signSecret).getBytes()).toLowerCase()); JSONObject response = HttpsUtils.doPost(HuiftConfig.reqUrl + "/hfq/v1/thirdPay/thirdPreOrder", JSONObject.toJSONString(param)); if (response.getString("status").equals("ok")) { return response.getJSONObject("data"); @@ -60,11 +61,11 @@ public class TradeService { * @return * @throws Exception */ - public JSONObject thirdPayResult(String preOrderNo) throws Exception { + public JSONObject thirdPayResult(String preOrderNo , String shopCode , String signSecret) throws Exception { Map param = new HashMap<>(); - param.put("shopCode", HuiftConfig.shopcode); + param.put("shopCode", shopCode); param.put("preOrderNo", preOrderNo); - param.put("sign", HuiftConfig.md5Encode(HuiftConfig.paramSort(param, HuiftConfig.signSecret).getBytes()).toLowerCase()); + param.put("sign", HuiftConfig.md5Encode(HuiftConfig.paramSort(param, signSecret).getBytes()).toLowerCase()); JSONObject response = HttpsUtils.doPost(HuiftConfig.reqUrl + "/hfq/v1/thirdPay/thirdPayResult", JSONObject.toJSONString(param)); if (response.getString("status").equals("ok")) { return response.getJSONObject("data"); @@ -83,6 +84,7 @@ public class TradeService { public JSONObject thirdPayRefund(String refundOrderNo, BigDecimal refundPrice, String orderNo) throws Exception { // 查询订单 BsOrder order = orderService.getOrder(orderNo); + OrderModel orderModel = orderService.getDetail(orderNo); if (order == null) { throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未知的的订单"); } @@ -94,11 +96,11 @@ public class TradeService { throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "支付方式错误"); } Map param = new HashMap<>(); - param.put("shopCode", HuiftConfig.shopcode); + param.put("shopCode", orderModel.getOrderChildList().get(0).getSettleAccount()); param.put("preOrderNo", order.getPayChannelOrderNo()); param.put("outRefundNo", refundOrderNo); param.put("refundAmt", refundPrice.multiply(new BigDecimal("100")).intValue()); - param.put("sign", HuiftConfig.md5Encode(HuiftConfig.paramSort(param, HuiftConfig.signSecret).getBytes()).toLowerCase()); + param.put("sign", HuiftConfig.md5Encode(HuiftConfig.paramSort(param, orderModel.getOrderChildList().get(0).getSettleAccountKey()).getBytes()).toLowerCase()); JSONObject response = HttpsUtils.doPost(HuiftConfig.reqUrl + "/hfq/v1/thirdPay/thirdPayRefund", JSONObject.toJSONString(param)); if (response.getString("status").equals("ok")) { return response.getJSONObject("data"); diff --git a/service/src/main/java/com/hfkj/service/pay/huift/config/HuiftConfig.java b/service/src/main/java/com/hfkj/service/pay/huift/config/HuiftConfig.java index 39625db..5d5339f 100644 --- a/service/src/main/java/com/hfkj/service/pay/huift/config/HuiftConfig.java +++ b/service/src/main/java/com/hfkj/service/pay/huift/config/HuiftConfig.java @@ -19,6 +19,10 @@ public class HuiftConfig { public final static String reqUrl = CommonSysConst.getSysConfig().getHuiftReqUrl(); public final static String shopcode = CommonSysConst.getSysConfig().getHuiftShopCode(); public final static String signSecret = CommonSysConst.getSysConfig().getHuiftSignSecret(); + public final static String shopcode98 = "20240653-59c4-4181-9157-17fd4b95c3fc"; + public final static String signSecret98 = "19C17F9E19B8DDDDF2FD2EE4EA9F6C61"; + public final static String shopcode95 = "b4b121b6-ec5c-44e1-a020-d2f21e754b55"; + public final static String signSecret95 = "4AA9E79115848B797B53FBD830B402F4"; /** * 参数排序 diff --git a/service/src/main/java/com/hfkj/sysenum/GoodsVpdSourceEnum.java b/service/src/main/java/com/hfkj/sysenum/GoodsVpdSourceEnum.java index 56bab82..710c05b 100644 --- a/service/src/main/java/com/hfkj/sysenum/GoodsVpdSourceEnum.java +++ b/service/src/main/java/com/hfkj/sysenum/GoodsVpdSourceEnum.java @@ -12,6 +12,10 @@ public enum GoodsVpdSourceEnum { * 内部虚拟商品 */ type1(1, "内部虚拟商品"), + /** + * 娱尚虚拟商品 + */ + type2(2, "娱尚虚拟商品"), /** * 贵州中石化 */ diff --git a/service/src/main/java/com/hfkj/yushang/YuShangService.java b/service/src/main/java/com/hfkj/yushang/YuShangService.java new file mode 100644 index 0000000..9b8f5a5 --- /dev/null +++ b/service/src/main/java/com/hfkj/yushang/YuShangService.java @@ -0,0 +1,88 @@ +package com.hfkj.yushang; + +import com.alibaba.fastjson.JSONObject; +import com.hfkj.common.exception.ErrorCode; +import com.hfkj.common.exception.ErrorHelp; +import com.hfkj.common.exception.SysCode; +import com.hfkj.common.utils.HttpsUtils; +import com.hfkj.common.utils.MD5Util; +import com.hfkj.config.CommonSysConst; +import com.hfkj.config.GenerateSign; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.Date; +import java.util.Map; + +public class YuShangService { + + private static Logger log = LoggerFactory.getLogger(YuShangService.class); + + /** + * @MethodName insertV2 + * @Description: 直充订单提交接口 + * @param map + * @return: com.alibaba.fastjson.JSONObject + * @Author: Sum1Dream + * @Date: 2024/9/5 下午2:17 + */ + public static JSONObject insertV2(Map map) throws Exception { + + JSONObject object = request("/Order/InsertV2" , map); + + if ( object.getInteger("Code") == 999) { + return object; + } else { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "请求失败!"); + } + + } + + /** + * @MethodName queryV2 + * @Description: 订单查询接口 + * @param map + * @return: com.alibaba.fastjson.JSONObject + * @Author: Sum1Dream + * @Date: 2024/9/5 下午2:29 + */ + public static JSONObject queryV2(Map map) throws Exception { + + JSONObject object = request("Order/QueryV2" , map); + + if ( object.getInteger("Code") == 999) { + return object; + } else { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "请求失败!"); + } + + } + + /** + * 请求 + * @param postUrl 接口请求地址 + * @param param 参数 + * @return + * @throws Exception + */ + public static JSONObject request(String postUrl, Map param) throws Exception { + + log.info("============ 娱尚请求-START ============="); + param.put("AppKey", CommonSysConst.getSysConfig().getYuShangAppKey()); + param.put("timestamp", new Date().getTime()); + param.put("CustomerIP", "127.0.0.1"); + param.put("sign", MD5Util.encode(GenerateSign.paramSortYuShang(param,CommonSysConst.getSysConfig().getYuShangAppSecret()).getBytes()).toLowerCase()); + + log.info("请求接口:" + postUrl); + log.info("请求参数:" + JSONObject.toJSONString(param)); + + JSONObject response = HttpsUtils.doPost(CommonSysConst.getSysConfig().getYuShangPostUrl()+ postUrl, JSONObject.toJSONString(param)); + + log.info("响应参数:" + response.toJSONString()); + log.info("============ 娱尚请求-END =============="); + return response; + + } + + +} diff --git a/service/src/main/resources/dev/commonConfig.properties b/service/src/main/resources/dev/commonConfig.properties index db598c6..ad37f73 100644 --- a/service/src/main/resources/dev/commonConfig.properties +++ b/service/src/main/resources/dev/commonConfig.properties @@ -76,3 +76,11 @@ mtNotifyUrl = https://phg.dctpay.com/order/cinemaNotify/notify mtAccessKey=DVNKSHSDHHJ6-TK mtSecretKey=lj2YDjGnqroY1OuR5zriWg== mtPostUrl=https://waimai-openapi.apigw.test.meituan.com/api/sqt/open/login/h5/loginFree/redirection?test_open_swimlane=test-open + +yuShangAppKey=211394653 +yuShangAppSecret=cyQpQKMaGUG186iEZRt1uQ== +yuShangPostUrl=http://mbsmemberwebapi.test.onfishes.com/ + +haiOilPostUrl = https://test-oil.dctpay.com +haiOilAppid = hf7356c71fb97ab0 +haiOilAppSecret = 8aef995ff71485dc19b36e35f04c4016