hurui
/
hai-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

'提交代码'

Browse Source
dev-discount
= 3 years ago
parent 24a98e81c3
commit 574dfbeebe
14 changed files with 1100 additions and 37 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      hai-bweb/src/main/java/com/bweb/controller/HighOrderController.java
  2. 1
      hai-cweb/src/main/java/com/cweb/config/AuthConfig.java
  3. 7
      hai-cweb/src/main/java/com/cweb/controller/CmsContentController.java
  4. 24
      hai-cweb/src/main/java/com/cweb/controller/HighOrderController.java
  5. 108
      hai-cweb/src/main/java/com/cweb/controller/pay/QzOrderController.java
  6. 54
      hai-service/src/main/java/com/hai/dao/HighChildOrderMapper.java
  7. 98
      hai-service/src/main/java/com/hai/dao/HighChildOrderSqlProvider.java
  8. 22
      hai-service/src/main/java/com/hai/dao/HighOrderMapper.java
  9. 28
      hai-service/src/main/java/com/hai/dao/HighOrderSqlProvider.java
  10. 107
      hai-service/src/main/java/com/hai/entity/HighChildOrder.java
  11. 480
      hai-service/src/main/java/com/hai/entity/HighChildOrderExample.java
  12. 36
      hai-service/src/main/java/com/hai/entity/HighOrder.java
  13. 130
      hai-service/src/main/java/com/hai/entity/HighOrderExample.java
  14. 38
      hai-service/src/main/java/com/hai/service/impl/HighQzOrderServiceImpl.java

4
hai-bweb/src/main/java/com/bweb/controller/HighOrderController.java
Unescape View File

@ -336,7 +336,7 @@ public class HighOrderController {
map.put("payTimeE", payTimeE);
PageHelper.startPage(pageNum,pageSize);
return ResponseMsgUtil.success(new PageInfo<>(highOrderService.getGasOrderModelList(map)));
return ResponseMsgUtil.success(new PageInfo<>(highOrderService.getKfcOrderModelList(map)));
} catch (Exception e) {
log.error("HighOrderController --> getGasOrderList() error!", e);
@ -386,7 +386,7 @@ public class HighOrderController {
map.put("payTimeE", payTimeE);
PageHelper.startPage(pageNum,pageSize);
return ResponseMsgUtil.success(new PageInfo<>(highOrderService.getGasOrderModelList(map)));
return ResponseMsgUtil.success(new PageInfo<>(highOrderService.getCinemaOrderList(map)));
} catch (Exception e) {
log.error("HighOrderController --> getGasOrderList() error!", e);

1
hai-cweb/src/main/java/com/cweb/config/AuthConfig.java
Unescape View File

@ -109,6 +109,7 @@ public class AuthConfig implements WebMvcConfigurer {
.excludePathPatterns("/order/orderToH5Pay")
.excludePathPatterns("/order/orderToPay")
.excludePathPatterns("/test/*")
.excludePathPatterns("/cmsContent/*")
.excludePathPatterns("/highGas/*")
.excludePathPatterns("/wechat/*")
.excludePathPatterns("/tuanyou/*")

7
hai-cweb/src/main/java/com/cweb/controller/CmsContentController.java
Unescape View File

@ -40,10 +40,11 @@ public class CmsContentController {
@Resource
private BsCompanyService bsCompanyService;
@RequestMapping(value = "/getCorporateAdvertising", method = RequestMethod.GET)
@RequestMapping(value = "/getCmsContent", method = RequestMethod.GET)
@ApiOperation(value = "查询首页轮播图")
@ResponseBody
public ResponseData getCorporateAdvertising(@RequestParam(name = "regionId", required = true) String regionId) {
public ResponseData getCmsContent(@RequestParam(name = "regionId", required = true) String regionId,
@RequestParam(name = "categoryCode", required = true) String categoryCode) {
try {
SecRegion region = commonService.getParentByRegion(Long.parseLong(regionId));
@ -53,7 +54,7 @@ public class CmsContentController {
Map<String,String> map = new HashMap<>();
map.put("companyId", bsCompany.getId().toString());
map.put("status", "2");
map.put("categoryCode", "HOME_IMG");
map.put("categoryCode", categoryCode);
return ResponseMsgUtil.success(cmsContentService.getListContent(map));
}
}

24
hai-cweb/src/main/java/com/cweb/controller/HighOrderController.java
Unescape View File

@ -277,9 +277,6 @@ public class HighOrderController {
}
}
public static void main(String[] args) {
}
@RequestMapping(value = "/getOrderById", method = RequestMethod.GET)
@ResponseBody
@ApiOperation(value = "根据id查询订单详情")
@ -370,6 +367,27 @@ public class HighOrderController {
}
}
@RequestMapping(value = "/cancelOrderByOrderNo", method = RequestMethod.GET)
@ResponseBody
@ApiOperation(value = "取消订单")
public ResponseData cancelOrder(@RequestParam(name = "orderNo", required = true) String orderNo) {
try {
HighOrder order = highOrderService.getOrderByOrderNo(orderNo);
if (order == null) {
log.error("HighOrderController --> addOrder() error!", "未找到订单");
throw ErrorHelp.genException(SysCode.System, ErrorCode.NOT_FOUND_ORDER, "");
}
highOrderService.cancelOrder(order.getId());
return ResponseMsgUtil.success("操作成功");
} catch (Exception e) {
log.error("HighOrderController --> cancelOrderByOrderNo() error!", e);
return ResponseMsgUtil.exception(e);
}
}
@RequestMapping(value = "/getUserOrderList", method = RequestMethod.GET)
@ResponseBody
@ApiOperation(value = "获取用户订单")

108
hai-cweb/src/main/java/com/cweb/controller/pay/QzOrderController.java
Unescape View File

@ -0,0 +1,108 @@
package com.cweb.controller.pay;
import com.alibaba.fastjson.JSONObject;
import com.hai.common.security.AESEncodeUtil;
import com.hai.config.CommonSysConst;
import com.hai.config.WxOrderConfig;
import com.hai.dao.HighGasOrderRefundMapper;
import com.hai.entity.HighChildOrder;
import com.hai.entity.HighGasOrderRefund;
import com.hai.entity.HighOrder;
import com.hai.model.OrderRefundModel;
import com.hai.service.HighOrderService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.PrintWriter;
import java.util.Date;
@Controller
@RequestMapping(value = "/qianzhu")
@Api(value = "千猪回调")
public class QzOrderController {
private static Logger log = LoggerFactory.getLogger(QzOrderController.class);
@Resource
private HighOrderService highOrderService;
@RequestMapping(value = "/orderNotify", method = RequestMethod.POST)
@ApiOperation(value = "千猪订单回调")
public void orderPaymentNotify(@RequestBody String reqBodyStr,HttpServletRequest request, HttpServletResponse response) {
try {
log.info(reqBodyStr);
JSONObject dataObject = JSONObject.parseObject(reqBodyStr, JSONObject.class);
HighOrder order = highOrderService.getOrderByOrderNo(dataObject.getString("orderNo"));
if (order != null) {
JSONObject data = dataObject.getJSONObject("data");
for (HighChildOrder childOrder : order.getHighChildOrderList()) {
// 4：KFC肯德基 5：电影票
if (childOrder.getGoodsType() == 4) {
// 10:已出票 -5:已取消 -3:部分取消 -10:退款
if (dataObject.getInteger("eventType") == -5) {
// 微信退款
OrderRefundModel orderRefundModel = WxOrderConfig.orderToRefund(order.getPaySerialNo(), data.getBigDecimal("cancelReason"), data.getBigDecimal("cancelReason"));
if(orderRefundModel.getResult_code().equals("SUCCESS")) {
childOrder.setChildOrdeStatus(5);
order.setOrderStatus(5);
order.setCancelTime(new Date());
order.setCancelRemarks(data.getString("cancelReason"));
highOrderService.updateOrderDetail(order);
}
}
if (dataObject.getInteger("eventType") == -10) {
// 微信退款
OrderRefundModel orderRefundModel = WxOrderConfig.orderToRefund(order.getPaySerialNo(), data.getBigDecimal("refundAmount"), data.getBigDecimal("refundAmount"));
if(orderRefundModel.getResult_code().equals("SUCCESS")) {
childOrder.setChildOrdeStatus(4);
order.setOrderStatus(4);
order.setRefundTime(new Date());
order.setRefundPrice(data.getBigDecimal("refundAmount"));
highOrderService.updateOrderDetail(order);
}
}
}
if (childOrder.getGoodsType() == 5) {
// 5：已支付(默认不发) 10:已出票 -5:已取消 15：交易成功
if (dataObject.getInteger("eventType") == -5) {
childOrder.setChildOrdeStatus(5);
order.setOrderStatus(5);
order.setCancelTime(new Date());
order.setCancelRemarks(data.getString("cancelReason"));
}
if (dataObject.getInteger("eventType") == 15) {
childOrder.setChildOrdeStatus(3);
order.setOrderStatus(3);
order.setFinishTime(new Date());
}
}
}
highOrderService.updateOrder(order);
response.setCharacterEncoding("UTF-8");
response.setContentType("text/html;charset=utf-8");
PrintWriter writer= response.getWriter();
writer.write("success");
}
} catch (Exception e) {
log.error("WechatPayController --> wechatNotify() error!", e);
}
}
}

54
hai-service/src/main/java/com/hai/dao/HighChildOrderMapper.java
Unescape View File

@ -40,8 +40,10 @@ public interface HighChildOrderMapper extends HighChildOrderMapperExt {
@Insert({
"insert into high_child_order (order_id, mem_id, ",
"goods_type, goods_id, ",
"goods_name, goods_img, ",
"store_id, store_name, ",
"store_address, goods_type, ",
"goods_id, goods_name, ",
"goods_desc, goods_img, ",
"goods_spec_name, goods_price, ",
"goods_actual_price, sale_count, ",
"total_price, giveaway_type, ",
@ -49,10 +51,13 @@ public interface HighChildOrderMapper extends HighChildOrderMapperExt {
"gas_oil_no, gas_gun_no, ",
"gas_oil_type, gas_order_no, ",
"gas_price_gun, gas_price_vip, ",
"ext_1, ext_2, ext_3)",
"ext_1, ext_2, ext_3, ",
"ext_4, ext_5, ext_6)",
"values (#{orderId,jdbcType=BIGINT}, #{memId,jdbcType=BIGINT}, ",
"#{goodsType,jdbcType=INTEGER}, #{goodsId,jdbcType=BIGINT}, ",
"#{goodsName,jdbcType=VARCHAR}, #{goodsImg,jdbcType=VARCHAR}, ",
"#{storeId,jdbcType=BIGINT}, #{storeName,jdbcType=VARCHAR}, ",
"#{storeAddress,jdbcType=VARCHAR}, #{goodsType,jdbcType=INTEGER}, ",
"#{goodsId,jdbcType=BIGINT}, #{goodsName,jdbcType=VARCHAR}, ",
"#{goodsDesc,jdbcType=VARCHAR}, #{goodsImg,jdbcType=VARCHAR}, ",
"#{goodsSpecName,jdbcType=VARCHAR}, #{goodsPrice,jdbcType=DECIMAL}, ",
"#{goodsActualPrice,jdbcType=DECIMAL}, #{saleCount,jdbcType=INTEGER}, ",
"#{totalPrice,jdbcType=DECIMAL}, #{giveawayType,jdbcType=BIT}, ",
@ -60,7 +65,8 @@ public interface HighChildOrderMapper extends HighChildOrderMapperExt {
"#{gasOilNo,jdbcType=VARCHAR}, #{gasGunNo,jdbcType=VARCHAR}, ",
"#{gasOilType,jdbcType=INTEGER}, #{gasOrderNo,jdbcType=VARCHAR}, ",
"#{gasPriceGun,jdbcType=DECIMAL}, #{gasPriceVip,jdbcType=DECIMAL}, ",
"#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})"
"#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR}, ",
"#{ext4,jdbcType=VARCHAR}, #{ext5,jdbcType=VARCHAR}, #{ext6,jdbcType=VARCHAR})"
})
@Options(useGeneratedKeys=true,keyProperty="id")
int insert(HighChildOrder record);
@ -74,9 +80,13 @@ public interface HighChildOrderMapper extends HighChildOrderMapperExt {
@Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
@Result(column="order_id", property="orderId", jdbcType=JdbcType.BIGINT),
@Result(column="mem_id", property="memId", jdbcType=JdbcType.BIGINT),
@Result(column="store_id", property="storeId", jdbcType=JdbcType.BIGINT),
@Result(column="store_name", property="storeName", jdbcType=JdbcType.VARCHAR),
@Result(column="store_address", property="storeAddress", jdbcType=JdbcType.VARCHAR),
@Result(column="goods_type", property="goodsType", jdbcType=JdbcType.INTEGER),
@Result(column="goods_id", property="goodsId", jdbcType=JdbcType.BIGINT),
@Result(column="goods_name", property="goodsName", jdbcType=JdbcType.VARCHAR),
@Result(column="goods_desc", property="goodsDesc", jdbcType=JdbcType.VARCHAR),
@Result(column="goods_img", property="goodsImg", jdbcType=JdbcType.VARCHAR),
@Result(column="goods_spec_name", property="goodsSpecName", jdbcType=JdbcType.VARCHAR),
@Result(column="goods_price", property="goodsPrice", jdbcType=JdbcType.DECIMAL),
@ -94,16 +104,20 @@ public interface HighChildOrderMapper extends HighChildOrderMapperExt {
@Result(column="gas_price_vip", property="gasPriceVip", jdbcType=JdbcType.DECIMAL),
@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)
@Result(column="ext_3", property="ext3", jdbcType=JdbcType.VARCHAR),
@Result(column="ext_4", property="ext4", jdbcType=JdbcType.VARCHAR),
@Result(column="ext_5", property="ext5", jdbcType=JdbcType.VARCHAR),
@Result(column="ext_6", property="ext6", jdbcType=JdbcType.VARCHAR)
})
List<HighChildOrder> selectByExample(HighChildOrderExample example);
@Select({
"select",
"id, order_id, mem_id, goods_type, goods_id, goods_name, goods_img, goods_spec_name, ",
"goods_price, goods_actual_price, sale_count, total_price, giveaway_type, child_orde_status, ",
"praise_status, gas_oil_no, gas_gun_no, gas_oil_type, gas_order_no, gas_price_gun, ",
"gas_price_vip, ext_1, ext_2, ext_3",
"id, order_id, mem_id, store_id, store_name, store_address, goods_type, goods_id, ",
"goods_name, goods_desc, goods_img, goods_spec_name, goods_price, goods_actual_price, ",
"sale_count, total_price, giveaway_type, child_orde_status, praise_status, gas_oil_no, ",
"gas_gun_no, gas_oil_type, gas_order_no, gas_price_gun, gas_price_vip, ext_1, ",
"ext_2, ext_3, ext_4, ext_5, ext_6",
"from high_child_order",
"where id = #{id,jdbcType=BIGINT}"
})
@ -111,9 +125,13 @@ public interface HighChildOrderMapper extends HighChildOrderMapperExt {
@Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
@Result(column="order_id", property="orderId", jdbcType=JdbcType.BIGINT),
@Result(column="mem_id", property="memId", jdbcType=JdbcType.BIGINT),
@Result(column="store_id", property="storeId", jdbcType=JdbcType.BIGINT),
@Result(column="store_name", property="storeName", jdbcType=JdbcType.VARCHAR),
@Result(column="store_address", property="storeAddress", jdbcType=JdbcType.VARCHAR),
@Result(column="goods_type", property="goodsType", jdbcType=JdbcType.INTEGER),
@Result(column="goods_id", property="goodsId", jdbcType=JdbcType.BIGINT),
@Result(column="goods_name", property="goodsName", jdbcType=JdbcType.VARCHAR),
@Result(column="goods_desc", property="goodsDesc", jdbcType=JdbcType.VARCHAR),
@Result(column="goods_img", property="goodsImg", jdbcType=JdbcType.VARCHAR),
@Result(column="goods_spec_name", property="goodsSpecName", jdbcType=JdbcType.VARCHAR),
@Result(column="goods_price", property="goodsPrice", jdbcType=JdbcType.DECIMAL),
@ -131,7 +149,10 @@ public interface HighChildOrderMapper extends HighChildOrderMapperExt {
@Result(column="gas_price_vip", property="gasPriceVip", jdbcType=JdbcType.DECIMAL),
@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)
@Result(column="ext_3", property="ext3", jdbcType=JdbcType.VARCHAR),
@Result(column="ext_4", property="ext4", jdbcType=JdbcType.VARCHAR),
@Result(column="ext_5", property="ext5", jdbcType=JdbcType.VARCHAR),
@Result(column="ext_6", property="ext6", jdbcType=JdbcType.VARCHAR)
})
HighChildOrder selectByPrimaryKey(Long id);
@ -148,9 +169,13 @@ public interface HighChildOrderMapper extends HighChildOrderMapperExt {
"update high_child_order",
"set order_id = #{orderId,jdbcType=BIGINT},",
"mem_id = #{memId,jdbcType=BIGINT},",
"store_id = #{storeId,jdbcType=BIGINT},",
"store_name = #{storeName,jdbcType=VARCHAR},",
"store_address = #{storeAddress,jdbcType=VARCHAR},",
"goods_type = #{goodsType,jdbcType=INTEGER},",
"goods_id = #{goodsId,jdbcType=BIGINT},",
"goods_name = #{goodsName,jdbcType=VARCHAR},",
"goods_desc = #{goodsDesc,jdbcType=VARCHAR},",
"goods_img = #{goodsImg,jdbcType=VARCHAR},",
"goods_spec_name = #{goodsSpecName,jdbcType=VARCHAR},",
"goods_price = #{goodsPrice,jdbcType=DECIMAL},",
@ -168,7 +193,10 @@ public interface HighChildOrderMapper extends HighChildOrderMapperExt {
"gas_price_vip = #{gasPriceVip,jdbcType=DECIMAL},",
"ext_1 = #{ext1,jdbcType=VARCHAR},",
"ext_2 = #{ext2,jdbcType=VARCHAR},",
"ext_3 = #{ext3,jdbcType=VARCHAR}",
"ext_3 = #{ext3,jdbcType=VARCHAR},",
"ext_4 = #{ext4,jdbcType=VARCHAR},",
"ext_5 = #{ext5,jdbcType=VARCHAR},",
"ext_6 = #{ext6,jdbcType=VARCHAR}",
"where id = #{id,jdbcType=BIGINT}"
})
int updateByPrimaryKey(HighChildOrder record);

98
hai-service/src/main/java/com/hai/dao/HighChildOrderSqlProvider.java
Unescape View File

@ -36,6 +36,18 @@ public class HighChildOrderSqlProvider {
sql.VALUES("mem_id", "#{memId,jdbcType=BIGINT}");
}
if (record.getStoreId() != null) {
sql.VALUES("store_id", "#{storeId,jdbcType=BIGINT}");
}
if (record.getStoreName() != null) {
sql.VALUES("store_name", "#{storeName,jdbcType=VARCHAR}");
}
if (record.getStoreAddress() != null) {
sql.VALUES("store_address", "#{storeAddress,jdbcType=VARCHAR}");
}
if (record.getGoodsType() != null) {
sql.VALUES("goods_type", "#{goodsType,jdbcType=INTEGER}");
}
@ -48,6 +60,10 @@ public class HighChildOrderSqlProvider {
sql.VALUES("goods_name", "#{goodsName,jdbcType=VARCHAR}");
}
if (record.getGoodsDesc() != null) {
sql.VALUES("goods_desc", "#{goodsDesc,jdbcType=VARCHAR}");
}
if (record.getGoodsImg() != null) {
sql.VALUES("goods_img", "#{goodsImg,jdbcType=VARCHAR}");
}
@ -120,6 +136,18 @@ public class HighChildOrderSqlProvider {
sql.VALUES("ext_3", "#{ext3,jdbcType=VARCHAR}");
}
if (record.getExt4() != null) {
sql.VALUES("ext_4", "#{ext4,jdbcType=VARCHAR}");
}
if (record.getExt5() != null) {
sql.VALUES("ext_5", "#{ext5,jdbcType=VARCHAR}");
}
if (record.getExt6() != null) {
sql.VALUES("ext_6", "#{ext6,jdbcType=VARCHAR}");
}
return sql.toString();
}
@ -132,9 +160,13 @@ public class HighChildOrderSqlProvider {
}
sql.SELECT("order_id");
sql.SELECT("mem_id");
sql.SELECT("store_id");
sql.SELECT("store_name");
sql.SELECT("store_address");
sql.SELECT("goods_type");
sql.SELECT("goods_id");
sql.SELECT("goods_name");
sql.SELECT("goods_desc");
sql.SELECT("goods_img");
sql.SELECT("goods_spec_name");
sql.SELECT("goods_price");
@ -153,6 +185,9 @@ public class HighChildOrderSqlProvider {
sql.SELECT("ext_1");
sql.SELECT("ext_2");
sql.SELECT("ext_3");
sql.SELECT("ext_4");
sql.SELECT("ext_5");
sql.SELECT("ext_6");
sql.FROM("high_child_order");
applyWhere(sql, example, false);
@ -182,6 +217,18 @@ public class HighChildOrderSqlProvider {
sql.SET("mem_id = #{record.memId,jdbcType=BIGINT}");
}
if (record.getStoreId() != null) {
sql.SET("store_id = #{record.storeId,jdbcType=BIGINT}");
}
if (record.getStoreName() != null) {
sql.SET("store_name = #{record.storeName,jdbcType=VARCHAR}");
}
if (record.getStoreAddress() != null) {
sql.SET("store_address = #{record.storeAddress,jdbcType=VARCHAR}");
}
if (record.getGoodsType() != null) {
sql.SET("goods_type = #{record.goodsType,jdbcType=INTEGER}");
}
@ -194,6 +241,10 @@ public class HighChildOrderSqlProvider {
sql.SET("goods_name = #{record.goodsName,jdbcType=VARCHAR}");
}
if (record.getGoodsDesc() != null) {
sql.SET("goods_desc = #{record.goodsDesc,jdbcType=VARCHAR}");
}
if (record.getGoodsImg() != null) {
sql.SET("goods_img = #{record.goodsImg,jdbcType=VARCHAR}");
}
@ -266,6 +317,18 @@ public class HighChildOrderSqlProvider {
sql.SET("ext_3 = #{record.ext3,jdbcType=VARCHAR}");
}
if (record.getExt4() != null) {
sql.SET("ext_4 = #{record.ext4,jdbcType=VARCHAR}");
}
if (record.getExt5() != null) {
sql.SET("ext_5 = #{record.ext5,jdbcType=VARCHAR}");
}
if (record.getExt6() != null) {
sql.SET("ext_6 = #{record.ext6,jdbcType=VARCHAR}");
}
applyWhere(sql, example, true);
return sql.toString();
}
@ -277,9 +340,13 @@ public class HighChildOrderSqlProvider {
sql.SET("id = #{record.id,jdbcType=BIGINT}");
sql.SET("order_id = #{record.orderId,jdbcType=BIGINT}");
sql.SET("mem_id = #{record.memId,jdbcType=BIGINT}");
sql.SET("store_id = #{record.storeId,jdbcType=BIGINT}");
sql.SET("store_name = #{record.storeName,jdbcType=VARCHAR}");
sql.SET("store_address = #{record.storeAddress,jdbcType=VARCHAR}");
sql.SET("goods_type = #{record.goodsType,jdbcType=INTEGER}");
sql.SET("goods_id = #{record.goodsId,jdbcType=BIGINT}");
sql.SET("goods_name = #{record.goodsName,jdbcType=VARCHAR}");
sql.SET("goods_desc = #{record.goodsDesc,jdbcType=VARCHAR}");
sql.SET("goods_img = #{record.goodsImg,jdbcType=VARCHAR}");
sql.SET("goods_spec_name = #{record.goodsSpecName,jdbcType=VARCHAR}");
sql.SET("goods_price = #{record.goodsPrice,jdbcType=DECIMAL}");
@ -298,6 +365,9 @@ public class HighChildOrderSqlProvider {
sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}");
sql.SET("ext_2 = #{record.ext2,jdbcType=VARCHAR}");
sql.SET("ext_3 = #{record.ext3,jdbcType=VARCHAR}");
sql.SET("ext_4 = #{record.ext4,jdbcType=VARCHAR}");
sql.SET("ext_5 = #{record.ext5,jdbcType=VARCHAR}");
sql.SET("ext_6 = #{record.ext6,jdbcType=VARCHAR}");
HighChildOrderExample example = (HighChildOrderExample) parameter.get("example");
applyWhere(sql, example, true);
@ -316,6 +386,18 @@ public class HighChildOrderSqlProvider {
sql.SET("mem_id = #{memId,jdbcType=BIGINT}");
}
if (record.getStoreId() != null) {
sql.SET("store_id = #{storeId,jdbcType=BIGINT}");
}
if (record.getStoreName() != null) {
sql.SET("store_name = #{storeName,jdbcType=VARCHAR}");
}
if (record.getStoreAddress() != null) {
sql.SET("store_address = #{storeAddress,jdbcType=VARCHAR}");
}
if (record.getGoodsType() != null) {
sql.SET("goods_type = #{goodsType,jdbcType=INTEGER}");
}
@ -328,6 +410,10 @@ public class HighChildOrderSqlProvider {
sql.SET("goods_name = #{goodsName,jdbcType=VARCHAR}");
}
if (record.getGoodsDesc() != null) {
sql.SET("goods_desc = #{goodsDesc,jdbcType=VARCHAR}");
}
if (record.getGoodsImg() != null) {
sql.SET("goods_img = #{goodsImg,jdbcType=VARCHAR}");
}
@ -400,6 +486,18 @@ public class HighChildOrderSqlProvider {
sql.SET("ext_3 = #{ext3,jdbcType=VARCHAR}");
}
if (record.getExt4() != null) {
sql.SET("ext_4 = #{ext4,jdbcType=VARCHAR}");
}
if (record.getExt5() != null) {
sql.SET("ext_5 = #{ext5,jdbcType=VARCHAR}");
}
if (record.getExt6() != null) {
sql.SET("ext_6 = #{ext6,jdbcType=VARCHAR}");
}
sql.WHERE("id = #{id,jdbcType=BIGINT}");
return sql.toString();

22
hai-service/src/main/java/com/hai/dao/HighOrderMapper.java
Unescape View File

@ -48,8 +48,9 @@ public interface HighOrderMapper extends HighOrderMapperExt {
"deduction_price, order_status, ",
"total_price, create_time, ",
"pay_time, cancel_time, ",
"finish_time, remarks, ",
"refund_time, refund_content, ",
"cancel_remarks, finish_time, ",
"remarks, refund_time, ",
"refund_price, refund_content, ",
"refusal_refund_content, ext_1, ",
"ext_2, ext_3)",
"values (#{orderNo,jdbcType=VARCHAR}, #{memDiscountId,jdbcType=BIGINT}, ",
@ -61,8 +62,9 @@ public interface HighOrderMapper extends HighOrderMapperExt {
"#{deductionPrice,jdbcType=DECIMAL}, #{orderStatus,jdbcType=INTEGER}, ",
"#{totalPrice,jdbcType=DECIMAL}, #{createTime,jdbcType=TIMESTAMP}, ",
"#{payTime,jdbcType=TIMESTAMP}, #{cancelTime,jdbcType=TIMESTAMP}, ",
"#{finishTime,jdbcType=TIMESTAMP}, #{remarks,jdbcType=VARCHAR}, ",
"#{refundTime,jdbcType=TIMESTAMP}, #{refundContent,jdbcType=VARCHAR}, ",
"#{cancelRemarks,jdbcType=VARCHAR}, #{finishTime,jdbcType=TIMESTAMP}, ",
"#{remarks,jdbcType=VARCHAR}, #{refundTime,jdbcType=TIMESTAMP}, ",
"#{refundPrice,jdbcType=DECIMAL}, #{refundContent,jdbcType=VARCHAR}, ",
"#{refusalRefundContent,jdbcType=VARCHAR}, #{ext1,jdbcType=VARCHAR}, ",
"#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})"
})
@ -94,9 +96,11 @@ public interface HighOrderMapper extends HighOrderMapperExt {
@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="cancel_remarks", property="cancelRemarks", jdbcType=JdbcType.VARCHAR),
@Result(column="finish_time", property="finishTime", jdbcType=JdbcType.TIMESTAMP),
@Result(column="remarks", property="remarks", jdbcType=JdbcType.VARCHAR),
@Result(column="refund_time", property="refundTime", jdbcType=JdbcType.TIMESTAMP),
@Result(column="refund_price", property="refundPrice", jdbcType=JdbcType.DECIMAL),
@Result(column="refund_content", property="refundContent", jdbcType=JdbcType.VARCHAR),
@Result(column="refusal_refund_content", property="refusalRefundContent", jdbcType=JdbcType.VARCHAR),
@Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR),
@ -109,9 +113,9 @@ public interface HighOrderMapper extends HighOrderMapperExt {
"select",
"id, order_no, mem_discount_id, mem_discount_name, mem_id, mem_name, mem_phone, ",
"pay_model, pay_type, pay_gold, pay_price, pay_real_price, pay_serial_no, deduction_price, ",
"order_status, total_price, create_time, pay_time, cancel_time, finish_time, ",
"remarks, refund_time, refund_content, refusal_refund_content, ext_1, ext_2, ",
"ext_3",
"order_status, total_price, create_time, pay_time, cancel_time, cancel_remarks, ",
"finish_time, remarks, refund_time, refund_price, refund_content, refusal_refund_content, ",
"ext_1, ext_2, ext_3",
"from high_order",
"where id = #{id,jdbcType=BIGINT}"
})
@ -135,9 +139,11 @@ public interface HighOrderMapper extends HighOrderMapperExt {
@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="cancel_remarks", property="cancelRemarks", jdbcType=JdbcType.VARCHAR),
@Result(column="finish_time", property="finishTime", jdbcType=JdbcType.TIMESTAMP),
@Result(column="remarks", property="remarks", jdbcType=JdbcType.VARCHAR),
@Result(column="refund_time", property="refundTime", jdbcType=JdbcType.TIMESTAMP),
@Result(column="refund_price", property="refundPrice", jdbcType=JdbcType.DECIMAL),
@Result(column="refund_content", property="refundContent", jdbcType=JdbcType.VARCHAR),
@Result(column="refusal_refund_content", property="refusalRefundContent", jdbcType=JdbcType.VARCHAR),
@Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR),
@ -175,9 +181,11 @@ public interface HighOrderMapper extends HighOrderMapperExt {
"create_time = #{createTime,jdbcType=TIMESTAMP},",
"pay_time = #{payTime,jdbcType=TIMESTAMP},",
"cancel_time = #{cancelTime,jdbcType=TIMESTAMP},",
"cancel_remarks = #{cancelRemarks,jdbcType=VARCHAR},",
"finish_time = #{finishTime,jdbcType=TIMESTAMP},",
"remarks = #{remarks,jdbcType=VARCHAR},",
"refund_time = #{refundTime,jdbcType=TIMESTAMP},",
"refund_price = #{refundPrice,jdbcType=DECIMAL},",
"refund_content = #{refundContent,jdbcType=VARCHAR},",
"refusal_refund_content = #{refusalRefundContent,jdbcType=VARCHAR},",
"ext_1 = #{ext1,jdbcType=VARCHAR},",

28
hai-service/src/main/java/com/hai/dao/HighOrderSqlProvider.java
Unescape View File

@ -100,6 +100,10 @@ public class HighOrderSqlProvider {
sql.VALUES("cancel_time", "#{cancelTime,jdbcType=TIMESTAMP}");
}
if (record.getCancelRemarks() != null) {
sql.VALUES("cancel_remarks", "#{cancelRemarks,jdbcType=VARCHAR}");
}
if (record.getFinishTime() != null) {
sql.VALUES("finish_time", "#{finishTime,jdbcType=TIMESTAMP}");
}
@ -112,6 +116,10 @@ public class HighOrderSqlProvider {
sql.VALUES("refund_time", "#{refundTime,jdbcType=TIMESTAMP}");
}
if (record.getRefundPrice() != null) {
sql.VALUES("refund_price", "#{refundPrice,jdbcType=DECIMAL}");
}
if (record.getRefundContent() != null) {
sql.VALUES("refund_content", "#{refundContent,jdbcType=VARCHAR}");
}
@ -160,9 +168,11 @@ public class HighOrderSqlProvider {
sql.SELECT("create_time");
sql.SELECT("pay_time");
sql.SELECT("cancel_time");
sql.SELECT("cancel_remarks");
sql.SELECT("finish_time");
sql.SELECT("remarks");
sql.SELECT("refund_time");
sql.SELECT("refund_price");
sql.SELECT("refund_content");
sql.SELECT("refusal_refund_content");
sql.SELECT("ext_1");
@ -261,6 +271,10 @@ public class HighOrderSqlProvider {
sql.SET("cancel_time = #{record.cancelTime,jdbcType=TIMESTAMP}");
}
if (record.getCancelRemarks() != null) {
sql.SET("cancel_remarks = #{record.cancelRemarks,jdbcType=VARCHAR}");
}
if (record.getFinishTime() != null) {
sql.SET("finish_time = #{record.finishTime,jdbcType=TIMESTAMP}");
}
@ -273,6 +287,10 @@ public class HighOrderSqlProvider {
sql.SET("refund_time = #{record.refundTime,jdbcType=TIMESTAMP}");
}
if (record.getRefundPrice() != null) {
sql.SET("refund_price = #{record.refundPrice,jdbcType=DECIMAL}");
}
if (record.getRefundContent() != null) {
sql.SET("refund_content = #{record.refundContent,jdbcType=VARCHAR}");
}
@ -320,9 +338,11 @@ public class HighOrderSqlProvider {
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("cancel_remarks = #{record.cancelRemarks,jdbcType=VARCHAR}");
sql.SET("finish_time = #{record.finishTime,jdbcType=TIMESTAMP}");
sql.SET("remarks = #{record.remarks,jdbcType=VARCHAR}");
sql.SET("refund_time = #{record.refundTime,jdbcType=TIMESTAMP}");
sql.SET("refund_price = #{record.refundPrice,jdbcType=DECIMAL}");
sql.SET("refund_content = #{record.refundContent,jdbcType=VARCHAR}");
sql.SET("refusal_refund_content = #{record.refusalRefundContent,jdbcType=VARCHAR}");
sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}");
@ -410,6 +430,10 @@ public class HighOrderSqlProvider {
sql.SET("cancel_time = #{cancelTime,jdbcType=TIMESTAMP}");
}
if (record.getCancelRemarks() != null) {
sql.SET("cancel_remarks = #{cancelRemarks,jdbcType=VARCHAR}");
}
if (record.getFinishTime() != null) {
sql.SET("finish_time = #{finishTime,jdbcType=TIMESTAMP}");
}
@ -422,6 +446,10 @@ public class HighOrderSqlProvider {
sql.SET("refund_time = #{refundTime,jdbcType=TIMESTAMP}");
}
if (record.getRefundPrice() != null) {
sql.SET("refund_price = #{refundPrice,jdbcType=DECIMAL}");
}
if (record.getRefundContent() != null) {
sql.SET("refund_content = #{refundContent,jdbcType=VARCHAR}");
}

107
hai-service/src/main/java/com/hai/entity/HighChildOrder.java
Unescape View File

@ -29,7 +29,22 @@ public class HighChildOrder implements Serializable {
private Long memId;
/**
* 商品类型 1:卡卷 2:金币充值 3:团油【加油站】
* 门店id
*/
private Long storeId;
/**
* 门店名称
*/
private String storeName;
/**
* 门店地址
*/
private String storeAddress;
/**
* 商品类型 1:卡卷 2:金币充值 3:团油【加油站】 4: KFC 5：电影票
*/
private Integer goodsType;
@ -43,6 +58,11 @@ public class HighChildOrder implements Serializable {
*/
private String goodsName;
/**
* 商品描述
*/
private String goodsDesc;
/**
* 商品图片
*/
@ -124,6 +144,12 @@ public class HighChildOrder implements Serializable {
private String ext3;
private String ext4;
private String ext5;
private String ext6;
private static final long serialVersionUID = 1L;
public Long getId() {
@ -150,6 +176,30 @@ public class HighChildOrder implements Serializable {
this.memId = memId;
}
public Long getStoreId() {
return storeId;
}
public void setStoreId(Long storeId) {
this.storeId = storeId;
}
public String getStoreName() {
return storeName;
}
public void setStoreName(String storeName) {
this.storeName = storeName;
}
public String getStoreAddress() {
return storeAddress;
}
public void setStoreAddress(String storeAddress) {
this.storeAddress = storeAddress;
}
public Integer getGoodsType() {
return goodsType;
}
@ -174,6 +224,14 @@ public class HighChildOrder implements Serializable {
this.goodsName = goodsName;
}
public String getGoodsDesc() {
return goodsDesc;
}
public void setGoodsDesc(String goodsDesc) {
this.goodsDesc = goodsDesc;
}
public String getGoodsImg() {
return goodsImg;
}
@ -318,6 +376,30 @@ public class HighChildOrder implements Serializable {
this.ext3 = ext3;
}
public String getExt4() {
return ext4;
}
public void setExt4(String ext4) {
this.ext4 = ext4;
}
public String getExt5() {
return ext5;
}
public void setExt5(String ext5) {
this.ext5 = ext5;
}
public String getExt6() {
return ext6;
}
public void setExt6(String ext6) {
this.ext6 = ext6;
}
@Override
public boolean equals(Object that) {
if (this == that) {
@ -333,9 +415,13 @@ public class HighChildOrder implements Serializable {
return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
&& (this.getOrderId() == null ? other.getOrderId() == null : this.getOrderId().equals(other.getOrderId()))
&& (this.getMemId() == null ? other.getMemId() == null : this.getMemId().equals(other.getMemId()))
&& (this.getStoreId() == null ? other.getStoreId() == null : this.getStoreId().equals(other.getStoreId()))
&& (this.getStoreName() == null ? other.getStoreName() == null : this.getStoreName().equals(other.getStoreName()))
&& (this.getStoreAddress() == null ? other.getStoreAddress() == null : this.getStoreAddress().equals(other.getStoreAddress()))
&& (this.getGoodsType() == null ? other.getGoodsType() == null : this.getGoodsType().equals(other.getGoodsType()))
&& (this.getGoodsId() == null ? other.getGoodsId() == null : this.getGoodsId().equals(other.getGoodsId()))
&& (this.getGoodsName() == null ? other.getGoodsName() == null : this.getGoodsName().equals(other.getGoodsName()))
&& (this.getGoodsDesc() == null ? other.getGoodsDesc() == null : this.getGoodsDesc().equals(other.getGoodsDesc()))
&& (this.getGoodsImg() == null ? other.getGoodsImg() == null : this.getGoodsImg().equals(other.getGoodsImg()))
&& (this.getGoodsSpecName() == null ? other.getGoodsSpecName() == null : this.getGoodsSpecName().equals(other.getGoodsSpecName()))
&& (this.getGoodsPrice() == null ? other.getGoodsPrice() == null : this.getGoodsPrice().equals(other.getGoodsPrice()))
@ -353,7 +439,10 @@ public class HighChildOrder implements Serializable {
&& (this.getGasPriceVip() == null ? other.getGasPriceVip() == null : this.getGasPriceVip().equals(other.getGasPriceVip()))
&& (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()));
&& (this.getExt3() == null ? other.getExt3() == null : this.getExt3().equals(other.getExt3()))
&& (this.getExt4() == null ? other.getExt4() == null : this.getExt4().equals(other.getExt4()))
&& (this.getExt5() == null ? other.getExt5() == null : this.getExt5().equals(other.getExt5()))
&& (this.getExt6() == null ? other.getExt6() == null : this.getExt6().equals(other.getExt6()));
}
@Override
@ -363,9 +452,13 @@ public class HighChildOrder implements Serializable {
result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
result = prime * result + ((getOrderId() == null) ? 0 : getOrderId().hashCode());
result = prime * result + ((getMemId() == null) ? 0 : getMemId().hashCode());
result = prime * result + ((getStoreId() == null) ? 0 : getStoreId().hashCode());
result = prime * result + ((getStoreName() == null) ? 0 : getStoreName().hashCode());
result = prime * result + ((getStoreAddress() == null) ? 0 : getStoreAddress().hashCode());
result = prime * result + ((getGoodsType() == null) ? 0 : getGoodsType().hashCode());
result = prime * result + ((getGoodsId() == null) ? 0 : getGoodsId().hashCode());
result = prime * result + ((getGoodsName() == null) ? 0 : getGoodsName().hashCode());
result = prime * result + ((getGoodsDesc() == null) ? 0 : getGoodsDesc().hashCode());
result = prime * result + ((getGoodsImg() == null) ? 0 : getGoodsImg().hashCode());
result = prime * result + ((getGoodsSpecName() == null) ? 0 : getGoodsSpecName().hashCode());
result = prime * result + ((getGoodsPrice() == null) ? 0 : getGoodsPrice().hashCode());
@ -384,6 +477,9 @@ public class HighChildOrder implements Serializable {
result = prime * result + ((getExt1() == null) ? 0 : getExt1().hashCode());
result = prime * result + ((getExt2() == null) ? 0 : getExt2().hashCode());
result = prime * result + ((getExt3() == null) ? 0 : getExt3().hashCode());
result = prime * result + ((getExt4() == null) ? 0 : getExt4().hashCode());
result = prime * result + ((getExt5() == null) ? 0 : getExt5().hashCode());
result = prime * result + ((getExt6() == null) ? 0 : getExt6().hashCode());
return result;
}
@ -396,9 +492,13 @@ public class HighChildOrder implements Serializable {
sb.append(", id=").append(id);
sb.append(", orderId=").append(orderId);
sb.append(", memId=").append(memId);
sb.append(", storeId=").append(storeId);
sb.append(", storeName=").append(storeName);
sb.append(", storeAddress=").append(storeAddress);
sb.append(", goodsType=").append(goodsType);
sb.append(", goodsId=").append(goodsId);
sb.append(", goodsName=").append(goodsName);
sb.append(", goodsDesc=").append(goodsDesc);
sb.append(", goodsImg=").append(goodsImg);
sb.append(", goodsSpecName=").append(goodsSpecName);
sb.append(", goodsPrice=").append(goodsPrice);
@ -417,6 +517,9 @@ public class HighChildOrder implements Serializable {
sb.append(", ext1=").append(ext1);
sb.append(", ext2=").append(ext2);
sb.append(", ext3=").append(ext3);
sb.append(", ext4=").append(ext4);
sb.append(", ext5=").append(ext5);
sb.append(", ext6=").append(ext6);
sb.append(", serialVersionUID=").append(serialVersionUID);
sb.append("]");
return sb.toString();

480
hai-service/src/main/java/com/hai/entity/HighChildOrderExample.java
Unescape View File

@ -305,6 +305,206 @@ public class HighChildOrderExample {
return (Criteria) this;
}
public Criteria andStoreIdIsNull() {
addCriterion("store_id is null");
return (Criteria) this;
}
public Criteria andStoreIdIsNotNull() {
addCriterion("store_id is not null");
return (Criteria) this;
}
public Criteria andStoreIdEqualTo(Long value) {
addCriterion("store_id =", value, "storeId");
return (Criteria) this;
}
public Criteria andStoreIdNotEqualTo(Long value) {
addCriterion("store_id <>", value, "storeId");
return (Criteria) this;
}
public Criteria andStoreIdGreaterThan(Long value) {
addCriterion("store_id >", value, "storeId");
return (Criteria) this;
}
public Criteria andStoreIdGreaterThanOrEqualTo(Long value) {
addCriterion("store_id >=", value, "storeId");
return (Criteria) this;
}
public Criteria andStoreIdLessThan(Long value) {
addCriterion("store_id <", value, "storeId");
return (Criteria) this;
}
public Criteria andStoreIdLessThanOrEqualTo(Long value) {
addCriterion("store_id <=", value, "storeId");
return (Criteria) this;
}
public Criteria andStoreIdIn(List<Long> values) {
addCriterion("store_id in", values, "storeId");
return (Criteria) this;
}
public Criteria andStoreIdNotIn(List<Long> values) {
addCriterion("store_id not in", values, "storeId");
return (Criteria) this;
}
public Criteria andStoreIdBetween(Long value1, Long value2) {
addCriterion("store_id between", value1, value2, "storeId");
return (Criteria) this;
}
public Criteria andStoreIdNotBetween(Long value1, Long value2) {
addCriterion("store_id not between", value1, value2, "storeId");
return (Criteria) this;
}
public Criteria andStoreNameIsNull() {
addCriterion("store_name is null");
return (Criteria) this;
}
public Criteria andStoreNameIsNotNull() {
addCriterion("store_name is not null");
return (Criteria) this;
}
public Criteria andStoreNameEqualTo(String value) {
addCriterion("store_name =", value, "storeName");
return (Criteria) this;
}
public Criteria andStoreNameNotEqualTo(String value) {
addCriterion("store_name <>", value, "storeName");
return (Criteria) this;
}
public Criteria andStoreNameGreaterThan(String value) {
addCriterion("store_name >", value, "storeName");
return (Criteria) this;
}
public Criteria andStoreNameGreaterThanOrEqualTo(String value) {
addCriterion("store_name >=", value, "storeName");
return (Criteria) this;
}
public Criteria andStoreNameLessThan(String value) {
addCriterion("store_name <", value, "storeName");
return (Criteria) this;
}
public Criteria andStoreNameLessThanOrEqualTo(String value) {
addCriterion("store_name <=", value, "storeName");
return (Criteria) this;
}
public Criteria andStoreNameLike(String value) {
addCriterion("store_name like", value, "storeName");
return (Criteria) this;
}
public Criteria andStoreNameNotLike(String value) {
addCriterion("store_name not like", value, "storeName");
return (Criteria) this;
}
public Criteria andStoreNameIn(List<String> values) {
addCriterion("store_name in", values, "storeName");
return (Criteria) this;
}
public Criteria andStoreNameNotIn(List<String> values) {
addCriterion("store_name not in", values, "storeName");
return (Criteria) this;
}
public Criteria andStoreNameBetween(String value1, String value2) {
addCriterion("store_name between", value1, value2, "storeName");
return (Criteria) this;
}
public Criteria andStoreNameNotBetween(String value1, String value2) {
addCriterion("store_name not between", value1, value2, "storeName");
return (Criteria) this;
}
public Criteria andStoreAddressIsNull() {
addCriterion("store_address is null");
return (Criteria) this;
}
public Criteria andStoreAddressIsNotNull() {
addCriterion("store_address is not null");
return (Criteria) this;
}
public Criteria andStoreAddressEqualTo(String value) {
addCriterion("store_address =", value, "storeAddress");
return (Criteria) this;
}
public Criteria andStoreAddressNotEqualTo(String value) {
addCriterion("store_address <>", value, "storeAddress");
return (Criteria) this;
}
public Criteria andStoreAddressGreaterThan(String value) {
addCriterion("store_address >", value, "storeAddress");
return (Criteria) this;
}
public Criteria andStoreAddressGreaterThanOrEqualTo(String value) {
addCriterion("store_address >=", value, "storeAddress");
return (Criteria) this;
}
public Criteria andStoreAddressLessThan(String value) {
addCriterion("store_address <", value, "storeAddress");
return (Criteria) this;
}
public Criteria andStoreAddressLessThanOrEqualTo(String value) {
addCriterion("store_address <=", value, "storeAddress");
return (Criteria) this;
}
public Criteria andStoreAddressLike(String value) {
addCriterion("store_address like", value, "storeAddress");
return (Criteria) this;
}
public Criteria andStoreAddressNotLike(String value) {
addCriterion("store_address not like", value, "storeAddress");
return (Criteria) this;
}
public Criteria andStoreAddressIn(List<String> values) {
addCriterion("store_address in", values, "storeAddress");
return (Criteria) this;
}
public Criteria andStoreAddressNotIn(List<String> values) {
addCriterion("store_address not in", values, "storeAddress");
return (Criteria) this;
}
public Criteria andStoreAddressBetween(String value1, String value2) {
addCriterion("store_address between", value1, value2, "storeAddress");
return (Criteria) this;
}
public Criteria andStoreAddressNotBetween(String value1, String value2) {
addCriterion("store_address not between", value1, value2, "storeAddress");
return (Criteria) this;
}
public Criteria andGoodsTypeIsNull() {
addCriterion("goods_type is null");
return (Criteria) this;
@ -495,6 +695,76 @@ public class HighChildOrderExample {
return (Criteria) this;
}
public Criteria andGoodsDescIsNull() {
addCriterion("goods_desc is null");
return (Criteria) this;
}
public Criteria andGoodsDescIsNotNull() {
addCriterion("goods_desc is not null");
return (Criteria) this;
}
public Criteria andGoodsDescEqualTo(String value) {
addCriterion("goods_desc =", value, "goodsDesc");
return (Criteria) this;
}
public Criteria andGoodsDescNotEqualTo(String value) {
addCriterion("goods_desc <>", value, "goodsDesc");
return (Criteria) this;
}
public Criteria andGoodsDescGreaterThan(String value) {
addCriterion("goods_desc >", value, "goodsDesc");
return (Criteria) this;
}
public Criteria andGoodsDescGreaterThanOrEqualTo(String value) {
addCriterion("goods_desc >=", value, "goodsDesc");
return (Criteria) this;
}
public Criteria andGoodsDescLessThan(String value) {
addCriterion("goods_desc <", value, "goodsDesc");
return (Criteria) this;
}
public Criteria andGoodsDescLessThanOrEqualTo(String value) {
addCriterion("goods_desc <=", value, "goodsDesc");
return (Criteria) this;
}
public Criteria andGoodsDescLike(String value) {
addCriterion("goods_desc like", value, "goodsDesc");
return (Criteria) this;
}
public Criteria andGoodsDescNotLike(String value) {
addCriterion("goods_desc not like", value, "goodsDesc");
return (Criteria) this;
}
public Criteria andGoodsDescIn(List<String> values) {
addCriterion("goods_desc in", values, "goodsDesc");
return (Criteria) this;
}
public Criteria andGoodsDescNotIn(List<String> values) {
addCriterion("goods_desc not in", values, "goodsDesc");
return (Criteria) this;
}
public Criteria andGoodsDescBetween(String value1, String value2) {
addCriterion("goods_desc between", value1, value2, "goodsDesc");
return (Criteria) this;
}
public Criteria andGoodsDescNotBetween(String value1, String value2) {
addCriterion("goods_desc not between", value1, value2, "goodsDesc");
return (Criteria) this;
}
public Criteria andGoodsImgIsNull() {
addCriterion("goods_img is null");
return (Criteria) this;
@ -1654,6 +1924,216 @@ public class HighChildOrderExample {
addCriterion("ext_3 not between", value1, value2, "ext3");
return (Criteria) this;
}
public Criteria andExt4IsNull() {
addCriterion("ext_4 is null");
return (Criteria) this;
}
public Criteria andExt4IsNotNull() {
addCriterion("ext_4 is not null");
return (Criteria) this;
}
public Criteria andExt4EqualTo(String value) {
addCriterion("ext_4 =", value, "ext4");
return (Criteria) this;
}
public Criteria andExt4NotEqualTo(String value) {
addCriterion("ext_4 <>", value, "ext4");
return (Criteria) this;
}
public Criteria andExt4GreaterThan(String value) {
addCriterion("ext_4 >", value, "ext4");
return (Criteria) this;
}
public Criteria andExt4GreaterThanOrEqualTo(String value) {
addCriterion("ext_4 >=", value, "ext4");
return (Criteria) this;
}
public Criteria andExt4LessThan(String value) {
addCriterion("ext_4 <", value, "ext4");
return (Criteria) this;
}
public Criteria andExt4LessThanOrEqualTo(String value) {
addCriterion("ext_4 <=", value, "ext4");
return (Criteria) this;
}
public Criteria andExt4Like(String value) {
addCriterion("ext_4 like", value, "ext4");
return (Criteria) this;
}
public Criteria andExt4NotLike(String value) {
addCriterion("ext_4 not like", value, "ext4");
return (Criteria) this;
}
public Criteria andExt4In(List<String> values) {
addCriterion("ext_4 in", values, "ext4");
return (Criteria) this;
}
public Criteria andExt4NotIn(List<String> values) {
addCriterion("ext_4 not in", values, "ext4");
return (Criteria) this;
}
public Criteria andExt4Between(String value1, String value2) {
addCriterion("ext_4 between", value1, value2, "ext4");
return (Criteria) this;
}
public Criteria andExt4NotBetween(String value1, String value2) {
addCriterion("ext_4 not between", value1, value2, "ext4");
return (Criteria) this;
}
public Criteria andExt5IsNull() {
addCriterion("ext_5 is null");
return (Criteria) this;
}
public Criteria andExt5IsNotNull() {
addCriterion("ext_5 is not null");
return (Criteria) this;
}
public Criteria andExt5EqualTo(String value) {
addCriterion("ext_5 =", value, "ext5");
return (Criteria) this;
}
public Criteria andExt5NotEqualTo(String value) {
addCriterion("ext_5 <>", value, "ext5");
return (Criteria) this;
}
public Criteria andExt5GreaterThan(String value) {
addCriterion("ext_5 >", value, "ext5");
return (Criteria) this;
}
public Criteria andExt5GreaterThanOrEqualTo(String value) {
addCriterion("ext_5 >=", value, "ext5");
return (Criteria) this;
}
public Criteria andExt5LessThan(String value) {
addCriterion("ext_5 <", value, "ext5");
return (Criteria) this;
}
public Criteria andExt5LessThanOrEqualTo(String value) {
addCriterion("ext_5 <=", value, "ext5");
return (Criteria) this;
}
public Criteria andExt5Like(String value) {
addCriterion("ext_5 like", value, "ext5");
return (Criteria) this;
}
public Criteria andExt5NotLike(String value) {
addCriterion("ext_5 not like", value, "ext5");
return (Criteria) this;
}
public Criteria andExt5In(List<String> values) {
addCriterion("ext_5 in", values, "ext5");
return (Criteria) this;
}
public Criteria andExt5NotIn(List<String> values) {
addCriterion("ext_5 not in", values, "ext5");
return (Criteria) this;
}
public Criteria andExt5Between(String value1, String value2) {
addCriterion("ext_5 between", value1, value2, "ext5");
return (Criteria) this;
}
public Criteria andExt5NotBetween(String value1, String value2) {
addCriterion("ext_5 not between", value1, value2, "ext5");
return (Criteria) this;
}
public Criteria andExt6IsNull() {
addCriterion("ext_6 is null");
return (Criteria) this;
}
public Criteria andExt6IsNotNull() {
addCriterion("ext_6 is not null");
return (Criteria) this;
}
public Criteria andExt6EqualTo(String value) {
addCriterion("ext_6 =", value, "ext6");
return (Criteria) this;
}
public Criteria andExt6NotEqualTo(String value) {
addCriterion("ext_6 <>", value, "ext6");
return (Criteria) this;
}
public Criteria andExt6GreaterThan(String value) {
addCriterion("ext_6 >", value, "ext6");
return (Criteria) this;
}
public Criteria andExt6GreaterThanOrEqualTo(String value) {
addCriterion("ext_6 >=", value, "ext6");
return (Criteria) this;
}
public Criteria andExt6LessThan(String value) {
addCriterion("ext_6 <", value, "ext6");
return (Criteria) this;
}
public Criteria andExt6LessThanOrEqualTo(String value) {
addCriterion("ext_6 <=", value, "ext6");
return (Criteria) this;
}
public Criteria andExt6Like(String value) {
addCriterion("ext_6 like", value, "ext6");
return (Criteria) this;
}
public Criteria andExt6NotLike(String value) {
addCriterion("ext_6 not like", value, "ext6");
return (Criteria) this;
}
public Criteria andExt6In(List<String> values) {
addCriterion("ext_6 in", values, "ext6");
return (Criteria) this;
}
public Criteria andExt6NotIn(List<String> values) {
addCriterion("ext_6 not in", values, "ext6");
return (Criteria) this;
}
public Criteria andExt6Between(String value1, String value2) {
addCriterion("ext_6 between", value1, value2, "ext6");
return (Criteria) this;
}
public Criteria andExt6NotBetween(String value1, String value2) {
addCriterion("ext_6 not between", value1, value2, "ext6");
return (Criteria) this;
}
}
/**

36
hai-service/src/main/java/com/hai/entity/HighOrder.java
Unescape View File

@ -110,6 +110,11 @@ public class HighOrder implements Serializable {
*/
private Date cancelTime;
/**
* 取消原因
*/
private String cancelRemarks;
/**
* 完成时间
*/
@ -125,6 +130,11 @@ public class HighOrder implements Serializable {
*/
private Date refundTime;
/**
* 退款金额
*/
private BigDecimal refundPrice;
/**
* 退款原因
*/
@ -145,8 +155,6 @@ public class HighOrder implements Serializable {
private HighDiscount highDiscount;
private static final long serialVersionUID = 1L;
public List<HighChildOrder> getHighChildOrderList() {
return highChildOrderList;
}
@ -163,6 +171,8 @@ public class HighOrder implements Serializable {
this.highDiscount = highDiscount;
}
private static final long serialVersionUID = 1L;
public Long getId() {
return id;
}
@ -315,6 +325,14 @@ public class HighOrder implements Serializable {
this.cancelTime = cancelTime;
}
public String getCancelRemarks() {
return cancelRemarks;
}
public void setCancelRemarks(String cancelRemarks) {
this.cancelRemarks = cancelRemarks;
}
public Date getFinishTime() {
return finishTime;
}
@ -339,6 +357,14 @@ public class HighOrder implements Serializable {
this.refundTime = refundTime;
}
public BigDecimal getRefundPrice() {
return refundPrice;
}
public void setRefundPrice(BigDecimal refundPrice) {
this.refundPrice = refundPrice;
}
public String getRefundContent() {
return refundContent;
}
@ -410,9 +436,11 @@ public class HighOrder implements Serializable {
&& (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.getCancelRemarks() == null ? other.getCancelRemarks() == null : this.getCancelRemarks().equals(other.getCancelRemarks()))
&& (this.getFinishTime() == null ? other.getFinishTime() == null : this.getFinishTime().equals(other.getFinishTime()))
&& (this.getRemarks() == null ? other.getRemarks() == null : this.getRemarks().equals(other.getRemarks()))
&& (this.getRefundTime() == null ? other.getRefundTime() == null : this.getRefundTime().equals(other.getRefundTime()))
&& (this.getRefundPrice() == null ? other.getRefundPrice() == null : this.getRefundPrice().equals(other.getRefundPrice()))
&& (this.getRefundContent() == null ? other.getRefundContent() == null : this.getRefundContent().equals(other.getRefundContent()))
&& (this.getRefusalRefundContent() == null ? other.getRefusalRefundContent() == null : this.getRefusalRefundContent().equals(other.getRefusalRefundContent()))
&& (this.getExt1() == null ? other.getExt1() == null : this.getExt1().equals(other.getExt1()))
@ -443,9 +471,11 @@ public class HighOrder implements Serializable {
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 + ((getCancelRemarks() == null) ? 0 : getCancelRemarks().hashCode());
result = prime * result + ((getFinishTime() == null) ? 0 : getFinishTime().hashCode());
result = prime * result + ((getRemarks() == null) ? 0 : getRemarks().hashCode());
result = prime * result + ((getRefundTime() == null) ? 0 : getRefundTime().hashCode());
result = prime * result + ((getRefundPrice() == null) ? 0 : getRefundPrice().hashCode());
result = prime * result + ((getRefundContent() == null) ? 0 : getRefundContent().hashCode());
result = prime * result + ((getRefusalRefundContent() == null) ? 0 : getRefusalRefundContent().hashCode());
result = prime * result + ((getExt1() == null) ? 0 : getExt1().hashCode());
@ -479,9 +509,11 @@ public class HighOrder implements Serializable {
sb.append(", createTime=").append(createTime);
sb.append(", payTime=").append(payTime);
sb.append(", cancelTime=").append(cancelTime);
sb.append(", cancelRemarks=").append(cancelRemarks);
sb.append(", finishTime=").append(finishTime);
sb.append(", remarks=").append(remarks);
sb.append(", refundTime=").append(refundTime);
sb.append(", refundPrice=").append(refundPrice);
sb.append(", refundContent=").append(refundContent);
sb.append(", refusalRefundContent=").append(refusalRefundContent);
sb.append(", ext1=").append(ext1);

130
hai-service/src/main/java/com/hai/entity/HighOrderExample.java
Unescape View File

@ -1316,6 +1316,76 @@ public class HighOrderExample {
return (Criteria) this;
}
public Criteria andCancelRemarksIsNull() {
addCriterion("cancel_remarks is null");
return (Criteria) this;
}
public Criteria andCancelRemarksIsNotNull() {
addCriterion("cancel_remarks is not null");
return (Criteria) this;
}
public Criteria andCancelRemarksEqualTo(String value) {
addCriterion("cancel_remarks =", value, "cancelRemarks");
return (Criteria) this;
}
public Criteria andCancelRemarksNotEqualTo(String value) {
addCriterion("cancel_remarks <>", value, "cancelRemarks");
return (Criteria) this;
}
public Criteria andCancelRemarksGreaterThan(String value) {
addCriterion("cancel_remarks >", value, "cancelRemarks");
return (Criteria) this;
}
public Criteria andCancelRemarksGreaterThanOrEqualTo(String value) {
addCriterion("cancel_remarks >=", value, "cancelRemarks");
return (Criteria) this;
}
public Criteria andCancelRemarksLessThan(String value) {
addCriterion("cancel_remarks <", value, "cancelRemarks");
return (Criteria) this;
}
public Criteria andCancelRemarksLessThanOrEqualTo(String value) {
addCriterion("cancel_remarks <=", value, "cancelRemarks");
return (Criteria) this;
}
public Criteria andCancelRemarksLike(String value) {
addCriterion("cancel_remarks like", value, "cancelRemarks");
return (Criteria) this;
}
public Criteria andCancelRemarksNotLike(String value) {
addCriterion("cancel_remarks not like", value, "cancelRemarks");
return (Criteria) this;
}
public Criteria andCancelRemarksIn(List<String> values) {
addCriterion("cancel_remarks in", values, "cancelRemarks");
return (Criteria) this;
}
public Criteria andCancelRemarksNotIn(List<String> values) {
addCriterion("cancel_remarks not in", values, "cancelRemarks");
return (Criteria) this;
}
public Criteria andCancelRemarksBetween(String value1, String value2) {
addCriterion("cancel_remarks between", value1, value2, "cancelRemarks");
return (Criteria) this;
}
public Criteria andCancelRemarksNotBetween(String value1, String value2) {
addCriterion("cancel_remarks not between", value1, value2, "cancelRemarks");
return (Criteria) this;
}
public Criteria andFinishTimeIsNull() {
addCriterion("finish_time is null");
return (Criteria) this;
@ -1506,6 +1576,66 @@ public class HighOrderExample {
return (Criteria) this;
}
public Criteria andRefundPriceIsNull() {
addCriterion("refund_price is null");
return (Criteria) this;
}
public Criteria andRefundPriceIsNotNull() {
addCriterion("refund_price is not null");
return (Criteria) this;
}
public Criteria andRefundPriceEqualTo(BigDecimal value) {
addCriterion("refund_price =", value, "refundPrice");
return (Criteria) this;
}
public Criteria andRefundPriceNotEqualTo(BigDecimal value) {
addCriterion("refund_price <>", value, "refundPrice");
return (Criteria) this;
}
public Criteria andRefundPriceGreaterThan(BigDecimal value) {
addCriterion("refund_price >", value, "refundPrice");
return (Criteria) this;
}
public Criteria andRefundPriceGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("refund_price >=", value, "refundPrice");
return (Criteria) this;
}
public Criteria andRefundPriceLessThan(BigDecimal value) {
addCriterion("refund_price <", value, "refundPrice");
return (Criteria) this;
}
public Criteria andRefundPriceLessThanOrEqualTo(BigDecimal value) {
addCriterion("refund_price <=", value, "refundPrice");
return (Criteria) this;
}
public Criteria andRefundPriceIn(List<BigDecimal> values) {
addCriterion("refund_price in", values, "refundPrice");
return (Criteria) this;
}
public Criteria andRefundPriceNotIn(List<BigDecimal> values) {
addCriterion("refund_price not in", values, "refundPrice");
return (Criteria) this;
}
public Criteria andRefundPriceBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("refund_price between", value1, value2, "refundPrice");
return (Criteria) this;
}
public Criteria andRefundPriceNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("refund_price not between", value1, value2, "refundPrice");
return (Criteria) this;
}
public Criteria andRefundContentIsNull() {
addCriterion("refund_content is null");
return (Criteria) this;

38
hai-service/src/main/java/com/hai/service/impl/HighQzOrderServiceImpl.java
Unescape View File

@ -58,8 +58,7 @@ public class HighQzOrderServiceImpl implements HighQzOrderService {
highOrder.setPayType(2);
highOrder.setPayPrice(data.getBigDecimal("totalPrice"));
highOrder.setTotalPrice(data.getBigDecimal("totalPrice"));
highOrder.setDeductionPrice(new BigDecimal(
"0"));
highOrder.setDeductionPrice(new BigDecimal("0"));
highOrder.setOrderStatus(1);
highOrder.setCreateTime(data.getDate("createTime"));
highOrder.setRemarks(data.getString("userRemark"));
@ -74,6 +73,8 @@ public class HighQzOrderServiceImpl implements HighQzOrderService {
highChildOrder = new HighChildOrder();
highChildOrder.setMemId(highOrder.getMemId());
highChildOrder.setGoodsType(4);
highChildOrder.setStoreName(kfcPlaceOrder.getString("storeName"));
highChildOrder.setStoreAddress(kfcPlaceOrder.getString("storeAddress"));
highChildOrder.setGoodsName(object.getString("productName"));
highChildOrder.setGoodsImg(object.getString("imageUrl"));
highChildOrder.setGoodsSpecName("默认");
@ -84,6 +85,12 @@ public class HighQzOrderServiceImpl implements HighQzOrderService {
highChildOrder.setGiveawayType(false);
highChildOrder.setChildOrdeStatus(1);
highChildOrder.setPraiseStatus(0);
// 计算原始价格
highOrder.setTotalPrice(highChildOrder.getGoodsPrice().multiply(new BigDecimal(highChildOrder.getSaleCount().toString())));
// 1:堂食 2:外带 3：外卖
highChildOrder.setExt1(kfcPlaceOrder.getString("eatType"));
highOrder.getHighChildOrderList().add(highChildOrder);
}
}
@ -92,16 +99,37 @@ public class HighQzOrderServiceImpl implements HighQzOrderService {
highChildOrder = new HighChildOrder();
highChildOrder.setMemId(highOrder.getMemId());
highChildOrder.setGoodsType(5);
highChildOrder.setGoodsName(data.getString("cinemaName"));
//highChildOrder.setStoreId(data.getLong("hallId"));
highChildOrder.setStoreName(data.getString("cinemaName"));
highChildOrder.setStoreAddress(data.getString("cinemaAddr"));
//highChildOrder.setGoodsId(data.getLong("filmId"));
highChildOrder.setGoodsName(data.getString("filmName"));
highChildOrder.setGoodsDesc(data.getString("seatsDesc"));
highChildOrder.setGoodsImg(data.getString("pic"));
highChildOrder.setGoodsSpecName("默认");
highChildOrder.setGoodsPrice(new BigDecimal(data.getString("unitPrice")));
highChildOrder.setGoodsPrice(new BigDecimal(data.getString("marketUnitPrice")));
highChildOrder.setGoodsActualPrice(new BigDecimal(data.getString("unitPrice")));
highChildOrder.setSaleCount(data.getInteger("seatsCount"));
highChildOrder.setTotalPrice(new BigDecimal(highChildOrder.getSaleCount().toString()).multiply(highChildOrder.getGoodsPrice()));
highChildOrder.setGoodsActualPrice(highChildOrder.getTotalPrice());
highChildOrder.setGiveawayType(false);
highChildOrder.setChildOrdeStatus(1);
highChildOrder.setPraiseStatus(0);
// 计算原始价格
highOrder.setTotalPrice(highChildOrder.getGoodsPrice().multiply(new BigDecimal(highChildOrder.getSaleCount().toString())));
// 观看时间
JSONObject showTimeObject = new JSONObject();
showTimeObject.put("showTime", data.getString("showTime"));
showTimeObject.put("showEndTime", data.getString("showEndTime"));
highChildOrder.setExt1(showTimeObject.toJSONString());
// 影厅名称
highChildOrder.setExt2(data.getString("hallName"));
// 影片语言
highChildOrder.setExt3(data.getString("language"));
highOrder.getHighChildOrderList().add(highChildOrder);
}
}

Write Preview
Loading…
Cancel
Save