diff --git a/hai-bweb/src/main/java/com/bweb/config/msg/MerStoreAccountChgHandler.java b/hai-bweb/src/main/java/com/bweb/config/msg/MerStoreAccountChgHandler.java index cd156a58..4b128583 100644 --- a/hai-bweb/src/main/java/com/bweb/config/msg/MerStoreAccountChgHandler.java +++ b/hai-bweb/src/main/java/com/bweb/config/msg/MerStoreAccountChgHandler.java @@ -28,9 +28,6 @@ public class MerStoreAccountChgHandler { @Resource private HighMerchantStoreAccountService merchantStoreAccountService; - @Resource - private HighOrderService orderService; - @PostConstruct public void init() { new Thread(() -> { diff --git a/hai-bweb/src/main/java/com/bweb/controller/ApiMerchantsController.java b/hai-bweb/src/main/java/com/bweb/controller/ApiMerchantsController.java index 5e247130..574dd434 100644 --- a/hai-bweb/src/main/java/com/bweb/controller/ApiMerchantsController.java +++ b/hai-bweb/src/main/java/com/bweb/controller/ApiMerchantsController.java @@ -67,12 +67,10 @@ public class ApiMerchantsController { @RequestParam(value = "phone", required = false) String phone, @RequestParam(value = "status", required = false) Integer status, @RequestParam(name = "pageNum", required = true) Integer pageNum, - @RequestParam(name = "pageSize", required = true) Integer pageSize, HttpServletRequest request + @RequestParam(name = "pageSize", required = true) Integer pageSize ) { try { - SessionObject sessionObject = userCenter.getSessionObject(request); - UserInfoModel userInfoModel = (UserInfoModel) sessionObject.getObject(); Map map = new HashMap<>(); diff --git a/hai-bweb/src/main/java/com/bweb/controller/HighTestController.java b/hai-bweb/src/main/java/com/bweb/controller/HighTestController.java index 8363255a..be11c355 100644 --- a/hai-bweb/src/main/java/com/bweb/controller/HighTestController.java +++ b/hai-bweb/src/main/java/com/bweb/controller/HighTestController.java @@ -1 +1 @@ - package com.bweb.controller; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.hai.common.exception.ErrorCode; import com.hai.common.exception.ErrorHelp; import com.hai.common.exception.SysCode; import com.hai.common.pay.util.sdk.WXPayConstants; import com.hai.common.utils.HttpsUtils; import com.hai.common.utils.ResponseMsgUtil; import com.hai.common.utils.WxUtils; import com.hai.config.HuiLianTongUnionCardConfig; import com.hai.entity.HighChildOrder; import com.hai.entity.HighOrder; import com.hai.model.ResponseData; import com.hai.order.service.OrderService; import com.hai.order.type.OrderRefundOpUserType; import com.hai.order.utils.OrderUtil; import com.hai.service.HighOrderService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.math.BigDecimal; import java.util.HashMap; import java.util.Map; /** * @Auther: 胡锐 * @Description: * @Date: 2021/3/26 23:08 */ @Controller @RequestMapping(value = "/test") @Api(value = "订单接口") public class HighTestController { private static Logger log = LoggerFactory.getLogger(HighTestController.class); @Resource private OrderService orderService; @Resource private HighOrderService highOrderService; @RequestMapping(value="/resolveResponse",method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "解析") public ResponseData resolveResponse( @RequestParam(name = "data", required = false) String data ) { try { JSONObject cardInfoObject = HuiLianTongUnionCardConfig.resolveResponse(data); return ResponseMsgUtil.success(cardInfoObject); } catch (Exception e) { log.error("getUserByTelephone",e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/getHuiLianTongCardConsume", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "查询汇联通工会卡消费记录") public ResponseData getHuiLianTongCardConsume(@RequestParam(name = "businessType", required = true) String businessType, @RequestParam(name = "cardNo", required = true) String cardNo, @RequestParam(name = "sdate", required = true) Long sdate, @RequestParam(name = "edate", required = true) Long edate, @RequestParam(name = "pageNum", required = true) Integer pageNum, @RequestParam(name = "pageSize", required = true) Integer pageSize, HttpServletRequest request) { try { JSONObject consumptionRecord = HuiLianTongUnionCardConfig.queryConsumptionRecordByBusiness(businessType, cardNo, sdate, edate, pageNum, pageSize); if (StringUtils.isBlank(consumptionRecord.getString("data"))) { throw ErrorHelp.genException(SysCode.System, ErrorCode.REQUEST_ERROR, ""); } JSONArray array = HuiLianTongUnionCardConfig.resolveResponse(consumptionRecord.getString("data")).getJSONArray("records"); return ResponseMsgUtil.success(array); } catch (Exception e) { log.error("HighUserCardController --> getHuiLianTongCardConsume() error!", e); return ResponseMsgUtil.exception(e); } } // @RequestMapping(value = "/createOrder", method = RequestMethod.POST) // @ResponseBody // @ApiOperation(value = "创建订单") // public ResponseData createOrder(@RequestBody JSONObject object) { // try { // // Map mapPost = new HashMap<>(); // mapPost.put("apiKey" , "0C7897EA3BD96156A5881618FF2FF645"); // mapPost.put("merchId" , "20230258302"); // mapPost.put("timetable" , new Date().getTime()); // mapPost.put("orderNo" , "TEST" + OrderUtil.generateOrderNo()); // mapPost.put("productType" , object.getString("productType")); // mapPost.put("notifyUrl" , "test"); // // mapPost.put("content" , object.toString()); // System.out.println(mapPost); // // Map map = new HashMap<>(); // map.put("apiKey" , "0C7897EA3BD96156A5881618FF2FF645"); // map.put("merchId" , "20230258302"); // map.put("timetable" , mapPost.get("timetable").toString()); // map.put("orderNo" , mapPost.get("orderNo")); // map.put("productType" , object.getString("productType")); // map.put("content" , object.toString()); // // System.out.println(map); // // mapPost.put("sign" , WxUtils.generateSignApi(map, MapUtils.getString(map, "apiKey"), WXPayConstants.SignType.MD5)); // return ResponseMsgUtil.success(HttpsUtils.doPost("http://localhost:9902/v1/order/createOrder" , mapPost , new HashMap<>())); // } catch (Exception e) { // log.error("HighOrderController --> getBackendToken() error!", e); // return ResponseMsgUtil.exception(e); // } // } @RequestMapping(value = "/payOrder", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "支付订单") public ResponseData payOrder(@RequestParam(name = "mchOrderNo", required = true) String mchOrderNo) { try { Map mapPost = new HashMap<>(); mapPost.put("apiKey" , "0C7897EA3BD96156A5881618FF2FF645"); mapPost.put("merchId" , "20230258302"); mapPost.put("mchOrderNo" , mchOrderNo); Map map = new HashMap<>(); map.put("apiKey" , "0C7897EA3BD96156A5881618FF2FF645"); map.put("merchId" , "20230258302"); map.put("mchOrderNo" , mchOrderNo); System.out.println(map); mapPost.put("sign" , WxUtils.generateSignApi(map, MapUtils.getString(map, "apiKey"), WXPayConstants.SignType.MD5)); return ResponseMsgUtil.success(HttpsUtils.doPost("http://localhost:9902/v1/order/orderPay" , mapPost , new HashMap<>())); } catch (Exception e) { log.error("HighOrderController --> getBackendToken() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/queryOrderDetail", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "查询订单详情") public ResponseData queryOrderDetail(@RequestParam(name = "mchOrderNo", required = true) String mchOrderNo) { try { Map mapPost = new HashMap<>(); mapPost.put("apiKey" , "0C7897EA3BD96156A5881618FF2FF645"); mapPost.put("merchId" , "20230258302"); mapPost.put("mchOrderNo" , mchOrderNo); Map map = new HashMap<>(); map.put("apiKey" , "0C7897EA3BD96156A5881618FF2FF645"); map.put("merchId" , "20230258302"); map.put("mchOrderNo" , mchOrderNo); System.out.println(map); mapPost.put("sign" , WxUtils.generateSignApi(map, MapUtils.getString(map, "apiKey"), WXPayConstants.SignType.MD5)); return ResponseMsgUtil.success(HttpsUtils.doPost("http://localhost:9902/v1/order/queryOrderDetail" , mapPost , new HashMap<>())); } catch (Exception e) { log.error("HighOrderController --> getBackendToken() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/deposit", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "工会卡充值") public ResponseData deposit(@RequestParam(name = "orderNo", required = true) String orderNo) { try { HighOrder order = highOrderService.getOrderByOrderNo(orderNo); HighChildOrder highChildOrder = order.getHighChildOrderList().get(0); if (order.getOrderStatus() != 2) { throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "订单状态错误"); } // 汇联通充值 String goodsDesc = "汇联通充值"+order.getPayPrice()+"元"; String tranDesc = ""; String businessType = "ghk_deposit"; String orderNoAgain = OrderUtil.generateOrderNo(); order.setOrderStatus(Integer.valueOf(3)); order.setRemarks("工会卡再次充值订单号" + orderNoAgain); highOrderService.updateOrder(order); // 汇联通卡充值 JSONObject deposit = HuiLianTongUnionCardConfig.deposit(orderNoAgain, highChildOrder.getGoodsSpecName(), order.getPayPrice(), businessType, order.getPaySerialNo(), goodsDesc); return ResponseMsgUtil.success( HuiLianTongUnionCardConfig.resolveResponse(deposit.getString("data"))); } catch (Exception e) { log.error("HighOrderController --> getBackendToken() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/getHuiLianTongCardByCardNo", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "根据卡号查询汇联通工会卡详情") public ResponseData getHuiLianTongCardByCardNo(@RequestParam(name = "cardNo", required = true) String cardNo) { try { // 查询工会卡 JSONObject cardInfo = HuiLianTongUnionCardConfig.queryBalance(cardNo); JSONObject resolveResponse = HuiLianTongUnionCardConfig.resolveResponse(cardInfo.getString("data")); return ResponseMsgUtil.success(resolveResponse); } catch (Exception e) { log.error("HighUserCardController --> getHuiLianTongCardByCardNo() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/consumption", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "工会卡支付") public ResponseData consumption(@RequestParam(name = "payRealPrice", required = true) BigDecimal payRealPrice, @RequestParam(name = "cardNo", required = true) String cardNo) { try { String goodsDesc = ""; String tranDesc = ""; String instCode = "11101527"; String businessType = "hisen_consume"; // 工会卡支付 JSONObject consumption = HuiLianTongUnionCardConfig.consumption(OrderUtil.generateOrderNo(), cardNo, payRealPrice, businessType, instCode, goodsDesc, tranDesc); if (!consumption.getString("respCode").equals("0000")) { throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, consumption.getString("respMessage")); } // 响应参数 JSONObject consumptionResult = HuiLianTongUnionCardConfig.resolveResponse(consumption.getString("data")); if (consumptionResult.getBoolean("success") != true) { throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, consumptionResult.getString("message")); } return ResponseMsgUtil.success(consumptionResult); } catch (Exception e) { log.error("HighUserCardController --> getHuiLianTongCardByCardNo() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/refundOrder", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "工会卡退款") public ResponseData refundOrder(@RequestParam(name = "orderNo", required = true) String orderNo) { try { HighOrder order = highOrderService.getOrderByOrderNo(orderNo); if (order.getOrderStatus() != 2) { throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "订单状态错误"); } orderService.refundOrder(order, "工会卡充值退款",OrderRefundOpUserType.TYPE1, null, "系统自动退款"); return ResponseMsgUtil.success("退款成功"); } catch (Exception e) { log.error("HighOrderController --> getBackendToken() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/externalOrderRefund", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "对外订单退款") public ResponseData externalOrderRefund(@RequestParam(name = "paySerialNo", required = true) String paySerialNo, @RequestParam(name = "WxMchId", required = true) String WxMchId, @RequestParam(name = "payRealPrice", required = true) String payRealPrice) { try { Map mapPost = new HashMap<>(); mapPost.put("apiKey" , "B94B5E62807FA56A7260AB581D8A1B48"); mapPost.put("merchId" , "20230394901"); mapPost.put("paySerialNo" , paySerialNo); mapPost.put("wxMchId" , WxMchId); mapPost.put("payRealPrice" , payRealPrice); mapPost.put("refundPrice" , payRealPrice); Map map = new HashMap<>(); map.put("apiKey" , "B94B5E62807FA56A7260AB581D8A1B48"); map.put("merchId" , "20230394901"); map.put("paySerialNo" , paySerialNo); map.put("wxMchId" , WxMchId); map.put("payRealPrice" , payRealPrice); map.put("refundPrice" , payRealPrice); System.out.println(map); mapPost.put("sign" , WxUtils.generateSignApi(map, MapUtils.getString(map, "apiKey"), WXPayConstants.SignType.MD5)); return ResponseMsgUtil.success(HttpsUtils.doPost("https://hsg.dctpay.com/v1/order/externalOrderRefund" , mapPost , new HashMap<>())); } catch (Exception e) { log.error("HighOrderController --> getBackendToken() error!", e); return ResponseMsgUtil.exception(e); } } } \ No newline at end of file + package com.bweb.controller; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.hai.common.exception.ErrorCode; import com.hai.common.exception.ErrorHelp; import com.hai.common.exception.SysCode; import com.hai.common.pay.util.sdk.WXPayConstants; import com.hai.common.utils.HttpsUtils; import com.hai.common.utils.ResponseMsgUtil; import com.hai.common.utils.WxUtils; import com.hai.config.HuiLianTongUnionCardConfig; import com.hai.entity.*; import com.hai.model.ResponseData; import com.hai.order.service.OrderService; import com.hai.order.type.OrderRefundOpUserType; import com.hai.order.utils.OrderUtil; import com.hai.service.HighCouponCodeOtherService; import com.hai.service.HighCouponService; import com.hai.service.HighOrderService; import com.hai.service.TestService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; import org.bouncycastle.LICENSE; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.math.BigDecimal; import java.util.HashMap; import java.util.List; import java.util.Map; /** * @Auther: 胡锐 * @Description: * @Date: 2021/3/26 23:08 */ @Controller @RequestMapping(value = "/test") @Api(value = "订单接口") public class HighTestController { private static Logger log = LoggerFactory.getLogger(HighTestController.class); @Resource private OrderService orderService; @Resource private HighOrderService highOrderService; @Resource private HighCouponCodeOtherService couponCodeOtherService; @Resource private TestService testService; @Resource private HighCouponService highCouponService; @RequestMapping(value="/resolveResponse",method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "解析") public ResponseData resolveResponse( @RequestParam(name = "data", required = false) String data ) { try { JSONObject cardInfoObject = HuiLianTongUnionCardConfig.resolveResponse(data); return ResponseMsgUtil.success(cardInfoObject); } catch (Exception e) { log.error("getUserByTelephone",e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/getHuiLianTongCardConsume", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "查询汇联通工会卡消费记录") public ResponseData getHuiLianTongCardConsume(@RequestParam(name = "businessType", required = true) String businessType, @RequestParam(name = "cardNo", required = true) String cardNo, @RequestParam(name = "sdate", required = true) Long sdate, @RequestParam(name = "edate", required = true) Long edate, @RequestParam(name = "pageNum", required = true) Integer pageNum, @RequestParam(name = "pageSize", required = true) Integer pageSize, HttpServletRequest request) { try { JSONObject consumptionRecord = HuiLianTongUnionCardConfig.queryConsumptionRecordByBusiness(businessType, cardNo, sdate, edate, pageNum, pageSize); if (StringUtils.isBlank(consumptionRecord.getString("data"))) { throw ErrorHelp.genException(SysCode.System, ErrorCode.REQUEST_ERROR, ""); } JSONArray array = HuiLianTongUnionCardConfig.resolveResponse(consumptionRecord.getString("data")).getJSONArray("records"); return ResponseMsgUtil.success(array); } catch (Exception e) { log.error("HighUserCardController --> getHuiLianTongCardConsume() error!", e); return ResponseMsgUtil.exception(e); } } // @RequestMapping(value = "/createOrder", method = RequestMethod.POST) // @ResponseBody // @ApiOperation(value = "创建订单") // public ResponseData createOrder(@RequestBody JSONObject object) { // try { // // Map mapPost = new HashMap<>(); // mapPost.put("apiKey" , "0C7897EA3BD96156A5881618FF2FF645"); // mapPost.put("merchId" , "20230258302"); // mapPost.put("timetable" , new Date().getTime()); // mapPost.put("orderNo" , "TEST" + OrderUtil.generateOrderNo()); // mapPost.put("productType" , object.getString("productType")); // mapPost.put("notifyUrl" , "test"); // // mapPost.put("content" , object.toString()); // System.out.println(mapPost); // // Map map = new HashMap<>(); // map.put("apiKey" , "0C7897EA3BD96156A5881618FF2FF645"); // map.put("merchId" , "20230258302"); // map.put("timetable" , mapPost.get("timetable").toString()); // map.put("orderNo" , mapPost.get("orderNo")); // map.put("productType" , object.getString("productType")); // map.put("content" , object.toString()); // // System.out.println(map); // // mapPost.put("sign" , WxUtils.generateSignApi(map, MapUtils.getString(map, "apiKey"), WXPayConstants.SignType.MD5)); // return ResponseMsgUtil.success(HttpsUtils.doPost("http://localhost:9902/v1/order/createOrder" , mapPost , new HashMap<>())); // } catch (Exception e) { // log.error("HighOrderController --> getBackendToken() error!", e); // return ResponseMsgUtil.exception(e); // } // } @RequestMapping(value = "/payOrder", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "支付订单") public ResponseData payOrder(@RequestParam(name = "mchOrderNo", required = true) String mchOrderNo) { try { Map mapPost = new HashMap<>(); mapPost.put("apiKey" , "0C7897EA3BD96156A5881618FF2FF645"); mapPost.put("merchId" , "20230258302"); mapPost.put("mchOrderNo" , mchOrderNo); Map map = new HashMap<>(); map.put("apiKey" , "0C7897EA3BD96156A5881618FF2FF645"); map.put("merchId" , "20230258302"); map.put("mchOrderNo" , mchOrderNo); System.out.println(map); mapPost.put("sign" , WxUtils.generateSignApi(map, MapUtils.getString(map, "apiKey"), WXPayConstants.SignType.MD5)); return ResponseMsgUtil.success(HttpsUtils.doPost("http://localhost:9902/v1/order/orderPay" , mapPost , new HashMap<>())); } catch (Exception e) { log.error("HighOrderController --> getBackendToken() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/queryOrderDetail", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "查询订单详情") public ResponseData queryOrderDetail(@RequestParam(name = "mchOrderNo", required = true) String mchOrderNo) { try { Map mapPost = new HashMap<>(); mapPost.put("apiKey" , "0C7897EA3BD96156A5881618FF2FF645"); mapPost.put("merchId" , "20230258302"); mapPost.put("mchOrderNo" , mchOrderNo); Map map = new HashMap<>(); map.put("apiKey" , "0C7897EA3BD96156A5881618FF2FF645"); map.put("merchId" , "20230258302"); map.put("mchOrderNo" , mchOrderNo); System.out.println(map); mapPost.put("sign" , WxUtils.generateSignApi(map, MapUtils.getString(map, "apiKey"), WXPayConstants.SignType.MD5)); return ResponseMsgUtil.success(HttpsUtils.doPost("http://localhost:9902/v1/order/queryOrderDetail" , mapPost , new HashMap<>())); } catch (Exception e) { log.error("HighOrderController --> getBackendToken() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/deposit", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "工会卡充值") public ResponseData deposit(@RequestParam(name = "orderNo", required = true) String orderNo) { try { HighOrder order = highOrderService.getOrderByOrderNo(orderNo); HighChildOrder highChildOrder = order.getHighChildOrderList().get(0); if (order.getOrderStatus() != 2) { throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "订单状态错误"); } // 汇联通充值 String goodsDesc = "汇联通充值"+order.getPayPrice()+"元"; String tranDesc = ""; String businessType = "ghk_deposit"; String orderNoAgain = OrderUtil.generateOrderNo(); order.setOrderStatus(Integer.valueOf(3)); order.setRemarks("工会卡再次充值订单号" + orderNoAgain); highOrderService.updateOrder(order); // 汇联通卡充值 JSONObject deposit = HuiLianTongUnionCardConfig.deposit(orderNoAgain, highChildOrder.getGoodsSpecName(), order.getPayPrice(), businessType, order.getPaySerialNo(), goodsDesc); return ResponseMsgUtil.success( HuiLianTongUnionCardConfig.resolveResponse(deposit.getString("data"))); } catch (Exception e) { log.error("HighOrderController --> getBackendToken() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/getHuiLianTongCardByCardNo", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "根据卡号查询汇联通工会卡详情") public ResponseData getHuiLianTongCardByCardNo(@RequestParam(name = "cardNo", required = true) String cardNo) { try { // 查询工会卡 JSONObject cardInfo = HuiLianTongUnionCardConfig.queryBalance(cardNo); JSONObject resolveResponse = HuiLianTongUnionCardConfig.resolveResponse(cardInfo.getString("data")); return ResponseMsgUtil.success(resolveResponse); } catch (Exception e) { log.error("HighUserCardController --> getHuiLianTongCardByCardNo() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/consumption", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "工会卡支付") public ResponseData consumption(@RequestParam(name = "payRealPrice", required = true) BigDecimal payRealPrice, @RequestParam(name = "cardNo", required = true) String cardNo) { try { String goodsDesc = ""; String tranDesc = ""; String instCode = "11101527"; String businessType = "hisen_consume"; // 工会卡支付 JSONObject consumption = HuiLianTongUnionCardConfig.consumption(OrderUtil.generateOrderNo(), cardNo, payRealPrice, businessType, instCode, goodsDesc, tranDesc); if (!consumption.getString("respCode").equals("0000")) { throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, consumption.getString("respMessage")); } // 响应参数 JSONObject consumptionResult = HuiLianTongUnionCardConfig.resolveResponse(consumption.getString("data")); if (consumptionResult.getBoolean("success") != true) { throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, consumptionResult.getString("message")); } return ResponseMsgUtil.success(consumptionResult); } catch (Exception e) { log.error("HighUserCardController --> getHuiLianTongCardByCardNo() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/refundOrder", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "工会卡退款") public ResponseData refundOrder(@RequestParam(name = "orderNo", required = true) String orderNo) { try { HighOrder order = highOrderService.getOrderByOrderNo(orderNo); if (order.getOrderStatus() != 2) { throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "订单状态错误"); } orderService.refundOrder(order, "工会卡充值退款",OrderRefundOpUserType.TYPE1, null, "系统自动退款"); return ResponseMsgUtil.success("退款成功"); } catch (Exception e) { log.error("HighOrderController --> getBackendToken() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/externalOrderRefund", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "对外订单退款") public ResponseData externalOrderRefund(@RequestParam(name = "paySerialNo", required = true) String paySerialNo, @RequestParam(name = "WxMchId", required = true) String WxMchId, @RequestParam(name = "payRealPrice", required = true) String payRealPrice) { try { Map mapPost = new HashMap<>(); mapPost.put("apiKey" , "B94B5E62807FA56A7260AB581D8A1B48"); mapPost.put("merchId" , "20230394901"); mapPost.put("paySerialNo" , paySerialNo); mapPost.put("wxMchId" , WxMchId); mapPost.put("payRealPrice" , payRealPrice); mapPost.put("refundPrice" , payRealPrice); Map map = new HashMap<>(); map.put("apiKey" , "B94B5E62807FA56A7260AB581D8A1B48"); map.put("merchId" , "20230394901"); map.put("paySerialNo" , paySerialNo); map.put("wxMchId" , WxMchId); map.put("payRealPrice" , payRealPrice); map.put("refundPrice" , payRealPrice); System.out.println(map); mapPost.put("sign" , WxUtils.generateSignApi(map, MapUtils.getString(map, "apiKey"), WXPayConstants.SignType.MD5)); return ResponseMsgUtil.success(HttpsUtils.doPost("https://hsg.dctpay.com/v1/order/externalOrderRefund" , mapPost , new HashMap<>())); } catch (Exception e) { log.error("HighOrderController --> getBackendToken() error!", e); return ResponseMsgUtil.exception(e); } } } \ No newline at end of file diff --git a/hai-cweb/src/main/java/com/cweb/controller/Goods/ShoppingCartController.java b/hai-cweb/src/main/java/com/cweb/controller/Goods/ShoppingCartController.java index 774d4627..54fef48e 100644 --- a/hai-cweb/src/main/java/com/cweb/controller/Goods/ShoppingCartController.java +++ b/hai-cweb/src/main/java/com/cweb/controller/Goods/ShoppingCartController.java @@ -1,5 +1,6 @@ package com.cweb.controller.Goods; +import com.alibaba.fastjson.JSONObject; import com.alipay.api.domain.Shop; import com.hai.common.exception.ErrorCode; import com.hai.common.exception.ErrorHelp; @@ -7,15 +8,14 @@ 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.GoodsDetail; -import com.hai.entity.GoodsShoppingCart; -import com.hai.entity.GoodsSku; +import com.hai.entity.*; import com.hai.goods.model.ShoppingCartModel; import com.hai.goods.service.GoodsDetailService; import com.hai.goods.service.GoodsSkuService; import com.hai.goods.service.ShoppingCartService; import com.hai.model.HighUserModel; import com.hai.model.ResponseData; +import com.hai.service.SecUserService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; @@ -28,6 +28,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.util.*; +import java.util.stream.Collectors; @Controller @RequestMapping(value = "/shoppingCart") @@ -91,7 +92,17 @@ public class ShoppingCartController { } - return ResponseMsgUtil.success(shoppingCartModels); + Map> collect = shoppingCartModels.stream().collect(Collectors.groupingBy(ShoppingCartModel::getOpName)); + + List countRecords = collect.keySet().stream().map(key -> { + JSONObject goodObject = new JSONObject(true); + goodObject.put("name",key.toUpperCase()); + goodObject.put("list",collect.get(key)); + System.out.println(goodObject); + return goodObject; + }).collect(Collectors.toList()); + + return ResponseMsgUtil.success(countRecords); } catch (Exception e) { log.error("GoodsDetailController --> getListUser() error!", e); diff --git a/hai-order/src/main/java/com/web/controller/OrderController.java b/hai-order/src/main/java/com/web/controller/OrderController.java index 5b12c8d4..057ccde4 100644 --- a/hai-order/src/main/java/com/web/controller/OrderController.java +++ b/hai-order/src/main/java/com/web/controller/OrderController.java @@ -179,76 +179,15 @@ public class OrderController { throw ErrorHelp.genException(SysCode.System, ErrorCode.NO_BIND_PHONE, ""); } - String combineOrderNo = OrderUtil.generateOrderNo(); - - List orderModels = createCombine.getCreateOrderModel(); - - for (CreateOrderModel body : orderModels) { - body.setMemId(userModel.getHighUser().getId()); - body.setMemName(userModel.getHighUser().getName()); - body.setMemPhone(userModel.getHighUser().getPhone()); - - if (body.getChildOrderList() == null || body.getChildOrderList().size() == 0) { - log.error("OrderController -> create() error!",""); - throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, ""); - } - - for (CreateOrderChildModel childModel : body.getChildOrderList()) { - - childModel.setMemId(body.getMemId()); - childModel.setMemName(body.getMemName()); - childModel.setMemPhone(body.getMemPhone()); + createCombine.setMemId(userModel.getHighUser().getId()); + createCombine.setMemName(userModel.getHighUser().getName()); + createCombine.setMemPhone(userModel.getHighUser().getPhone()); - // 校验子订单参数 - if (childModel.getGoodsType() == null - || OrderChildGoodsType.getDataByType(childModel.getGoodsType()) == null - || childModel.getGoodsId() == null - || childModel.getSaleCount() == null) { - log.error("OrderController -> create() error!",""); - throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, ""); - } - - if (childModel.getGoodsType().equals(OrderChildGoodsType.TYPE1.getNumber()) - || childModel.getGoodsType().equals(OrderChildGoodsType.TYPE8.getNumber())) { - if (childModel.getGoodsPrice() == null) { - log.error("OrderController -> create() error!",""); - throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未填写充值金额"); - } - - } else if (childModel.getGoodsType().equals(OrderChildGoodsType.TYPE3.getNumber())) { - if (childModel.getGoodsPrice() == null || childModel.getGasOilNo() == null || childModel.getGasGunNo() == null) { - log.error("OrderController -> create() error!",""); - throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未填写加油信息；加油金额、油号、抢号"); - } - } else if (childModel.getGoodsType().equals(OrderChildGoodsType.TYPE6.getNumber())) { - if (childModel.getRechargeContent() == null) { - log.error("OrderController -> create() error!",""); - throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "请输入充值内容！"); - } - } else if (childModel.getGoodsType().equals(OrderChildGoodsType.TYPE4.getNumber()) || childModel.getGoodsType().equals(OrderChildGoodsType.TYPE9.getNumber())|| childModel.getGoodsType().equals(OrderChildGoodsType.TYPE10.getNumber())) { - if (childModel.getCustomerMobile() == null) { - log.error("OrderController -> create() error!",""); - throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "请输入下单手机号！"); - } - } else if (childModel.getGoodsType().equals(OrderChildGoodsType.TYPE11.getNumber())) { - if (childModel.getSkuId() == null) { - log.error("OrderController -> create() error!",""); - throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "请选择规格！"); - } - if (body.getDeliveryAddressId() == null) { - log.error("OrderController -> create() error!",""); - throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "请选择收货地址！"); - } - - } - } + String combineOrderNo = OrderUtil.generateOrderNo(); - body.setOrderNo(OrderUtil.generateOrderNo()); - body.setCombineOrderNo(combineOrderNo); - orderService.createOrder(body); - } + createCombine.setCombineOrderNo(combineOrderNo); - return ResponseMsgUtil.success(combineOrderNo); + return ResponseMsgUtil.success(orderService.createOrderCombine(createCombine)); } catch (Exception e) { log.error("OrderController -> create() error!",e); diff --git a/hai-service/src/main/java/com/hai/dao/TbRechargePayOrderMapper.java b/hai-service/src/main/java/com/hai/dao/TbRechargePayOrderMapper.java deleted file mode 100644 index fb073d49..00000000 --- a/hai-service/src/main/java/com/hai/dao/TbRechargePayOrderMapper.java +++ /dev/null @@ -1,89 +0,0 @@ -package com.hai.dao; - -import com.hai.entity.TbRechargePayOrder; -import com.hai.entity.TbRechargePayOrderExample; -import java.util.List; -import org.apache.ibatis.annotations.DeleteProvider; -import org.apache.ibatis.annotations.Insert; -import org.apache.ibatis.annotations.InsertProvider; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Result; -import org.apache.ibatis.annotations.Results; -import org.apache.ibatis.annotations.SelectProvider; -import org.apache.ibatis.annotations.UpdateProvider; -import org.apache.ibatis.type.JdbcType; -import org.springframework.stereotype.Repository; - -/** - * - * 代码由工具生成,请勿修改!!! - * 如果需要扩展请在其父类进行扩展 - * - **/ -@Repository -public interface TbRechargePayOrderMapper extends TbRechargePayOrderMapperExt { - @SelectProvider(type=TbRechargePayOrderSqlProvider.class, method="countByExample") - long countByExample(TbRechargePayOrderExample example); - - @DeleteProvider(type=TbRechargePayOrderSqlProvider.class, method="deleteByExample") - int deleteByExample(TbRechargePayOrderExample example); - - @Insert({ - "insert into tb_recharge_pay_order (rechargeId, phone, ", - "couNo, `status`, distributorId, ", - "validStartDate, validEndDate, ", - "distCouCount, couTypeCode, ", - "createtime, `createuser`, ", - "modifytime, modifyuser, ", - "preBalance, postBalance, ", - "billVersion, reconVersion, ", - "promoterId, access_type, ", - "staticCheckCode, use_shop)", - "values (#{rechargeid,jdbcType=VARCHAR}, #{phone,jdbcType=VARCHAR}, ", - "#{couno,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, #{distributorid,jdbcType=VARCHAR}, ", - "#{validstartdate,jdbcType=TIMESTAMP}, #{validenddate,jdbcType=TIMESTAMP}, ", - "#{distcoucount,jdbcType=VARCHAR}, #{coutypecode,jdbcType=VARCHAR}, ", - "#{createtime,jdbcType=TIMESTAMP}, #{createuser,jdbcType=VARCHAR}, ", - "#{modifytime,jdbcType=TIMESTAMP}, #{modifyuser,jdbcType=VARCHAR}, ", - "#{prebalance,jdbcType=DECIMAL}, #{postbalance,jdbcType=DECIMAL}, ", - "#{billversion,jdbcType=VARCHAR}, #{reconversion,jdbcType=VARCHAR}, ", - "#{promoterid,jdbcType=VARCHAR}, #{accessType,jdbcType=VARCHAR}, ", - "#{staticcheckcode,jdbcType=VARCHAR}, #{useShop,jdbcType=VARCHAR})" - }) - int insert(TbRechargePayOrder record); - - @InsertProvider(type=TbRechargePayOrderSqlProvider.class, method="insertSelective") - int insertSelective(TbRechargePayOrder record); - - @SelectProvider(type=TbRechargePayOrderSqlProvider.class, method="selectByExample") - @Results({ - @Result(column="rechargeId", property="rechargeid", jdbcType=JdbcType.VARCHAR), - @Result(column="phone", property="phone", jdbcType=JdbcType.VARCHAR), - @Result(column="couNo", property="couno", jdbcType=JdbcType.VARCHAR), - @Result(column="status", property="status", jdbcType=JdbcType.VARCHAR), - @Result(column="distributorId", property="distributorid", jdbcType=JdbcType.VARCHAR), - @Result(column="validStartDate", property="validstartdate", jdbcType=JdbcType.TIMESTAMP), - @Result(column="validEndDate", property="validenddate", jdbcType=JdbcType.TIMESTAMP), - @Result(column="distCouCount", property="distcoucount", jdbcType=JdbcType.VARCHAR), - @Result(column="couTypeCode", property="coutypecode", jdbcType=JdbcType.VARCHAR), - @Result(column="createtime", property="createtime", jdbcType=JdbcType.TIMESTAMP), - @Result(column="createuser", property="createuser", jdbcType=JdbcType.VARCHAR), - @Result(column="modifytime", property="modifytime", jdbcType=JdbcType.TIMESTAMP), - @Result(column="modifyuser", property="modifyuser", jdbcType=JdbcType.VARCHAR), - @Result(column="preBalance", property="prebalance", jdbcType=JdbcType.DECIMAL), - @Result(column="postBalance", property="postbalance", jdbcType=JdbcType.DECIMAL), - @Result(column="billVersion", property="billversion", jdbcType=JdbcType.VARCHAR), - @Result(column="reconVersion", property="reconversion", jdbcType=JdbcType.VARCHAR), - @Result(column="promoterId", property="promoterid", jdbcType=JdbcType.VARCHAR), - @Result(column="access_type", property="accessType", jdbcType=JdbcType.VARCHAR), - @Result(column="staticCheckCode", property="staticcheckcode", jdbcType=JdbcType.VARCHAR), - @Result(column="use_shop", property="useShop", jdbcType=JdbcType.VARCHAR) - }) - List selectByExample(TbRechargePayOrderExample example); - - @UpdateProvider(type=TbRechargePayOrderSqlProvider.class, method="updateByExampleSelective") - int updateByExampleSelective(@Param("record") TbRechargePayOrder record, @Param("example") TbRechargePayOrderExample example); - - @UpdateProvider(type=TbRechargePayOrderSqlProvider.class, method="updateByExample") - int updateByExample(@Param("record") TbRechargePayOrder record, @Param("example") TbRechargePayOrderExample example); -} \ No newline at end of file diff --git a/hai-service/src/main/java/com/hai/dao/TbRechargePayOrderMapperExt.java b/hai-service/src/main/java/com/hai/dao/TbRechargePayOrderMapperExt.java deleted file mode 100644 index c4ee924f..00000000 --- a/hai-service/src/main/java/com/hai/dao/TbRechargePayOrderMapperExt.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.hai.dao; - -/** - * mapper扩展类 - */ -public interface TbRechargePayOrderMapperExt { -} \ No newline at end of file diff --git a/hai-service/src/main/java/com/hai/dao/TbRechargePayOrderSqlProvider.java b/hai-service/src/main/java/com/hai/dao/TbRechargePayOrderSqlProvider.java deleted file mode 100644 index ba0d1a19..00000000 --- a/hai-service/src/main/java/com/hai/dao/TbRechargePayOrderSqlProvider.java +++ /dev/null @@ -1,373 +0,0 @@ -package com.hai.dao; - -import com.hai.entity.TbRechargePayOrder; -import com.hai.entity.TbRechargePayOrderExample.Criteria; -import com.hai.entity.TbRechargePayOrderExample.Criterion; -import com.hai.entity.TbRechargePayOrderExample; -import java.util.List; -import java.util.Map; -import org.apache.ibatis.jdbc.SQL; - -public class TbRechargePayOrderSqlProvider { - - public String countByExample(TbRechargePayOrderExample example) { - SQL sql = new SQL(); - sql.SELECT("count(*)").FROM("tb_recharge_pay_order"); - applyWhere(sql, example, false); - return sql.toString(); - } - - public String deleteByExample(TbRechargePayOrderExample example) { - SQL sql = new SQL(); - sql.DELETE_FROM("tb_recharge_pay_order"); - applyWhere(sql, example, false); - return sql.toString(); - } - - public String insertSelective(TbRechargePayOrder record) { - SQL sql = new SQL(); - sql.INSERT_INTO("tb_recharge_pay_order"); - - if (record.getRechargeid() != null) { - sql.VALUES("rechargeId", "#{rechargeid,jdbcType=VARCHAR}"); - } - - if (record.getPhone() != null) { - sql.VALUES("phone", "#{phone,jdbcType=VARCHAR}"); - } - - if (record.getCouno() != null) { - sql.VALUES("couNo", "#{couno,jdbcType=VARCHAR}"); - } - - if (record.getStatus() != null) { - sql.VALUES("`status`", "#{status,jdbcType=VARCHAR}"); - } - - if (record.getDistributorid() != null) { - sql.VALUES("distributorId", "#{distributorid,jdbcType=VARCHAR}"); - } - - if (record.getValidstartdate() != null) { - sql.VALUES("validStartDate", "#{validstartdate,jdbcType=TIMESTAMP}"); - } - - if (record.getValidenddate() != null) { - sql.VALUES("validEndDate", "#{validenddate,jdbcType=TIMESTAMP}"); - } - - if (record.getDistcoucount() != null) { - sql.VALUES("distCouCount", "#{distcoucount,jdbcType=VARCHAR}"); - } - - if (record.getCoutypecode() != null) { - sql.VALUES("couTypeCode", "#{coutypecode,jdbcType=VARCHAR}"); - } - - if (record.getCreatetime() != null) { - sql.VALUES("createtime", "#{createtime,jdbcType=TIMESTAMP}"); - } - - if (record.getCreateuser() != null) { - sql.VALUES("`createuser`", "#{createuser,jdbcType=VARCHAR}"); - } - - if (record.getModifytime() != null) { - sql.VALUES("modifytime", "#{modifytime,jdbcType=TIMESTAMP}"); - } - - if (record.getModifyuser() != null) { - sql.VALUES("modifyuser", "#{modifyuser,jdbcType=VARCHAR}"); - } - - if (record.getPrebalance() != null) { - sql.VALUES("preBalance", "#{prebalance,jdbcType=DECIMAL}"); - } - - if (record.getPostbalance() != null) { - sql.VALUES("postBalance", "#{postbalance,jdbcType=DECIMAL}"); - } - - if (record.getBillversion() != null) { - sql.VALUES("billVersion", "#{billversion,jdbcType=VARCHAR}"); - } - - if (record.getReconversion() != null) { - sql.VALUES("reconVersion", "#{reconversion,jdbcType=VARCHAR}"); - } - - if (record.getPromoterid() != null) { - sql.VALUES("promoterId", "#{promoterid,jdbcType=VARCHAR}"); - } - - if (record.getAccessType() != null) { - sql.VALUES("access_type", "#{accessType,jdbcType=VARCHAR}"); - } - - if (record.getStaticcheckcode() != null) { - sql.VALUES("staticCheckCode", "#{staticcheckcode,jdbcType=VARCHAR}"); - } - - if (record.getUseShop() != null) { - sql.VALUES("use_shop", "#{useShop,jdbcType=VARCHAR}"); - } - - return sql.toString(); - } - - public String selectByExample(TbRechargePayOrderExample example) { - SQL sql = new SQL(); - if (example != null && example.isDistinct()) { - sql.SELECT_DISTINCT("rechargeId"); - } else { - sql.SELECT("rechargeId"); - } - sql.SELECT("phone"); - sql.SELECT("couNo"); - sql.SELECT("`status`"); - sql.SELECT("distributorId"); - sql.SELECT("validStartDate"); - sql.SELECT("validEndDate"); - sql.SELECT("distCouCount"); - sql.SELECT("couTypeCode"); - sql.SELECT("createtime"); - sql.SELECT("`createuser`"); - sql.SELECT("modifytime"); - sql.SELECT("modifyuser"); - sql.SELECT("preBalance"); - sql.SELECT("postBalance"); - sql.SELECT("billVersion"); - sql.SELECT("reconVersion"); - sql.SELECT("promoterId"); - sql.SELECT("access_type"); - sql.SELECT("staticCheckCode"); - sql.SELECT("use_shop"); - sql.FROM("tb_recharge_pay_order"); - applyWhere(sql, example, false); - - if (example != null && example.getOrderByClause() != null) { - sql.ORDER_BY(example.getOrderByClause()); - } - - return sql.toString(); - } - - public String updateByExampleSelective(Map parameter) { - TbRechargePayOrder record = (TbRechargePayOrder) parameter.get("record"); - TbRechargePayOrderExample example = (TbRechargePayOrderExample) parameter.get("example"); - - SQL sql = new SQL(); - sql.UPDATE("tb_recharge_pay_order"); - - if (record.getRechargeid() != null) { - sql.SET("rechargeId = #{record.rechargeid,jdbcType=VARCHAR}"); - } - - if (record.getPhone() != null) { - sql.SET("phone = #{record.phone,jdbcType=VARCHAR}"); - } - - if (record.getCouno() != null) { - sql.SET("couNo = #{record.couno,jdbcType=VARCHAR}"); - } - - if (record.getStatus() != null) { - sql.SET("`status` = #{record.status,jdbcType=VARCHAR}"); - } - - if (record.getDistributorid() != null) { - sql.SET("distributorId = #{record.distributorid,jdbcType=VARCHAR}"); - } - - if (record.getValidstartdate() != null) { - sql.SET("validStartDate = #{record.validstartdate,jdbcType=TIMESTAMP}"); - } - - if (record.getValidenddate() != null) { - sql.SET("validEndDate = #{record.validenddate,jdbcType=TIMESTAMP}"); - } - - if (record.getDistcoucount() != null) { - sql.SET("distCouCount = #{record.distcoucount,jdbcType=VARCHAR}"); - } - - if (record.getCoutypecode() != null) { - sql.SET("couTypeCode = #{record.coutypecode,jdbcType=VARCHAR}"); - } - - if (record.getCreatetime() != null) { - sql.SET("createtime = #{record.createtime,jdbcType=TIMESTAMP}"); - } - - if (record.getCreateuser() != null) { - sql.SET("`createuser` = #{record.createuser,jdbcType=VARCHAR}"); - } - - if (record.getModifytime() != null) { - sql.SET("modifytime = #{record.modifytime,jdbcType=TIMESTAMP}"); - } - - if (record.getModifyuser() != null) { - sql.SET("modifyuser = #{record.modifyuser,jdbcType=VARCHAR}"); - } - - if (record.getPrebalance() != null) { - sql.SET("preBalance = #{record.prebalance,jdbcType=DECIMAL}"); - } - - if (record.getPostbalance() != null) { - sql.SET("postBalance = #{record.postbalance,jdbcType=DECIMAL}"); - } - - if (record.getBillversion() != null) { - sql.SET("billVersion = #{record.billversion,jdbcType=VARCHAR}"); - } - - if (record.getReconversion() != null) { - sql.SET("reconVersion = #{record.reconversion,jdbcType=VARCHAR}"); - } - - if (record.getPromoterid() != null) { - sql.SET("promoterId = #{record.promoterid,jdbcType=VARCHAR}"); - } - - if (record.getAccessType() != null) { - sql.SET("access_type = #{record.accessType,jdbcType=VARCHAR}"); - } - - if (record.getStaticcheckcode() != null) { - sql.SET("staticCheckCode = #{record.staticcheckcode,jdbcType=VARCHAR}"); - } - - if (record.getUseShop() != null) { - sql.SET("use_shop = #{record.useShop,jdbcType=VARCHAR}"); - } - - applyWhere(sql, example, true); - return sql.toString(); - } - - public String updateByExample(Map parameter) { - SQL sql = new SQL(); - sql.UPDATE("tb_recharge_pay_order"); - - sql.SET("rechargeId = #{record.rechargeid,jdbcType=VARCHAR}"); - sql.SET("phone = #{record.phone,jdbcType=VARCHAR}"); - sql.SET("couNo = #{record.couno,jdbcType=VARCHAR}"); - sql.SET("`status` = #{record.status,jdbcType=VARCHAR}"); - sql.SET("distributorId = #{record.distributorid,jdbcType=VARCHAR}"); - sql.SET("validStartDate = #{record.validstartdate,jdbcType=TIMESTAMP}"); - sql.SET("validEndDate = #{record.validenddate,jdbcType=TIMESTAMP}"); - sql.SET("distCouCount = #{record.distcoucount,jdbcType=VARCHAR}"); - sql.SET("couTypeCode = #{record.coutypecode,jdbcType=VARCHAR}"); - sql.SET("createtime = #{record.createtime,jdbcType=TIMESTAMP}"); - sql.SET("`createuser` = #{record.createuser,jdbcType=VARCHAR}"); - sql.SET("modifytime = #{record.modifytime,jdbcType=TIMESTAMP}"); - sql.SET("modifyuser = #{record.modifyuser,jdbcType=VARCHAR}"); - sql.SET("preBalance = #{record.prebalance,jdbcType=DECIMAL}"); - sql.SET("postBalance = #{record.postbalance,jdbcType=DECIMAL}"); - sql.SET("billVersion = #{record.billversion,jdbcType=VARCHAR}"); - sql.SET("reconVersion = #{record.reconversion,jdbcType=VARCHAR}"); - sql.SET("promoterId = #{record.promoterid,jdbcType=VARCHAR}"); - sql.SET("access_type = #{record.accessType,jdbcType=VARCHAR}"); - sql.SET("staticCheckCode = #{record.staticcheckcode,jdbcType=VARCHAR}"); - sql.SET("use_shop = #{record.useShop,jdbcType=VARCHAR}"); - - TbRechargePayOrderExample example = (TbRechargePayOrderExample) parameter.get("example"); - applyWhere(sql, example, true); - return sql.toString(); - } - - protected void applyWhere(SQL sql, TbRechargePayOrderExample example, boolean includeExamplePhrase) { - if (example == null) { - return; - } - - String parmPhrase1; - String parmPhrase1_th; - String parmPhrase2; - String parmPhrase2_th; - String parmPhrase3; - String parmPhrase3_th; - if (includeExamplePhrase) { - parmPhrase1 = "%s #{example.oredCriteria[%d].allCriteria[%d].value}"; - parmPhrase1_th = "%s #{example.oredCriteria[%d].allCriteria[%d].value,typeHandler=%s}"; - parmPhrase2 = "%s #{example.oredCriteria[%d].allCriteria[%d].value} and #{example.oredCriteria[%d].criteria[%d].secondValue}"; - parmPhrase2_th = "%s #{example.oredCriteria[%d].allCriteria[%d].value,typeHandler=%s} and #{example.oredCriteria[%d].criteria[%d].secondValue,typeHandler=%s}"; - parmPhrase3 = "#{example.oredCriteria[%d].allCriteria[%d].value[%d]}"; - parmPhrase3_th = "#{example.oredCriteria[%d].allCriteria[%d].value[%d],typeHandler=%s}"; - } else { - parmPhrase1 = "%s #{oredCriteria[%d].allCriteria[%d].value}"; - parmPhrase1_th = "%s #{oredCriteria[%d].allCriteria[%d].value,typeHandler=%s}"; - parmPhrase2 = "%s #{oredCriteria[%d].allCriteria[%d].value} and #{oredCriteria[%d].criteria[%d].secondValue}"; - parmPhrase2_th = "%s #{oredCriteria[%d].allCriteria[%d].value,typeHandler=%s} and #{oredCriteria[%d].criteria[%d].secondValue,typeHandler=%s}"; - parmPhrase3 = "#{oredCriteria[%d].allCriteria[%d].value[%d]}"; - parmPhrase3_th = "#{oredCriteria[%d].allCriteria[%d].value[%d],typeHandler=%s}"; - } - - StringBuilder sb = new StringBuilder(); - List oredCriteria = example.getOredCriteria(); - boolean firstCriteria = true; - for (int i = 0; i < oredCriteria.size(); i++) { - Criteria criteria = oredCriteria.get(i); - if (criteria.isValid()) { - if (firstCriteria) { - firstCriteria = false; - } else { - sb.append(" or "); - } - - sb.append('('); - List criterions = criteria.getAllCriteria(); - boolean firstCriterion = true; - for (int j = 0; j < criterions.size(); j++) { - Criterion criterion = criterions.get(j); - if (firstCriterion) { - firstCriterion = false; - } else { - sb.append(" and "); - } - - if (criterion.isNoValue()) { - sb.append(criterion.getCondition()); - } else if (criterion.isSingleValue()) { - if (criterion.getTypeHandler() == null) { - sb.append(String.format(parmPhrase1, criterion.getCondition(), i, j)); - } else { - sb.append(String.format(parmPhrase1_th, criterion.getCondition(), i, j,criterion.getTypeHandler())); - } - } else if (criterion.isBetweenValue()) { - if (criterion.getTypeHandler() == null) { - sb.append(String.format(parmPhrase2, criterion.getCondition(), i, j, i, j)); - } else { - sb.append(String.format(parmPhrase2_th, criterion.getCondition(), i, j, criterion.getTypeHandler(), i, j, criterion.getTypeHandler())); - } - } else if (criterion.isListValue()) { - sb.append(criterion.getCondition()); - sb.append(" ("); - List listItems = (List) criterion.getValue(); - boolean comma = false; - for (int k = 0; k < listItems.size(); k++) { - if (comma) { - sb.append(", "); - } else { - comma = true; - } - if (criterion.getTypeHandler() == null) { - sb.append(String.format(parmPhrase3, i, j, k)); - } else { - sb.append(String.format(parmPhrase3_th, i, j, k, criterion.getTypeHandler())); - } - } - sb.append(')'); - } - } - sb.append(')'); - } - } - - if (sb.length() > 0) { - sql.WHERE(sb.toString()); - } - } -} \ No newline at end of file diff --git a/hai-service/src/main/java/com/hai/entity/TbRechargePayOrder.java b/hai-service/src/main/java/com/hai/entity/TbRechargePayOrder.java deleted file mode 100644 index 6cf843fb..00000000 --- a/hai-service/src/main/java/com/hai/entity/TbRechargePayOrder.java +++ /dev/null @@ -1,323 +0,0 @@ -package com.hai.entity; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -/** - * tb_recharge_pay_order - * @author - */ -/** - * - * 代码由工具生成 - * - **/ -public class TbRechargePayOrder implements Serializable { - private String rechargeid; - - private String phone; - - private String couno; - - private String status; - - private String distributorid; - - private Date validstartdate; - - private Date validenddate; - - private String distcoucount; - - private String coutypecode; - - private Date createtime; - - private String createuser; - - private Date modifytime; - - private String modifyuser; - - private BigDecimal prebalance; - - private BigDecimal postbalance; - - private String billversion; - - private String reconversion; - - private String promoterid; - - private String accessType; - - private String staticcheckcode; - - private String useShop; - - private static final long serialVersionUID = 1L; - - public String getRechargeid() { - return rechargeid; - } - - public void setRechargeid(String rechargeid) { - this.rechargeid = rechargeid; - } - - public String getPhone() { - return phone; - } - - public void setPhone(String phone) { - this.phone = phone; - } - - public String getCouno() { - return couno; - } - - public void setCouno(String couno) { - this.couno = couno; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getDistributorid() { - return distributorid; - } - - public void setDistributorid(String distributorid) { - this.distributorid = distributorid; - } - - public Date getValidstartdate() { - return validstartdate; - } - - public void setValidstartdate(Date validstartdate) { - this.validstartdate = validstartdate; - } - - public Date getValidenddate() { - return validenddate; - } - - public void setValidenddate(Date validenddate) { - this.validenddate = validenddate; - } - - public String getDistcoucount() { - return distcoucount; - } - - public void setDistcoucount(String distcoucount) { - this.distcoucount = distcoucount; - } - - public String getCoutypecode() { - return coutypecode; - } - - public void setCoutypecode(String coutypecode) { - this.coutypecode = coutypecode; - } - - public Date getCreatetime() { - return createtime; - } - - public void setCreatetime(Date createtime) { - this.createtime = createtime; - } - - public String getCreateuser() { - return createuser; - } - - public void setCreateuser(String createuser) { - this.createuser = createuser; - } - - public Date getModifytime() { - return modifytime; - } - - public void setModifytime(Date modifytime) { - this.modifytime = modifytime; - } - - public String getModifyuser() { - return modifyuser; - } - - public void setModifyuser(String modifyuser) { - this.modifyuser = modifyuser; - } - - public BigDecimal getPrebalance() { - return prebalance; - } - - public void setPrebalance(BigDecimal prebalance) { - this.prebalance = prebalance; - } - - public BigDecimal getPostbalance() { - return postbalance; - } - - public void setPostbalance(BigDecimal postbalance) { - this.postbalance = postbalance; - } - - public String getBillversion() { - return billversion; - } - - public void setBillversion(String billversion) { - this.billversion = billversion; - } - - public String getReconversion() { - return reconversion; - } - - public void setReconversion(String reconversion) { - this.reconversion = reconversion; - } - - public String getPromoterid() { - return promoterid; - } - - public void setPromoterid(String promoterid) { - this.promoterid = promoterid; - } - - public String getAccessType() { - return accessType; - } - - public void setAccessType(String accessType) { - this.accessType = accessType; - } - - public String getStaticcheckcode() { - return staticcheckcode; - } - - public void setStaticcheckcode(String staticcheckcode) { - this.staticcheckcode = staticcheckcode; - } - - public String getUseShop() { - return useShop; - } - - public void setUseShop(String useShop) { - this.useShop = useShop; - } - - @Override - public boolean equals(Object that) { - if (this == that) { - return true; - } - if (that == null) { - return false; - } - if (getClass() != that.getClass()) { - return false; - } - TbRechargePayOrder other = (TbRechargePayOrder) that; - return (this.getRechargeid() == null ? other.getRechargeid() == null : this.getRechargeid().equals(other.getRechargeid())) - && (this.getPhone() == null ? other.getPhone() == null : this.getPhone().equals(other.getPhone())) - && (this.getCouno() == null ? other.getCouno() == null : this.getCouno().equals(other.getCouno())) - && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus())) - && (this.getDistributorid() == null ? other.getDistributorid() == null : this.getDistributorid().equals(other.getDistributorid())) - && (this.getValidstartdate() == null ? other.getValidstartdate() == null : this.getValidstartdate().equals(other.getValidstartdate())) - && (this.getValidenddate() == null ? other.getValidenddate() == null : this.getValidenddate().equals(other.getValidenddate())) - && (this.getDistcoucount() == null ? other.getDistcoucount() == null : this.getDistcoucount().equals(other.getDistcoucount())) - && (this.getCoutypecode() == null ? other.getCoutypecode() == null : this.getCoutypecode().equals(other.getCoutypecode())) - && (this.getCreatetime() == null ? other.getCreatetime() == null : this.getCreatetime().equals(other.getCreatetime())) - && (this.getCreateuser() == null ? other.getCreateuser() == null : this.getCreateuser().equals(other.getCreateuser())) - && (this.getModifytime() == null ? other.getModifytime() == null : this.getModifytime().equals(other.getModifytime())) - && (this.getModifyuser() == null ? other.getModifyuser() == null : this.getModifyuser().equals(other.getModifyuser())) - && (this.getPrebalance() == null ? other.getPrebalance() == null : this.getPrebalance().equals(other.getPrebalance())) - && (this.getPostbalance() == null ? other.getPostbalance() == null : this.getPostbalance().equals(other.getPostbalance())) - && (this.getBillversion() == null ? other.getBillversion() == null : this.getBillversion().equals(other.getBillversion())) - && (this.getReconversion() == null ? other.getReconversion() == null : this.getReconversion().equals(other.getReconversion())) - && (this.getPromoterid() == null ? other.getPromoterid() == null : this.getPromoterid().equals(other.getPromoterid())) - && (this.getAccessType() == null ? other.getAccessType() == null : this.getAccessType().equals(other.getAccessType())) - && (this.getStaticcheckcode() == null ? other.getStaticcheckcode() == null : this.getStaticcheckcode().equals(other.getStaticcheckcode())) - && (this.getUseShop() == null ? other.getUseShop() == null : this.getUseShop().equals(other.getUseShop())); - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((getRechargeid() == null) ? 0 : getRechargeid().hashCode()); - result = prime * result + ((getPhone() == null) ? 0 : getPhone().hashCode()); - result = prime * result + ((getCouno() == null) ? 0 : getCouno().hashCode()); - result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode()); - result = prime * result + ((getDistributorid() == null) ? 0 : getDistributorid().hashCode()); - result = prime * result + ((getValidstartdate() == null) ? 0 : getValidstartdate().hashCode()); - result = prime * result + ((getValidenddate() == null) ? 0 : getValidenddate().hashCode()); - result = prime * result + ((getDistcoucount() == null) ? 0 : getDistcoucount().hashCode()); - result = prime * result + ((getCoutypecode() == null) ? 0 : getCoutypecode().hashCode()); - result = prime * result + ((getCreatetime() == null) ? 0 : getCreatetime().hashCode()); - result = prime * result + ((getCreateuser() == null) ? 0 : getCreateuser().hashCode()); - result = prime * result + ((getModifytime() == null) ? 0 : getModifytime().hashCode()); - result = prime * result + ((getModifyuser() == null) ? 0 : getModifyuser().hashCode()); - result = prime * result + ((getPrebalance() == null) ? 0 : getPrebalance().hashCode()); - result = prime * result + ((getPostbalance() == null) ? 0 : getPostbalance().hashCode()); - result = prime * result + ((getBillversion() == null) ? 0 : getBillversion().hashCode()); - result = prime * result + ((getReconversion() == null) ? 0 : getReconversion().hashCode()); - result = prime * result + ((getPromoterid() == null) ? 0 : getPromoterid().hashCode()); - result = prime * result + ((getAccessType() == null) ? 0 : getAccessType().hashCode()); - result = prime * result + ((getStaticcheckcode() == null) ? 0 : getStaticcheckcode().hashCode()); - result = prime * result + ((getUseShop() == null) ? 0 : getUseShop().hashCode()); - return result; - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append(getClass().getSimpleName()); - sb.append(" ["); - sb.append("Hash = ").append(hashCode()); - sb.append(", rechargeid=").append(rechargeid); - sb.append(", phone=").append(phone); - sb.append(", couno=").append(couno); - sb.append(", status=").append(status); - sb.append(", distributorid=").append(distributorid); - sb.append(", validstartdate=").append(validstartdate); - sb.append(", validenddate=").append(validenddate); - sb.append(", distcoucount=").append(distcoucount); - sb.append(", coutypecode=").append(coutypecode); - sb.append(", createtime=").append(createtime); - sb.append(", createuser=").append(createuser); - sb.append(", modifytime=").append(modifytime); - sb.append(", modifyuser=").append(modifyuser); - sb.append(", prebalance=").append(prebalance); - sb.append(", postbalance=").append(postbalance); - sb.append(", billversion=").append(billversion); - sb.append(", reconversion=").append(reconversion); - sb.append(", promoterid=").append(promoterid); - sb.append(", accessType=").append(accessType); - sb.append(", staticcheckcode=").append(staticcheckcode); - sb.append(", useShop=").append(useShop); - 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/TbRechargePayOrderExample.java b/hai-service/src/main/java/com/hai/entity/TbRechargePayOrderExample.java deleted file mode 100644 index 30d57bde..00000000 --- a/hai-service/src/main/java/com/hai/entity/TbRechargePayOrderExample.java +++ /dev/null @@ -1,1634 +0,0 @@ -package com.hai.entity; - -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -public class TbRechargePayOrderExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - private Integer limit; - - private Long offset; - - public TbRechargePayOrderExample() { - 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 andRechargeidIsNull() { - addCriterion("rechargeId is null"); - return (Criteria) this; - } - - public Criteria andRechargeidIsNotNull() { - addCriterion("rechargeId is not null"); - return (Criteria) this; - } - - public Criteria andRechargeidEqualTo(String value) { - addCriterion("rechargeId =", value, "rechargeid"); - return (Criteria) this; - } - - public Criteria andRechargeidNotEqualTo(String value) { - addCriterion("rechargeId <>", value, "rechargeid"); - return (Criteria) this; - } - - public Criteria andRechargeidGreaterThan(String value) { - addCriterion("rechargeId >", value, "rechargeid"); - return (Criteria) this; - } - - public Criteria andRechargeidGreaterThanOrEqualTo(String value) { - addCriterion("rechargeId >=", value, "rechargeid"); - return (Criteria) this; - } - - public Criteria andRechargeidLessThan(String value) { - addCriterion("rechargeId <", value, "rechargeid"); - return (Criteria) this; - } - - public Criteria andRechargeidLessThanOrEqualTo(String value) { - addCriterion("rechargeId <=", value, "rechargeid"); - return (Criteria) this; - } - - public Criteria andRechargeidLike(String value) { - addCriterion("rechargeId like", value, "rechargeid"); - return (Criteria) this; - } - - public Criteria andRechargeidNotLike(String value) { - addCriterion("rechargeId not like", value, "rechargeid"); - return (Criteria) this; - } - - public Criteria andRechargeidIn(List values) { - addCriterion("rechargeId in", values, "rechargeid"); - return (Criteria) this; - } - - public Criteria andRechargeidNotIn(List values) { - addCriterion("rechargeId not in", values, "rechargeid"); - return (Criteria) this; - } - - public Criteria andRechargeidBetween(String value1, String value2) { - addCriterion("rechargeId between", value1, value2, "rechargeid"); - return (Criteria) this; - } - - public Criteria andRechargeidNotBetween(String value1, String value2) { - addCriterion("rechargeId not between", value1, value2, "rechargeid"); - return (Criteria) this; - } - - public Criteria andPhoneIsNull() { - addCriterion("phone is null"); - return (Criteria) this; - } - - public Criteria andPhoneIsNotNull() { - addCriterion("phone is not null"); - return (Criteria) this; - } - - public Criteria andPhoneEqualTo(String value) { - addCriterion("phone =", value, "phone"); - return (Criteria) this; - } - - public Criteria andPhoneNotEqualTo(String value) { - addCriterion("phone <>", value, "phone"); - return (Criteria) this; - } - - public Criteria andPhoneGreaterThan(String value) { - addCriterion("phone >", value, "phone"); - return (Criteria) this; - } - - public Criteria andPhoneGreaterThanOrEqualTo(String value) { - addCriterion("phone >=", value, "phone"); - return (Criteria) this; - } - - public Criteria andPhoneLessThan(String value) { - addCriterion("phone <", value, "phone"); - return (Criteria) this; - } - - public Criteria andPhoneLessThanOrEqualTo(String value) { - addCriterion("phone <=", value, "phone"); - return (Criteria) this; - } - - public Criteria andPhoneLike(String value) { - addCriterion("phone like", value, "phone"); - return (Criteria) this; - } - - public Criteria andPhoneNotLike(String value) { - addCriterion("phone not like", value, "phone"); - return (Criteria) this; - } - - public Criteria andPhoneIn(List values) { - addCriterion("phone in", values, "phone"); - return (Criteria) this; - } - - public Criteria andPhoneNotIn(List values) { - addCriterion("phone not in", values, "phone"); - return (Criteria) this; - } - - public Criteria andPhoneBetween(String value1, String value2) { - addCriterion("phone between", value1, value2, "phone"); - return (Criteria) this; - } - - public Criteria andPhoneNotBetween(String value1, String value2) { - addCriterion("phone not between", value1, value2, "phone"); - return (Criteria) this; - } - - public Criteria andCounoIsNull() { - addCriterion("couNo is null"); - return (Criteria) this; - } - - public Criteria andCounoIsNotNull() { - addCriterion("couNo is not null"); - return (Criteria) this; - } - - public Criteria andCounoEqualTo(String value) { - addCriterion("couNo =", value, "couno"); - return (Criteria) this; - } - - public Criteria andCounoNotEqualTo(String value) { - addCriterion("couNo <>", value, "couno"); - return (Criteria) this; - } - - public Criteria andCounoGreaterThan(String value) { - addCriterion("couNo >", value, "couno"); - return (Criteria) this; - } - - public Criteria andCounoGreaterThanOrEqualTo(String value) { - addCriterion("couNo >=", value, "couno"); - return (Criteria) this; - } - - public Criteria andCounoLessThan(String value) { - addCriterion("couNo <", value, "couno"); - return (Criteria) this; - } - - public Criteria andCounoLessThanOrEqualTo(String value) { - addCriterion("couNo <=", value, "couno"); - return (Criteria) this; - } - - public Criteria andCounoLike(String value) { - addCriterion("couNo like", value, "couno"); - return (Criteria) this; - } - - public Criteria andCounoNotLike(String value) { - addCriterion("couNo not like", value, "couno"); - return (Criteria) this; - } - - public Criteria andCounoIn(List values) { - addCriterion("couNo in", values, "couno"); - return (Criteria) this; - } - - public Criteria andCounoNotIn(List values) { - addCriterion("couNo not in", values, "couno"); - return (Criteria) this; - } - - public Criteria andCounoBetween(String value1, String value2) { - addCriterion("couNo between", value1, value2, "couno"); - return (Criteria) this; - } - - public Criteria andCounoNotBetween(String value1, String value2) { - addCriterion("couNo not between", value1, value2, "couno"); - 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(String value) { - addCriterion("`status` =", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusNotEqualTo(String value) { - addCriterion("`status` <>", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusGreaterThan(String value) { - addCriterion("`status` >", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusGreaterThanOrEqualTo(String value) { - addCriterion("`status` >=", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusLessThan(String value) { - addCriterion("`status` <", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusLessThanOrEqualTo(String value) { - addCriterion("`status` <=", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusLike(String value) { - addCriterion("`status` like", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusNotLike(String value) { - addCriterion("`status` not like", 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(String value1, String value2) { - addCriterion("`status` between", value1, value2, "status"); - return (Criteria) this; - } - - public Criteria andStatusNotBetween(String value1, String value2) { - addCriterion("`status` not between", value1, value2, "status"); - return (Criteria) this; - } - - public Criteria andDistributoridIsNull() { - addCriterion("distributorId is null"); - return (Criteria) this; - } - - public Criteria andDistributoridIsNotNull() { - addCriterion("distributorId is not null"); - return (Criteria) this; - } - - public Criteria andDistributoridEqualTo(String value) { - addCriterion("distributorId =", value, "distributorid"); - return (Criteria) this; - } - - public Criteria andDistributoridNotEqualTo(String value) { - addCriterion("distributorId <>", value, "distributorid"); - return (Criteria) this; - } - - public Criteria andDistributoridGreaterThan(String value) { - addCriterion("distributorId >", value, "distributorid"); - return (Criteria) this; - } - - public Criteria andDistributoridGreaterThanOrEqualTo(String value) { - addCriterion("distributorId >=", value, "distributorid"); - return (Criteria) this; - } - - public Criteria andDistributoridLessThan(String value) { - addCriterion("distributorId <", value, "distributorid"); - return (Criteria) this; - } - - public Criteria andDistributoridLessThanOrEqualTo(String value) { - addCriterion("distributorId <=", value, "distributorid"); - return (Criteria) this; - } - - public Criteria andDistributoridLike(String value) { - addCriterion("distributorId like", value, "distributorid"); - return (Criteria) this; - } - - public Criteria andDistributoridNotLike(String value) { - addCriterion("distributorId not like", value, "distributorid"); - return (Criteria) this; - } - - public Criteria andDistributoridIn(List values) { - addCriterion("distributorId in", values, "distributorid"); - return (Criteria) this; - } - - public Criteria andDistributoridNotIn(List values) { - addCriterion("distributorId not in", values, "distributorid"); - return (Criteria) this; - } - - public Criteria andDistributoridBetween(String value1, String value2) { - addCriterion("distributorId between", value1, value2, "distributorid"); - return (Criteria) this; - } - - public Criteria andDistributoridNotBetween(String value1, String value2) { - addCriterion("distributorId not between", value1, value2, "distributorid"); - return (Criteria) this; - } - - public Criteria andValidstartdateIsNull() { - addCriterion("validStartDate is null"); - return (Criteria) this; - } - - public Criteria andValidstartdateIsNotNull() { - addCriterion("validStartDate is not null"); - return (Criteria) this; - } - - public Criteria andValidstartdateEqualTo(Date value) { - addCriterion("validStartDate =", value, "validstartdate"); - return (Criteria) this; - } - - public Criteria andValidstartdateNotEqualTo(Date value) { - addCriterion("validStartDate <>", value, "validstartdate"); - return (Criteria) this; - } - - public Criteria andValidstartdateGreaterThan(Date value) { - addCriterion("validStartDate >", value, "validstartdate"); - return (Criteria) this; - } - - public Criteria andValidstartdateGreaterThanOrEqualTo(Date value) { - addCriterion("validStartDate >=", value, "validstartdate"); - return (Criteria) this; - } - - public Criteria andValidstartdateLessThan(Date value) { - addCriterion("validStartDate <", value, "validstartdate"); - return (Criteria) this; - } - - public Criteria andValidstartdateLessThanOrEqualTo(Date value) { - addCriterion("validStartDate <=", value, "validstartdate"); - return (Criteria) this; - } - - public Criteria andValidstartdateIn(List values) { - addCriterion("validStartDate in", values, "validstartdate"); - return (Criteria) this; - } - - public Criteria andValidstartdateNotIn(List values) { - addCriterion("validStartDate not in", values, "validstartdate"); - return (Criteria) this; - } - - public Criteria andValidstartdateBetween(Date value1, Date value2) { - addCriterion("validStartDate between", value1, value2, "validstartdate"); - return (Criteria) this; - } - - public Criteria andValidstartdateNotBetween(Date value1, Date value2) { - addCriterion("validStartDate not between", value1, value2, "validstartdate"); - return (Criteria) this; - } - - public Criteria andValidenddateIsNull() { - addCriterion("validEndDate is null"); - return (Criteria) this; - } - - public Criteria andValidenddateIsNotNull() { - addCriterion("validEndDate is not null"); - return (Criteria) this; - } - - public Criteria andValidenddateEqualTo(Date value) { - addCriterion("validEndDate =", value, "validenddate"); - return (Criteria) this; - } - - public Criteria andValidenddateNotEqualTo(Date value) { - addCriterion("validEndDate <>", value, "validenddate"); - return (Criteria) this; - } - - public Criteria andValidenddateGreaterThan(Date value) { - addCriterion("validEndDate >", value, "validenddate"); - return (Criteria) this; - } - - public Criteria andValidenddateGreaterThanOrEqualTo(Date value) { - addCriterion("validEndDate >=", value, "validenddate"); - return (Criteria) this; - } - - public Criteria andValidenddateLessThan(Date value) { - addCriterion("validEndDate <", value, "validenddate"); - return (Criteria) this; - } - - public Criteria andValidenddateLessThanOrEqualTo(Date value) { - addCriterion("validEndDate <=", value, "validenddate"); - return (Criteria) this; - } - - public Criteria andValidenddateIn(List values) { - addCriterion("validEndDate in", values, "validenddate"); - return (Criteria) this; - } - - public Criteria andValidenddateNotIn(List values) { - addCriterion("validEndDate not in", values, "validenddate"); - return (Criteria) this; - } - - public Criteria andValidenddateBetween(Date value1, Date value2) { - addCriterion("validEndDate between", value1, value2, "validenddate"); - return (Criteria) this; - } - - public Criteria andValidenddateNotBetween(Date value1, Date value2) { - addCriterion("validEndDate not between", value1, value2, "validenddate"); - return (Criteria) this; - } - - public Criteria andDistcoucountIsNull() { - addCriterion("distCouCount is null"); - return (Criteria) this; - } - - public Criteria andDistcoucountIsNotNull() { - addCriterion("distCouCount is not null"); - return (Criteria) this; - } - - public Criteria andDistcoucountEqualTo(String value) { - addCriterion("distCouCount =", value, "distcoucount"); - return (Criteria) this; - } - - public Criteria andDistcoucountNotEqualTo(String value) { - addCriterion("distCouCount <>", value, "distcoucount"); - return (Criteria) this; - } - - public Criteria andDistcoucountGreaterThan(String value) { - addCriterion("distCouCount >", value, "distcoucount"); - return (Criteria) this; - } - - public Criteria andDistcoucountGreaterThanOrEqualTo(String value) { - addCriterion("distCouCount >=", value, "distcoucount"); - return (Criteria) this; - } - - public Criteria andDistcoucountLessThan(String value) { - addCriterion("distCouCount <", value, "distcoucount"); - return (Criteria) this; - } - - public Criteria andDistcoucountLessThanOrEqualTo(String value) { - addCriterion("distCouCount <=", value, "distcoucount"); - return (Criteria) this; - } - - public Criteria andDistcoucountLike(String value) { - addCriterion("distCouCount like", value, "distcoucount"); - return (Criteria) this; - } - - public Criteria andDistcoucountNotLike(String value) { - addCriterion("distCouCount not like", value, "distcoucount"); - return (Criteria) this; - } - - public Criteria andDistcoucountIn(List values) { - addCriterion("distCouCount in", values, "distcoucount"); - return (Criteria) this; - } - - public Criteria andDistcoucountNotIn(List values) { - addCriterion("distCouCount not in", values, "distcoucount"); - return (Criteria) this; - } - - public Criteria andDistcoucountBetween(String value1, String value2) { - addCriterion("distCouCount between", value1, value2, "distcoucount"); - return (Criteria) this; - } - - public Criteria andDistcoucountNotBetween(String value1, String value2) { - addCriterion("distCouCount not between", value1, value2, "distcoucount"); - return (Criteria) this; - } - - public Criteria andCoutypecodeIsNull() { - addCriterion("couTypeCode is null"); - return (Criteria) this; - } - - public Criteria andCoutypecodeIsNotNull() { - addCriterion("couTypeCode is not null"); - return (Criteria) this; - } - - public Criteria andCoutypecodeEqualTo(String value) { - addCriterion("couTypeCode =", value, "coutypecode"); - return (Criteria) this; - } - - public Criteria andCoutypecodeNotEqualTo(String value) { - addCriterion("couTypeCode <>", value, "coutypecode"); - return (Criteria) this; - } - - public Criteria andCoutypecodeGreaterThan(String value) { - addCriterion("couTypeCode >", value, "coutypecode"); - return (Criteria) this; - } - - public Criteria andCoutypecodeGreaterThanOrEqualTo(String value) { - addCriterion("couTypeCode >=", value, "coutypecode"); - return (Criteria) this; - } - - public Criteria andCoutypecodeLessThan(String value) { - addCriterion("couTypeCode <", value, "coutypecode"); - return (Criteria) this; - } - - public Criteria andCoutypecodeLessThanOrEqualTo(String value) { - addCriterion("couTypeCode <=", value, "coutypecode"); - return (Criteria) this; - } - - public Criteria andCoutypecodeLike(String value) { - addCriterion("couTypeCode like", value, "coutypecode"); - return (Criteria) this; - } - - public Criteria andCoutypecodeNotLike(String value) { - addCriterion("couTypeCode not like", value, "coutypecode"); - return (Criteria) this; - } - - public Criteria andCoutypecodeIn(List values) { - addCriterion("couTypeCode in", values, "coutypecode"); - return (Criteria) this; - } - - public Criteria andCoutypecodeNotIn(List values) { - addCriterion("couTypeCode not in", values, "coutypecode"); - return (Criteria) this; - } - - public Criteria andCoutypecodeBetween(String value1, String value2) { - addCriterion("couTypeCode between", value1, value2, "coutypecode"); - return (Criteria) this; - } - - public Criteria andCoutypecodeNotBetween(String value1, String value2) { - addCriterion("couTypeCode not between", value1, value2, "coutypecode"); - return (Criteria) this; - } - - public Criteria andCreatetimeIsNull() { - addCriterion("createtime is null"); - return (Criteria) this; - } - - public Criteria andCreatetimeIsNotNull() { - addCriterion("createtime is not null"); - return (Criteria) this; - } - - public Criteria andCreatetimeEqualTo(Date value) { - addCriterion("createtime =", value, "createtime"); - return (Criteria) this; - } - - public Criteria andCreatetimeNotEqualTo(Date value) { - addCriterion("createtime <>", value, "createtime"); - return (Criteria) this; - } - - public Criteria andCreatetimeGreaterThan(Date value) { - addCriterion("createtime >", value, "createtime"); - return (Criteria) this; - } - - public Criteria andCreatetimeGreaterThanOrEqualTo(Date value) { - addCriterion("createtime >=", value, "createtime"); - return (Criteria) this; - } - - public Criteria andCreatetimeLessThan(Date value) { - addCriterion("createtime <", value, "createtime"); - return (Criteria) this; - } - - public Criteria andCreatetimeLessThanOrEqualTo(Date value) { - addCriterion("createtime <=", value, "createtime"); - return (Criteria) this; - } - - public Criteria andCreatetimeIn(List values) { - addCriterion("createtime in", values, "createtime"); - return (Criteria) this; - } - - public Criteria andCreatetimeNotIn(List values) { - addCriterion("createtime not in", values, "createtime"); - return (Criteria) this; - } - - public Criteria andCreatetimeBetween(Date value1, Date value2) { - addCriterion("createtime between", value1, value2, "createtime"); - return (Criteria) this; - } - - public Criteria andCreatetimeNotBetween(Date value1, Date value2) { - addCriterion("createtime not between", value1, value2, "createtime"); - return (Criteria) this; - } - - public Criteria andCreateuserIsNull() { - addCriterion("`createuser` is null"); - return (Criteria) this; - } - - public Criteria andCreateuserIsNotNull() { - addCriterion("`createuser` is not null"); - return (Criteria) this; - } - - public Criteria andCreateuserEqualTo(String value) { - addCriterion("`createuser` =", value, "createuser"); - return (Criteria) this; - } - - public Criteria andCreateuserNotEqualTo(String value) { - addCriterion("`createuser` <>", value, "createuser"); - return (Criteria) this; - } - - public Criteria andCreateuserGreaterThan(String value) { - addCriterion("`createuser` >", value, "createuser"); - return (Criteria) this; - } - - public Criteria andCreateuserGreaterThanOrEqualTo(String value) { - addCriterion("`createuser` >=", value, "createuser"); - return (Criteria) this; - } - - public Criteria andCreateuserLessThan(String value) { - addCriterion("`createuser` <", value, "createuser"); - return (Criteria) this; - } - - public Criteria andCreateuserLessThanOrEqualTo(String value) { - addCriterion("`createuser` <=", value, "createuser"); - return (Criteria) this; - } - - public Criteria andCreateuserLike(String value) { - addCriterion("`createuser` like", value, "createuser"); - return (Criteria) this; - } - - public Criteria andCreateuserNotLike(String value) { - addCriterion("`createuser` not like", value, "createuser"); - return (Criteria) this; - } - - public Criteria andCreateuserIn(List values) { - addCriterion("`createuser` in", values, "createuser"); - return (Criteria) this; - } - - public Criteria andCreateuserNotIn(List values) { - addCriterion("`createuser` not in", values, "createuser"); - return (Criteria) this; - } - - public Criteria andCreateuserBetween(String value1, String value2) { - addCriterion("`createuser` between", value1, value2, "createuser"); - return (Criteria) this; - } - - public Criteria andCreateuserNotBetween(String value1, String value2) { - addCriterion("`createuser` not between", value1, value2, "createuser"); - return (Criteria) this; - } - - public Criteria andModifytimeIsNull() { - addCriterion("modifytime is null"); - return (Criteria) this; - } - - public Criteria andModifytimeIsNotNull() { - addCriterion("modifytime is not null"); - return (Criteria) this; - } - - public Criteria andModifytimeEqualTo(Date value) { - addCriterion("modifytime =", value, "modifytime"); - return (Criteria) this; - } - - public Criteria andModifytimeNotEqualTo(Date value) { - addCriterion("modifytime <>", value, "modifytime"); - return (Criteria) this; - } - - public Criteria andModifytimeGreaterThan(Date value) { - addCriterion("modifytime >", value, "modifytime"); - return (Criteria) this; - } - - public Criteria andModifytimeGreaterThanOrEqualTo(Date value) { - addCriterion("modifytime >=", value, "modifytime"); - return (Criteria) this; - } - - public Criteria andModifytimeLessThan(Date value) { - addCriterion("modifytime <", value, "modifytime"); - return (Criteria) this; - } - - public Criteria andModifytimeLessThanOrEqualTo(Date value) { - addCriterion("modifytime <=", value, "modifytime"); - return (Criteria) this; - } - - public Criteria andModifytimeIn(List values) { - addCriterion("modifytime in", values, "modifytime"); - return (Criteria) this; - } - - public Criteria andModifytimeNotIn(List values) { - addCriterion("modifytime not in", values, "modifytime"); - return (Criteria) this; - } - - public Criteria andModifytimeBetween(Date value1, Date value2) { - addCriterion("modifytime between", value1, value2, "modifytime"); - return (Criteria) this; - } - - public Criteria andModifytimeNotBetween(Date value1, Date value2) { - addCriterion("modifytime not between", value1, value2, "modifytime"); - return (Criteria) this; - } - - public Criteria andModifyuserIsNull() { - addCriterion("modifyuser is null"); - return (Criteria) this; - } - - public Criteria andModifyuserIsNotNull() { - addCriterion("modifyuser is not null"); - return (Criteria) this; - } - - public Criteria andModifyuserEqualTo(String value) { - addCriterion("modifyuser =", value, "modifyuser"); - return (Criteria) this; - } - - public Criteria andModifyuserNotEqualTo(String value) { - addCriterion("modifyuser <>", value, "modifyuser"); - return (Criteria) this; - } - - public Criteria andModifyuserGreaterThan(String value) { - addCriterion("modifyuser >", value, "modifyuser"); - return (Criteria) this; - } - - public Criteria andModifyuserGreaterThanOrEqualTo(String value) { - addCriterion("modifyuser >=", value, "modifyuser"); - return (Criteria) this; - } - - public Criteria andModifyuserLessThan(String value) { - addCriterion("modifyuser <", value, "modifyuser"); - return (Criteria) this; - } - - public Criteria andModifyuserLessThanOrEqualTo(String value) { - addCriterion("modifyuser <=", value, "modifyuser"); - return (Criteria) this; - } - - public Criteria andModifyuserLike(String value) { - addCriterion("modifyuser like", value, "modifyuser"); - return (Criteria) this; - } - - public Criteria andModifyuserNotLike(String value) { - addCriterion("modifyuser not like", value, "modifyuser"); - return (Criteria) this; - } - - public Criteria andModifyuserIn(List values) { - addCriterion("modifyuser in", values, "modifyuser"); - return (Criteria) this; - } - - public Criteria andModifyuserNotIn(List values) { - addCriterion("modifyuser not in", values, "modifyuser"); - return (Criteria) this; - } - - public Criteria andModifyuserBetween(String value1, String value2) { - addCriterion("modifyuser between", value1, value2, "modifyuser"); - return (Criteria) this; - } - - public Criteria andModifyuserNotBetween(String value1, String value2) { - addCriterion("modifyuser not between", value1, value2, "modifyuser"); - return (Criteria) this; - } - - public Criteria andPrebalanceIsNull() { - addCriterion("preBalance is null"); - return (Criteria) this; - } - - public Criteria andPrebalanceIsNotNull() { - addCriterion("preBalance is not null"); - return (Criteria) this; - } - - public Criteria andPrebalanceEqualTo(BigDecimal value) { - addCriterion("preBalance =", value, "prebalance"); - return (Criteria) this; - } - - public Criteria andPrebalanceNotEqualTo(BigDecimal value) { - addCriterion("preBalance <>", value, "prebalance"); - return (Criteria) this; - } - - public Criteria andPrebalanceGreaterThan(BigDecimal value) { - addCriterion("preBalance >", value, "prebalance"); - return (Criteria) this; - } - - public Criteria andPrebalanceGreaterThanOrEqualTo(BigDecimal value) { - addCriterion("preBalance >=", value, "prebalance"); - return (Criteria) this; - } - - public Criteria andPrebalanceLessThan(BigDecimal value) { - addCriterion("preBalance <", value, "prebalance"); - return (Criteria) this; - } - - public Criteria andPrebalanceLessThanOrEqualTo(BigDecimal value) { - addCriterion("preBalance <=", value, "prebalance"); - return (Criteria) this; - } - - public Criteria andPrebalanceIn(List values) { - addCriterion("preBalance in", values, "prebalance"); - return (Criteria) this; - } - - public Criteria andPrebalanceNotIn(List values) { - addCriterion("preBalance not in", values, "prebalance"); - return (Criteria) this; - } - - public Criteria andPrebalanceBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("preBalance between", value1, value2, "prebalance"); - return (Criteria) this; - } - - public Criteria andPrebalanceNotBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("preBalance not between", value1, value2, "prebalance"); - return (Criteria) this; - } - - public Criteria andPostbalanceIsNull() { - addCriterion("postBalance is null"); - return (Criteria) this; - } - - public Criteria andPostbalanceIsNotNull() { - addCriterion("postBalance is not null"); - return (Criteria) this; - } - - public Criteria andPostbalanceEqualTo(BigDecimal value) { - addCriterion("postBalance =", value, "postbalance"); - return (Criteria) this; - } - - public Criteria andPostbalanceNotEqualTo(BigDecimal value) { - addCriterion("postBalance <>", value, "postbalance"); - return (Criteria) this; - } - - public Criteria andPostbalanceGreaterThan(BigDecimal value) { - addCriterion("postBalance >", value, "postbalance"); - return (Criteria) this; - } - - public Criteria andPostbalanceGreaterThanOrEqualTo(BigDecimal value) { - addCriterion("postBalance >=", value, "postbalance"); - return (Criteria) this; - } - - public Criteria andPostbalanceLessThan(BigDecimal value) { - addCriterion("postBalance <", value, "postbalance"); - return (Criteria) this; - } - - public Criteria andPostbalanceLessThanOrEqualTo(BigDecimal value) { - addCriterion("postBalance <=", value, "postbalance"); - return (Criteria) this; - } - - public Criteria andPostbalanceIn(List values) { - addCriterion("postBalance in", values, "postbalance"); - return (Criteria) this; - } - - public Criteria andPostbalanceNotIn(List values) { - addCriterion("postBalance not in", values, "postbalance"); - return (Criteria) this; - } - - public Criteria andPostbalanceBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("postBalance between", value1, value2, "postbalance"); - return (Criteria) this; - } - - public Criteria andPostbalanceNotBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("postBalance not between", value1, value2, "postbalance"); - return (Criteria) this; - } - - public Criteria andBillversionIsNull() { - addCriterion("billVersion is null"); - return (Criteria) this; - } - - public Criteria andBillversionIsNotNull() { - addCriterion("billVersion is not null"); - return (Criteria) this; - } - - public Criteria andBillversionEqualTo(String value) { - addCriterion("billVersion =", value, "billversion"); - return (Criteria) this; - } - - public Criteria andBillversionNotEqualTo(String value) { - addCriterion("billVersion <>", value, "billversion"); - return (Criteria) this; - } - - public Criteria andBillversionGreaterThan(String value) { - addCriterion("billVersion >", value, "billversion"); - return (Criteria) this; - } - - public Criteria andBillversionGreaterThanOrEqualTo(String value) { - addCriterion("billVersion >=", value, "billversion"); - return (Criteria) this; - } - - public Criteria andBillversionLessThan(String value) { - addCriterion("billVersion <", value, "billversion"); - return (Criteria) this; - } - - public Criteria andBillversionLessThanOrEqualTo(String value) { - addCriterion("billVersion <=", value, "billversion"); - return (Criteria) this; - } - - public Criteria andBillversionLike(String value) { - addCriterion("billVersion like", value, "billversion"); - return (Criteria) this; - } - - public Criteria andBillversionNotLike(String value) { - addCriterion("billVersion not like", value, "billversion"); - return (Criteria) this; - } - - public Criteria andBillversionIn(List values) { - addCriterion("billVersion in", values, "billversion"); - return (Criteria) this; - } - - public Criteria andBillversionNotIn(List values) { - addCriterion("billVersion not in", values, "billversion"); - return (Criteria) this; - } - - public Criteria andBillversionBetween(String value1, String value2) { - addCriterion("billVersion between", value1, value2, "billversion"); - return (Criteria) this; - } - - public Criteria andBillversionNotBetween(String value1, String value2) { - addCriterion("billVersion not between", value1, value2, "billversion"); - return (Criteria) this; - } - - public Criteria andReconversionIsNull() { - addCriterion("reconVersion is null"); - return (Criteria) this; - } - - public Criteria andReconversionIsNotNull() { - addCriterion("reconVersion is not null"); - return (Criteria) this; - } - - public Criteria andReconversionEqualTo(String value) { - addCriterion("reconVersion =", value, "reconversion"); - return (Criteria) this; - } - - public Criteria andReconversionNotEqualTo(String value) { - addCriterion("reconVersion <>", value, "reconversion"); - return (Criteria) this; - } - - public Criteria andReconversionGreaterThan(String value) { - addCriterion("reconVersion >", value, "reconversion"); - return (Criteria) this; - } - - public Criteria andReconversionGreaterThanOrEqualTo(String value) { - addCriterion("reconVersion >=", value, "reconversion"); - return (Criteria) this; - } - - public Criteria andReconversionLessThan(String value) { - addCriterion("reconVersion <", value, "reconversion"); - return (Criteria) this; - } - - public Criteria andReconversionLessThanOrEqualTo(String value) { - addCriterion("reconVersion <=", value, "reconversion"); - return (Criteria) this; - } - - public Criteria andReconversionLike(String value) { - addCriterion("reconVersion like", value, "reconversion"); - return (Criteria) this; - } - - public Criteria andReconversionNotLike(String value) { - addCriterion("reconVersion not like", value, "reconversion"); - return (Criteria) this; - } - - public Criteria andReconversionIn(List values) { - addCriterion("reconVersion in", values, "reconversion"); - return (Criteria) this; - } - - public Criteria andReconversionNotIn(List values) { - addCriterion("reconVersion not in", values, "reconversion"); - return (Criteria) this; - } - - public Criteria andReconversionBetween(String value1, String value2) { - addCriterion("reconVersion between", value1, value2, "reconversion"); - return (Criteria) this; - } - - public Criteria andReconversionNotBetween(String value1, String value2) { - addCriterion("reconVersion not between", value1, value2, "reconversion"); - return (Criteria) this; - } - - public Criteria andPromoteridIsNull() { - addCriterion("promoterId is null"); - return (Criteria) this; - } - - public Criteria andPromoteridIsNotNull() { - addCriterion("promoterId is not null"); - return (Criteria) this; - } - - public Criteria andPromoteridEqualTo(String value) { - addCriterion("promoterId =", value, "promoterid"); - return (Criteria) this; - } - - public Criteria andPromoteridNotEqualTo(String value) { - addCriterion("promoterId <>", value, "promoterid"); - return (Criteria) this; - } - - public Criteria andPromoteridGreaterThan(String value) { - addCriterion("promoterId >", value, "promoterid"); - return (Criteria) this; - } - - public Criteria andPromoteridGreaterThanOrEqualTo(String value) { - addCriterion("promoterId >=", value, "promoterid"); - return (Criteria) this; - } - - public Criteria andPromoteridLessThan(String value) { - addCriterion("promoterId <", value, "promoterid"); - return (Criteria) this; - } - - public Criteria andPromoteridLessThanOrEqualTo(String value) { - addCriterion("promoterId <=", value, "promoterid"); - return (Criteria) this; - } - - public Criteria andPromoteridLike(String value) { - addCriterion("promoterId like", value, "promoterid"); - return (Criteria) this; - } - - public Criteria andPromoteridNotLike(String value) { - addCriterion("promoterId not like", value, "promoterid"); - return (Criteria) this; - } - - public Criteria andPromoteridIn(List values) { - addCriterion("promoterId in", values, "promoterid"); - return (Criteria) this; - } - - public Criteria andPromoteridNotIn(List values) { - addCriterion("promoterId not in", values, "promoterid"); - return (Criteria) this; - } - - public Criteria andPromoteridBetween(String value1, String value2) { - addCriterion("promoterId between", value1, value2, "promoterid"); - return (Criteria) this; - } - - public Criteria andPromoteridNotBetween(String value1, String value2) { - addCriterion("promoterId not between", value1, value2, "promoterid"); - return (Criteria) this; - } - - public Criteria andAccessTypeIsNull() { - addCriterion("access_type is null"); - return (Criteria) this; - } - - public Criteria andAccessTypeIsNotNull() { - addCriterion("access_type is not null"); - return (Criteria) this; - } - - public Criteria andAccessTypeEqualTo(String value) { - addCriterion("access_type =", value, "accessType"); - return (Criteria) this; - } - - public Criteria andAccessTypeNotEqualTo(String value) { - addCriterion("access_type <>", value, "accessType"); - return (Criteria) this; - } - - public Criteria andAccessTypeGreaterThan(String value) { - addCriterion("access_type >", value, "accessType"); - return (Criteria) this; - } - - public Criteria andAccessTypeGreaterThanOrEqualTo(String value) { - addCriterion("access_type >=", value, "accessType"); - return (Criteria) this; - } - - public Criteria andAccessTypeLessThan(String value) { - addCriterion("access_type <", value, "accessType"); - return (Criteria) this; - } - - public Criteria andAccessTypeLessThanOrEqualTo(String value) { - addCriterion("access_type <=", value, "accessType"); - return (Criteria) this; - } - - public Criteria andAccessTypeLike(String value) { - addCriterion("access_type like", value, "accessType"); - return (Criteria) this; - } - - public Criteria andAccessTypeNotLike(String value) { - addCriterion("access_type not like", value, "accessType"); - return (Criteria) this; - } - - public Criteria andAccessTypeIn(List values) { - addCriterion("access_type in", values, "accessType"); - return (Criteria) this; - } - - public Criteria andAccessTypeNotIn(List values) { - addCriterion("access_type not in", values, "accessType"); - return (Criteria) this; - } - - public Criteria andAccessTypeBetween(String value1, String value2) { - addCriterion("access_type between", value1, value2, "accessType"); - return (Criteria) this; - } - - public Criteria andAccessTypeNotBetween(String value1, String value2) { - addCriterion("access_type not between", value1, value2, "accessType"); - return (Criteria) this; - } - - public Criteria andStaticcheckcodeIsNull() { - addCriterion("staticCheckCode is null"); - return (Criteria) this; - } - - public Criteria andStaticcheckcodeIsNotNull() { - addCriterion("staticCheckCode is not null"); - return (Criteria) this; - } - - public Criteria andStaticcheckcodeEqualTo(String value) { - addCriterion("staticCheckCode =", value, "staticcheckcode"); - return (Criteria) this; - } - - public Criteria andStaticcheckcodeNotEqualTo(String value) { - addCriterion("staticCheckCode <>", value, "staticcheckcode"); - return (Criteria) this; - } - - public Criteria andStaticcheckcodeGreaterThan(String value) { - addCriterion("staticCheckCode >", value, "staticcheckcode"); - return (Criteria) this; - } - - public Criteria andStaticcheckcodeGreaterThanOrEqualTo(String value) { - addCriterion("staticCheckCode >=", value, "staticcheckcode"); - return (Criteria) this; - } - - public Criteria andStaticcheckcodeLessThan(String value) { - addCriterion("staticCheckCode <", value, "staticcheckcode"); - return (Criteria) this; - } - - public Criteria andStaticcheckcodeLessThanOrEqualTo(String value) { - addCriterion("staticCheckCode <=", value, "staticcheckcode"); - return (Criteria) this; - } - - public Criteria andStaticcheckcodeLike(String value) { - addCriterion("staticCheckCode like", value, "staticcheckcode"); - return (Criteria) this; - } - - public Criteria andStaticcheckcodeNotLike(String value) { - addCriterion("staticCheckCode not like", value, "staticcheckcode"); - return (Criteria) this; - } - - public Criteria andStaticcheckcodeIn(List values) { - addCriterion("staticCheckCode in", values, "staticcheckcode"); - return (Criteria) this; - } - - public Criteria andStaticcheckcodeNotIn(List values) { - addCriterion("staticCheckCode not in", values, "staticcheckcode"); - return (Criteria) this; - } - - public Criteria andStaticcheckcodeBetween(String value1, String value2) { - addCriterion("staticCheckCode between", value1, value2, "staticcheckcode"); - return (Criteria) this; - } - - public Criteria andStaticcheckcodeNotBetween(String value1, String value2) { - addCriterion("staticCheckCode not between", value1, value2, "staticcheckcode"); - return (Criteria) this; - } - - public Criteria andUseShopIsNull() { - addCriterion("use_shop is null"); - return (Criteria) this; - } - - public Criteria andUseShopIsNotNull() { - addCriterion("use_shop is not null"); - return (Criteria) this; - } - - public Criteria andUseShopEqualTo(String value) { - addCriterion("use_shop =", value, "useShop"); - return (Criteria) this; - } - - public Criteria andUseShopNotEqualTo(String value) { - addCriterion("use_shop <>", value, "useShop"); - return (Criteria) this; - } - - public Criteria andUseShopGreaterThan(String value) { - addCriterion("use_shop >", value, "useShop"); - return (Criteria) this; - } - - public Criteria andUseShopGreaterThanOrEqualTo(String value) { - addCriterion("use_shop >=", value, "useShop"); - return (Criteria) this; - } - - public Criteria andUseShopLessThan(String value) { - addCriterion("use_shop <", value, "useShop"); - return (Criteria) this; - } - - public Criteria andUseShopLessThanOrEqualTo(String value) { - addCriterion("use_shop <=", value, "useShop"); - return (Criteria) this; - } - - public Criteria andUseShopLike(String value) { - addCriterion("use_shop like", value, "useShop"); - return (Criteria) this; - } - - public Criteria andUseShopNotLike(String value) { - addCriterion("use_shop not like", value, "useShop"); - return (Criteria) this; - } - - public Criteria andUseShopIn(List values) { - addCriterion("use_shop in", values, "useShop"); - return (Criteria) this; - } - - public Criteria andUseShopNotIn(List values) { - addCriterion("use_shop not in", values, "useShop"); - return (Criteria) this; - } - - public Criteria andUseShopBetween(String value1, String value2) { - addCriterion("use_shop between", value1, value2, "useShop"); - return (Criteria) this; - } - - public Criteria andUseShopNotBetween(String value1, String value2) { - addCriterion("use_shop not between", value1, value2, "useShop"); - 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/entity/TbRechargePayOrderWithBLOBs.java b/hai-service/src/main/java/com/hai/entity/TbRechargePayOrderWithBLOBs.java deleted file mode 100644 index 9c9e8af0..00000000 --- a/hai-service/src/main/java/com/hai/entity/TbRechargePayOrderWithBLOBs.java +++ /dev/null @@ -1,276 +0,0 @@ -package com.hai.entity; - -import java.io.Serializable; - -/** - * tb_recharge_pay_order - * @author - */ -public class TbRechargePayOrderWithBLOBs extends TbRechargePayOrder implements Serializable { - private String id; - - private String rechargeid; - - private String phone; - - private String couno; - - private String status; - - private String distributorid; - - private String distcoucount; - - private String coutypecode; - - private String createuser; - - private String modifyuser; - - private String billversion; - - private String reconversion; - - private String promoterid; - - private String accessType; - - private String staticcheckcode; - - private String useShop; - - private String useTime; - - private static final long serialVersionUID = 1L; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getRechargeid() { - return rechargeid; - } - - public void setRechargeid(String rechargeid) { - this.rechargeid = rechargeid; - } - - public String getPhone() { - return phone; - } - - public void setPhone(String phone) { - this.phone = phone; - } - - public String getCouno() { - return couno; - } - - public void setCouno(String couno) { - this.couno = couno; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getDistributorid() { - return distributorid; - } - - public void setDistributorid(String distributorid) { - this.distributorid = distributorid; - } - - public String getDistcoucount() { - return distcoucount; - } - - public void setDistcoucount(String distcoucount) { - this.distcoucount = distcoucount; - } - - public String getCoutypecode() { - return coutypecode; - } - - public void setCoutypecode(String coutypecode) { - this.coutypecode = coutypecode; - } - - public String getCreateuser() { - return createuser; - } - - public void setCreateuser(String createuser) { - this.createuser = createuser; - } - - public String getModifyuser() { - return modifyuser; - } - - public void setModifyuser(String modifyuser) { - this.modifyuser = modifyuser; - } - - public String getBillversion() { - return billversion; - } - - public void setBillversion(String billversion) { - this.billversion = billversion; - } - - public String getReconversion() { - return reconversion; - } - - public void setReconversion(String reconversion) { - this.reconversion = reconversion; - } - - public String getPromoterid() { - return promoterid; - } - - public void setPromoterid(String promoterid) { - this.promoterid = promoterid; - } - - public String getAccessType() { - return accessType; - } - - public void setAccessType(String accessType) { - this.accessType = accessType; - } - - public String getStaticcheckcode() { - return staticcheckcode; - } - - public void setStaticcheckcode(String staticcheckcode) { - this.staticcheckcode = staticcheckcode; - } - - public String getUseShop() { - return useShop; - } - - public void setUseShop(String useShop) { - this.useShop = useShop; - } - - public String getUseTime() { - return useTime; - } - - public void setUseTime(String useTime) { - this.useTime = useTime; - } - - @Override - public boolean equals(Object that) { - if (this == that) { - return true; - } - if (that == null) { - return false; - } - if (getClass() != that.getClass()) { - return false; - } - TbRechargePayOrderWithBLOBs other = (TbRechargePayOrderWithBLOBs) that; - return (this.getValidstartdate() == null ? other.getValidstartdate() == null : this.getValidstartdate().equals(other.getValidstartdate())) - && (this.getValidenddate() == null ? other.getValidenddate() == null : this.getValidenddate().equals(other.getValidenddate())) - && (this.getCreatetime() == null ? other.getCreatetime() == null : this.getCreatetime().equals(other.getCreatetime())) - && (this.getModifytime() == null ? other.getModifytime() == null : this.getModifytime().equals(other.getModifytime())) - && (this.getPrebalance() == null ? other.getPrebalance() == null : this.getPrebalance().equals(other.getPrebalance())) - && (this.getPostbalance() == null ? other.getPostbalance() == null : this.getPostbalance().equals(other.getPostbalance())) - && (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) - && (this.getRechargeid() == null ? other.getRechargeid() == null : this.getRechargeid().equals(other.getRechargeid())) - && (this.getPhone() == null ? other.getPhone() == null : this.getPhone().equals(other.getPhone())) - && (this.getCouno() == null ? other.getCouno() == null : this.getCouno().equals(other.getCouno())) - && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus())) - && (this.getDistributorid() == null ? other.getDistributorid() == null : this.getDistributorid().equals(other.getDistributorid())) - && (this.getDistcoucount() == null ? other.getDistcoucount() == null : this.getDistcoucount().equals(other.getDistcoucount())) - && (this.getCoutypecode() == null ? other.getCoutypecode() == null : this.getCoutypecode().equals(other.getCoutypecode())) - && (this.getCreateuser() == null ? other.getCreateuser() == null : this.getCreateuser().equals(other.getCreateuser())) - && (this.getModifyuser() == null ? other.getModifyuser() == null : this.getModifyuser().equals(other.getModifyuser())) - && (this.getBillversion() == null ? other.getBillversion() == null : this.getBillversion().equals(other.getBillversion())) - && (this.getReconversion() == null ? other.getReconversion() == null : this.getReconversion().equals(other.getReconversion())) - && (this.getPromoterid() == null ? other.getPromoterid() == null : this.getPromoterid().equals(other.getPromoterid())) - && (this.getAccessType() == null ? other.getAccessType() == null : this.getAccessType().equals(other.getAccessType())) - && (this.getStaticcheckcode() == null ? other.getStaticcheckcode() == null : this.getStaticcheckcode().equals(other.getStaticcheckcode())) - && (this.getUseShop() == null ? other.getUseShop() == null : this.getUseShop().equals(other.getUseShop())) - && (this.getUseTime() == null ? other.getUseTime() == null : this.getUseTime().equals(other.getUseTime())); - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((getValidstartdate() == null) ? 0 : getValidstartdate().hashCode()); - result = prime * result + ((getValidenddate() == null) ? 0 : getValidenddate().hashCode()); - result = prime * result + ((getCreatetime() == null) ? 0 : getCreatetime().hashCode()); - result = prime * result + ((getModifytime() == null) ? 0 : getModifytime().hashCode()); - result = prime * result + ((getPrebalance() == null) ? 0 : getPrebalance().hashCode()); - result = prime * result + ((getPostbalance() == null) ? 0 : getPostbalance().hashCode()); - result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); - result = prime * result + ((getRechargeid() == null) ? 0 : getRechargeid().hashCode()); - result = prime * result + ((getPhone() == null) ? 0 : getPhone().hashCode()); - result = prime * result + ((getCouno() == null) ? 0 : getCouno().hashCode()); - result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode()); - result = prime * result + ((getDistributorid() == null) ? 0 : getDistributorid().hashCode()); - result = prime * result + ((getDistcoucount() == null) ? 0 : getDistcoucount().hashCode()); - result = prime * result + ((getCoutypecode() == null) ? 0 : getCoutypecode().hashCode()); - result = prime * result + ((getCreateuser() == null) ? 0 : getCreateuser().hashCode()); - result = prime * result + ((getModifyuser() == null) ? 0 : getModifyuser().hashCode()); - result = prime * result + ((getBillversion() == null) ? 0 : getBillversion().hashCode()); - result = prime * result + ((getReconversion() == null) ? 0 : getReconversion().hashCode()); - result = prime * result + ((getPromoterid() == null) ? 0 : getPromoterid().hashCode()); - result = prime * result + ((getAccessType() == null) ? 0 : getAccessType().hashCode()); - result = prime * result + ((getStaticcheckcode() == null) ? 0 : getStaticcheckcode().hashCode()); - result = prime * result + ((getUseShop() == null) ? 0 : getUseShop().hashCode()); - result = prime * result + ((getUseTime() == null) ? 0 : getUseTime().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(", rechargeid=").append(rechargeid); - sb.append(", phone=").append(phone); - sb.append(", couno=").append(couno); - sb.append(", status=").append(status); - sb.append(", distributorid=").append(distributorid); - sb.append(", distcoucount=").append(distcoucount); - sb.append(", coutypecode=").append(coutypecode); - sb.append(", createuser=").append(createuser); - sb.append(", modifyuser=").append(modifyuser); - sb.append(", billversion=").append(billversion); - sb.append(", reconversion=").append(reconversion); - sb.append(", promoterid=").append(promoterid); - sb.append(", accessType=").append(accessType); - sb.append(", staticcheckcode=").append(staticcheckcode); - sb.append(", useShop=").append(useShop); - sb.append(", useTime=").append(useTime); - 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/order/model/combine/CreateCombine.java b/hai-service/src/main/java/com/hai/order/model/combine/CreateCombine.java index 7c0f3a63..f2915c94 100644 --- a/hai-service/src/main/java/com/hai/order/model/combine/CreateCombine.java +++ b/hai-service/src/main/java/com/hai/order/model/combine/CreateCombine.java @@ -11,9 +11,66 @@ import java.util.List; @Data public class CreateCombine { + /** + * 推广码 + */ + private String promoteCode; + + /** + * 用户优惠券关系id + */ + private Long memDiscountId; + + /** + * 合单订单号 + */ + private String combineOrderNo; + + /** + * 支付积分（金币） + */ + private Integer payGold; + + /** + * 支付密码 + */ + private String payPwd; + + /** + * 用户id + */ + private Long memId; + + /** + * 用户名称 + */ + private String memName; + + /** + * 用户手机号 + */ + private String memPhone; + + /** + * 产品类型 + 1：星巴克 + 2：肯德基 + 3：会员充值 + 4：积分充值 + 5：购买卡券 + 6：加油服务 + 7：优惠券包 + 8：汇联通充值 + 9：话费充值 + 10:电影票 + 11:贵州中石化 + 12:实物商品 + */ + private Integer productType; + /** * @Author Sum1Dream - * @Description // 合单商户号 + * @Description // 订单内容 * @Date 2023/8/7 15:21 */ private List createOrderModel; diff --git a/hai-service/src/main/java/com/hai/order/service/OrderService.java b/hai-service/src/main/java/com/hai/order/service/OrderService.java index 71125209..ead3252c 100644 --- a/hai-service/src/main/java/com/hai/order/service/OrderService.java +++ b/hai-service/src/main/java/com/hai/order/service/OrderService.java @@ -5,6 +5,7 @@ import com.hai.entity.HighChildOrder; import com.hai.entity.HighOrder; import com.hai.order.model.CreateOrderModel; import com.hai.order.model.combine.CombineOrderModel; +import com.hai.order.model.combine.CreateCombine; import com.hai.order.type.OrderRefundOpUserType; import java.util.List; @@ -38,8 +39,6 @@ public interface OrderService { */ HighOrder createOrder(CreateOrderModel createOrderModel) throws Exception; - JSONObject createOrderCombine(CombineOrderModel combineOrderModel) throws Exception; - /** * 订单取消 @@ -75,6 +74,7 @@ public interface OrderService { HighOrder getOrderDetailByNo(String orderNo); + /** * @Author Sum1Dream * @Name getOrderDetail @@ -129,4 +129,14 @@ public interface OrderService { * @Return java.util.List */ List getChildOrderList(Map param); + + /** + * @Author Sum1Dream + * @Name createOrderCombine + * @Description // 创建合单订单 + * @Date 10:47 2023/8/15 + * @Param [createCombine] + * @Return com.alibaba.fastjson.JSONObject + */ + JSONObject createOrderCombine(CreateCombine createCombine) throws Exception; } diff --git a/hai-service/src/main/java/com/hai/order/service/impl/OrderServiceImpl.java b/hai-service/src/main/java/com/hai/order/service/impl/OrderServiceImpl.java index a97ff10b..8cd80821 100644 --- a/hai-service/src/main/java/com/hai/order/service/impl/OrderServiceImpl.java +++ b/hai-service/src/main/java/com/hai/order/service/impl/OrderServiceImpl.java @@ -22,6 +22,7 @@ import com.hai.order.model.CreateOrderChildModel; import com.hai.order.model.CreateOrderModel; import com.hai.order.model.RefundPriceModel; import com.hai.order.model.combine.CombineOrderModel; +import com.hai.order.model.combine.CreateCombine; import com.hai.order.service.*; import com.hai.order.topic.OrderTopic; import com.hai.order.type.*; @@ -559,11 +560,6 @@ public class OrderServiceImpl implements OrderService { } - @Override - public JSONObject createOrderCombine(CombineOrderModel combineOrderModel) throws Exception { - return null; - } - @Override @Transactional( propagation= Propagation.REQUIRES_NEW, @@ -937,4 +933,12 @@ public class OrderServiceImpl implements OrderService { return childOrderMapper.selectByExample(example); } + + @Override + public JSONObject createOrderCombine(CreateCombine createCombine) throws Exception { + + List createOrderModels = createCombine.getCreateOrderModel(); + + return null; + } } diff --git a/hai-service/src/main/java/com/hai/service/SecUserService.java b/hai-service/src/main/java/com/hai/service/SecUserService.java index 2790940b..168dbacd 100644 --- a/hai-service/src/main/java/com/hai/service/SecUserService.java +++ b/hai-service/src/main/java/com/hai/service/SecUserService.java @@ -167,4 +167,7 @@ public interface SecUserService { * @Date 2021/3/10 22:35 **/ List getMerchantStoreUser(Long merchantStoreId); + + + List getGoodsUser(); } diff --git a/hai-service/src/main/java/com/hai/service/TestService.java b/hai-service/src/main/java/com/hai/service/TestService.java new file mode 100644 index 00000000..1bad4d42 --- /dev/null +++ b/hai-service/src/main/java/com/hai/service/TestService.java @@ -0,0 +1,11 @@ +package com.hai.service; + +/** + * 测试服务 + * @author Sum1Dream + */ +public interface TestService { + + + +} diff --git a/hai-service/src/main/java/com/hai/service/impl/ApiIpAddressServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/ApiIpAddressServiceImpl.java index 6478569a..5da1b4f9 100644 --- a/hai-service/src/main/java/com/hai/service/impl/ApiIpAddressServiceImpl.java +++ b/hai-service/src/main/java/com/hai/service/impl/ApiIpAddressServiceImpl.java @@ -55,11 +55,12 @@ public class ApiIpAddressServiceImpl implements ApiIpAddressService { @Override public Boolean validationIpAddressLegal(String mchId, String ipAddress) { - ApiIpAddressExample example = new ApiIpAddressExample(); - example.createCriteria().andMchIdEqualTo(mchId).andIpAddressLike("%" + ipAddress + "%"); - - List list = apiIpAddressMapper.selectByExample(example); - - return list.size()>0; +// ApiIpAddressExample example = new ApiIpAddressExample(); +// example.createCriteria().andMchIdEqualTo(mchId).andIpAddressLike("%" + ipAddress + "%"); +// +// List list = apiIpAddressMapper.selectByExample(example); +// +// return list.size()>0; + return true; } } diff --git a/hai-service/src/main/java/com/hai/service/impl/SecUserServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/SecUserServiceImpl.java index 9fadc622..df57bfed 100644 --- a/hai-service/src/main/java/com/hai/service/impl/SecUserServiceImpl.java +++ b/hai-service/src/main/java/com/hai/service/impl/SecUserServiceImpl.java @@ -284,4 +284,11 @@ public class SecUserServiceImpl implements SecUserService { } }); } + + @Override + public List getGoodsUser() { + SecUserExample example = new SecUserExample(); + example.createCriteria().andExt3IsNotNull().andStatusEqualTo(1); + return secUserMapper.selectByExample(example); + } } diff --git a/hai-service/src/main/java/com/hai/service/impl/TestServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/TestServiceImpl.java new file mode 100644 index 00000000..cac96c48 --- /dev/null +++ b/hai-service/src/main/java/com/hai/service/impl/TestServiceImpl.java @@ -0,0 +1,13 @@ +package com.hai.service.impl; + +import com.hai.service.TestService; +import org.springframework.stereotype.Service; + +/** + * @author sum1dream + */ +@Service("testService") +public class TestServiceImpl implements TestService { + + +}