diff --git a/hai-bweb/src/main/java/com/bweb/controller/HighBrandController.java b/hai-bweb/src/main/java/com/bweb/controller/HighBrandController.java new file mode 100644 index 00000000..e2be97af --- /dev/null +++ b/hai-bweb/src/main/java/com/bweb/controller/HighBrandController.java @@ -0,0 +1,16 @@ +package com.bweb.controller; + +import io.swagger.annotations.Api; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; + +/** + * @Auther: 袁野 + * @Description: + * @Date: 2021/3/26 23:08 + */ +@Controller +@RequestMapping(value = "/highBrand") +@Api(value = "品牌接口") +public class HighBrandController { +} diff --git a/hai-bweb/src/main/java/com/bweb/controller/HighGoodsTypeController.java b/hai-bweb/src/main/java/com/bweb/controller/HighGoodsTypeController.java new file mode 100644 index 00000000..0232d24a --- /dev/null +++ b/hai-bweb/src/main/java/com/bweb/controller/HighGoodsTypeController.java @@ -0,0 +1,163 @@ +package com.bweb.controller; + +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.hai.common.exception.ErrorCode; +import com.hai.common.exception.ErrorHelp; +import com.hai.common.exception.SysCode; +import com.hai.common.security.SessionObject; +import com.hai.common.security.UserCenter; +import com.hai.common.utils.ResponseMsgUtil; +import com.hai.entity.HighGoodsType; +import com.hai.model.HighAgentModel; +import com.hai.model.ResponseData; +import com.hai.model.UserInfoModel; +import com.hai.service.HighGoodsTypeService; +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.*; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + +/** + * @Auther: 袁野 + * @Description: + * @Date: 2021/3/26 23:08 + */ +@Controller +@RequestMapping(value = "/highGoodsType") +@Api(value = "商品类型接口") +public class HighGoodsTypeController { + + private static Logger log = LoggerFactory.getLogger(HighMerchantStoreController.class); + + @Autowired + private UserCenter userCenter; + + @Resource + private HighGoodsTypeService highGoodsTypeService; + + @RequestMapping(value = "/getListGoodsType", method = RequestMethod.GET) + @ResponseBody + @ApiOperation(value = "获取商品类型列表") + public ResponseData getListGoodsType(@RequestParam(name = "pageNum", required = true) Integer pageNum, + @RequestParam(name = "pageSize", required = true) Integer pageSize, + @RequestParam(name = "title", required = false) String title, + HttpServletRequest request) { + try { + + Map map = new HashMap<>(); + map.put("title", title); + + PageHelper.startPage(pageNum,pageSize); + return ResponseMsgUtil.success(new PageInfo<>(highGoodsTypeService.getListGoodsType(map))); + + } catch (Exception e) { + log.error("HighOrderController --> getUserOrderList() error!", e); + return ResponseMsgUtil.exception(e); + } + } + + @RequestMapping(value = "/getGoodsTypeById", method = RequestMethod.GET) + @ResponseBody + @ApiOperation(value = "根据id查询详情") + public ResponseData getGoodsTypeById(@RequestParam(name = "id", required = true) Integer id) { + try { + + return ResponseMsgUtil.success(highGoodsTypeService.findById(id)); + + } catch (Exception e) { + log.error("HighOrderController --> getOrderById() error!", e); + return ResponseMsgUtil.exception(e); + } + } + + @RequestMapping(value = "/insertGoodsType", method = RequestMethod.POST) + @ResponseBody + @ApiOperation(value = "新增商品类型") + public ResponseData insertGoodsType(@RequestBody HighGoodsType highGoodsType, HttpServletRequest request) { + try { + //发布人员 + SessionObject sessionObject = userCenter.getSessionObject(request); + UserInfoModel userInfoModel = (UserInfoModel) sessionObject.getObject(); + + + if (StringUtils.isBlank(highGoodsType.getTitle()) + || StringUtils.isBlank(highGoodsType.getImg()) + ) { + log.error("HighAgentController -> insertAgent() error!","参数错误"); + throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, ""); + } + + // 校验账号用户名是否存在 + if (highGoodsTypeService.findByTitle(highGoodsType.getTitle())) { + log.error("HighGoodsTypeController --> insertGoodsType() error!", "用户名已存在"); + throw ErrorHelp.genException(SysCode.System, ErrorCode.USER_LOGIN_NAME_IS_EXIST_ERROR, ""); + } + + highGoodsType.setCreatedTime(new Date()); + highGoodsType.setCreatedUserId(userInfoModel.getSecUser().getId().intValue()); + highGoodsType.setUpdatedTime(new Date()); + highGoodsType.setUpdatedUserId(userInfoModel.getSecUser().getId().intValue()); + highGoodsType.setStatus(1); + + highGoodsTypeService.insertGoodsType(highGoodsType); + + return ResponseMsgUtil.success("新增成功"); + + } catch (Exception e) { + log.error("HighAgentController --> insertAgent() error!", e); + return ResponseMsgUtil.exception(e); + } + } + + @RequestMapping(value = "/updateGoodsType", method = RequestMethod.POST) + @ResponseBody + @ApiOperation(value = "修改商品类型") + public ResponseData updateGoodsType(@RequestBody HighGoodsType highGoodsType, HttpServletRequest request) { + try { + //发布人员 + SessionObject sessionObject = userCenter.getSessionObject(request); + UserInfoModel userInfoModel = (UserInfoModel) sessionObject.getObject(); + + + if (StringUtils.isBlank(highGoodsType.getTitle()) + || StringUtils.isBlank(highGoodsType.getImg()) + || highGoodsType.getId() != null + ) { + log.error("HighAgentController -> insertAgent() error!","参数错误"); + throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, ""); + } + + HighGoodsType highGoodsTypes = highGoodsTypeService.findById(highGoodsType.getId()); + + // 校验账号用户名是否存在 + if (highGoodsTypeService.findByTitle(highGoodsType.getTitle()) && !highGoodsTypes.getId().equals(highGoodsType.getId())) { + log.error("HighGoodsTypeController --> insertGoodsType() error!", "用户名已存在"); + throw ErrorHelp.genException(SysCode.System, ErrorCode.USER_LOGIN_NAME_IS_EXIST_ERROR, ""); + } + + highGoodsTypes.setUpdatedTime(new Date()); + highGoodsTypes.setUpdatedUserId(userInfoModel.getSecUser().getId().intValue()); + highGoodsTypes.setImg(highGoodsType.getImg()); + highGoodsTypes.setTitle(highGoodsType.getTitle()); + + highGoodsTypeService.updateGoodsType(highGoodsType); + + return ResponseMsgUtil.success("修改成功"); + + } catch (Exception e) { + log.error("HighAgentController --> insertAgent() error!", e); + return ResponseMsgUtil.exception(e); + } + } +} diff --git a/hai-bweb/src/main/java/com/bweb/controller/HighOrderController.java b/hai-bweb/src/main/java/com/bweb/controller/HighOrderController.java index e10805b2..43a7075c 100644 --- a/hai-bweb/src/main/java/com/bweb/controller/HighOrderController.java +++ b/hai-bweb/src/main/java/com/bweb/controller/HighOrderController.java @@ -578,7 +578,7 @@ public class HighOrderController { @RequestMapping(value = "/orderToRefundHlt", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "汇联通订单退款") - public ResponseData orderToRefund(@RequestParam(name = "orderId", required = false) Long orderId, + public ResponseData orderToRefundHlt(@RequestParam(name = "orderId", required = false) Long orderId, HttpServletRequest request) { try { @@ -589,10 +589,10 @@ public class HighOrderController { } // 订单状态 : 1.待支付 2.已支付 3.已完成 4.已取消 5.已退款 -// if (order.getOrderStatus() != 2) { -// log.error("orderToPay error!", "无法退款,订单不处于已支付状态"); -// throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "无法退款,订单不处于已支付状态"); -// } + if (order.getOrderStatus() != 2) { + log.error("orderToPay error!", "无法退款,订单不处于已支付状态"); + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "无法退款,订单不处于已支付状态"); + } JSONObject jsonObject = HuiLianTongUnionCardConfig.refund( "HFR"+new Date().getTime() , order.getOrderNo()); diff --git a/hai-bweb/src/main/java/com/bweb/model/ExportOutRechargeOrder.java b/hai-bweb/src/main/java/com/bweb/model/ExportOutRechargeOrder.java index 72533171..039fb5be 100644 --- a/hai-bweb/src/main/java/com/bweb/model/ExportOutRechargeOrder.java +++ b/hai-bweb/src/main/java/com/bweb/model/ExportOutRechargeOrder.java @@ -28,6 +28,9 @@ public class ExportOutRechargeOrder { @ExcelProperty("支付方式") private String payTypeName; + @ExcelProperty("卡号") + private String cardNo; + @ExcelProperty("订单金额") private BigDecimal orderPrice; @@ -215,4 +218,12 @@ public class ExportOutRechargeOrder { public void setRefundId(String refundId) { this.refundId = refundId; } + + public String getCardNo() { + return cardNo; + } + + public void setCardNo(String cardNo) { + this.cardNo = cardNo; + } } diff --git a/hai-service/src/main/java/com/hai/common/exception/ErrorCode.java b/hai-service/src/main/java/com/hai/common/exception/ErrorCode.java index 85d9a4d1..cfc3de98 100644 --- a/hai-service/src/main/java/com/hai/common/exception/ErrorCode.java +++ b/hai-service/src/main/java/com/hai/common/exception/ErrorCode.java @@ -115,6 +115,7 @@ public enum ErrorCode { NOT_ENTER_USER_PAY_PWD("2131","未输入支付密码"), USER_PAY_PWD_ERROR("2132","支付密码错误"), NO_BIND_PHONE("2133","未绑定手机号"), + title_("2134","名称已存在"), STATUS_ERROR("3000","状态错误"), diff --git a/hai-service/src/main/java/com/hai/dao/HighReserveMsgMapper.java b/hai-service/src/main/java/com/hai/dao/HighReserveMsgMapper.java deleted file mode 100644 index 8d5b8bab..00000000 --- a/hai-service/src/main/java/com/hai/dao/HighReserveMsgMapper.java +++ /dev/null @@ -1,142 +0,0 @@ -package com.hai.dao; - -import com.hai.entity.HighReserveMsg; -import com.hai.entity.HighReserveMsgExample; -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 HighReserveMsgMapper extends HighReserveMsgMapperExt { - @SelectProvider(type=HighReserveMsgSqlProvider.class, method="countByExample") - long countByExample(HighReserveMsgExample example); - - @DeleteProvider(type=HighReserveMsgSqlProvider.class, method="deleteByExample") - int deleteByExample(HighReserveMsgExample example); - - @Delete({ - "delete from high_reserve_msg", - "where id = #{id,jdbcType=INTEGER}" - }) - int deleteByPrimaryKey(Integer id); - - @Insert({ - "insert into high_reserve_msg (goods_name, order_id, ", - "pay_price, reserve_remark, ", - "reserve_time, user_name, ", - "user_phone, created_user_id, ", - "created_time, updated_user_id, ", - "updated_time, `status`, ", - "ext_1, ext_2, ext_3)", - "values (#{goodsName,jdbcType=VARCHAR}, #{orderId,jdbcType=VARCHAR}, ", - "#{payPrice,jdbcType=DECIMAL}, #{reserveRemark,jdbcType=VARCHAR}, ", - "#{reserveTime,jdbcType=TIMESTAMP}, #{userName,jdbcType=VARCHAR}, ", - "#{userPhone,jdbcType=VARCHAR}, #{createdUserId,jdbcType=VARCHAR}, ", - "#{createdTime,jdbcType=TIMESTAMP}, #{updatedUserId,jdbcType=VARCHAR}, ", - "#{updatedTime,jdbcType=TIMESTAMP}, #{status,jdbcType=INTEGER}, ", - "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" - }) - @Options(useGeneratedKeys=true,keyProperty="id") - int insert(HighReserveMsg record); - - @InsertProvider(type=HighReserveMsgSqlProvider.class, method="insertSelective") - @Options(useGeneratedKeys=true,keyProperty="id") - int insertSelective(HighReserveMsg record); - - @SelectProvider(type=HighReserveMsgSqlProvider.class, method="selectByExample") - @Results({ - @Result(column="id", property="id", jdbcType=JdbcType.INTEGER, id=true), - @Result(column="goods_name", property="goodsName", jdbcType=JdbcType.VARCHAR), - @Result(column="order_id", property="orderId", jdbcType=JdbcType.VARCHAR), - @Result(column="pay_price", property="payPrice", jdbcType=JdbcType.DECIMAL), - @Result(column="reserve_remark", property="reserveRemark", jdbcType=JdbcType.VARCHAR), - @Result(column="reserve_time", property="reserveTime", jdbcType=JdbcType.TIMESTAMP), - @Result(column="user_name", property="userName", jdbcType=JdbcType.VARCHAR), - @Result(column="user_phone", property="userPhone", jdbcType=JdbcType.VARCHAR), - @Result(column="created_user_id", property="createdUserId", jdbcType=JdbcType.VARCHAR), - @Result(column="created_time", property="createdTime", jdbcType=JdbcType.TIMESTAMP), - @Result(column="updated_user_id", property="updatedUserId", jdbcType=JdbcType.VARCHAR), - @Result(column="updated_time", property="updatedTime", jdbcType=JdbcType.TIMESTAMP), - @Result(column="status", property="status", jdbcType=JdbcType.INTEGER), - @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(HighReserveMsgExample example); - - @Select({ - "select", - "id, goods_name, order_id, pay_price, reserve_remark, reserve_time, user_name, ", - "user_phone, created_user_id, created_time, updated_user_id, updated_time, `status`, ", - "ext_1, ext_2, ext_3", - "from high_reserve_msg", - "where id = #{id,jdbcType=INTEGER}" - }) - @Results({ - @Result(column="id", property="id", jdbcType=JdbcType.INTEGER, id=true), - @Result(column="goods_name", property="goodsName", jdbcType=JdbcType.VARCHAR), - @Result(column="order_id", property="orderId", jdbcType=JdbcType.VARCHAR), - @Result(column="pay_price", property="payPrice", jdbcType=JdbcType.DECIMAL), - @Result(column="reserve_remark", property="reserveRemark", jdbcType=JdbcType.VARCHAR), - @Result(column="reserve_time", property="reserveTime", jdbcType=JdbcType.TIMESTAMP), - @Result(column="user_name", property="userName", jdbcType=JdbcType.VARCHAR), - @Result(column="user_phone", property="userPhone", jdbcType=JdbcType.VARCHAR), - @Result(column="created_user_id", property="createdUserId", jdbcType=JdbcType.VARCHAR), - @Result(column="created_time", property="createdTime", jdbcType=JdbcType.TIMESTAMP), - @Result(column="updated_user_id", property="updatedUserId", jdbcType=JdbcType.VARCHAR), - @Result(column="updated_time", property="updatedTime", jdbcType=JdbcType.TIMESTAMP), - @Result(column="status", property="status", jdbcType=JdbcType.INTEGER), - @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) - }) - HighReserveMsg selectByPrimaryKey(Integer id); - - @UpdateProvider(type=HighReserveMsgSqlProvider.class, method="updateByExampleSelective") - int updateByExampleSelective(@Param("record") HighReserveMsg record, @Param("example") HighReserveMsgExample example); - - @UpdateProvider(type=HighReserveMsgSqlProvider.class, method="updateByExample") - int updateByExample(@Param("record") HighReserveMsg record, @Param("example") HighReserveMsgExample example); - - @UpdateProvider(type=HighReserveMsgSqlProvider.class, method="updateByPrimaryKeySelective") - int updateByPrimaryKeySelective(HighReserveMsg record); - - @Update({ - "update high_reserve_msg", - "set goods_name = #{goodsName,jdbcType=VARCHAR},", - "order_id = #{orderId,jdbcType=VARCHAR},", - "pay_price = #{payPrice,jdbcType=DECIMAL},", - "reserve_remark = #{reserveRemark,jdbcType=VARCHAR},", - "reserve_time = #{reserveTime,jdbcType=TIMESTAMP},", - "user_name = #{userName,jdbcType=VARCHAR},", - "user_phone = #{userPhone,jdbcType=VARCHAR},", - "created_user_id = #{createdUserId,jdbcType=VARCHAR},", - "created_time = #{createdTime,jdbcType=TIMESTAMP},", - "updated_user_id = #{updatedUserId,jdbcType=VARCHAR},", - "updated_time = #{updatedTime,jdbcType=TIMESTAMP},", - "`status` = #{status,jdbcType=INTEGER},", - "ext_1 = #{ext1,jdbcType=VARCHAR},", - "ext_2 = #{ext2,jdbcType=VARCHAR},", - "ext_3 = #{ext3,jdbcType=VARCHAR}", - "where id = #{id,jdbcType=INTEGER}" - }) - int updateByPrimaryKey(HighReserveMsg record); -} \ No newline at end of file diff --git a/hai-service/src/main/java/com/hai/dao/HighReserveMsgMapperExt.java b/hai-service/src/main/java/com/hai/dao/HighReserveMsgMapperExt.java deleted file mode 100644 index 9a628c0c..00000000 --- a/hai-service/src/main/java/com/hai/dao/HighReserveMsgMapperExt.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.hai.dao; - -/** - * mapper扩展类 - */ -public interface HighReserveMsgMapperExt { -} \ No newline at end of file diff --git a/hai-service/src/main/java/com/hai/dao/HighReserveMsgSqlProvider.java b/hai-service/src/main/java/com/hai/dao/HighReserveMsgSqlProvider.java deleted file mode 100644 index 0775a564..00000000 --- a/hai-service/src/main/java/com/hai/dao/HighReserveMsgSqlProvider.java +++ /dev/null @@ -1,388 +0,0 @@ -package com.hai.dao; - -import com.hai.entity.HighReserveMsg; -import com.hai.entity.HighReserveMsgExample.Criteria; -import com.hai.entity.HighReserveMsgExample.Criterion; -import com.hai.entity.HighReserveMsgExample; -import java.util.List; -import java.util.Map; -import org.apache.ibatis.jdbc.SQL; - -public class HighReserveMsgSqlProvider { - - public String countByExample(HighReserveMsgExample example) { - SQL sql = new SQL(); - sql.SELECT("count(*)").FROM("high_reserve_msg"); - applyWhere(sql, example, false); - return sql.toString(); - } - - public String deleteByExample(HighReserveMsgExample example) { - SQL sql = new SQL(); - sql.DELETE_FROM("high_reserve_msg"); - applyWhere(sql, example, false); - return sql.toString(); - } - - public String insertSelective(HighReserveMsg record) { - SQL sql = new SQL(); - sql.INSERT_INTO("high_reserve_msg"); - - if (record.getGoodsName() != null) { - sql.VALUES("goods_name", "#{goodsName,jdbcType=VARCHAR}"); - } - - if (record.getOrderId() != null) { - sql.VALUES("order_id", "#{orderId,jdbcType=VARCHAR}"); - } - - if (record.getPayPrice() != null) { - sql.VALUES("pay_price", "#{payPrice,jdbcType=DECIMAL}"); - } - - if (record.getReserveRemark() != null) { - sql.VALUES("reserve_remark", "#{reserveRemark,jdbcType=VARCHAR}"); - } - - if (record.getReserveTime() != null) { - sql.VALUES("reserve_time", "#{reserveTime,jdbcType=TIMESTAMP}"); - } - - if (record.getUserName() != null) { - sql.VALUES("user_name", "#{userName,jdbcType=VARCHAR}"); - } - - if (record.getUserPhone() != null) { - sql.VALUES("user_phone", "#{userPhone,jdbcType=VARCHAR}"); - } - - if (record.getCreatedUserId() != null) { - sql.VALUES("created_user_id", "#{createdUserId,jdbcType=VARCHAR}"); - } - - if (record.getCreatedTime() != null) { - sql.VALUES("created_time", "#{createdTime,jdbcType=TIMESTAMP}"); - } - - if (record.getUpdatedUserId() != null) { - sql.VALUES("updated_user_id", "#{updatedUserId,jdbcType=VARCHAR}"); - } - - if (record.getUpdatedTime() != null) { - sql.VALUES("updated_time", "#{updatedTime,jdbcType=TIMESTAMP}"); - } - - if (record.getStatus() != null) { - sql.VALUES("`status`", "#{status,jdbcType=INTEGER}"); - } - - 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(HighReserveMsgExample example) { - SQL sql = new SQL(); - if (example != null && example.isDistinct()) { - sql.SELECT_DISTINCT("id"); - } else { - sql.SELECT("id"); - } - sql.SELECT("goods_name"); - sql.SELECT("order_id"); - sql.SELECT("pay_price"); - sql.SELECT("reserve_remark"); - sql.SELECT("reserve_time"); - sql.SELECT("user_name"); - sql.SELECT("user_phone"); - sql.SELECT("created_user_id"); - sql.SELECT("created_time"); - sql.SELECT("updated_user_id"); - sql.SELECT("updated_time"); - sql.SELECT("`status`"); - sql.SELECT("ext_1"); - sql.SELECT("ext_2"); - sql.SELECT("ext_3"); - sql.FROM("high_reserve_msg"); - applyWhere(sql, example, false); - - if (example != null && example.getOrderByClause() != null) { - sql.ORDER_BY(example.getOrderByClause()); - } - - return sql.toString(); - } - - public String updateByExampleSelective(Map parameter) { - HighReserveMsg record = (HighReserveMsg) parameter.get("record"); - HighReserveMsgExample example = (HighReserveMsgExample) parameter.get("example"); - - SQL sql = new SQL(); - sql.UPDATE("high_reserve_msg"); - - if (record.getId() != null) { - sql.SET("id = #{record.id,jdbcType=INTEGER}"); - } - - if (record.getGoodsName() != null) { - sql.SET("goods_name = #{record.goodsName,jdbcType=VARCHAR}"); - } - - if (record.getOrderId() != null) { - sql.SET("order_id = #{record.orderId,jdbcType=VARCHAR}"); - } - - if (record.getPayPrice() != null) { - sql.SET("pay_price = #{record.payPrice,jdbcType=DECIMAL}"); - } - - if (record.getReserveRemark() != null) { - sql.SET("reserve_remark = #{record.reserveRemark,jdbcType=VARCHAR}"); - } - - if (record.getReserveTime() != null) { - sql.SET("reserve_time = #{record.reserveTime,jdbcType=TIMESTAMP}"); - } - - if (record.getUserName() != null) { - sql.SET("user_name = #{record.userName,jdbcType=VARCHAR}"); - } - - if (record.getUserPhone() != null) { - sql.SET("user_phone = #{record.userPhone,jdbcType=VARCHAR}"); - } - - if (record.getCreatedUserId() != null) { - sql.SET("created_user_id = #{record.createdUserId,jdbcType=VARCHAR}"); - } - - if (record.getCreatedTime() != null) { - sql.SET("created_time = #{record.createdTime,jdbcType=TIMESTAMP}"); - } - - if (record.getUpdatedUserId() != null) { - sql.SET("updated_user_id = #{record.updatedUserId,jdbcType=VARCHAR}"); - } - - if (record.getUpdatedTime() != null) { - sql.SET("updated_time = #{record.updatedTime,jdbcType=TIMESTAMP}"); - } - - if (record.getStatus() != null) { - sql.SET("`status` = #{record.status,jdbcType=INTEGER}"); - } - - if (record.getExt1() != null) { - sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}"); - } - - if (record.getExt2() != null) { - sql.SET("ext_2 = #{record.ext2,jdbcType=VARCHAR}"); - } - - if (record.getExt3() != null) { - sql.SET("ext_3 = #{record.ext3,jdbcType=VARCHAR}"); - } - - applyWhere(sql, example, true); - return sql.toString(); - } - - public String updateByExample(Map parameter) { - SQL sql = new SQL(); - sql.UPDATE("high_reserve_msg"); - - sql.SET("id = #{record.id,jdbcType=INTEGER}"); - sql.SET("goods_name = #{record.goodsName,jdbcType=VARCHAR}"); - sql.SET("order_id = #{record.orderId,jdbcType=VARCHAR}"); - sql.SET("pay_price = #{record.payPrice,jdbcType=DECIMAL}"); - sql.SET("reserve_remark = #{record.reserveRemark,jdbcType=VARCHAR}"); - sql.SET("reserve_time = #{record.reserveTime,jdbcType=TIMESTAMP}"); - sql.SET("user_name = #{record.userName,jdbcType=VARCHAR}"); - sql.SET("user_phone = #{record.userPhone,jdbcType=VARCHAR}"); - sql.SET("created_user_id = #{record.createdUserId,jdbcType=VARCHAR}"); - sql.SET("created_time = #{record.createdTime,jdbcType=TIMESTAMP}"); - sql.SET("updated_user_id = #{record.updatedUserId,jdbcType=VARCHAR}"); - sql.SET("updated_time = #{record.updatedTime,jdbcType=TIMESTAMP}"); - sql.SET("`status` = #{record.status,jdbcType=INTEGER}"); - sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}"); - sql.SET("ext_2 = #{record.ext2,jdbcType=VARCHAR}"); - sql.SET("ext_3 = #{record.ext3,jdbcType=VARCHAR}"); - - HighReserveMsgExample example = (HighReserveMsgExample) parameter.get("example"); - applyWhere(sql, example, true); - return sql.toString(); - } - - public String updateByPrimaryKeySelective(HighReserveMsg record) { - SQL sql = new SQL(); - sql.UPDATE("high_reserve_msg"); - - if (record.getGoodsName() != null) { - sql.SET("goods_name = #{goodsName,jdbcType=VARCHAR}"); - } - - if (record.getOrderId() != null) { - sql.SET("order_id = #{orderId,jdbcType=VARCHAR}"); - } - - if (record.getPayPrice() != null) { - sql.SET("pay_price = #{payPrice,jdbcType=DECIMAL}"); - } - - if (record.getReserveRemark() != null) { - sql.SET("reserve_remark = #{reserveRemark,jdbcType=VARCHAR}"); - } - - if (record.getReserveTime() != null) { - sql.SET("reserve_time = #{reserveTime,jdbcType=TIMESTAMP}"); - } - - if (record.getUserName() != null) { - sql.SET("user_name = #{userName,jdbcType=VARCHAR}"); - } - - if (record.getUserPhone() != null) { - sql.SET("user_phone = #{userPhone,jdbcType=VARCHAR}"); - } - - if (record.getCreatedUserId() != null) { - sql.SET("created_user_id = #{createdUserId,jdbcType=VARCHAR}"); - } - - if (record.getCreatedTime() != null) { - sql.SET("created_time = #{createdTime,jdbcType=TIMESTAMP}"); - } - - if (record.getUpdatedUserId() != null) { - sql.SET("updated_user_id = #{updatedUserId,jdbcType=VARCHAR}"); - } - - if (record.getUpdatedTime() != null) { - sql.SET("updated_time = #{updatedTime,jdbcType=TIMESTAMP}"); - } - - if (record.getStatus() != null) { - sql.SET("`status` = #{status,jdbcType=INTEGER}"); - } - - 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=INTEGER}"); - - return sql.toString(); - } - - protected void applyWhere(SQL sql, HighReserveMsgExample example, boolean includeExamplePhrase) { - if (example == null) { - return; - } - - String parmPhrase1; - String parmPhrase1_th; - String parmPhrase2; - String parmPhrase2_th; - String parmPhrase3; - String parmPhrase3_th; - if (includeExamplePhrase) { - parmPhrase1 = "%s #{example.oredCriteria[%d].allCriteria[%d].value}"; - parmPhrase1_th = "%s #{example.oredCriteria[%d].allCriteria[%d].value,typeHandler=%s}"; - parmPhrase2 = "%s #{example.oredCriteria[%d].allCriteria[%d].value} and #{example.oredCriteria[%d].criteria[%d].secondValue}"; - parmPhrase2_th = "%s #{example.oredCriteria[%d].allCriteria[%d].value,typeHandler=%s} and #{example.oredCriteria[%d].criteria[%d].secondValue,typeHandler=%s}"; - parmPhrase3 = "#{example.oredCriteria[%d].allCriteria[%d].value[%d]}"; - parmPhrase3_th = "#{example.oredCriteria[%d].allCriteria[%d].value[%d],typeHandler=%s}"; - } else { - parmPhrase1 = "%s #{oredCriteria[%d].allCriteria[%d].value}"; - parmPhrase1_th = "%s #{oredCriteria[%d].allCriteria[%d].value,typeHandler=%s}"; - parmPhrase2 = "%s #{oredCriteria[%d].allCriteria[%d].value} and #{oredCriteria[%d].criteria[%d].secondValue}"; - parmPhrase2_th = "%s #{oredCriteria[%d].allCriteria[%d].value,typeHandler=%s} and #{oredCriteria[%d].criteria[%d].secondValue,typeHandler=%s}"; - parmPhrase3 = "#{oredCriteria[%d].allCriteria[%d].value[%d]}"; - parmPhrase3_th = "#{oredCriteria[%d].allCriteria[%d].value[%d],typeHandler=%s}"; - } - - StringBuilder sb = new StringBuilder(); - List oredCriteria = example.getOredCriteria(); - boolean firstCriteria = true; - for (int i = 0; i < oredCriteria.size(); i++) { - Criteria criteria = oredCriteria.get(i); - if (criteria.isValid()) { - if (firstCriteria) { - firstCriteria = false; - } else { - sb.append(" or "); - } - - sb.append('('); - List criterions = criteria.getAllCriteria(); - boolean firstCriterion = true; - for (int j = 0; j < criterions.size(); j++) { - Criterion criterion = criterions.get(j); - if (firstCriterion) { - firstCriterion = false; - } else { - sb.append(" and "); - } - - if (criterion.isNoValue()) { - sb.append(criterion.getCondition()); - } else if (criterion.isSingleValue()) { - if (criterion.getTypeHandler() == null) { - sb.append(String.format(parmPhrase1, criterion.getCondition(), i, j)); - } else { - sb.append(String.format(parmPhrase1_th, criterion.getCondition(), i, j,criterion.getTypeHandler())); - } - } else if (criterion.isBetweenValue()) { - if (criterion.getTypeHandler() == null) { - sb.append(String.format(parmPhrase2, criterion.getCondition(), i, j, i, j)); - } else { - sb.append(String.format(parmPhrase2_th, criterion.getCondition(), i, j, criterion.getTypeHandler(), i, j, criterion.getTypeHandler())); - } - } else if (criterion.isListValue()) { - sb.append(criterion.getCondition()); - sb.append(" ("); - List listItems = (List) criterion.getValue(); - boolean comma = false; - for (int k = 0; k < listItems.size(); k++) { - if (comma) { - sb.append(", "); - } else { - comma = true; - } - if (criterion.getTypeHandler() == null) { - sb.append(String.format(parmPhrase3, i, j, k)); - } else { - sb.append(String.format(parmPhrase3_th, i, j, k, criterion.getTypeHandler())); - } - } - sb.append(')'); - } - } - sb.append(')'); - } - } - - if (sb.length() > 0) { - sql.WHERE(sb.toString()); - } - } -} \ No newline at end of file diff --git a/hai-service/src/main/java/com/hai/dao/OutRechargeOrderMapperExt.java b/hai-service/src/main/java/com/hai/dao/OutRechargeOrderMapperExt.java index 3612e890..a2ac284d 100644 --- a/hai-service/src/main/java/com/hai/dao/OutRechargeOrderMapperExt.java +++ b/hai-service/src/main/java/com/hai/dao/OutRechargeOrderMapperExt.java @@ -81,10 +81,12 @@ public interface OutRechargeOrderMapperExt { " a.refund_time refundTime," + " a.refund_fee refundFee," + " a.out_refund_no outRefundNo," + - " a.refund_id refundId" + + " a.refund_id refundId," + + " b.card_no cardNo" + " FROM" + - " out_recharge_order a where 1 = 1 " + + " out_recharge_order a join high_user_card b on a.user_id = b.user_id where 1 = 1 " + " and a.`status` = #{map.status} ", + " and a.`Identification_code` = #{map.code} ", " and a.`order_no` = #{map.orderNo} ", " and a.`recharge_model` = #{map.rechargeModel} ", " and a.`recharge_content` LIKE '%${map.rechargeContent}%' ", diff --git a/hai-service/src/main/java/com/hai/entity/HighReserveMsg.java b/hai-service/src/main/java/com/hai/entity/HighReserveMsg.java deleted file mode 100644 index 9b601d43..00000000 --- a/hai-service/src/main/java/com/hai/entity/HighReserveMsg.java +++ /dev/null @@ -1,306 +0,0 @@ -package com.hai.entity; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -/** - * high_reserve_msg - * @author - */ -/** - * - * 代码由工具生成 - * - **/ -public class HighReserveMsg implements Serializable { - /** - * 主键 - */ - private Integer id; - - /** - * 商品名称 - */ - private String goodsName; - - /** - * 订单ID - */ - private String orderId; - - /** - * 支付金额 - */ - private BigDecimal payPrice; - - /** - * 预约备注 - */ - private String reserveRemark; - - /** - * 预约时间 - */ - private Date reserveTime; - - /** - * 用户名称 - */ - private String userName; - - /** - * 用户电话 - */ - private String userPhone; - - /** - * 创建人 - */ - private String createdUserId; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新人 - */ - private String updatedUserId; - - /** - * 更新时间 - */ - private Date updatedTime; - - /** - * 状态 1:预约中 2:已预约 3:完成 3: 异常 - */ - private Integer status; - - /** - * 扩展字段 - */ - private String ext1; - - /** - * 扩展字段 - */ - private String ext2; - - /** - * 扩展字段 - */ - private String ext3; - - private static final long serialVersionUID = 1L; - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getGoodsName() { - return goodsName; - } - - public void setGoodsName(String goodsName) { - this.goodsName = goodsName; - } - - public String getOrderId() { - return orderId; - } - - public void setOrderId(String orderId) { - this.orderId = orderId; - } - - public BigDecimal getPayPrice() { - return payPrice; - } - - public void setPayPrice(BigDecimal payPrice) { - this.payPrice = payPrice; - } - - public String getReserveRemark() { - return reserveRemark; - } - - public void setReserveRemark(String reserveRemark) { - this.reserveRemark = reserveRemark; - } - - public Date getReserveTime() { - return reserveTime; - } - - public void setReserveTime(Date reserveTime) { - this.reserveTime = reserveTime; - } - - public String getUserName() { - return userName; - } - - public void setUserName(String userName) { - this.userName = userName; - } - - public String getUserPhone() { - return userPhone; - } - - public void setUserPhone(String userPhone) { - this.userPhone = userPhone; - } - - public String getCreatedUserId() { - return createdUserId; - } - - public void setCreatedUserId(String createdUserId) { - this.createdUserId = createdUserId; - } - - public Date getCreatedTime() { - return createdTime; - } - - public void setCreatedTime(Date createdTime) { - this.createdTime = createdTime; - } - - public String getUpdatedUserId() { - return updatedUserId; - } - - public void setUpdatedUserId(String updatedUserId) { - this.updatedUserId = updatedUserId; - } - - public Date getUpdatedTime() { - return updatedTime; - } - - public void setUpdatedTime(Date updatedTime) { - this.updatedTime = updatedTime; - } - - public Integer getStatus() { - return status; - } - - public void setStatus(Integer status) { - this.status = status; - } - - 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; - } - HighReserveMsg other = (HighReserveMsg) that; - return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) - && (this.getGoodsName() == null ? other.getGoodsName() == null : this.getGoodsName().equals(other.getGoodsName())) - && (this.getOrderId() == null ? other.getOrderId() == null : this.getOrderId().equals(other.getOrderId())) - && (this.getPayPrice() == null ? other.getPayPrice() == null : this.getPayPrice().equals(other.getPayPrice())) - && (this.getReserveRemark() == null ? other.getReserveRemark() == null : this.getReserveRemark().equals(other.getReserveRemark())) - && (this.getReserveTime() == null ? other.getReserveTime() == null : this.getReserveTime().equals(other.getReserveTime())) - && (this.getUserName() == null ? other.getUserName() == null : this.getUserName().equals(other.getUserName())) - && (this.getUserPhone() == null ? other.getUserPhone() == null : this.getUserPhone().equals(other.getUserPhone())) - && (this.getCreatedUserId() == null ? other.getCreatedUserId() == null : this.getCreatedUserId().equals(other.getCreatedUserId())) - && (this.getCreatedTime() == null ? other.getCreatedTime() == null : this.getCreatedTime().equals(other.getCreatedTime())) - && (this.getUpdatedUserId() == null ? other.getUpdatedUserId() == null : this.getUpdatedUserId().equals(other.getUpdatedUserId())) - && (this.getUpdatedTime() == null ? other.getUpdatedTime() == null : this.getUpdatedTime().equals(other.getUpdatedTime())) - && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus())) - && (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 + ((getGoodsName() == null) ? 0 : getGoodsName().hashCode()); - result = prime * result + ((getOrderId() == null) ? 0 : getOrderId().hashCode()); - result = prime * result + ((getPayPrice() == null) ? 0 : getPayPrice().hashCode()); - result = prime * result + ((getReserveRemark() == null) ? 0 : getReserveRemark().hashCode()); - result = prime * result + ((getReserveTime() == null) ? 0 : getReserveTime().hashCode()); - result = prime * result + ((getUserName() == null) ? 0 : getUserName().hashCode()); - result = prime * result + ((getUserPhone() == null) ? 0 : getUserPhone().hashCode()); - result = prime * result + ((getCreatedUserId() == null) ? 0 : getCreatedUserId().hashCode()); - result = prime * result + ((getCreatedTime() == null) ? 0 : getCreatedTime().hashCode()); - result = prime * result + ((getUpdatedUserId() == null) ? 0 : getUpdatedUserId().hashCode()); - result = prime * result + ((getUpdatedTime() == null) ? 0 : getUpdatedTime().hashCode()); - result = prime * result + ((getStatus() == null) ? 0 : getStatus().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(", goodsName=").append(goodsName); - sb.append(", orderId=").append(orderId); - sb.append(", payPrice=").append(payPrice); - sb.append(", reserveRemark=").append(reserveRemark); - sb.append(", reserveTime=").append(reserveTime); - sb.append(", userName=").append(userName); - sb.append(", userPhone=").append(userPhone); - sb.append(", createdUserId=").append(createdUserId); - sb.append(", createdTime=").append(createdTime); - sb.append(", updatedUserId=").append(updatedUserId); - sb.append(", updatedTime=").append(updatedTime); - sb.append(", status=").append(status); - sb.append(", ext1=").append(ext1); - sb.append(", ext2=").append(ext2); - sb.append(", ext3=").append(ext3); - sb.append(", serialVersionUID=").append(serialVersionUID); - sb.append("]"); - return sb.toString(); - } -} \ No newline at end of file diff --git a/hai-service/src/main/java/com/hai/entity/HighReserveMsgExample.java b/hai-service/src/main/java/com/hai/entity/HighReserveMsgExample.java deleted file mode 100644 index 6c1880aa..00000000 --- a/hai-service/src/main/java/com/hai/entity/HighReserveMsgExample.java +++ /dev/null @@ -1,1284 +0,0 @@ -package com.hai.entity; - -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -public class HighReserveMsgExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - private Integer limit; - - private Long offset; - - public HighReserveMsgExample() { - 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 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 andOrderIdIsNull() { - addCriterion("order_id is null"); - return (Criteria) this; - } - - public Criteria andOrderIdIsNotNull() { - addCriterion("order_id is not null"); - return (Criteria) this; - } - - public Criteria andOrderIdEqualTo(String value) { - addCriterion("order_id =", value, "orderId"); - return (Criteria) this; - } - - public Criteria andOrderIdNotEqualTo(String value) { - addCriterion("order_id <>", value, "orderId"); - return (Criteria) this; - } - - public Criteria andOrderIdGreaterThan(String value) { - addCriterion("order_id >", value, "orderId"); - return (Criteria) this; - } - - public Criteria andOrderIdGreaterThanOrEqualTo(String value) { - addCriterion("order_id >=", value, "orderId"); - return (Criteria) this; - } - - public Criteria andOrderIdLessThan(String value) { - addCriterion("order_id <", value, "orderId"); - return (Criteria) this; - } - - public Criteria andOrderIdLessThanOrEqualTo(String value) { - addCriterion("order_id <=", value, "orderId"); - return (Criteria) this; - } - - public Criteria andOrderIdLike(String value) { - addCriterion("order_id like", value, "orderId"); - return (Criteria) this; - } - - public Criteria andOrderIdNotLike(String value) { - addCriterion("order_id not like", value, "orderId"); - return (Criteria) this; - } - - public Criteria andOrderIdIn(List values) { - addCriterion("order_id in", values, "orderId"); - return (Criteria) this; - } - - public Criteria andOrderIdNotIn(List values) { - addCriterion("order_id not in", values, "orderId"); - return (Criteria) this; - } - - public Criteria andOrderIdBetween(String value1, String value2) { - addCriterion("order_id between", value1, value2, "orderId"); - return (Criteria) this; - } - - public Criteria andOrderIdNotBetween(String value1, String value2) { - addCriterion("order_id not between", value1, value2, "orderId"); - return (Criteria) this; - } - - public Criteria andPayPriceIsNull() { - addCriterion("pay_price is null"); - return (Criteria) this; - } - - public Criteria andPayPriceIsNotNull() { - addCriterion("pay_price is not null"); - return (Criteria) this; - } - - public Criteria andPayPriceEqualTo(BigDecimal value) { - addCriterion("pay_price =", value, "payPrice"); - return (Criteria) this; - } - - public Criteria andPayPriceNotEqualTo(BigDecimal value) { - addCriterion("pay_price <>", value, "payPrice"); - return (Criteria) this; - } - - public Criteria andPayPriceGreaterThan(BigDecimal value) { - addCriterion("pay_price >", value, "payPrice"); - return (Criteria) this; - } - - public Criteria andPayPriceGreaterThanOrEqualTo(BigDecimal value) { - addCriterion("pay_price >=", value, "payPrice"); - return (Criteria) this; - } - - public Criteria andPayPriceLessThan(BigDecimal value) { - addCriterion("pay_price <", value, "payPrice"); - return (Criteria) this; - } - - public Criteria andPayPriceLessThanOrEqualTo(BigDecimal value) { - addCriterion("pay_price <=", value, "payPrice"); - return (Criteria) this; - } - - public Criteria andPayPriceIn(List values) { - addCriterion("pay_price in", values, "payPrice"); - return (Criteria) this; - } - - public Criteria andPayPriceNotIn(List values) { - addCriterion("pay_price not in", values, "payPrice"); - return (Criteria) this; - } - - public Criteria andPayPriceBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("pay_price between", value1, value2, "payPrice"); - return (Criteria) this; - } - - public Criteria andPayPriceNotBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("pay_price not between", value1, value2, "payPrice"); - return (Criteria) this; - } - - public Criteria andReserveRemarkIsNull() { - addCriterion("reserve_remark is null"); - return (Criteria) this; - } - - public Criteria andReserveRemarkIsNotNull() { - addCriterion("reserve_remark is not null"); - return (Criteria) this; - } - - public Criteria andReserveRemarkEqualTo(String value) { - addCriterion("reserve_remark =", value, "reserveRemark"); - return (Criteria) this; - } - - public Criteria andReserveRemarkNotEqualTo(String value) { - addCriterion("reserve_remark <>", value, "reserveRemark"); - return (Criteria) this; - } - - public Criteria andReserveRemarkGreaterThan(String value) { - addCriterion("reserve_remark >", value, "reserveRemark"); - return (Criteria) this; - } - - public Criteria andReserveRemarkGreaterThanOrEqualTo(String value) { - addCriterion("reserve_remark >=", value, "reserveRemark"); - return (Criteria) this; - } - - public Criteria andReserveRemarkLessThan(String value) { - addCriterion("reserve_remark <", value, "reserveRemark"); - return (Criteria) this; - } - - public Criteria andReserveRemarkLessThanOrEqualTo(String value) { - addCriterion("reserve_remark <=", value, "reserveRemark"); - return (Criteria) this; - } - - public Criteria andReserveRemarkLike(String value) { - addCriterion("reserve_remark like", value, "reserveRemark"); - return (Criteria) this; - } - - public Criteria andReserveRemarkNotLike(String value) { - addCriterion("reserve_remark not like", value, "reserveRemark"); - return (Criteria) this; - } - - public Criteria andReserveRemarkIn(List values) { - addCriterion("reserve_remark in", values, "reserveRemark"); - return (Criteria) this; - } - - public Criteria andReserveRemarkNotIn(List values) { - addCriterion("reserve_remark not in", values, "reserveRemark"); - return (Criteria) this; - } - - public Criteria andReserveRemarkBetween(String value1, String value2) { - addCriterion("reserve_remark between", value1, value2, "reserveRemark"); - return (Criteria) this; - } - - public Criteria andReserveRemarkNotBetween(String value1, String value2) { - addCriterion("reserve_remark not between", value1, value2, "reserveRemark"); - return (Criteria) this; - } - - public Criteria andReserveTimeIsNull() { - addCriterion("reserve_time is null"); - return (Criteria) this; - } - - public Criteria andReserveTimeIsNotNull() { - addCriterion("reserve_time is not null"); - return (Criteria) this; - } - - public Criteria andReserveTimeEqualTo(Date value) { - addCriterion("reserve_time =", value, "reserveTime"); - return (Criteria) this; - } - - public Criteria andReserveTimeNotEqualTo(Date value) { - addCriterion("reserve_time <>", value, "reserveTime"); - return (Criteria) this; - } - - public Criteria andReserveTimeGreaterThan(Date value) { - addCriterion("reserve_time >", value, "reserveTime"); - return (Criteria) this; - } - - public Criteria andReserveTimeGreaterThanOrEqualTo(Date value) { - addCriterion("reserve_time >=", value, "reserveTime"); - return (Criteria) this; - } - - public Criteria andReserveTimeLessThan(Date value) { - addCriterion("reserve_time <", value, "reserveTime"); - return (Criteria) this; - } - - public Criteria andReserveTimeLessThanOrEqualTo(Date value) { - addCriterion("reserve_time <=", value, "reserveTime"); - return (Criteria) this; - } - - public Criteria andReserveTimeIn(List values) { - addCriterion("reserve_time in", values, "reserveTime"); - return (Criteria) this; - } - - public Criteria andReserveTimeNotIn(List values) { - addCriterion("reserve_time not in", values, "reserveTime"); - return (Criteria) this; - } - - public Criteria andReserveTimeBetween(Date value1, Date value2) { - addCriterion("reserve_time between", value1, value2, "reserveTime"); - return (Criteria) this; - } - - public Criteria andReserveTimeNotBetween(Date value1, Date value2) { - addCriterion("reserve_time not between", value1, value2, "reserveTime"); - return (Criteria) this; - } - - public Criteria andUserNameIsNull() { - addCriterion("user_name is null"); - return (Criteria) this; - } - - public Criteria andUserNameIsNotNull() { - addCriterion("user_name is not null"); - return (Criteria) this; - } - - public Criteria andUserNameEqualTo(String value) { - addCriterion("user_name =", value, "userName"); - return (Criteria) this; - } - - public Criteria andUserNameNotEqualTo(String value) { - addCriterion("user_name <>", value, "userName"); - return (Criteria) this; - } - - public Criteria andUserNameGreaterThan(String value) { - addCriterion("user_name >", value, "userName"); - return (Criteria) this; - } - - public Criteria andUserNameGreaterThanOrEqualTo(String value) { - addCriterion("user_name >=", value, "userName"); - return (Criteria) this; - } - - public Criteria andUserNameLessThan(String value) { - addCriterion("user_name <", value, "userName"); - return (Criteria) this; - } - - public Criteria andUserNameLessThanOrEqualTo(String value) { - addCriterion("user_name <=", value, "userName"); - return (Criteria) this; - } - - public Criteria andUserNameLike(String value) { - addCriterion("user_name like", value, "userName"); - return (Criteria) this; - } - - public Criteria andUserNameNotLike(String value) { - addCriterion("user_name not like", value, "userName"); - return (Criteria) this; - } - - public Criteria andUserNameIn(List values) { - addCriterion("user_name in", values, "userName"); - return (Criteria) this; - } - - public Criteria andUserNameNotIn(List values) { - addCriterion("user_name not in", values, "userName"); - return (Criteria) this; - } - - public Criteria andUserNameBetween(String value1, String value2) { - addCriterion("user_name between", value1, value2, "userName"); - return (Criteria) this; - } - - public Criteria andUserNameNotBetween(String value1, String value2) { - addCriterion("user_name not between", value1, value2, "userName"); - 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 andCreatedUserIdIsNull() { - addCriterion("created_user_id is null"); - return (Criteria) this; - } - - public Criteria andCreatedUserIdIsNotNull() { - addCriterion("created_user_id is not null"); - return (Criteria) this; - } - - public Criteria andCreatedUserIdEqualTo(String value) { - addCriterion("created_user_id =", value, "createdUserId"); - return (Criteria) this; - } - - public Criteria andCreatedUserIdNotEqualTo(String value) { - addCriterion("created_user_id <>", value, "createdUserId"); - return (Criteria) this; - } - - public Criteria andCreatedUserIdGreaterThan(String value) { - addCriterion("created_user_id >", value, "createdUserId"); - return (Criteria) this; - } - - public Criteria andCreatedUserIdGreaterThanOrEqualTo(String value) { - addCriterion("created_user_id >=", value, "createdUserId"); - return (Criteria) this; - } - - public Criteria andCreatedUserIdLessThan(String value) { - addCriterion("created_user_id <", value, "createdUserId"); - return (Criteria) this; - } - - public Criteria andCreatedUserIdLessThanOrEqualTo(String value) { - addCriterion("created_user_id <=", value, "createdUserId"); - return (Criteria) this; - } - - public Criteria andCreatedUserIdLike(String value) { - addCriterion("created_user_id like", value, "createdUserId"); - return (Criteria) this; - } - - public Criteria andCreatedUserIdNotLike(String value) { - addCriterion("created_user_id not like", value, "createdUserId"); - return (Criteria) this; - } - - public Criteria andCreatedUserIdIn(List values) { - addCriterion("created_user_id in", values, "createdUserId"); - return (Criteria) this; - } - - public Criteria andCreatedUserIdNotIn(List values) { - addCriterion("created_user_id not in", values, "createdUserId"); - return (Criteria) this; - } - - public Criteria andCreatedUserIdBetween(String value1, String value2) { - addCriterion("created_user_id between", value1, value2, "createdUserId"); - return (Criteria) this; - } - - public Criteria andCreatedUserIdNotBetween(String value1, String value2) { - addCriterion("created_user_id not between", value1, value2, "createdUserId"); - return (Criteria) this; - } - - public Criteria andCreatedTimeIsNull() { - addCriterion("created_time is null"); - return (Criteria) this; - } - - public Criteria andCreatedTimeIsNotNull() { - addCriterion("created_time is not null"); - return (Criteria) this; - } - - public Criteria andCreatedTimeEqualTo(Date value) { - addCriterion("created_time =", value, "createdTime"); - return (Criteria) this; - } - - public Criteria andCreatedTimeNotEqualTo(Date value) { - addCriterion("created_time <>", value, "createdTime"); - return (Criteria) this; - } - - public Criteria andCreatedTimeGreaterThan(Date value) { - addCriterion("created_time >", value, "createdTime"); - return (Criteria) this; - } - - public Criteria andCreatedTimeGreaterThanOrEqualTo(Date value) { - addCriterion("created_time >=", value, "createdTime"); - return (Criteria) this; - } - - public Criteria andCreatedTimeLessThan(Date value) { - addCriterion("created_time <", value, "createdTime"); - return (Criteria) this; - } - - public Criteria andCreatedTimeLessThanOrEqualTo(Date value) { - addCriterion("created_time <=", value, "createdTime"); - return (Criteria) this; - } - - public Criteria andCreatedTimeIn(List values) { - addCriterion("created_time in", values, "createdTime"); - return (Criteria) this; - } - - public Criteria andCreatedTimeNotIn(List values) { - addCriterion("created_time not in", values, "createdTime"); - return (Criteria) this; - } - - public Criteria andCreatedTimeBetween(Date value1, Date value2) { - addCriterion("created_time between", value1, value2, "createdTime"); - return (Criteria) this; - } - - public Criteria andCreatedTimeNotBetween(Date value1, Date value2) { - addCriterion("created_time not between", value1, value2, "createdTime"); - return (Criteria) this; - } - - public Criteria andUpdatedUserIdIsNull() { - addCriterion("updated_user_id is null"); - return (Criteria) this; - } - - public Criteria andUpdatedUserIdIsNotNull() { - addCriterion("updated_user_id is not null"); - return (Criteria) this; - } - - public Criteria andUpdatedUserIdEqualTo(String value) { - addCriterion("updated_user_id =", value, "updatedUserId"); - return (Criteria) this; - } - - public Criteria andUpdatedUserIdNotEqualTo(String value) { - addCriterion("updated_user_id <>", value, "updatedUserId"); - return (Criteria) this; - } - - public Criteria andUpdatedUserIdGreaterThan(String value) { - addCriterion("updated_user_id >", value, "updatedUserId"); - return (Criteria) this; - } - - public Criteria andUpdatedUserIdGreaterThanOrEqualTo(String value) { - addCriterion("updated_user_id >=", value, "updatedUserId"); - return (Criteria) this; - } - - public Criteria andUpdatedUserIdLessThan(String value) { - addCriterion("updated_user_id <", value, "updatedUserId"); - return (Criteria) this; - } - - public Criteria andUpdatedUserIdLessThanOrEqualTo(String value) { - addCriterion("updated_user_id <=", value, "updatedUserId"); - return (Criteria) this; - } - - public Criteria andUpdatedUserIdLike(String value) { - addCriterion("updated_user_id like", value, "updatedUserId"); - return (Criteria) this; - } - - public Criteria andUpdatedUserIdNotLike(String value) { - addCriterion("updated_user_id not like", value, "updatedUserId"); - return (Criteria) this; - } - - public Criteria andUpdatedUserIdIn(List values) { - addCriterion("updated_user_id in", values, "updatedUserId"); - return (Criteria) this; - } - - public Criteria andUpdatedUserIdNotIn(List values) { - addCriterion("updated_user_id not in", values, "updatedUserId"); - return (Criteria) this; - } - - public Criteria andUpdatedUserIdBetween(String value1, String value2) { - addCriterion("updated_user_id between", value1, value2, "updatedUserId"); - return (Criteria) this; - } - - public Criteria andUpdatedUserIdNotBetween(String value1, String value2) { - addCriterion("updated_user_id not between", value1, value2, "updatedUserId"); - return (Criteria) this; - } - - public Criteria andUpdatedTimeIsNull() { - addCriterion("updated_time is null"); - return (Criteria) this; - } - - public Criteria andUpdatedTimeIsNotNull() { - addCriterion("updated_time is not null"); - return (Criteria) this; - } - - public Criteria andUpdatedTimeEqualTo(Date value) { - addCriterion("updated_time =", value, "updatedTime"); - return (Criteria) this; - } - - public Criteria andUpdatedTimeNotEqualTo(Date value) { - addCriterion("updated_time <>", value, "updatedTime"); - return (Criteria) this; - } - - public Criteria andUpdatedTimeGreaterThan(Date value) { - addCriterion("updated_time >", value, "updatedTime"); - return (Criteria) this; - } - - public Criteria andUpdatedTimeGreaterThanOrEqualTo(Date value) { - addCriterion("updated_time >=", value, "updatedTime"); - return (Criteria) this; - } - - public Criteria andUpdatedTimeLessThan(Date value) { - addCriterion("updated_time <", value, "updatedTime"); - return (Criteria) this; - } - - public Criteria andUpdatedTimeLessThanOrEqualTo(Date value) { - addCriterion("updated_time <=", value, "updatedTime"); - return (Criteria) this; - } - - public Criteria andUpdatedTimeIn(List values) { - addCriterion("updated_time in", values, "updatedTime"); - return (Criteria) this; - } - - public Criteria andUpdatedTimeNotIn(List values) { - addCriterion("updated_time not in", values, "updatedTime"); - return (Criteria) this; - } - - public Criteria andUpdatedTimeBetween(Date value1, Date value2) { - addCriterion("updated_time between", value1, value2, "updatedTime"); - return (Criteria) this; - } - - public Criteria andUpdatedTimeNotBetween(Date value1, Date value2) { - addCriterion("updated_time not between", value1, value2, "updatedTime"); - 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 andExt1IsNull() { - addCriterion("ext_1 is null"); - return (Criteria) this; - } - - public Criteria andExt1IsNotNull() { - addCriterion("ext_1 is not null"); - return (Criteria) this; - } - - public Criteria andExt1EqualTo(String value) { - addCriterion("ext_1 =", value, "ext1"); - return (Criteria) this; - } - - public Criteria andExt1NotEqualTo(String value) { - addCriterion("ext_1 <>", value, "ext1"); - return (Criteria) this; - } - - public Criteria andExt1GreaterThan(String value) { - addCriterion("ext_1 >", value, "ext1"); - return (Criteria) this; - } - - public Criteria andExt1GreaterThanOrEqualTo(String value) { - addCriterion("ext_1 >=", value, "ext1"); - return (Criteria) this; - } - - public Criteria andExt1LessThan(String value) { - addCriterion("ext_1 <", value, "ext1"); - return (Criteria) this; - } - - public Criteria andExt1LessThanOrEqualTo(String value) { - addCriterion("ext_1 <=", value, "ext1"); - return (Criteria) this; - } - - public Criteria andExt1Like(String value) { - addCriterion("ext_1 like", value, "ext1"); - return (Criteria) this; - } - - public Criteria andExt1NotLike(String value) { - addCriterion("ext_1 not like", value, "ext1"); - return (Criteria) this; - } - - public Criteria andExt1In(List values) { - addCriterion("ext_1 in", values, "ext1"); - return (Criteria) this; - } - - public Criteria andExt1NotIn(List values) { - addCriterion("ext_1 not in", values, "ext1"); - return (Criteria) this; - } - - public Criteria andExt1Between(String value1, String value2) { - addCriterion("ext_1 between", value1, value2, "ext1"); - return (Criteria) this; - } - - public Criteria andExt1NotBetween(String value1, String value2) { - addCriterion("ext_1 not between", value1, value2, "ext1"); - return (Criteria) this; - } - - public Criteria andExt2IsNull() { - addCriterion("ext_2 is null"); - return (Criteria) this; - } - - public Criteria andExt2IsNotNull() { - addCriterion("ext_2 is not null"); - return (Criteria) this; - } - - public Criteria andExt2EqualTo(String value) { - addCriterion("ext_2 =", value, "ext2"); - return (Criteria) this; - } - - public Criteria andExt2NotEqualTo(String value) { - addCriterion("ext_2 <>", value, "ext2"); - return (Criteria) this; - } - - public Criteria andExt2GreaterThan(String value) { - addCriterion("ext_2 >", value, "ext2"); - return (Criteria) this; - } - - public Criteria andExt2GreaterThanOrEqualTo(String value) { - addCriterion("ext_2 >=", value, "ext2"); - return (Criteria) this; - } - - public Criteria andExt2LessThan(String value) { - addCriterion("ext_2 <", value, "ext2"); - return (Criteria) this; - } - - public Criteria andExt2LessThanOrEqualTo(String value) { - addCriterion("ext_2 <=", value, "ext2"); - return (Criteria) this; - } - - public Criteria andExt2Like(String value) { - addCriterion("ext_2 like", value, "ext2"); - return (Criteria) this; - } - - public Criteria andExt2NotLike(String value) { - addCriterion("ext_2 not like", value, "ext2"); - return (Criteria) this; - } - - public Criteria andExt2In(List values) { - addCriterion("ext_2 in", values, "ext2"); - return (Criteria) this; - } - - public Criteria andExt2NotIn(List values) { - addCriterion("ext_2 not in", values, "ext2"); - return (Criteria) this; - } - - public Criteria andExt2Between(String value1, String value2) { - addCriterion("ext_2 between", value1, value2, "ext2"); - return (Criteria) this; - } - - public Criteria andExt2NotBetween(String value1, String value2) { - addCriterion("ext_2 not between", value1, value2, "ext2"); - return (Criteria) this; - } - - public Criteria andExt3IsNull() { - addCriterion("ext_3 is null"); - return (Criteria) this; - } - - public Criteria andExt3IsNotNull() { - addCriterion("ext_3 is not null"); - return (Criteria) this; - } - - public Criteria andExt3EqualTo(String value) { - addCriterion("ext_3 =", value, "ext3"); - return (Criteria) this; - } - - public Criteria andExt3NotEqualTo(String value) { - addCriterion("ext_3 <>", value, "ext3"); - return (Criteria) this; - } - - public Criteria andExt3GreaterThan(String value) { - addCriterion("ext_3 >", value, "ext3"); - return (Criteria) this; - } - - public Criteria andExt3GreaterThanOrEqualTo(String value) { - addCriterion("ext_3 >=", value, "ext3"); - return (Criteria) this; - } - - public Criteria andExt3LessThan(String value) { - addCriterion("ext_3 <", value, "ext3"); - return (Criteria) this; - } - - public Criteria andExt3LessThanOrEqualTo(String value) { - addCriterion("ext_3 <=", value, "ext3"); - return (Criteria) this; - } - - public Criteria andExt3Like(String value) { - addCriterion("ext_3 like", value, "ext3"); - return (Criteria) this; - } - - public Criteria andExt3NotLike(String value) { - addCriterion("ext_3 not like", value, "ext3"); - return (Criteria) this; - } - - public Criteria andExt3In(List values) { - addCriterion("ext_3 in", values, "ext3"); - return (Criteria) this; - } - - public Criteria andExt3NotIn(List values) { - addCriterion("ext_3 not in", values, "ext3"); - return (Criteria) this; - } - - public Criteria andExt3Between(String value1, String value2) { - addCriterion("ext_3 between", value1, value2, "ext3"); - return (Criteria) this; - } - - public Criteria andExt3NotBetween(String value1, String value2) { - addCriterion("ext_3 not between", value1, value2, "ext3"); - return (Criteria) this; - } - } - - /** - */ - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/hai-service/src/main/java/com/hai/model/OutRechargeOrderModel.java b/hai-service/src/main/java/com/hai/model/OutRechargeOrderModel.java index f0475b23..5d80f508 100644 --- a/hai-service/src/main/java/com/hai/model/OutRechargeOrderModel.java +++ b/hai-service/src/main/java/com/hai/model/OutRechargeOrderModel.java @@ -27,6 +27,7 @@ public class OutRechargeOrderModel extends OutRechargeOrder { private BigDecimal refundFee; private String outRefundNo; private String refundId; + private String cardNo; public String getOrderNo() { return orderNo; @@ -187,4 +188,12 @@ public class OutRechargeOrderModel extends OutRechargeOrder { public void setRefundId(String refundId) { this.refundId = refundId; } + + public String getCardNo() { + return cardNo; + } + + public void setCardNo(String cardNo) { + this.cardNo = cardNo; + } } diff --git a/hai-service/src/main/java/com/hai/service/HighBrandService.java b/hai-service/src/main/java/com/hai/service/HighBrandService.java new file mode 100644 index 00000000..58bf9180 --- /dev/null +++ b/hai-service/src/main/java/com/hai/service/HighBrandService.java @@ -0,0 +1,48 @@ +package com.hai.service; + +import com.hai.entity.HighBrand; +import com.hai.entity.HighOrderPre; + +import java.util.List; +import java.util.Map; + +public interface HighBrandService { + + /** + * @Author Sum1Dream + * @Description // 查询接口 + * @Date 15:18 2021/6/11 + * @Param [map] + * @return java.util.List + **/ + List getListBand(Map map); + + /** + * @Author Sum1Dream + * @Description // 根据订单ID查询订单 + * @Date 15:19 2021/6/11 + * @Param [id] + * @return com.hai.entity.HighBrand + **/ + HighBrand findByOrderId(Integer id); + + + /*** + * @Author Sum1Dream + * @Description // 新增订单 + * @Date 15:25 2021/6/11 + * @Param [HighOrderPre] + * @return void + **/ + void insertBrand(HighBrand highBrand); + + /*** + * @Author Sum1Dream + * @Description // 修改订单 + * @Date 15:26 2021/6/11 + * @Param [highBrand] + * @return void + **/ + void updateBrand(HighBrand highBrand); + +} diff --git a/hai-service/src/main/java/com/hai/service/HighGoodsTypeService.java b/hai-service/src/main/java/com/hai/service/HighGoodsTypeService.java new file mode 100644 index 00000000..ee2033c5 --- /dev/null +++ b/hai-service/src/main/java/com/hai/service/HighGoodsTypeService.java @@ -0,0 +1,57 @@ +package com.hai.service; + +import com.hai.entity.HighGoodsType; +import com.hai.entity.HighOrderPre; + +import java.util.List; +import java.util.Map; + +public interface HighGoodsTypeService { + + /** + * @Author Sum1Dream + * @Description // 查询 + * @Date 15:18 2021/6/11 + * @Param [map] + * @return java.util.List + **/ + List getListGoodsType(Map map); + + /** + * @Author Sum1Dream + * @Description // 根据ID查询 + * @Date 15:19 2021/6/11 + * @Param [orderId] + * @return com.hai.entity.HighOrderPre + **/ + HighGoodsType findById(Integer Id); + + /** + * @Author Sum1Dream + * @name HighGoodsType.java + * @Description // 根据标题判断是否存在 + * @Date 4:58 下午 2021/11/11 + * @Param + * @return + **/ + Boolean findByTitle(String title); + + + /*** + * @Author Sum1Dream + * @Description // 新增 + * @Date 15:25 2021/6/11 + * @Param [HighOrderPre] + * @return void + **/ + void insertGoodsType(HighGoodsType highGoodsType); + + /*** + * @Author Sum1Dream + * @Description // 修改 + * @Date 15:26 2021/6/11 + * @Param [HighOrderPre] + * @return void + **/ + void updateGoodsType(HighGoodsType highGoodsType); +} diff --git a/hai-service/src/main/java/com/hai/service/HighOrderPreService.java b/hai-service/src/main/java/com/hai/service/HighOrderPreService.java new file mode 100644 index 00000000..eabbaf38 --- /dev/null +++ b/hai-service/src/main/java/com/hai/service/HighOrderPreService.java @@ -0,0 +1,53 @@ +package com.hai.service; + +import com.hai.entity.HighOrderPre; +import java.util.List; +import java.util.Map; + +public interface HighOrderPreService { + + /** + * @Author Sum1Dream + * @Description // 查询充值订单 + * @Date 15:18 2021/6/11 + * @Param [map] + * @return java.util.List + **/ + List getListOrderPre(Map map); + + /** + * @Author Sum1Dream + * @Description // 根据订单ID查询订单 + * @Date 15:19 2021/6/11 + * @Param [orderId] + * @return com.hai.entity.HighOrderPre + **/ + HighOrderPre findByOrderId(Long orderId); + + /** + * @Author Sum1Dream + * @Description // 根据订单号查询订单 + * @Date 15:20 2021/6/11 + * @Param [orderNo] + * @return com.hai.entity.HighOrderPre + **/ + HighOrderPre findByOrderNo(String orderNo); + + /*** + * @Author Sum1Dream + * @Description // 新增订单 + * @Date 15:25 2021/6/11 + * @Param [HighOrderPre] + * @return void + **/ + void insertOrderPre(HighOrderPre highOrderPre); + + /*** + * @Author Sum1Dream + * @Description // 修改订单 + * @Date 15:26 2021/6/11 + * @Param [HighOrderPre] + * @return void + **/ + void updateOrderPre(HighOrderPre highOrderPre); +} diff --git a/hai-service/src/main/java/com/hai/service/impl/HighBrandServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/HighBrandServiceImpl.java new file mode 100644 index 00000000..22c88d57 --- /dev/null +++ b/hai-service/src/main/java/com/hai/service/impl/HighBrandServiceImpl.java @@ -0,0 +1,57 @@ +package com.hai.service.impl; + +import com.hai.dao.HighBrandMapper; +import com.hai.entity.HighBrand; +import com.hai.entity.HighBrandExample; +import com.hai.entity.HighOrder; +import com.hai.service.HighBrandService; +import org.apache.commons.collections4.MapUtils; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; +import java.util.Map; + +/** + * @Auther: 袁野 + * @Description: + * @Date: 2021/3/26 23:06 + */ +@Service("highBrandService") +public class HighBrandServiceImpl implements HighBrandService { + + @Resource + private HighBrandMapper highBrandMapper; + + @Override + public List getListBand(Map map) { + + HighBrandExample example = new HighBrandExample(); + HighBrandExample.Criteria criteria = example.createCriteria(); + + if (MapUtils.getString(map, "title") != null) { + criteria.andTitleLike("%" + MapUtils.getString(map, "title") + "%"); + } + + criteria.andStatusEqualTo(1); + + example.setOrderByClause("created_time desc"); + + return highBrandMapper.selectByExample(example); + } + + @Override + public HighBrand findByOrderId(Integer id) { + return highBrandMapper.selectByPrimaryKey(id); + } + + @Override + public void insertBrand(HighBrand highBrand) { + highBrandMapper.insert(highBrand); + } + + @Override + public void updateBrand(HighBrand highBrand) { + highBrandMapper.updateByPrimaryKey(highBrand); + } +} diff --git a/hai-service/src/main/java/com/hai/service/impl/HighGoodsTypeServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/HighGoodsTypeServiceImpl.java new file mode 100644 index 00000000..a4c24d3c --- /dev/null +++ b/hai-service/src/main/java/com/hai/service/impl/HighGoodsTypeServiceImpl.java @@ -0,0 +1,72 @@ +package com.hai.service.impl; + +import com.hai.dao.HighGoodsTypeMapper; +import com.hai.entity.HighGoodsType; +import com.hai.entity.HighGoodsTypeExample; +import com.hai.service.HighGoodsTypeService; +import org.apache.commons.collections4.MapUtils; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; +import java.util.Map; + +/** + * @serviceName HighGoodsTypeServiceImpl.java + * @author Sum1Dream + * @version 1.0.0 + * @Description //TODO + * @createTime 3:36 下午 2021/11/11 + **/ +@Service("highGoodsTypeService") +public class HighGoodsTypeServiceImpl implements HighGoodsTypeService { + + @Resource + private HighGoodsTypeMapper highGoodsTypeMapper; + + @Override + public List getListGoodsType(Map map) { + + HighGoodsTypeExample example = new HighGoodsTypeExample(); + HighGoodsTypeExample.Criteria criteria = example.createCriteria(); + + if (MapUtils.getString(map, "title") != null) { + criteria.andTitleLike("%" + MapUtils.getString(map, "title") + "%"); + } + + criteria.andStatusEqualTo(1); + + example.setOrderByClause("created_time desc"); + + return highGoodsTypeMapper.selectByExample(example); + } + + @Override + public HighGoodsType findById(Integer id) { + return highGoodsTypeMapper.selectByPrimaryKey(id); + } + + @Override + public Boolean findByTitle(String title) { + HighGoodsTypeExample example = new HighGoodsTypeExample(); + HighGoodsTypeExample.Criteria criteria = example.createCriteria(); + + criteria.andTitleEqualTo(title).andStatusEqualTo(1); + + List highGoodsTypes = highGoodsTypeMapper.selectByExample(example); + + return highGoodsTypes.size() > 0; + } + + @Override + public void insertGoodsType(HighGoodsType highGoodsType) { + highGoodsTypeMapper.insert(highGoodsType); + + } + + @Override + public void updateGoodsType(HighGoodsType highGoodsType) { + highGoodsTypeMapper.updateByPrimaryKey(highGoodsType); + + } +} diff --git a/hai-service/src/main/java/com/hai/service/impl/HighOrderPreServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/HighOrderPreServiceImpl.java new file mode 100644 index 00000000..55ceef27 --- /dev/null +++ b/hai-service/src/main/java/com/hai/service/impl/HighOrderPreServiceImpl.java @@ -0,0 +1,75 @@ +package com.hai.service.impl; + +import com.hai.common.utils.DateUtil; +import com.hai.dao.HighOrderPreMapper; +import com.hai.entity.HighOrder; +import com.hai.entity.HighOrderPre; +import com.hai.entity.HighOrderPreExample; +import com.hai.service.HighOrderPreService; +import org.apache.commons.collections4.MapUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; +import java.util.Map; + +@Service("highOrderPreService") +public class HighOrderPreServiceImpl implements HighOrderPreService { + + @Resource + private HighOrderPreMapper highOrderPreMapper; + + @Override + public List getListOrderPre(Map map) { + HighOrderPreExample example = new HighOrderPreExample(); + HighOrderPreExample.Criteria criteria = example.createCriteria(); + + if (MapUtils.getInteger(map, "status") != null) { + criteria.andStatusEqualTo(MapUtils.getInteger(map, "status")); + } + + if (MapUtils.getInteger(map, "goodsType") != null) { + criteria.andGoodsTypeEqualTo(MapUtils.getInteger(map, "goodsType")); + } + + if (MapUtils.getString(map, "orderNo") != null) { + criteria.andOrderNoLike("%" + MapUtils.getString(map, "orderNo") + "%"); + } + + if (MapUtils.getString(map, "goodsName") != null) { + criteria.andGoodsNameLike("%" + MapUtils.getString(map, "goodsName") + "%"); + } + + if (MapUtils.getString(map, "userPhone") != null) { + criteria.andPreUserPhoneEqualTo(MapUtils.getString(map, "userPhone")); + } + + if (StringUtils.isNotBlank(map.get("createTimeS")) && StringUtils.isNotBlank(map.get("createTimeE"))) { + criteria.andCreateTimeBetween( + DateUtil.format(map.get("createTimeS") , "yyyy-MM-dd HH:mm:ss") , + DateUtil.format(map.get("createTimeE") , "yyyy-MM-dd HH:mm:ss")); + } + return highOrderPreMapper.selectByExample(example); + } + + @Override + public HighOrderPre findByOrderId(Long orderId) { + return highOrderPreMapper.selectByPrimaryKey(orderId); + } + + @Override + public HighOrderPre findByOrderNo(String orderNo) { + return null; + } + + @Override + public void insertOrderPre(HighOrderPre highOrderPre) { + highOrderPreMapper.insert(highOrderPre); + } + + @Override + public void updateOrderPre(HighOrderPre highOrderPre) { + highOrderPreMapper.updateByPrimaryKey(highOrderPre); + } +} diff --git a/hai-service/src/main/java/com/hai/service/impl/OutRechargePriceServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/OutRechargePriceServiceImpl.java index 0eb45c6a..644dff08 100644 --- a/hai-service/src/main/java/com/hai/service/impl/OutRechargePriceServiceImpl.java +++ b/hai-service/src/main/java/com/hai/service/impl/OutRechargePriceServiceImpl.java @@ -34,6 +34,8 @@ public class OutRechargePriceServiceImpl implements OutRechargePriceService { OutRechargePriceExample example = new OutRechargePriceExample(); OutRechargePriceExample.Criteria criteria = example.createCriteria(); + criteria.andStatusEqualTo(1); + if (StringUtils.isNotBlank(map.get("type"))) { criteria.andTypeEqualTo(Integer.valueOf(map.get("type"))); }