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 b27a712a..f6e70131 100644 --- a/hai-order/src/main/java/com/web/controller/OrderController.java +++ b/hai-order/src/main/java/com/web/controller/OrderController.java @@ -20,6 +20,7 @@ import com.hai.order.service.OrderService; import com.hai.order.type.OrderChildGoodsType; import com.hai.order.type.OrderChildStatus; import com.hai.order.type.OrderPayType; +import com.hai.order.type.OrderStatus; import com.hai.order.utils.OrderUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -132,7 +133,13 @@ public class OrderController { String orderNo = body.getString("orderNo"); String remarks = body.getString("remarks"); - return ResponseMsgUtil.success(orderService.cancelOrder(orderNo, remarks)); + + // 查询订单 + HighOrder order = orderService.getOrderDetailByNo(orderNo); + if (order == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未找到订单"); + } + return ResponseMsgUtil.success(orderService.cancelOrder(order, remarks)); } catch (Exception e) { log.error("OrderController -> cancel() error!",e); diff --git a/hai-order/src/main/java/com/web/controller/OrderPayController.java b/hai-order/src/main/java/com/web/controller/OrderPayController.java index 4de25d6c..1828ad0d 100644 --- a/hai-order/src/main/java/com/web/controller/OrderPayController.java +++ b/hai-order/src/main/java/com/web/controller/OrderPayController.java @@ -55,7 +55,7 @@ import java.util.concurrent.ThreadLocalRandom; @Controller @RequestMapping("/orderPay") @Api(value = "订单支付") -public class OrderPayController { +public class OrderPayController { private static Logger log = LoggerFactory.getLogger(OrderPayController.class); diff --git a/hai-order/src/main/java/com/web/controller/OrderPayNotifyController.java b/hai-order/src/main/java/com/web/controller/OrderPayNotifyController.java index bbd7abae..633390eb 100644 --- a/hai-order/src/main/java/com/web/controller/OrderPayNotifyController.java +++ b/hai-order/src/main/java/com/web/controller/OrderPayNotifyController.java @@ -72,12 +72,17 @@ public class OrderPayNotifyController { if (order != null && order.getOrderStatus().equals(OrderStatus.STATUS1.getNumber())) { // 处理订单业务 paySuccessService.orderPaySuccessHandle(map.get("out_trade_no"), - OrderPayType.PAY_TYPE2, map.get("out_trade_no"), + OrderPayType.PAY_TYPE2, + map.get("transaction_id"), new BigDecimal(map.get("total_fee")).divide(new BigDecimal("100")), null); } log.info("处理业务完成"); + // 通知微信.异步确认成功.必写.不然会一直通知后台.八次之后就认为交易失败了 + resXml = "" + "" + + "" + " "; + BufferedOutputStream out = new BufferedOutputStream(response.getOutputStream()); out.write(resXml.getBytes()); out.flush(); diff --git a/hai-order/src/main/java/com/web/controller/OrderRefundController.java b/hai-order/src/main/java/com/web/controller/OrderRefundController.java index fd48b246..5d1ae6e7 100644 --- a/hai-order/src/main/java/com/web/controller/OrderRefundController.java +++ b/hai-order/src/main/java/com/web/controller/OrderRefundController.java @@ -12,6 +12,7 @@ import com.hai.common.utils.ResponseMsgUtil; import com.hai.entity.HighChildOrder; import com.hai.entity.HighOrder; import com.hai.entity.HighOrderRefund; +import com.hai.enum_type.OrderStatusEnum; import com.hai.model.HighUserModel; import com.hai.model.ResponseData; import com.hai.order.model.CreateOrderChildModel; @@ -21,10 +22,7 @@ import com.hai.order.model.ExportOrderRefundModel; import com.hai.order.service.OrderPaySuccessService; import com.hai.order.service.OrderRefundService; import com.hai.order.service.OrderService; -import com.hai.order.type.OrderChildGoodsType; -import com.hai.order.type.OrderChildStatus; -import com.hai.order.type.OrderPayType; -import com.hai.order.type.OrderRefundStatus; +import com.hai.order.type.*; import com.hai.order.utils.OrderUtil; import com.web.config.SysConst; import io.swagger.annotations.Api; @@ -72,7 +70,16 @@ public class OrderRefundController { if (body == null || StringUtils.isBlank(body.getString("orderNo"))) { throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未找到订单"); } - orderService.refundOrder(body.getString("orderNo"), body.getString("remarks")); + // 查询订单 + HighOrder order = orderService.getOrderDetailByNo(body.getString("orderNo")); + if (order == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未找到订单"); + } + if (!order.getOrderStatus().equals(OrderStatus.STATUS2.getNumber()) + && !order.getOrderStatus().equals(OrderStatus.STATUS3.getNumber())) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "订单状态错误"); + } + orderService.refundOrder(order, body.getString("remarks")); return ResponseMsgUtil.success("退款成功"); @@ -122,7 +129,6 @@ public class OrderRefundController { if (userModel == null) { throw ErrorHelp.genException(SysCode.System, ErrorCode.USE_VISIT_ILLEGAL, ""); } - return ResponseMsgUtil.success(orderRefundService.getRefundByRefundNo(refundOrderNo)); } catch (Exception e) { diff --git a/hai-order/src/main/java/com/web/controller/TestController.java b/hai-order/src/main/java/com/web/controller/TestController.java index 26f9fbf9..58b9019d 100644 --- a/hai-order/src/main/java/com/web/controller/TestController.java +++ b/hai-order/src/main/java/com/web/controller/TestController.java @@ -1 +1 @@ -package com.web.controller; import com.alibaba.fastjson.JSONObject; import com.hai.common.utils.*; import com.hai.config.HuiLianTongConfig; import com.hai.config.HuiLianTongUnionCardConfig; import com.hai.entity.HighOrder; import com.hai.model.ResponseData; import com.hai.order.model.CreateOrderModel; import com.hai.order.service.OrderService; import com.hai.order.type.OrderStatus; import com.hai.service.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.rocketmq.client.producer.SendCallback; import org.apache.rocketmq.client.producer.SendResult; import org.apache.rocketmq.common.message.Message; import org.apache.rocketmq.spring.core.RocketMQTemplate; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.integration.support.MessageBuilder; 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 java.util.ArrayList; import java.util.Date; import java.util.LinkedList; import java.util.List; /** * @Auther: 胡锐 * @Description: * @Date: 2021/3/26 23:08 */ @Controller @RequestMapping(value = "/test") @Api(value = "订单接口") public class TestController { private static Logger log = LoggerFactory.getLogger(TestController.class); @Autowired private RocketMQTemplate rocketMQTemplate; @Resource private OrderService orderService; @Resource private RedisUtil redisUtil; @Autowired private RedisTemplate redisTemplate; @RequestMapping(value = "/q", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "") public ResponseData q(@RequestParam(name = "orderNo", required = true) String orderNo) { try { HighOrder order = orderService.getOrderDetailByNo(orderNo); if (order != null) { orderService.refundOrder(orderNo, DateUtil.date2String(new Date(), "yyyy-MM-dd HH:mm:ss")); // order.setRefundTime(new Date()); // orderService.updateOrderData(order); return ResponseMsgUtil.success("修改成功"); } return ResponseMsgUtil.success(null); } catch (Exception e) { log.error("HighUserCardController --> rocketMq() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/rocketMq", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "") public ResponseData rocketMq(@RequestParam(name = "topicGroup", required = true) String topicGroup, @RequestParam(name = "body", required = true) String body) { try { long startTime = System.currentTimeMillis(); // org.springframework.messaging.Message message = MessageBuilder.withPayload(order).build(); CreateOrderModel createOrder = new CreateOrderModel(); //发送对象消息 HighOrder order = rocketMQTemplate.sendAndReceive("order-topic:create", createOrder, HighOrder.class); System.out.println("订单号:" + order.getOrderNo()); // SendResult sendResult = rocketMQTemplate.syncSend("order-topic:create", message, 3000); /*List list = new LinkedList<>(); for (int i = 0; i <= 100;i++) { list.add(orderService.getDetailByOrderNo("HF2022080918014365701")); *//* list.add(orderService.getDetailByOrderNo("HF2022080918014365701"));*//* *//* updateUserWithRedisLock("coupon_" + couponKey, i+""); new Thread(() -> {*//* *//* redisTemplate.opsForValue().setIfAbsent("coupon_" + couponKey, i); System.out.println("加入数据" + i);*//* // redisTemplate.delete("coupon" + couponKey); // System.out.println("释放数据" + index); *//* });*//* }*/ System.out.println(System.currentTimeMillis() - startTime); return ResponseMsgUtil.success(null); } catch (Exception e) { log.error("HighUserCardController --> rocketMq() error!", e); return ResponseMsgUtil.exception(e); } } public void updateUserWithRedisLock(String couponKey, String value) throws InterruptedException { // 占分布式锁,去redis占坑 // 1. 分布式锁占坑 Boolean lock = redisTemplate.opsForValue().setIfAbsent("coupon" + couponKey, value); if(lock) { //加锁成功... // todo business System.out.println("加锁成功: " + value); redisTemplate.delete("coupon" + couponKey); //删除key,释放锁 } else { System.out.println("加锁失败"); /* Thread.sleep(100); // 加锁失败,重试 updateUserWithRedisLock("sysUser");*/ } } } \ No newline at end of file +package com.web.controller; import com.alibaba.fastjson.JSONObject; import com.hai.common.utils.*; import com.hai.config.HuiLianTongConfig; import com.hai.config.HuiLianTongUnionCardConfig; import com.hai.entity.HighOrder; import com.hai.model.ResponseData; import com.hai.order.model.CreateOrderModel; import com.hai.order.service.OrderService; import com.hai.order.type.OrderStatus; import com.hai.service.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.rocketmq.client.producer.SendCallback; import org.apache.rocketmq.client.producer.SendResult; import org.apache.rocketmq.common.message.Message; import org.apache.rocketmq.spring.core.RocketMQTemplate; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.integration.support.MessageBuilder; 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 java.util.ArrayList; import java.util.Date; import java.util.LinkedList; import java.util.List; /** * @Auther: 胡锐 * @Description: * @Date: 2021/3/26 23:08 */ @Controller @RequestMapping(value = "/test") @Api(value = "订单接口") public class TestController { private static Logger log = LoggerFactory.getLogger(TestController.class); @Autowired private RocketMQTemplate rocketMQTemplate; @Resource private OrderService orderService; @Resource private RedisUtil redisUtil; @Autowired private RedisTemplate redisTemplate; @RequestMapping(value = "/q", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "") public ResponseData q(@RequestParam(name = "orderNo", required = true) String orderNo) { try { HighOrder order = orderService.getOrderDetailByNo(orderNo); if (order != null) { // orderService.refundOrder(orderNo, DateUtil.date2String(new Date(), "yyyy-MM-dd HH:mm:ss")); // order.setRefundTime(new Date()); // orderService.updateOrderData(order); return ResponseMsgUtil.success("修改成功"); } return ResponseMsgUtil.success(null); } catch (Exception e) { log.error("HighUserCardController --> rocketMq() error!", e); return ResponseMsgUtil.exception(e); } } @RequestMapping(value = "/rocketMq", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "") public ResponseData rocketMq(@RequestParam(name = "topicGroup", required = true) String topicGroup, @RequestParam(name = "body", required = true) String body) { try { long startTime = System.currentTimeMillis(); // org.springframework.messaging.Message message = MessageBuilder.withPayload(order).build(); CreateOrderModel createOrder = new CreateOrderModel(); //发送对象消息 HighOrder order = rocketMQTemplate.sendAndReceive("order-topic:create", createOrder, HighOrder.class); System.out.println("订单号:" + order.getOrderNo()); // SendResult sendResult = rocketMQTemplate.syncSend("order-topic:create", message, 3000); /*List list = new LinkedList<>(); for (int i = 0; i <= 100;i++) { list.add(orderService.getDetailByOrderNo("HF2022080918014365701")); *//* list.add(orderService.getDetailByOrderNo("HF2022080918014365701"));*//* *//* updateUserWithRedisLock("coupon_" + couponKey, i+""); new Thread(() -> {*//* *//* redisTemplate.opsForValue().setIfAbsent("coupon_" + couponKey, i); System.out.println("加入数据" + i);*//* // redisTemplate.delete("coupon" + couponKey); // System.out.println("释放数据" + index); *//* });*//* }*/ System.out.println(System.currentTimeMillis() - startTime); return ResponseMsgUtil.success(null); } catch (Exception e) { log.error("HighUserCardController --> rocketMq() error!", e); return ResponseMsgUtil.exception(e); } } public void updateUserWithRedisLock(String couponKey, String value) throws InterruptedException { // 占分布式锁,去redis占坑 // 1. 分布式锁占坑 Boolean lock = redisTemplate.opsForValue().setIfAbsent("coupon" + couponKey, value); if(lock) { //加锁成功... // todo business System.out.println("加锁成功: " + value); redisTemplate.delete("coupon" + couponKey); //删除key,释放锁 } else { System.out.println("加锁失败"); /* Thread.sleep(100); // 加锁失败,重试 updateUserWithRedisLock("sysUser");*/ } } } \ No newline at end of file diff --git a/hai-order/src/main/java/com/web/controller/business/OrderCouponController.java b/hai-order/src/main/java/com/web/controller/business/OrderCouponController.java index 90572cb4..4122c717 100644 --- a/hai-order/src/main/java/com/web/controller/business/OrderCouponController.java +++ b/hai-order/src/main/java/com/web/controller/business/OrderCouponController.java @@ -35,6 +35,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.io.File; +import java.lang.reflect.Field; import java.math.BigDecimal; import java.util.*; @@ -60,20 +61,23 @@ public class OrderCouponController { @RequestMapping(value = "/getOrderList", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "查询卡券订单列表") - public ResponseData getOrderList(@RequestParam(name = "orderNo", required = false) String orderNo, - @RequestParam(name = "memPhone", required = false) String memPhone, - @RequestParam(name = "couponName", required = false) String couponName, - @RequestParam(name = "payType", required = false) Integer payType, - @RequestParam(name = "orderStatus", required = false) Integer orderStatus, - @RequestParam(name = "createTimeS", required = false) Long createTimeS, - @RequestParam(name = "createTimeE", required = false) Long createTimeE, - @RequestParam(name = "payTimeS", required = false) Long payTimeS, - @RequestParam(name = "payTimeE", required = false) Long payTimeE, - @RequestParam(name = "finishTimeS", required = false) Long finishTimeS, - @RequestParam(name = "finishTimeE", required = false) Long finishTimeE, - @RequestParam(name = "pageNum", required = true) Integer pageNum, - @RequestParam(name = "pageSize", required = true) Integer pageSize, - HttpServletRequest request) { + public ResponseData getOrderList(@RequestParam(name = "companyId", required = false) Long companyId, + @RequestParam(name = "orderNo", required = false) String orderNo, + @RequestParam(name = "memPhone", required = false) String memPhone, + @RequestParam(name = "couponKey", required = false) String couponKey, + @RequestParam(name = "couponName", required = false) String couponName, + @RequestParam(name = "couponSource", required = false) String couponSource, + @RequestParam(name = "payType", required = false) Integer payType, + @RequestParam(name = "orderStatus", required = false) Integer orderStatus, + @RequestParam(name = "createTimeS", required = false) Long createTimeS, + @RequestParam(name = "createTimeE", required = false) Long createTimeE, + @RequestParam(name = "payTimeS", required = false) Long payTimeS, + @RequestParam(name = "payTimeE", required = false) Long payTimeE, + @RequestParam(name = "finishTimeS", required = false) Long finishTimeS, + @RequestParam(name = "finishTimeE", required = false) Long finishTimeE, + @RequestParam(name = "pageNum", required = true) Integer pageNum, + @RequestParam(name = "pageSize", required = true) Integer pageSize, + HttpServletRequest request) { try { UserInfoModel userInfoModel = userCenter.getSessionModel(UserInfoModel.class); @@ -83,16 +87,20 @@ public class OrderCouponController { Map map = new HashMap<>(); if (userInfoModel.getSecUser().getObjectType().equals(UserObjectTypeEnum.type0.getType())) { + map.put("companyId", companyId); } else if (userInfoModel.getSecUser().getObjectType().equals(UserObjectTypeEnum.type1.getType())) { - map.put("goodsId", couponService.getCouponIdsByCompanyId(userInfoModel.getBsCompany().getId())); + map.put("companyId", userInfoModel.getBsCompany().getId()); + } else { throw ErrorHelp.genException(SysCode.System, ErrorCode.COMPETENCE_INSUFFICIENT, ""); } map.put("orderNo", orderNo); map.put("memPhone", memPhone); + map.put("couponKey", couponKey); map.put("couponName", couponName); + map.put("couponSource", couponSource); map.put("payType", payType); map.put("orderStatus", orderStatus); map.put("createTimeS", createTimeS); @@ -116,9 +124,12 @@ public class OrderCouponController { @RequestMapping(value = "/exportOrderCouponExcel", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "导出卡券订单") - public ResponseData exportOrderCouponExcel(@RequestParam(name = "orderNo", required = false) String orderNo, + public ResponseData exportOrderCouponExcel(@RequestParam(name = "companyId", required = false) Long companyId, + @RequestParam(name = "orderNo", required = false) String orderNo, @RequestParam(name = "memPhone", required = false) String memPhone, + @RequestParam(name = "couponKey", required = false) String couponKey, @RequestParam(name = "couponName", required = false) String couponName, + @RequestParam(name = "couponSource", required = false) String couponSource, @RequestParam(name = "payType", required = false) Integer payType, @RequestParam(name = "orderStatus", required = false) Integer orderStatus, @RequestParam(name = "createTimeS", required = false) Long createTimeS, @@ -136,15 +147,20 @@ public class OrderCouponController { } Map map = new HashMap<>(); if (userInfoModel.getSecUser().getObjectType().equals(UserObjectTypeEnum.type0.getType())) { + map.put("companyId", companyId); } else if (userInfoModel.getSecUser().getObjectType().equals(UserObjectTypeEnum.type1.getType())) { - map.put("goodsId", couponService.getCouponIdsByCompanyId(userInfoModel.getBsCompany().getId())); + map.put("companyId", userInfoModel.getBsCompany().getId()); + } else { throw ErrorHelp.genException(SysCode.System, ErrorCode.COMPETENCE_INSUFFICIENT, ""); } + map.put("orderNo", orderNo); map.put("memPhone", memPhone); + map.put("couponKey", couponKey); map.put("couponName", couponName); + map.put("couponSource", couponSource); map.put("payType", payType); map.put("orderStatus", orderStatus); map.put("createTimeS", createTimeS); @@ -156,8 +172,17 @@ public class OrderCouponController { List list = orderServiceExt.getOrderCouponList(map); + Set includeColumnFiledNames = new HashSet(); + for (Field field : OrderCouponModel.class.getDeclaredFields()) { + includeColumnFiledNames.add(field.getName()); + } + if (!userInfoModel.getSecUser().getObjectType().equals(UserObjectTypeEnum.type0.getType())) { + includeColumnFiledNames.remove("companyName"); + } + String fileName = "/temporary/" + System.currentTimeMillis() + ".xlsx"; EasyExcel.write(SysConst.getSysConfig().getFileUrl() + fileName, OrderCouponModel.class) + .includeColumnFiledNames(includeColumnFiledNames) .sheet("卡券订单") .doWrite(list); diff --git a/hai-order/src/main/java/com/web/controller/business/OrderOilController.java b/hai-order/src/main/java/com/web/controller/business/OrderOilController.java index 07418301..f143fba6 100644 --- a/hai-order/src/main/java/com/web/controller/business/OrderOilController.java +++ b/hai-order/src/main/java/com/web/controller/business/OrderOilController.java @@ -311,7 +311,7 @@ public class OrderOilController { model.setDeductionCouponPrice(gasOrder.getDeductionCouponPrice()); model.setDeductionProductPrice(gasOrder.getDeductionProductPrice()); model.setPayablePrice(gasOrder.getPayablePrice()); - model.setPayGold(gasOrder.getPayGold()/100); + model.setPayGold(gasOrder.getPayGold()==null?null:gasOrder.getPayGold()/100); model.setPayPrice(gasOrder.getPayPrice()!=null?gasOrder.getPayPrice().toString():"未支付"); model.setStatus(OrderOilStatus.getNameByType(gasOrder.getStatus())); model.setCreateTime(gasOrder.getCreateTime()); diff --git a/hai-order/src/main/java/com/web/rocketmq/consumer/OrderCancelConsumer.java b/hai-order/src/main/java/com/web/rocketmq/consumer/OrderCancelConsumer.java index 3d83c4d7..a0acf6f0 100644 --- a/hai-order/src/main/java/com/web/rocketmq/consumer/OrderCancelConsumer.java +++ b/hai-order/src/main/java/com/web/rocketmq/consumer/OrderCancelConsumer.java @@ -23,7 +23,7 @@ public class OrderCancelConsumer implements RocketMQListener { HighOrder highOrder = orderService.getOrderDetailByNo(order.getOrderNo()); if (highOrder != null && highOrder.getOrderStatus().equals(OrderStatus.STATUS1.getNumber())) { // 取消订单 - orderService.cancelOrder(order.getOrderNo(), null); + orderService.cancelOrder(highOrder, null); } } } diff --git a/hai-service/src/main/java/com/hai/dao/HighOrderRefundMapper.java b/hai-service/src/main/java/com/hai/dao/HighOrderRefundMapper.java index 0d36b8fe..b7100049 100644 --- a/hai-service/src/main/java/com/hai/dao/HighOrderRefundMapper.java +++ b/hai-service/src/main/java/com/hai/dao/HighOrderRefundMapper.java @@ -46,13 +46,14 @@ public interface HighOrderRefundMapper extends HighOrderRefundMapperExt { "goods_name, goods_desc, ", "goods_img, goods_spec_name, ", "goods_count, refund_order_no, ", - "return_total_price, refund_goods_num, ", - "refund_price, refund_integral, ", - "refund_remark, refund_status, ", - "refund_fail_reason, create_time, ", - "refund_time, update_time, ", - "ext_1, ext_2, ext_3, ", - "ext_4, ext_5, ext_6)", + "third_party_refund_order_no, return_total_price, ", + "refund_goods_num, refund_price, ", + "refund_integral, refund_remark, ", + "refund_status, refund_fail_reason, ", + "create_time, refund_time, ", + "update_time, ext_1, ", + "ext_2, ext_3, ext_4, ", + "ext_5, ext_6)", "values (#{orderId,jdbcType=BIGINT}, #{orderNo,jdbcType=VARCHAR}, ", "#{orderChildId,jdbcType=BIGINT}, #{orderChildNo,jdbcType=VARCHAR}, ", "#{memId,jdbcType=BIGINT}, #{memName,jdbcType=VARCHAR}, #{memPhone,jdbcType=VARCHAR}, ", @@ -60,13 +61,14 @@ public interface HighOrderRefundMapper extends HighOrderRefundMapperExt { "#{goodsName,jdbcType=VARCHAR}, #{goodsDesc,jdbcType=VARCHAR}, ", "#{goodsImg,jdbcType=VARCHAR}, #{goodsSpecName,jdbcType=VARCHAR}, ", "#{goodsCount,jdbcType=INTEGER}, #{refundOrderNo,jdbcType=VARCHAR}, ", - "#{returnTotalPrice,jdbcType=DECIMAL}, #{refundGoodsNum,jdbcType=INTEGER}, ", - "#{refundPrice,jdbcType=DECIMAL}, #{refundIntegral,jdbcType=INTEGER}, ", - "#{refundRemark,jdbcType=VARCHAR}, #{refundStatus,jdbcType=INTEGER}, ", - "#{refundFailReason,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, ", - "#{refundTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, ", - "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR}, ", - "#{ext4,jdbcType=VARCHAR}, #{ext5,jdbcType=VARCHAR}, #{ext6,jdbcType=VARCHAR})" + "#{thirdPartyRefundOrderNo,jdbcType=VARCHAR}, #{returnTotalPrice,jdbcType=DECIMAL}, ", + "#{refundGoodsNum,jdbcType=INTEGER}, #{refundPrice,jdbcType=DECIMAL}, ", + "#{refundIntegral,jdbcType=INTEGER}, #{refundRemark,jdbcType=VARCHAR}, ", + "#{refundStatus,jdbcType=INTEGER}, #{refundFailReason,jdbcType=VARCHAR}, ", + "#{createTime,jdbcType=TIMESTAMP}, #{refundTime,jdbcType=TIMESTAMP}, ", + "#{updateTime,jdbcType=TIMESTAMP}, #{ext1,jdbcType=VARCHAR}, ", + "#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR}, #{ext4,jdbcType=VARCHAR}, ", + "#{ext5,jdbcType=VARCHAR}, #{ext6,jdbcType=VARCHAR})" }) @Options(useGeneratedKeys=true,keyProperty="id") int insert(HighOrderRefund record); @@ -93,6 +95,7 @@ public interface HighOrderRefundMapper extends HighOrderRefundMapperExt { @Result(column="goods_spec_name", property="goodsSpecName", jdbcType=JdbcType.VARCHAR), @Result(column="goods_count", property="goodsCount", jdbcType=JdbcType.INTEGER), @Result(column="refund_order_no", property="refundOrderNo", jdbcType=JdbcType.VARCHAR), + @Result(column="third_party_refund_order_no", property="thirdPartyRefundOrderNo", jdbcType=JdbcType.VARCHAR), @Result(column="return_total_price", property="returnTotalPrice", jdbcType=JdbcType.DECIMAL), @Result(column="refund_goods_num", property="refundGoodsNum", jdbcType=JdbcType.INTEGER), @Result(column="refund_price", property="refundPrice", jdbcType=JdbcType.DECIMAL), @@ -116,9 +119,9 @@ public interface HighOrderRefundMapper extends HighOrderRefundMapperExt { "select", "id, order_id, order_no, order_child_id, order_child_no, mem_id, mem_name, mem_phone, ", "goods_type, goods_id, goods_name, goods_desc, goods_img, goods_spec_name, goods_count, ", - "refund_order_no, return_total_price, refund_goods_num, refund_price, refund_integral, ", - "refund_remark, refund_status, refund_fail_reason, create_time, refund_time, ", - "update_time, ext_1, ext_2, ext_3, ext_4, ext_5, ext_6", + "refund_order_no, third_party_refund_order_no, return_total_price, refund_goods_num, ", + "refund_price, refund_integral, refund_remark, refund_status, refund_fail_reason, ", + "create_time, refund_time, update_time, ext_1, ext_2, ext_3, ext_4, ext_5, ext_6", "from high_order_refund", "where id = #{id,jdbcType=BIGINT}" }) @@ -139,6 +142,7 @@ public interface HighOrderRefundMapper extends HighOrderRefundMapperExt { @Result(column="goods_spec_name", property="goodsSpecName", jdbcType=JdbcType.VARCHAR), @Result(column="goods_count", property="goodsCount", jdbcType=JdbcType.INTEGER), @Result(column="refund_order_no", property="refundOrderNo", jdbcType=JdbcType.VARCHAR), + @Result(column="third_party_refund_order_no", property="thirdPartyRefundOrderNo", jdbcType=JdbcType.VARCHAR), @Result(column="return_total_price", property="returnTotalPrice", jdbcType=JdbcType.DECIMAL), @Result(column="refund_goods_num", property="refundGoodsNum", jdbcType=JdbcType.INTEGER), @Result(column="refund_price", property="refundPrice", jdbcType=JdbcType.DECIMAL), @@ -184,6 +188,7 @@ public interface HighOrderRefundMapper extends HighOrderRefundMapperExt { "goods_spec_name = #{goodsSpecName,jdbcType=VARCHAR},", "goods_count = #{goodsCount,jdbcType=INTEGER},", "refund_order_no = #{refundOrderNo,jdbcType=VARCHAR},", + "third_party_refund_order_no = #{thirdPartyRefundOrderNo,jdbcType=VARCHAR},", "return_total_price = #{returnTotalPrice,jdbcType=DECIMAL},", "refund_goods_num = #{refundGoodsNum,jdbcType=INTEGER},", "refund_price = #{refundPrice,jdbcType=DECIMAL},", diff --git a/hai-service/src/main/java/com/hai/dao/HighOrderRefundSqlProvider.java b/hai-service/src/main/java/com/hai/dao/HighOrderRefundSqlProvider.java index dd868b96..0667e007 100644 --- a/hai-service/src/main/java/com/hai/dao/HighOrderRefundSqlProvider.java +++ b/hai-service/src/main/java/com/hai/dao/HighOrderRefundSqlProvider.java @@ -88,6 +88,10 @@ public class HighOrderRefundSqlProvider { sql.VALUES("refund_order_no", "#{refundOrderNo,jdbcType=VARCHAR}"); } + if (record.getThirdPartyRefundOrderNo() != null) { + sql.VALUES("third_party_refund_order_no", "#{thirdPartyRefundOrderNo,jdbcType=VARCHAR}"); + } + if (record.getReturnTotalPrice() != null) { sql.VALUES("return_total_price", "#{returnTotalPrice,jdbcType=DECIMAL}"); } @@ -177,6 +181,7 @@ public class HighOrderRefundSqlProvider { sql.SELECT("goods_spec_name"); sql.SELECT("goods_count"); sql.SELECT("refund_order_no"); + sql.SELECT("third_party_refund_order_no"); sql.SELECT("return_total_price"); sql.SELECT("refund_goods_num"); sql.SELECT("refund_price"); @@ -274,6 +279,10 @@ public class HighOrderRefundSqlProvider { sql.SET("refund_order_no = #{record.refundOrderNo,jdbcType=VARCHAR}"); } + if (record.getThirdPartyRefundOrderNo() != null) { + sql.SET("third_party_refund_order_no = #{record.thirdPartyRefundOrderNo,jdbcType=VARCHAR}"); + } + if (record.getReturnTotalPrice() != null) { sql.SET("return_total_price = #{record.returnTotalPrice,jdbcType=DECIMAL}"); } @@ -362,6 +371,7 @@ public class HighOrderRefundSqlProvider { sql.SET("goods_spec_name = #{record.goodsSpecName,jdbcType=VARCHAR}"); sql.SET("goods_count = #{record.goodsCount,jdbcType=INTEGER}"); sql.SET("refund_order_no = #{record.refundOrderNo,jdbcType=VARCHAR}"); + sql.SET("third_party_refund_order_no = #{record.thirdPartyRefundOrderNo,jdbcType=VARCHAR}"); sql.SET("return_total_price = #{record.returnTotalPrice,jdbcType=DECIMAL}"); sql.SET("refund_goods_num = #{record.refundGoodsNum,jdbcType=INTEGER}"); sql.SET("refund_price = #{record.refundPrice,jdbcType=DECIMAL}"); @@ -448,6 +458,10 @@ public class HighOrderRefundSqlProvider { sql.SET("refund_order_no = #{refundOrderNo,jdbcType=VARCHAR}"); } + if (record.getThirdPartyRefundOrderNo() != null) { + sql.SET("third_party_refund_order_no = #{thirdPartyRefundOrderNo,jdbcType=VARCHAR}"); + } + if (record.getReturnTotalPrice() != null) { sql.SET("return_total_price = #{returnTotalPrice,jdbcType=DECIMAL}"); } diff --git a/hai-service/src/main/java/com/hai/dao/OutRechargeOrderMapper.java b/hai-service/src/main/java/com/hai/dao/OutRechargeOrderMapper.java index 2eeaf604..af13174d 100644 --- a/hai-service/src/main/java/com/hai/dao/OutRechargeOrderMapper.java +++ b/hai-service/src/main/java/com/hai/dao/OutRechargeOrderMapper.java @@ -39,50 +39,50 @@ public interface OutRechargeOrderMapper extends OutRechargeOrderMapperExt { int deleteByPrimaryKey(Long id); @Insert({ - "insert into out_recharge_order (recharge_price, `type`, ", - "operator_name, operator_type, ", - "order_no, recharge_type, ", + "insert into out_recharge_order (`type`, operator_name, ", + "operator_type, recharge_price, ", + "order_no, child_order_no, ", "mem_discount_id, mem_discount_name, ", "user_id, user_name, ", - "user_phone, goods_id, ", - "recharge_content, pay_type, ", + "user_phone, pay_type, ", "labor_union_card, integral_num, ", "discount_deduction_price, integral_deduction_price, ", - "pay_price, pay_real_price, ", - "pay_serial_no, create_timed, ", + "pay_price, order_price, ", + "pay_real_price, pay_serial_no, ", + "pay_status, recharge_status, ", + "recharge_name, create_timed, ", "pay_time, cancel_time, ", - "finish_time, out_refund_no, ", - "order_price, refund_time, ", + "finish_time, remarks, ", + "out_refund_no, refund_time, ", "tp_refund_order_no, refund_id, ", - "refund_fee, company_id, ", - "pay_status, merch_id, ", - "recharge_status, ext_1, ", - "ext_2, ext_3, recharge_name, ", - "remarks, agent_key, ", - "object_id, abnormal_msg, ", - "whether_rebate)", - "values (#{rechargePrice,jdbcType=DECIMAL}, #{type,jdbcType=INTEGER}, ", - "#{operatorName,jdbcType=VARCHAR}, #{operatorType,jdbcType=INTEGER}, ", - "#{orderNo,jdbcType=VARCHAR}, #{rechargeType,jdbcType=INTEGER}, ", + "refund_fee, agent_key, ", + "object_id, recharge_type, ", + "abnormal_msg, ext_1, ", + "ext_2, ext_3, goods_id, ", + "recharge_content, company_id, ", + "merch_id, whether_rebate)", + "values (#{type,jdbcType=INTEGER}, #{operatorName,jdbcType=VARCHAR}, ", + "#{operatorType,jdbcType=INTEGER}, #{rechargePrice,jdbcType=DECIMAL}, ", + "#{orderNo,jdbcType=VARCHAR}, #{childOrderNo,jdbcType=VARCHAR}, ", "#{memDiscountId,jdbcType=BIGINT}, #{memDiscountName,jdbcType=VARCHAR}, ", "#{userId,jdbcType=BIGINT}, #{userName,jdbcType=VARCHAR}, ", - "#{userPhone,jdbcType=VARCHAR}, #{goodsId,jdbcType=BIGINT}, ", - "#{rechargeContent,jdbcType=VARCHAR}, #{payType,jdbcType=INTEGER}, ", + "#{userPhone,jdbcType=VARCHAR}, #{payType,jdbcType=INTEGER}, ", "#{laborUnionCard,jdbcType=VARCHAR}, #{integralNum,jdbcType=DECIMAL}, ", "#{discountDeductionPrice,jdbcType=DECIMAL}, #{integralDeductionPrice,jdbcType=DECIMAL}, ", - "#{payPrice,jdbcType=DECIMAL}, #{payRealPrice,jdbcType=DECIMAL}, ", - "#{paySerialNo,jdbcType=VARCHAR}, #{createTimed,jdbcType=TIMESTAMP}, ", + "#{payPrice,jdbcType=DECIMAL}, #{orderPrice,jdbcType=DECIMAL}, ", + "#{payRealPrice,jdbcType=DECIMAL}, #{paySerialNo,jdbcType=VARCHAR}, ", + "#{payStatus,jdbcType=INTEGER}, #{rechargeStatus,jdbcType=INTEGER}, ", + "#{rechargeName,jdbcType=VARCHAR}, #{createTimed,jdbcType=TIMESTAMP}, ", "#{payTime,jdbcType=TIMESTAMP}, #{cancelTime,jdbcType=TIMESTAMP}, ", - "#{finishTime,jdbcType=TIMESTAMP}, #{outRefundNo,jdbcType=VARCHAR}, ", - "#{orderPrice,jdbcType=DECIMAL}, #{refundTime,jdbcType=TIMESTAMP}, ", + "#{finishTime,jdbcType=TIMESTAMP}, #{remarks,jdbcType=VARCHAR}, ", + "#{outRefundNo,jdbcType=VARCHAR}, #{refundTime,jdbcType=TIMESTAMP}, ", "#{tpRefundOrderNo,jdbcType=VARCHAR}, #{refundId,jdbcType=VARCHAR}, ", - "#{refundFee,jdbcType=DECIMAL}, #{companyId,jdbcType=BIGINT}, ", - "#{payStatus,jdbcType=INTEGER}, #{merchId,jdbcType=VARCHAR}, ", - "#{rechargeStatus,jdbcType=INTEGER}, #{ext1,jdbcType=VARCHAR}, ", - "#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR}, #{rechargeName,jdbcType=VARCHAR}, ", - "#{remarks,jdbcType=VARCHAR}, #{agentKey,jdbcType=VARCHAR}, ", - "#{objectId,jdbcType=BIGINT}, #{abnormalMsg,jdbcType=VARCHAR}, ", - "#{whetherRebate,jdbcType=BIT})" + "#{refundFee,jdbcType=DECIMAL}, #{agentKey,jdbcType=VARCHAR}, ", + "#{objectId,jdbcType=INTEGER}, #{rechargeType,jdbcType=INTEGER}, ", + "#{abnormalMsg,jdbcType=VARCHAR}, #{ext1,jdbcType=VARCHAR}, ", + "#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR}, #{goodsId,jdbcType=BIGINT}, ", + "#{rechargeContent,jdbcType=VARCHAR}, #{companyId,jdbcType=BIGINT}, ", + "#{merchId,jdbcType=VARCHAR}, #{whetherRebate,jdbcType=BIT})" }) @Options(useGeneratedKeys=true,keyProperty="id") int insert(OutRechargeOrder record); @@ -94,111 +94,113 @@ public interface OutRechargeOrderMapper extends OutRechargeOrderMapperExt { @SelectProvider(type=OutRechargeOrderSqlProvider.class, method="selectByExample") @Results({ @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), - @Result(column="recharge_price", property="rechargePrice", jdbcType=JdbcType.DECIMAL), @Result(column="type", property="type", jdbcType=JdbcType.INTEGER), @Result(column="operator_name", property="operatorName", jdbcType=JdbcType.VARCHAR), @Result(column="operator_type", property="operatorType", jdbcType=JdbcType.INTEGER), + @Result(column="recharge_price", property="rechargePrice", jdbcType=JdbcType.DECIMAL), @Result(column="order_no", property="orderNo", jdbcType=JdbcType.VARCHAR), - @Result(column="recharge_type", property="rechargeType", jdbcType=JdbcType.INTEGER), + @Result(column="child_order_no", property="childOrderNo", jdbcType=JdbcType.VARCHAR), @Result(column="mem_discount_id", property="memDiscountId", jdbcType=JdbcType.BIGINT), @Result(column="mem_discount_name", property="memDiscountName", jdbcType=JdbcType.VARCHAR), @Result(column="user_id", property="userId", jdbcType=JdbcType.BIGINT), @Result(column="user_name", property="userName", jdbcType=JdbcType.VARCHAR), @Result(column="user_phone", property="userPhone", jdbcType=JdbcType.VARCHAR), - @Result(column="goods_id", property="goodsId", jdbcType=JdbcType.BIGINT), - @Result(column="recharge_content", property="rechargeContent", jdbcType=JdbcType.VARCHAR), @Result(column="pay_type", property="payType", jdbcType=JdbcType.INTEGER), @Result(column="labor_union_card", property="laborUnionCard", jdbcType=JdbcType.VARCHAR), @Result(column="integral_num", property="integralNum", jdbcType=JdbcType.DECIMAL), @Result(column="discount_deduction_price", property="discountDeductionPrice", jdbcType=JdbcType.DECIMAL), @Result(column="integral_deduction_price", property="integralDeductionPrice", jdbcType=JdbcType.DECIMAL), @Result(column="pay_price", property="payPrice", jdbcType=JdbcType.DECIMAL), + @Result(column="order_price", property="orderPrice", jdbcType=JdbcType.DECIMAL), @Result(column="pay_real_price", property="payRealPrice", jdbcType=JdbcType.DECIMAL), @Result(column="pay_serial_no", property="paySerialNo", jdbcType=JdbcType.VARCHAR), + @Result(column="pay_status", property="payStatus", jdbcType=JdbcType.INTEGER), + @Result(column="recharge_status", property="rechargeStatus", jdbcType=JdbcType.INTEGER), + @Result(column="recharge_name", property="rechargeName", jdbcType=JdbcType.VARCHAR), @Result(column="create_timed", property="createTimed", jdbcType=JdbcType.TIMESTAMP), @Result(column="pay_time", property="payTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="cancel_time", property="cancelTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="finish_time", property="finishTime", jdbcType=JdbcType.TIMESTAMP), + @Result(column="remarks", property="remarks", jdbcType=JdbcType.VARCHAR), @Result(column="out_refund_no", property="outRefundNo", jdbcType=JdbcType.VARCHAR), - @Result(column="order_price", property="orderPrice", jdbcType=JdbcType.DECIMAL), @Result(column="refund_time", property="refundTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="tp_refund_order_no", property="tpRefundOrderNo", jdbcType=JdbcType.VARCHAR), @Result(column="refund_id", property="refundId", jdbcType=JdbcType.VARCHAR), @Result(column="refund_fee", property="refundFee", jdbcType=JdbcType.DECIMAL), - @Result(column="company_id", property="companyId", jdbcType=JdbcType.BIGINT), - @Result(column="pay_status", property="payStatus", jdbcType=JdbcType.INTEGER), - @Result(column="merch_id", property="merchId", jdbcType=JdbcType.VARCHAR), - @Result(column="recharge_status", property="rechargeStatus", jdbcType=JdbcType.INTEGER), + @Result(column="agent_key", property="agentKey", jdbcType=JdbcType.VARCHAR), + @Result(column="object_id", property="objectId", jdbcType=JdbcType.INTEGER), + @Result(column="recharge_type", property="rechargeType", jdbcType=JdbcType.INTEGER), + @Result(column="abnormal_msg", property="abnormalMsg", jdbcType=JdbcType.VARCHAR), @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR), @Result(column="ext_2", property="ext2", jdbcType=JdbcType.VARCHAR), @Result(column="ext_3", property="ext3", jdbcType=JdbcType.VARCHAR), - @Result(column="recharge_name", property="rechargeName", jdbcType=JdbcType.VARCHAR), - @Result(column="remarks", property="remarks", jdbcType=JdbcType.VARCHAR), - @Result(column="agent_key", property="agentKey", jdbcType=JdbcType.VARCHAR), - @Result(column="object_id", property="objectId", jdbcType=JdbcType.BIGINT), - @Result(column="abnormal_msg", property="abnormalMsg", jdbcType=JdbcType.VARCHAR), + @Result(column="goods_id", property="goodsId", jdbcType=JdbcType.BIGINT), + @Result(column="recharge_content", property="rechargeContent", jdbcType=JdbcType.VARCHAR), + @Result(column="company_id", property="companyId", jdbcType=JdbcType.BIGINT), + @Result(column="merch_id", property="merchId", jdbcType=JdbcType.VARCHAR), @Result(column="whether_rebate", property="whetherRebate", jdbcType=JdbcType.BIT) }) List selectByExample(OutRechargeOrderExample example); @Select({ "select", - "id, recharge_price, `type`, operator_name, operator_type, order_no, recharge_type, ", - "mem_discount_id, mem_discount_name, user_id, user_name, user_phone, goods_id, ", - "recharge_content, pay_type, labor_union_card, integral_num, discount_deduction_price, ", - "integral_deduction_price, pay_price, pay_real_price, pay_serial_no, create_timed, ", - "pay_time, cancel_time, finish_time, out_refund_no, order_price, refund_time, ", - "tp_refund_order_no, refund_id, refund_fee, company_id, pay_status, merch_id, ", - "recharge_status, ext_1, ext_2, ext_3, recharge_name, remarks, agent_key, object_id, ", - "abnormal_msg, whether_rebate", + "id, `type`, operator_name, operator_type, recharge_price, order_no, child_order_no, ", + "mem_discount_id, mem_discount_name, user_id, user_name, user_phone, pay_type, ", + "labor_union_card, integral_num, discount_deduction_price, integral_deduction_price, ", + "pay_price, order_price, pay_real_price, pay_serial_no, pay_status, recharge_status, ", + "recharge_name, create_timed, pay_time, cancel_time, finish_time, remarks, out_refund_no, ", + "refund_time, tp_refund_order_no, refund_id, refund_fee, agent_key, object_id, ", + "recharge_type, abnormal_msg, ext_1, ext_2, ext_3, goods_id, recharge_content, ", + "company_id, merch_id, whether_rebate", "from out_recharge_order", "where id = #{id,jdbcType=BIGINT}" }) @Results({ @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), - @Result(column="recharge_price", property="rechargePrice", jdbcType=JdbcType.DECIMAL), @Result(column="type", property="type", jdbcType=JdbcType.INTEGER), @Result(column="operator_name", property="operatorName", jdbcType=JdbcType.VARCHAR), @Result(column="operator_type", property="operatorType", jdbcType=JdbcType.INTEGER), + @Result(column="recharge_price", property="rechargePrice", jdbcType=JdbcType.DECIMAL), @Result(column="order_no", property="orderNo", jdbcType=JdbcType.VARCHAR), - @Result(column="recharge_type", property="rechargeType", jdbcType=JdbcType.INTEGER), + @Result(column="child_order_no", property="childOrderNo", jdbcType=JdbcType.VARCHAR), @Result(column="mem_discount_id", property="memDiscountId", jdbcType=JdbcType.BIGINT), @Result(column="mem_discount_name", property="memDiscountName", jdbcType=JdbcType.VARCHAR), @Result(column="user_id", property="userId", jdbcType=JdbcType.BIGINT), @Result(column="user_name", property="userName", jdbcType=JdbcType.VARCHAR), @Result(column="user_phone", property="userPhone", jdbcType=JdbcType.VARCHAR), - @Result(column="goods_id", property="goodsId", jdbcType=JdbcType.BIGINT), - @Result(column="recharge_content", property="rechargeContent", jdbcType=JdbcType.VARCHAR), @Result(column="pay_type", property="payType", jdbcType=JdbcType.INTEGER), @Result(column="labor_union_card", property="laborUnionCard", jdbcType=JdbcType.VARCHAR), @Result(column="integral_num", property="integralNum", jdbcType=JdbcType.DECIMAL), @Result(column="discount_deduction_price", property="discountDeductionPrice", jdbcType=JdbcType.DECIMAL), @Result(column="integral_deduction_price", property="integralDeductionPrice", jdbcType=JdbcType.DECIMAL), @Result(column="pay_price", property="payPrice", jdbcType=JdbcType.DECIMAL), + @Result(column="order_price", property="orderPrice", jdbcType=JdbcType.DECIMAL), @Result(column="pay_real_price", property="payRealPrice", jdbcType=JdbcType.DECIMAL), @Result(column="pay_serial_no", property="paySerialNo", jdbcType=JdbcType.VARCHAR), + @Result(column="pay_status", property="payStatus", jdbcType=JdbcType.INTEGER), + @Result(column="recharge_status", property="rechargeStatus", jdbcType=JdbcType.INTEGER), + @Result(column="recharge_name", property="rechargeName", jdbcType=JdbcType.VARCHAR), @Result(column="create_timed", property="createTimed", jdbcType=JdbcType.TIMESTAMP), @Result(column="pay_time", property="payTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="cancel_time", property="cancelTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="finish_time", property="finishTime", jdbcType=JdbcType.TIMESTAMP), + @Result(column="remarks", property="remarks", jdbcType=JdbcType.VARCHAR), @Result(column="out_refund_no", property="outRefundNo", jdbcType=JdbcType.VARCHAR), - @Result(column="order_price", property="orderPrice", jdbcType=JdbcType.DECIMAL), @Result(column="refund_time", property="refundTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="tp_refund_order_no", property="tpRefundOrderNo", jdbcType=JdbcType.VARCHAR), @Result(column="refund_id", property="refundId", jdbcType=JdbcType.VARCHAR), @Result(column="refund_fee", property="refundFee", jdbcType=JdbcType.DECIMAL), - @Result(column="company_id", property="companyId", jdbcType=JdbcType.BIGINT), - @Result(column="pay_status", property="payStatus", jdbcType=JdbcType.INTEGER), - @Result(column="merch_id", property="merchId", jdbcType=JdbcType.VARCHAR), - @Result(column="recharge_status", property="rechargeStatus", jdbcType=JdbcType.INTEGER), + @Result(column="agent_key", property="agentKey", jdbcType=JdbcType.VARCHAR), + @Result(column="object_id", property="objectId", jdbcType=JdbcType.INTEGER), + @Result(column="recharge_type", property="rechargeType", jdbcType=JdbcType.INTEGER), + @Result(column="abnormal_msg", property="abnormalMsg", jdbcType=JdbcType.VARCHAR), @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR), @Result(column="ext_2", property="ext2", jdbcType=JdbcType.VARCHAR), @Result(column="ext_3", property="ext3", jdbcType=JdbcType.VARCHAR), - @Result(column="recharge_name", property="rechargeName", jdbcType=JdbcType.VARCHAR), - @Result(column="remarks", property="remarks", jdbcType=JdbcType.VARCHAR), - @Result(column="agent_key", property="agentKey", jdbcType=JdbcType.VARCHAR), - @Result(column="object_id", property="objectId", jdbcType=JdbcType.BIGINT), - @Result(column="abnormal_msg", property="abnormalMsg", jdbcType=JdbcType.VARCHAR), + @Result(column="goods_id", property="goodsId", jdbcType=JdbcType.BIGINT), + @Result(column="recharge_content", property="rechargeContent", jdbcType=JdbcType.VARCHAR), + @Result(column="company_id", property="companyId", jdbcType=JdbcType.BIGINT), + @Result(column="merch_id", property="merchId", jdbcType=JdbcType.VARCHAR), @Result(column="whether_rebate", property="whetherRebate", jdbcType=JdbcType.BIT) }) OutRechargeOrder selectByPrimaryKey(Long id); @@ -214,49 +216,50 @@ public interface OutRechargeOrderMapper extends OutRechargeOrderMapperExt { @Update({ "update out_recharge_order", - "set recharge_price = #{rechargePrice,jdbcType=DECIMAL},", - "`type` = #{type,jdbcType=INTEGER},", + "set `type` = #{type,jdbcType=INTEGER},", "operator_name = #{operatorName,jdbcType=VARCHAR},", "operator_type = #{operatorType,jdbcType=INTEGER},", + "recharge_price = #{rechargePrice,jdbcType=DECIMAL},", "order_no = #{orderNo,jdbcType=VARCHAR},", - "recharge_type = #{rechargeType,jdbcType=INTEGER},", + "child_order_no = #{childOrderNo,jdbcType=VARCHAR},", "mem_discount_id = #{memDiscountId,jdbcType=BIGINT},", "mem_discount_name = #{memDiscountName,jdbcType=VARCHAR},", "user_id = #{userId,jdbcType=BIGINT},", "user_name = #{userName,jdbcType=VARCHAR},", "user_phone = #{userPhone,jdbcType=VARCHAR},", - "goods_id = #{goodsId,jdbcType=BIGINT},", - "recharge_content = #{rechargeContent,jdbcType=VARCHAR},", "pay_type = #{payType,jdbcType=INTEGER},", "labor_union_card = #{laborUnionCard,jdbcType=VARCHAR},", "integral_num = #{integralNum,jdbcType=DECIMAL},", "discount_deduction_price = #{discountDeductionPrice,jdbcType=DECIMAL},", "integral_deduction_price = #{integralDeductionPrice,jdbcType=DECIMAL},", "pay_price = #{payPrice,jdbcType=DECIMAL},", + "order_price = #{orderPrice,jdbcType=DECIMAL},", "pay_real_price = #{payRealPrice,jdbcType=DECIMAL},", "pay_serial_no = #{paySerialNo,jdbcType=VARCHAR},", + "pay_status = #{payStatus,jdbcType=INTEGER},", + "recharge_status = #{rechargeStatus,jdbcType=INTEGER},", + "recharge_name = #{rechargeName,jdbcType=VARCHAR},", "create_timed = #{createTimed,jdbcType=TIMESTAMP},", "pay_time = #{payTime,jdbcType=TIMESTAMP},", "cancel_time = #{cancelTime,jdbcType=TIMESTAMP},", "finish_time = #{finishTime,jdbcType=TIMESTAMP},", + "remarks = #{remarks,jdbcType=VARCHAR},", "out_refund_no = #{outRefundNo,jdbcType=VARCHAR},", - "order_price = #{orderPrice,jdbcType=DECIMAL},", "refund_time = #{refundTime,jdbcType=TIMESTAMP},", "tp_refund_order_no = #{tpRefundOrderNo,jdbcType=VARCHAR},", "refund_id = #{refundId,jdbcType=VARCHAR},", "refund_fee = #{refundFee,jdbcType=DECIMAL},", - "company_id = #{companyId,jdbcType=BIGINT},", - "pay_status = #{payStatus,jdbcType=INTEGER},", - "merch_id = #{merchId,jdbcType=VARCHAR},", - "recharge_status = #{rechargeStatus,jdbcType=INTEGER},", + "agent_key = #{agentKey,jdbcType=VARCHAR},", + "object_id = #{objectId,jdbcType=INTEGER},", + "recharge_type = #{rechargeType,jdbcType=INTEGER},", + "abnormal_msg = #{abnormalMsg,jdbcType=VARCHAR},", "ext_1 = #{ext1,jdbcType=VARCHAR},", "ext_2 = #{ext2,jdbcType=VARCHAR},", "ext_3 = #{ext3,jdbcType=VARCHAR},", - "recharge_name = #{rechargeName,jdbcType=VARCHAR},", - "remarks = #{remarks,jdbcType=VARCHAR},", - "agent_key = #{agentKey,jdbcType=VARCHAR},", - "object_id = #{objectId,jdbcType=BIGINT},", - "abnormal_msg = #{abnormalMsg,jdbcType=VARCHAR},", + "goods_id = #{goodsId,jdbcType=BIGINT},", + "recharge_content = #{rechargeContent,jdbcType=VARCHAR},", + "company_id = #{companyId,jdbcType=BIGINT},", + "merch_id = #{merchId,jdbcType=VARCHAR},", "whether_rebate = #{whetherRebate,jdbcType=BIT}", "where id = #{id,jdbcType=BIGINT}" }) diff --git a/hai-service/src/main/java/com/hai/dao/OutRechargeOrderSqlProvider.java b/hai-service/src/main/java/com/hai/dao/OutRechargeOrderSqlProvider.java index 9322bcd7..70feda23 100644 --- a/hai-service/src/main/java/com/hai/dao/OutRechargeOrderSqlProvider.java +++ b/hai-service/src/main/java/com/hai/dao/OutRechargeOrderSqlProvider.java @@ -28,10 +28,6 @@ public class OutRechargeOrderSqlProvider { SQL sql = new SQL(); sql.INSERT_INTO("out_recharge_order"); - if (record.getRechargePrice() != null) { - sql.VALUES("recharge_price", "#{rechargePrice,jdbcType=DECIMAL}"); - } - if (record.getType() != null) { sql.VALUES("`type`", "#{type,jdbcType=INTEGER}"); } @@ -44,12 +40,16 @@ public class OutRechargeOrderSqlProvider { sql.VALUES("operator_type", "#{operatorType,jdbcType=INTEGER}"); } + if (record.getRechargePrice() != null) { + sql.VALUES("recharge_price", "#{rechargePrice,jdbcType=DECIMAL}"); + } + if (record.getOrderNo() != null) { sql.VALUES("order_no", "#{orderNo,jdbcType=VARCHAR}"); } - if (record.getRechargeType() != null) { - sql.VALUES("recharge_type", "#{rechargeType,jdbcType=INTEGER}"); + if (record.getChildOrderNo() != null) { + sql.VALUES("child_order_no", "#{childOrderNo,jdbcType=VARCHAR}"); } if (record.getMemDiscountId() != null) { @@ -72,14 +72,6 @@ public class OutRechargeOrderSqlProvider { sql.VALUES("user_phone", "#{userPhone,jdbcType=VARCHAR}"); } - if (record.getGoodsId() != null) { - sql.VALUES("goods_id", "#{goodsId,jdbcType=BIGINT}"); - } - - if (record.getRechargeContent() != null) { - sql.VALUES("recharge_content", "#{rechargeContent,jdbcType=VARCHAR}"); - } - if (record.getPayType() != null) { sql.VALUES("pay_type", "#{payType,jdbcType=INTEGER}"); } @@ -104,6 +96,10 @@ public class OutRechargeOrderSqlProvider { sql.VALUES("pay_price", "#{payPrice,jdbcType=DECIMAL}"); } + if (record.getOrderPrice() != null) { + sql.VALUES("order_price", "#{orderPrice,jdbcType=DECIMAL}"); + } + if (record.getPayRealPrice() != null) { sql.VALUES("pay_real_price", "#{payRealPrice,jdbcType=DECIMAL}"); } @@ -112,6 +108,18 @@ public class OutRechargeOrderSqlProvider { sql.VALUES("pay_serial_no", "#{paySerialNo,jdbcType=VARCHAR}"); } + if (record.getPayStatus() != null) { + sql.VALUES("pay_status", "#{payStatus,jdbcType=INTEGER}"); + } + + if (record.getRechargeStatus() != null) { + sql.VALUES("recharge_status", "#{rechargeStatus,jdbcType=INTEGER}"); + } + + if (record.getRechargeName() != null) { + sql.VALUES("recharge_name", "#{rechargeName,jdbcType=VARCHAR}"); + } + if (record.getCreateTimed() != null) { sql.VALUES("create_timed", "#{createTimed,jdbcType=TIMESTAMP}"); } @@ -128,12 +136,12 @@ public class OutRechargeOrderSqlProvider { sql.VALUES("finish_time", "#{finishTime,jdbcType=TIMESTAMP}"); } - if (record.getOutRefundNo() != null) { - sql.VALUES("out_refund_no", "#{outRefundNo,jdbcType=VARCHAR}"); + if (record.getRemarks() != null) { + sql.VALUES("remarks", "#{remarks,jdbcType=VARCHAR}"); } - if (record.getOrderPrice() != null) { - sql.VALUES("order_price", "#{orderPrice,jdbcType=DECIMAL}"); + if (record.getOutRefundNo() != null) { + sql.VALUES("out_refund_no", "#{outRefundNo,jdbcType=VARCHAR}"); } if (record.getRefundTime() != null) { @@ -152,20 +160,20 @@ public class OutRechargeOrderSqlProvider { sql.VALUES("refund_fee", "#{refundFee,jdbcType=DECIMAL}"); } - if (record.getCompanyId() != null) { - sql.VALUES("company_id", "#{companyId,jdbcType=BIGINT}"); + if (record.getAgentKey() != null) { + sql.VALUES("agent_key", "#{agentKey,jdbcType=VARCHAR}"); } - if (record.getPayStatus() != null) { - sql.VALUES("pay_status", "#{payStatus,jdbcType=INTEGER}"); + if (record.getObjectId() != null) { + sql.VALUES("object_id", "#{objectId,jdbcType=INTEGER}"); } - if (record.getMerchId() != null) { - sql.VALUES("merch_id", "#{merchId,jdbcType=VARCHAR}"); + if (record.getRechargeType() != null) { + sql.VALUES("recharge_type", "#{rechargeType,jdbcType=INTEGER}"); } - if (record.getRechargeStatus() != null) { - sql.VALUES("recharge_status", "#{rechargeStatus,jdbcType=INTEGER}"); + if (record.getAbnormalMsg() != null) { + sql.VALUES("abnormal_msg", "#{abnormalMsg,jdbcType=VARCHAR}"); } if (record.getExt1() != null) { @@ -180,24 +188,20 @@ public class OutRechargeOrderSqlProvider { sql.VALUES("ext_3", "#{ext3,jdbcType=VARCHAR}"); } - if (record.getRechargeName() != null) { - sql.VALUES("recharge_name", "#{rechargeName,jdbcType=VARCHAR}"); - } - - if (record.getRemarks() != null) { - sql.VALUES("remarks", "#{remarks,jdbcType=VARCHAR}"); + if (record.getGoodsId() != null) { + sql.VALUES("goods_id", "#{goodsId,jdbcType=BIGINT}"); } - if (record.getAgentKey() != null) { - sql.VALUES("agent_key", "#{agentKey,jdbcType=VARCHAR}"); + if (record.getRechargeContent() != null) { + sql.VALUES("recharge_content", "#{rechargeContent,jdbcType=VARCHAR}"); } - if (record.getObjectId() != null) { - sql.VALUES("object_id", "#{objectId,jdbcType=BIGINT}"); + if (record.getCompanyId() != null) { + sql.VALUES("company_id", "#{companyId,jdbcType=BIGINT}"); } - if (record.getAbnormalMsg() != null) { - sql.VALUES("abnormal_msg", "#{abnormalMsg,jdbcType=VARCHAR}"); + if (record.getMerchId() != null) { + sql.VALUES("merch_id", "#{merchId,jdbcType=VARCHAR}"); } if (record.getWhetherRebate() != null) { @@ -214,49 +218,50 @@ public class OutRechargeOrderSqlProvider { } else { sql.SELECT("id"); } - sql.SELECT("recharge_price"); sql.SELECT("`type`"); sql.SELECT("operator_name"); sql.SELECT("operator_type"); + sql.SELECT("recharge_price"); sql.SELECT("order_no"); - sql.SELECT("recharge_type"); + sql.SELECT("child_order_no"); sql.SELECT("mem_discount_id"); sql.SELECT("mem_discount_name"); sql.SELECT("user_id"); sql.SELECT("user_name"); sql.SELECT("user_phone"); - sql.SELECT("goods_id"); - sql.SELECT("recharge_content"); sql.SELECT("pay_type"); sql.SELECT("labor_union_card"); sql.SELECT("integral_num"); sql.SELECT("discount_deduction_price"); sql.SELECT("integral_deduction_price"); sql.SELECT("pay_price"); + sql.SELECT("order_price"); sql.SELECT("pay_real_price"); sql.SELECT("pay_serial_no"); + sql.SELECT("pay_status"); + sql.SELECT("recharge_status"); + sql.SELECT("recharge_name"); sql.SELECT("create_timed"); sql.SELECT("pay_time"); sql.SELECT("cancel_time"); sql.SELECT("finish_time"); + sql.SELECT("remarks"); sql.SELECT("out_refund_no"); - sql.SELECT("order_price"); sql.SELECT("refund_time"); sql.SELECT("tp_refund_order_no"); sql.SELECT("refund_id"); sql.SELECT("refund_fee"); - sql.SELECT("company_id"); - sql.SELECT("pay_status"); - sql.SELECT("merch_id"); - sql.SELECT("recharge_status"); - sql.SELECT("ext_1"); - sql.SELECT("ext_2"); - sql.SELECT("ext_3"); - sql.SELECT("recharge_name"); - sql.SELECT("remarks"); sql.SELECT("agent_key"); sql.SELECT("object_id"); + sql.SELECT("recharge_type"); sql.SELECT("abnormal_msg"); + sql.SELECT("ext_1"); + sql.SELECT("ext_2"); + sql.SELECT("ext_3"); + sql.SELECT("goods_id"); + sql.SELECT("recharge_content"); + sql.SELECT("company_id"); + sql.SELECT("merch_id"); sql.SELECT("whether_rebate"); sql.FROM("out_recharge_order"); applyWhere(sql, example, false); @@ -279,10 +284,6 @@ public class OutRechargeOrderSqlProvider { sql.SET("id = #{record.id,jdbcType=BIGINT}"); } - if (record.getRechargePrice() != null) { - sql.SET("recharge_price = #{record.rechargePrice,jdbcType=DECIMAL}"); - } - if (record.getType() != null) { sql.SET("`type` = #{record.type,jdbcType=INTEGER}"); } @@ -295,12 +296,16 @@ public class OutRechargeOrderSqlProvider { sql.SET("operator_type = #{record.operatorType,jdbcType=INTEGER}"); } + if (record.getRechargePrice() != null) { + sql.SET("recharge_price = #{record.rechargePrice,jdbcType=DECIMAL}"); + } + if (record.getOrderNo() != null) { sql.SET("order_no = #{record.orderNo,jdbcType=VARCHAR}"); } - if (record.getRechargeType() != null) { - sql.SET("recharge_type = #{record.rechargeType,jdbcType=INTEGER}"); + if (record.getChildOrderNo() != null) { + sql.SET("child_order_no = #{record.childOrderNo,jdbcType=VARCHAR}"); } if (record.getMemDiscountId() != null) { @@ -323,14 +328,6 @@ public class OutRechargeOrderSqlProvider { sql.SET("user_phone = #{record.userPhone,jdbcType=VARCHAR}"); } - if (record.getGoodsId() != null) { - sql.SET("goods_id = #{record.goodsId,jdbcType=BIGINT}"); - } - - if (record.getRechargeContent() != null) { - sql.SET("recharge_content = #{record.rechargeContent,jdbcType=VARCHAR}"); - } - if (record.getPayType() != null) { sql.SET("pay_type = #{record.payType,jdbcType=INTEGER}"); } @@ -355,6 +352,10 @@ public class OutRechargeOrderSqlProvider { sql.SET("pay_price = #{record.payPrice,jdbcType=DECIMAL}"); } + if (record.getOrderPrice() != null) { + sql.SET("order_price = #{record.orderPrice,jdbcType=DECIMAL}"); + } + if (record.getPayRealPrice() != null) { sql.SET("pay_real_price = #{record.payRealPrice,jdbcType=DECIMAL}"); } @@ -363,6 +364,18 @@ public class OutRechargeOrderSqlProvider { sql.SET("pay_serial_no = #{record.paySerialNo,jdbcType=VARCHAR}"); } + if (record.getPayStatus() != null) { + sql.SET("pay_status = #{record.payStatus,jdbcType=INTEGER}"); + } + + if (record.getRechargeStatus() != null) { + sql.SET("recharge_status = #{record.rechargeStatus,jdbcType=INTEGER}"); + } + + if (record.getRechargeName() != null) { + sql.SET("recharge_name = #{record.rechargeName,jdbcType=VARCHAR}"); + } + if (record.getCreateTimed() != null) { sql.SET("create_timed = #{record.createTimed,jdbcType=TIMESTAMP}"); } @@ -379,12 +392,12 @@ public class OutRechargeOrderSqlProvider { sql.SET("finish_time = #{record.finishTime,jdbcType=TIMESTAMP}"); } - if (record.getOutRefundNo() != null) { - sql.SET("out_refund_no = #{record.outRefundNo,jdbcType=VARCHAR}"); + if (record.getRemarks() != null) { + sql.SET("remarks = #{record.remarks,jdbcType=VARCHAR}"); } - if (record.getOrderPrice() != null) { - sql.SET("order_price = #{record.orderPrice,jdbcType=DECIMAL}"); + if (record.getOutRefundNo() != null) { + sql.SET("out_refund_no = #{record.outRefundNo,jdbcType=VARCHAR}"); } if (record.getRefundTime() != null) { @@ -403,20 +416,20 @@ public class OutRechargeOrderSqlProvider { sql.SET("refund_fee = #{record.refundFee,jdbcType=DECIMAL}"); } - if (record.getCompanyId() != null) { - sql.SET("company_id = #{record.companyId,jdbcType=BIGINT}"); + if (record.getAgentKey() != null) { + sql.SET("agent_key = #{record.agentKey,jdbcType=VARCHAR}"); } - if (record.getPayStatus() != null) { - sql.SET("pay_status = #{record.payStatus,jdbcType=INTEGER}"); + if (record.getObjectId() != null) { + sql.SET("object_id = #{record.objectId,jdbcType=INTEGER}"); } - if (record.getMerchId() != null) { - sql.SET("merch_id = #{record.merchId,jdbcType=VARCHAR}"); + if (record.getRechargeType() != null) { + sql.SET("recharge_type = #{record.rechargeType,jdbcType=INTEGER}"); } - if (record.getRechargeStatus() != null) { - sql.SET("recharge_status = #{record.rechargeStatus,jdbcType=INTEGER}"); + if (record.getAbnormalMsg() != null) { + sql.SET("abnormal_msg = #{record.abnormalMsg,jdbcType=VARCHAR}"); } if (record.getExt1() != null) { @@ -431,24 +444,20 @@ public class OutRechargeOrderSqlProvider { sql.SET("ext_3 = #{record.ext3,jdbcType=VARCHAR}"); } - if (record.getRechargeName() != null) { - sql.SET("recharge_name = #{record.rechargeName,jdbcType=VARCHAR}"); - } - - if (record.getRemarks() != null) { - sql.SET("remarks = #{record.remarks,jdbcType=VARCHAR}"); + if (record.getGoodsId() != null) { + sql.SET("goods_id = #{record.goodsId,jdbcType=BIGINT}"); } - if (record.getAgentKey() != null) { - sql.SET("agent_key = #{record.agentKey,jdbcType=VARCHAR}"); + if (record.getRechargeContent() != null) { + sql.SET("recharge_content = #{record.rechargeContent,jdbcType=VARCHAR}"); } - if (record.getObjectId() != null) { - sql.SET("object_id = #{record.objectId,jdbcType=BIGINT}"); + if (record.getCompanyId() != null) { + sql.SET("company_id = #{record.companyId,jdbcType=BIGINT}"); } - if (record.getAbnormalMsg() != null) { - sql.SET("abnormal_msg = #{record.abnormalMsg,jdbcType=VARCHAR}"); + if (record.getMerchId() != null) { + sql.SET("merch_id = #{record.merchId,jdbcType=VARCHAR}"); } if (record.getWhetherRebate() != null) { @@ -464,49 +473,50 @@ public class OutRechargeOrderSqlProvider { sql.UPDATE("out_recharge_order"); sql.SET("id = #{record.id,jdbcType=BIGINT}"); - sql.SET("recharge_price = #{record.rechargePrice,jdbcType=DECIMAL}"); sql.SET("`type` = #{record.type,jdbcType=INTEGER}"); sql.SET("operator_name = #{record.operatorName,jdbcType=VARCHAR}"); sql.SET("operator_type = #{record.operatorType,jdbcType=INTEGER}"); + sql.SET("recharge_price = #{record.rechargePrice,jdbcType=DECIMAL}"); sql.SET("order_no = #{record.orderNo,jdbcType=VARCHAR}"); - sql.SET("recharge_type = #{record.rechargeType,jdbcType=INTEGER}"); + sql.SET("child_order_no = #{record.childOrderNo,jdbcType=VARCHAR}"); sql.SET("mem_discount_id = #{record.memDiscountId,jdbcType=BIGINT}"); sql.SET("mem_discount_name = #{record.memDiscountName,jdbcType=VARCHAR}"); sql.SET("user_id = #{record.userId,jdbcType=BIGINT}"); sql.SET("user_name = #{record.userName,jdbcType=VARCHAR}"); sql.SET("user_phone = #{record.userPhone,jdbcType=VARCHAR}"); - sql.SET("goods_id = #{record.goodsId,jdbcType=BIGINT}"); - sql.SET("recharge_content = #{record.rechargeContent,jdbcType=VARCHAR}"); sql.SET("pay_type = #{record.payType,jdbcType=INTEGER}"); sql.SET("labor_union_card = #{record.laborUnionCard,jdbcType=VARCHAR}"); sql.SET("integral_num = #{record.integralNum,jdbcType=DECIMAL}"); sql.SET("discount_deduction_price = #{record.discountDeductionPrice,jdbcType=DECIMAL}"); sql.SET("integral_deduction_price = #{record.integralDeductionPrice,jdbcType=DECIMAL}"); sql.SET("pay_price = #{record.payPrice,jdbcType=DECIMAL}"); + sql.SET("order_price = #{record.orderPrice,jdbcType=DECIMAL}"); sql.SET("pay_real_price = #{record.payRealPrice,jdbcType=DECIMAL}"); sql.SET("pay_serial_no = #{record.paySerialNo,jdbcType=VARCHAR}"); + sql.SET("pay_status = #{record.payStatus,jdbcType=INTEGER}"); + sql.SET("recharge_status = #{record.rechargeStatus,jdbcType=INTEGER}"); + sql.SET("recharge_name = #{record.rechargeName,jdbcType=VARCHAR}"); sql.SET("create_timed = #{record.createTimed,jdbcType=TIMESTAMP}"); sql.SET("pay_time = #{record.payTime,jdbcType=TIMESTAMP}"); sql.SET("cancel_time = #{record.cancelTime,jdbcType=TIMESTAMP}"); sql.SET("finish_time = #{record.finishTime,jdbcType=TIMESTAMP}"); + sql.SET("remarks = #{record.remarks,jdbcType=VARCHAR}"); sql.SET("out_refund_no = #{record.outRefundNo,jdbcType=VARCHAR}"); - sql.SET("order_price = #{record.orderPrice,jdbcType=DECIMAL}"); sql.SET("refund_time = #{record.refundTime,jdbcType=TIMESTAMP}"); sql.SET("tp_refund_order_no = #{record.tpRefundOrderNo,jdbcType=VARCHAR}"); sql.SET("refund_id = #{record.refundId,jdbcType=VARCHAR}"); sql.SET("refund_fee = #{record.refundFee,jdbcType=DECIMAL}"); - sql.SET("company_id = #{record.companyId,jdbcType=BIGINT}"); - sql.SET("pay_status = #{record.payStatus,jdbcType=INTEGER}"); - sql.SET("merch_id = #{record.merchId,jdbcType=VARCHAR}"); - sql.SET("recharge_status = #{record.rechargeStatus,jdbcType=INTEGER}"); + sql.SET("agent_key = #{record.agentKey,jdbcType=VARCHAR}"); + sql.SET("object_id = #{record.objectId,jdbcType=INTEGER}"); + sql.SET("recharge_type = #{record.rechargeType,jdbcType=INTEGER}"); + sql.SET("abnormal_msg = #{record.abnormalMsg,jdbcType=VARCHAR}"); sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}"); sql.SET("ext_2 = #{record.ext2,jdbcType=VARCHAR}"); sql.SET("ext_3 = #{record.ext3,jdbcType=VARCHAR}"); - sql.SET("recharge_name = #{record.rechargeName,jdbcType=VARCHAR}"); - sql.SET("remarks = #{record.remarks,jdbcType=VARCHAR}"); - sql.SET("agent_key = #{record.agentKey,jdbcType=VARCHAR}"); - sql.SET("object_id = #{record.objectId,jdbcType=BIGINT}"); - sql.SET("abnormal_msg = #{record.abnormalMsg,jdbcType=VARCHAR}"); + sql.SET("goods_id = #{record.goodsId,jdbcType=BIGINT}"); + sql.SET("recharge_content = #{record.rechargeContent,jdbcType=VARCHAR}"); + sql.SET("company_id = #{record.companyId,jdbcType=BIGINT}"); + sql.SET("merch_id = #{record.merchId,jdbcType=VARCHAR}"); sql.SET("whether_rebate = #{record.whetherRebate,jdbcType=BIT}"); OutRechargeOrderExample example = (OutRechargeOrderExample) parameter.get("example"); @@ -518,10 +528,6 @@ public class OutRechargeOrderSqlProvider { SQL sql = new SQL(); sql.UPDATE("out_recharge_order"); - if (record.getRechargePrice() != null) { - sql.SET("recharge_price = #{rechargePrice,jdbcType=DECIMAL}"); - } - if (record.getType() != null) { sql.SET("`type` = #{type,jdbcType=INTEGER}"); } @@ -534,12 +540,16 @@ public class OutRechargeOrderSqlProvider { sql.SET("operator_type = #{operatorType,jdbcType=INTEGER}"); } + if (record.getRechargePrice() != null) { + sql.SET("recharge_price = #{rechargePrice,jdbcType=DECIMAL}"); + } + if (record.getOrderNo() != null) { sql.SET("order_no = #{orderNo,jdbcType=VARCHAR}"); } - if (record.getRechargeType() != null) { - sql.SET("recharge_type = #{rechargeType,jdbcType=INTEGER}"); + if (record.getChildOrderNo() != null) { + sql.SET("child_order_no = #{childOrderNo,jdbcType=VARCHAR}"); } if (record.getMemDiscountId() != null) { @@ -562,14 +572,6 @@ public class OutRechargeOrderSqlProvider { sql.SET("user_phone = #{userPhone,jdbcType=VARCHAR}"); } - if (record.getGoodsId() != null) { - sql.SET("goods_id = #{goodsId,jdbcType=BIGINT}"); - } - - if (record.getRechargeContent() != null) { - sql.SET("recharge_content = #{rechargeContent,jdbcType=VARCHAR}"); - } - if (record.getPayType() != null) { sql.SET("pay_type = #{payType,jdbcType=INTEGER}"); } @@ -594,6 +596,10 @@ public class OutRechargeOrderSqlProvider { sql.SET("pay_price = #{payPrice,jdbcType=DECIMAL}"); } + if (record.getOrderPrice() != null) { + sql.SET("order_price = #{orderPrice,jdbcType=DECIMAL}"); + } + if (record.getPayRealPrice() != null) { sql.SET("pay_real_price = #{payRealPrice,jdbcType=DECIMAL}"); } @@ -602,6 +608,18 @@ public class OutRechargeOrderSqlProvider { sql.SET("pay_serial_no = #{paySerialNo,jdbcType=VARCHAR}"); } + if (record.getPayStatus() != null) { + sql.SET("pay_status = #{payStatus,jdbcType=INTEGER}"); + } + + if (record.getRechargeStatus() != null) { + sql.SET("recharge_status = #{rechargeStatus,jdbcType=INTEGER}"); + } + + if (record.getRechargeName() != null) { + sql.SET("recharge_name = #{rechargeName,jdbcType=VARCHAR}"); + } + if (record.getCreateTimed() != null) { sql.SET("create_timed = #{createTimed,jdbcType=TIMESTAMP}"); } @@ -618,12 +636,12 @@ public class OutRechargeOrderSqlProvider { sql.SET("finish_time = #{finishTime,jdbcType=TIMESTAMP}"); } - if (record.getOutRefundNo() != null) { - sql.SET("out_refund_no = #{outRefundNo,jdbcType=VARCHAR}"); + if (record.getRemarks() != null) { + sql.SET("remarks = #{remarks,jdbcType=VARCHAR}"); } - if (record.getOrderPrice() != null) { - sql.SET("order_price = #{orderPrice,jdbcType=DECIMAL}"); + if (record.getOutRefundNo() != null) { + sql.SET("out_refund_no = #{outRefundNo,jdbcType=VARCHAR}"); } if (record.getRefundTime() != null) { @@ -642,20 +660,20 @@ public class OutRechargeOrderSqlProvider { sql.SET("refund_fee = #{refundFee,jdbcType=DECIMAL}"); } - if (record.getCompanyId() != null) { - sql.SET("company_id = #{companyId,jdbcType=BIGINT}"); + if (record.getAgentKey() != null) { + sql.SET("agent_key = #{agentKey,jdbcType=VARCHAR}"); } - if (record.getPayStatus() != null) { - sql.SET("pay_status = #{payStatus,jdbcType=INTEGER}"); + if (record.getObjectId() != null) { + sql.SET("object_id = #{objectId,jdbcType=INTEGER}"); } - if (record.getMerchId() != null) { - sql.SET("merch_id = #{merchId,jdbcType=VARCHAR}"); + if (record.getRechargeType() != null) { + sql.SET("recharge_type = #{rechargeType,jdbcType=INTEGER}"); } - if (record.getRechargeStatus() != null) { - sql.SET("recharge_status = #{rechargeStatus,jdbcType=INTEGER}"); + if (record.getAbnormalMsg() != null) { + sql.SET("abnormal_msg = #{abnormalMsg,jdbcType=VARCHAR}"); } if (record.getExt1() != null) { @@ -670,24 +688,20 @@ public class OutRechargeOrderSqlProvider { sql.SET("ext_3 = #{ext3,jdbcType=VARCHAR}"); } - if (record.getRechargeName() != null) { - sql.SET("recharge_name = #{rechargeName,jdbcType=VARCHAR}"); - } - - if (record.getRemarks() != null) { - sql.SET("remarks = #{remarks,jdbcType=VARCHAR}"); + if (record.getGoodsId() != null) { + sql.SET("goods_id = #{goodsId,jdbcType=BIGINT}"); } - if (record.getAgentKey() != null) { - sql.SET("agent_key = #{agentKey,jdbcType=VARCHAR}"); + if (record.getRechargeContent() != null) { + sql.SET("recharge_content = #{rechargeContent,jdbcType=VARCHAR}"); } - if (record.getObjectId() != null) { - sql.SET("object_id = #{objectId,jdbcType=BIGINT}"); + if (record.getCompanyId() != null) { + sql.SET("company_id = #{companyId,jdbcType=BIGINT}"); } - if (record.getAbnormalMsg() != null) { - sql.SET("abnormal_msg = #{abnormalMsg,jdbcType=VARCHAR}"); + if (record.getMerchId() != null) { + sql.SET("merch_id = #{merchId,jdbcType=VARCHAR}"); } if (record.getWhetherRebate() != null) { diff --git a/hai-service/src/main/java/com/hai/dao/order/OrderMapperExt.java b/hai-service/src/main/java/com/hai/dao/order/OrderMapperExt.java index c9600008..a0d47fcf 100644 --- a/hai-service/src/main/java/com/hai/dao/order/OrderMapperExt.java +++ b/hai-service/src/main/java/com/hai/dao/order/OrderMapperExt.java @@ -26,8 +26,11 @@ public interface OrderMapperExt { @Select({"