Merge remote-tracking branch 'origin/order' into order

dev-discount
袁野 2 years ago
commit 4590ee9b11
  1. 9
      hai-order/src/main/java/com/web/controller/OrderController.java
  2. 2
      hai-order/src/main/java/com/web/controller/OrderPayController.java
  3. 7
      hai-order/src/main/java/com/web/controller/OrderPayNotifyController.java
  4. 18
      hai-order/src/main/java/com/web/controller/OrderRefundController.java
  5. 2
      hai-order/src/main/java/com/web/controller/TestController.java
  6. 59
      hai-order/src/main/java/com/web/controller/business/OrderCouponController.java
  7. 2
      hai-order/src/main/java/com/web/controller/business/OrderOilController.java
  8. 2
      hai-order/src/main/java/com/web/rocketmq/consumer/OrderCancelConsumer.java
  9. 39
      hai-service/src/main/java/com/hai/dao/HighOrderRefundMapper.java
  10. 14
      hai-service/src/main/java/com/hai/dao/HighOrderRefundSqlProvider.java
  11. 169
      hai-service/src/main/java/com/hai/dao/OutRechargeOrderMapper.java
  12. 298
      hai-service/src/main/java/com/hai/dao/OutRechargeOrderSqlProvider.java
  13. 7
      hai-service/src/main/java/com/hai/dao/order/OrderMapperExt.java
  14. 16
      hai-service/src/main/java/com/hai/entity/HighOrderRefund.java
  15. 70
      hai-service/src/main/java/com/hai/entity/HighOrderRefundExample.java
  16. 339
      hai-service/src/main/java/com/hai/entity/OutRechargeOrder.java
  17. 1342
      hai-service/src/main/java/com/hai/entity/OutRechargeOrderExample.java
  18. 12
      hai-service/src/main/java/com/hai/order/model/OrderCouponModel.java
  19. 8
      hai-service/src/main/java/com/hai/order/service/OrderService.java
  20. 2
      hai-service/src/main/java/com/hai/order/service/impl/OrderCreateHandleServiceImpl.java
  21. 8
      hai-service/src/main/java/com/hai/order/service/impl/OrderPaySuccessServiceImpl.java
  22. 17
      hai-service/src/main/java/com/hai/order/service/impl/OrderServiceImpl.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);

@ -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);

@ -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 = "<xml>" + "<return_code><![CDATA[SUCCESS]]></return_code>"
+ "<return_msg><![CDATA[OK]]></return_msg>" + "</xml> ";
BufferedOutputStream out = new BufferedOutputStream(response.getOutputStream());
out.write(resXml.getBytes());
out.flush();

@ -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) {

File diff suppressed because one or more lines are too long

@ -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<String,Object> 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<String,Object> 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<OrderCouponModel> list = orderServiceExt.getOrderCouponList(map);
Set<String> includeColumnFiledNames = new HashSet<String>();
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);

@ -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());

@ -23,7 +23,7 @@ public class OrderCancelConsumer implements RocketMQListener<HighOrder> {
HighOrder highOrder = orderService.getOrderDetailByNo(order.getOrderNo());
if (highOrder != null && highOrder.getOrderStatus().equals(OrderStatus.STATUS1.getNumber())) {
// 取消订单
orderService.cancelOrder(order.getOrderNo(), null);
orderService.cancelOrder(highOrder, null);
}
}
}

@ -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},",

@ -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}");
}

@ -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<OutRechargeOrder> 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}"
})

@ -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) {

@ -26,8 +26,11 @@ public interface OrderMapperExt {
@Select({"<script>" +
" select" +
" (select `name` from bs_company WHERE id = d.company_id) companyName," +
" b.order_no orderNo," +
" b.mem_phone memPhone," +
" d.coupon_key couponKey," +
" (select code_name from sec_dictionary WHERE code_type = 'COUPON_SOURCE' and code_value = d.coupon_source) couponSource," +
" a.goods_name couponName," +
" a.goods_price couponPrice," +
" b.total_price totalPrice," +
@ -60,10 +63,14 @@ public interface OrderMapperExt {
" b.finish_time finishTime" +
" from high_child_order a" +
" LEFT JOIN high_order b on b.id = a.order_id" +
" LEFT JOIN high_coupon d on d.id = a.goods_id" +
" where a.goods_type = 1" +
" <if test='param.companyId != null'> and d.company_id = #{param.companyId} </if>" +
" <if test='param.goodsId != null'> and a.goods_id in (${param.goodsId}) </if>" +
" <if test='param.orderNo != null'> and b.order_no like concat('%', #{param.orderNo}, '%') </if>" +
" <if test='param.memPhone != null'> and b.mem_phone like concat('%', #{param.memPhone}, '%') </if>" +
" <if test='param.couponKey != null'> and d.coupon_key like concat('%', #{param.couponKey}, '%') </if>" +
" <if test='param.couponSource != null'> and d.coupon_source = #{param.couponSource} </if>" +
" <if test='param.couponName != null'> and a.goods_name like concat('%', #{param.couponName}, '%') </if>" +
" <if test='param.payType != null'> and b.pay_type = #{param.payType} </if>" +
" <if test='param.orderStatus != null'> and b.order_status = #{param.orderStatus} </if>" +

@ -104,6 +104,11 @@ public class HighOrderRefund implements Serializable {
*/
private String refundOrderNo;
/**
* 退款订单号第三方
*/
private String thirdPartyRefundOrderNo;
/**
* 退款总金额
*/
@ -299,6 +304,14 @@ public class HighOrderRefund implements Serializable {
this.refundOrderNo = refundOrderNo;
}
public String getThirdPartyRefundOrderNo() {
return thirdPartyRefundOrderNo;
}
public void setThirdPartyRefundOrderNo(String thirdPartyRefundOrderNo) {
this.thirdPartyRefundOrderNo = thirdPartyRefundOrderNo;
}
public BigDecimal getReturnTotalPrice() {
return returnTotalPrice;
}
@ -455,6 +468,7 @@ public class HighOrderRefund implements Serializable {
&& (this.getGoodsSpecName() == null ? other.getGoodsSpecName() == null : this.getGoodsSpecName().equals(other.getGoodsSpecName()))
&& (this.getGoodsCount() == null ? other.getGoodsCount() == null : this.getGoodsCount().equals(other.getGoodsCount()))
&& (this.getRefundOrderNo() == null ? other.getRefundOrderNo() == null : this.getRefundOrderNo().equals(other.getRefundOrderNo()))
&& (this.getThirdPartyRefundOrderNo() == null ? other.getThirdPartyRefundOrderNo() == null : this.getThirdPartyRefundOrderNo().equals(other.getThirdPartyRefundOrderNo()))
&& (this.getReturnTotalPrice() == null ? other.getReturnTotalPrice() == null : this.getReturnTotalPrice().equals(other.getReturnTotalPrice()))
&& (this.getRefundGoodsNum() == null ? other.getRefundGoodsNum() == null : this.getRefundGoodsNum().equals(other.getRefundGoodsNum()))
&& (this.getRefundPrice() == null ? other.getRefundPrice() == null : this.getRefundPrice().equals(other.getRefundPrice()))
@ -493,6 +507,7 @@ public class HighOrderRefund implements Serializable {
result = prime * result + ((getGoodsSpecName() == null) ? 0 : getGoodsSpecName().hashCode());
result = prime * result + ((getGoodsCount() == null) ? 0 : getGoodsCount().hashCode());
result = prime * result + ((getRefundOrderNo() == null) ? 0 : getRefundOrderNo().hashCode());
result = prime * result + ((getThirdPartyRefundOrderNo() == null) ? 0 : getThirdPartyRefundOrderNo().hashCode());
result = prime * result + ((getReturnTotalPrice() == null) ? 0 : getReturnTotalPrice().hashCode());
result = prime * result + ((getRefundGoodsNum() == null) ? 0 : getRefundGoodsNum().hashCode());
result = prime * result + ((getRefundPrice() == null) ? 0 : getRefundPrice().hashCode());
@ -534,6 +549,7 @@ public class HighOrderRefund implements Serializable {
sb.append(", goodsSpecName=").append(goodsSpecName);
sb.append(", goodsCount=").append(goodsCount);
sb.append(", refundOrderNo=").append(refundOrderNo);
sb.append(", thirdPartyRefundOrderNo=").append(thirdPartyRefundOrderNo);
sb.append(", returnTotalPrice=").append(returnTotalPrice);
sb.append(", refundGoodsNum=").append(refundGoodsNum);
sb.append(", refundPrice=").append(refundPrice);

@ -1176,6 +1176,76 @@ public class HighOrderRefundExample {
return (Criteria) this;
}
public Criteria andThirdPartyRefundOrderNoIsNull() {
addCriterion("third_party_refund_order_no is null");
return (Criteria) this;
}
public Criteria andThirdPartyRefundOrderNoIsNotNull() {
addCriterion("third_party_refund_order_no is not null");
return (Criteria) this;
}
public Criteria andThirdPartyRefundOrderNoEqualTo(String value) {
addCriterion("third_party_refund_order_no =", value, "thirdPartyRefundOrderNo");
return (Criteria) this;
}
public Criteria andThirdPartyRefundOrderNoNotEqualTo(String value) {
addCriterion("third_party_refund_order_no <>", value, "thirdPartyRefundOrderNo");
return (Criteria) this;
}
public Criteria andThirdPartyRefundOrderNoGreaterThan(String value) {
addCriterion("third_party_refund_order_no >", value, "thirdPartyRefundOrderNo");
return (Criteria) this;
}
public Criteria andThirdPartyRefundOrderNoGreaterThanOrEqualTo(String value) {
addCriterion("third_party_refund_order_no >=", value, "thirdPartyRefundOrderNo");
return (Criteria) this;
}
public Criteria andThirdPartyRefundOrderNoLessThan(String value) {
addCriterion("third_party_refund_order_no <", value, "thirdPartyRefundOrderNo");
return (Criteria) this;
}
public Criteria andThirdPartyRefundOrderNoLessThanOrEqualTo(String value) {
addCriterion("third_party_refund_order_no <=", value, "thirdPartyRefundOrderNo");
return (Criteria) this;
}
public Criteria andThirdPartyRefundOrderNoLike(String value) {
addCriterion("third_party_refund_order_no like", value, "thirdPartyRefundOrderNo");
return (Criteria) this;
}
public Criteria andThirdPartyRefundOrderNoNotLike(String value) {
addCriterion("third_party_refund_order_no not like", value, "thirdPartyRefundOrderNo");
return (Criteria) this;
}
public Criteria andThirdPartyRefundOrderNoIn(List<String> values) {
addCriterion("third_party_refund_order_no in", values, "thirdPartyRefundOrderNo");
return (Criteria) this;
}
public Criteria andThirdPartyRefundOrderNoNotIn(List<String> values) {
addCriterion("third_party_refund_order_no not in", values, "thirdPartyRefundOrderNo");
return (Criteria) this;
}
public Criteria andThirdPartyRefundOrderNoBetween(String value1, String value2) {
addCriterion("third_party_refund_order_no between", value1, value2, "thirdPartyRefundOrderNo");
return (Criteria) this;
}
public Criteria andThirdPartyRefundOrderNoNotBetween(String value1, String value2) {
addCriterion("third_party_refund_order_no not between", value1, value2, "thirdPartyRefundOrderNo");
return (Criteria) this;
}
public Criteria andReturnTotalPriceIsNull() {
addCriterion("return_total_price is null");
return (Criteria) this;

@ -19,11 +19,6 @@ public class OutRechargeOrder implements Serializable {
*/
private Long id;
/**
* 充值金额
*/
private BigDecimal rechargePrice;
/**
* 类型1 话费充值
*/
@ -39,15 +34,20 @@ public class OutRechargeOrder implements Serializable {
*/
private Integer operatorType;
/**
* 充值金额
*/
private BigDecimal rechargePrice;
/**
* 充值订单号
*/
private String orderNo;
/**
* 1:快充 2慢充
* 子订单号 订单号
*/
private Integer rechargeType;
private String childOrderNo;
/**
* 用户的优惠券high_discount_user_rel表的id
@ -74,16 +74,6 @@ public class OutRechargeOrder implements Serializable {
*/
private String userPhone;
/**
* 商品ID
*/
private Long goodsId;
/**
* 充值内容电话号码 卡号
*/
private String rechargeContent;
/**
* 1支付宝 2微信 3汇联通工会卡 4银联 5银联分期
*/
@ -114,6 +104,11 @@ public class OutRechargeOrder implements Serializable {
*/
private BigDecimal payPrice;
/**
* 订单充值金额
*/
private BigDecimal orderPrice;
/**
* 实际金额
*/
@ -124,6 +119,21 @@ public class OutRechargeOrder implements Serializable {
*/
private String paySerialNo;
/**
* 订单支付状态 101.待支付 102.已支付 100.已完成 104.已取消 105.已退款
*/
private Integer payStatus;
/**
* 充值状态201:充值中 202充值成功 203充值失败 204未充值
*/
private Integer rechargeStatus;
/**
* 中石油需要的持卡人姓名
*/
private String rechargeName;
/**
* 生成时间
*/
@ -145,14 +155,14 @@ public class OutRechargeOrder implements Serializable {
private Date finishTime;
/**
* 退款订单号
* 备注
*/
private String outRefundNo;
private String remarks;
/**
* 订单金额
* 退款订单号
*/
private BigDecimal orderPrice;
private String outRefundNo;
/**
* 退款时间
@ -175,24 +185,21 @@ public class OutRechargeOrder implements Serializable {
private BigDecimal refundFee;
/**
* 公司id
* 代理商编号
*/
private Long companyId;
private String agentKey;
/**
* 订单支付状态 101.待支付 102.已支付 100.已完成 104.已取消 105.已退款
*/
private Integer payStatus;
private Integer objectId;
/**
* 商户号
* 1快充 2慢充
*/
private String merchId;
private Integer rechargeType;
/**
* 充值状态201:充值中 202充值成功 203充值失败 204:未充值
* 异常信息
*/
private Integer rechargeStatus;
private String abnormalMsg;
private String ext1;
@ -200,19 +207,26 @@ public class OutRechargeOrder implements Serializable {
private String ext3;
private String rechargeName;
private String remarks;
private String agentKey;
/**
* 产品id
*/
private Long goodsId;
private Long objectId;
/**
* 充值内容电话号码 卡号
*/
private String rechargeContent;
private String abnormalMsg;
/**
* 公司id
*/
private Long companyId;
/**
* 是否返利
* 商户号
*/
private String merchId;
private Boolean whetherRebate;
private static final long serialVersionUID = 1L;
@ -225,14 +239,6 @@ public class OutRechargeOrder implements Serializable {
this.id = id;
}
public BigDecimal getRechargePrice() {
return rechargePrice;
}
public void setRechargePrice(BigDecimal rechargePrice) {
this.rechargePrice = rechargePrice;
}
public Integer getType() {
return type;
}
@ -257,6 +263,14 @@ public class OutRechargeOrder implements Serializable {
this.operatorType = operatorType;
}
public BigDecimal getRechargePrice() {
return rechargePrice;
}
public void setRechargePrice(BigDecimal rechargePrice) {
this.rechargePrice = rechargePrice;
}
public String getOrderNo() {
return orderNo;
}
@ -265,12 +279,12 @@ public class OutRechargeOrder implements Serializable {
this.orderNo = orderNo;
}
public Integer getRechargeType() {
return rechargeType;
public String getChildOrderNo() {
return childOrderNo;
}
public void setRechargeType(Integer rechargeType) {
this.rechargeType = rechargeType;
public void setChildOrderNo(String childOrderNo) {
this.childOrderNo = childOrderNo;
}
public Long getMemDiscountId() {
@ -313,22 +327,6 @@ public class OutRechargeOrder implements Serializable {
this.userPhone = userPhone;
}
public Long getGoodsId() {
return goodsId;
}
public void setGoodsId(Long goodsId) {
this.goodsId = goodsId;
}
public String getRechargeContent() {
return rechargeContent;
}
public void setRechargeContent(String rechargeContent) {
this.rechargeContent = rechargeContent;
}
public Integer getPayType() {
return payType;
}
@ -377,6 +375,14 @@ public class OutRechargeOrder implements Serializable {
this.payPrice = payPrice;
}
public BigDecimal getOrderPrice() {
return orderPrice;
}
public void setOrderPrice(BigDecimal orderPrice) {
this.orderPrice = orderPrice;
}
public BigDecimal getPayRealPrice() {
return payRealPrice;
}
@ -393,6 +399,30 @@ public class OutRechargeOrder implements Serializable {
this.paySerialNo = paySerialNo;
}
public Integer getPayStatus() {
return payStatus;
}
public void setPayStatus(Integer payStatus) {
this.payStatus = payStatus;
}
public Integer getRechargeStatus() {
return rechargeStatus;
}
public void setRechargeStatus(Integer rechargeStatus) {
this.rechargeStatus = rechargeStatus;
}
public String getRechargeName() {
return rechargeName;
}
public void setRechargeName(String rechargeName) {
this.rechargeName = rechargeName;
}
public Date getCreateTimed() {
return createTimed;
}
@ -425,20 +455,20 @@ public class OutRechargeOrder implements Serializable {
this.finishTime = finishTime;
}
public String getOutRefundNo() {
return outRefundNo;
public String getRemarks() {
return remarks;
}
public void setOutRefundNo(String outRefundNo) {
this.outRefundNo = outRefundNo;
public void setRemarks(String remarks) {
this.remarks = remarks;
}
public BigDecimal getOrderPrice() {
return orderPrice;
public String getOutRefundNo() {
return outRefundNo;
}
public void setOrderPrice(BigDecimal orderPrice) {
this.orderPrice = orderPrice;
public void setOutRefundNo(String outRefundNo) {
this.outRefundNo = outRefundNo;
}
public Date getRefundTime() {
@ -473,36 +503,36 @@ public class OutRechargeOrder implements Serializable {
this.refundFee = refundFee;
}
public Long getCompanyId() {
return companyId;
public String getAgentKey() {
return agentKey;
}
public void setCompanyId(Long companyId) {
this.companyId = companyId;
public void setAgentKey(String agentKey) {
this.agentKey = agentKey;
}
public Integer getPayStatus() {
return payStatus;
public Integer getObjectId() {
return objectId;
}
public void setPayStatus(Integer payStatus) {
this.payStatus = payStatus;
public void setObjectId(Integer objectId) {
this.objectId = objectId;
}
public String getMerchId() {
return merchId;
public Integer getRechargeType() {
return rechargeType;
}
public void setMerchId(String merchId) {
this.merchId = merchId;
public void setRechargeType(Integer rechargeType) {
this.rechargeType = rechargeType;
}
public Integer getRechargeStatus() {
return rechargeStatus;
public String getAbnormalMsg() {
return abnormalMsg;
}
public void setRechargeStatus(Integer rechargeStatus) {
this.rechargeStatus = rechargeStatus;
public void setAbnormalMsg(String abnormalMsg) {
this.abnormalMsg = abnormalMsg;
}
public String getExt1() {
@ -529,44 +559,36 @@ public class OutRechargeOrder implements Serializable {
this.ext3 = ext3;
}
public String getRechargeName() {
return rechargeName;
}
public void setRechargeName(String rechargeName) {
this.rechargeName = rechargeName;
}
public String getRemarks() {
return remarks;
public Long getGoodsId() {
return goodsId;
}
public void setRemarks(String remarks) {
this.remarks = remarks;
public void setGoodsId(Long goodsId) {
this.goodsId = goodsId;
}
public String getAgentKey() {
return agentKey;
public String getRechargeContent() {
return rechargeContent;
}
public void setAgentKey(String agentKey) {
this.agentKey = agentKey;
public void setRechargeContent(String rechargeContent) {
this.rechargeContent = rechargeContent;
}
public Long getObjectId() {
return objectId;
public Long getCompanyId() {
return companyId;
}
public void setObjectId(Long objectId) {
this.objectId = objectId;
public void setCompanyId(Long companyId) {
this.companyId = companyId;
}
public String getAbnormalMsg() {
return abnormalMsg;
public String getMerchId() {
return merchId;
}
public void setAbnormalMsg(String abnormalMsg) {
this.abnormalMsg = abnormalMsg;
public void setMerchId(String merchId) {
this.merchId = merchId;
}
public Boolean getWhetherRebate() {
@ -590,49 +612,50 @@ public class OutRechargeOrder implements Serializable {
}
OutRechargeOrder other = (OutRechargeOrder) that;
return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
&& (this.getRechargePrice() == null ? other.getRechargePrice() == null : this.getRechargePrice().equals(other.getRechargePrice()))
&& (this.getType() == null ? other.getType() == null : this.getType().equals(other.getType()))
&& (this.getOperatorName() == null ? other.getOperatorName() == null : this.getOperatorName().equals(other.getOperatorName()))
&& (this.getOperatorType() == null ? other.getOperatorType() == null : this.getOperatorType().equals(other.getOperatorType()))
&& (this.getRechargePrice() == null ? other.getRechargePrice() == null : this.getRechargePrice().equals(other.getRechargePrice()))
&& (this.getOrderNo() == null ? other.getOrderNo() == null : this.getOrderNo().equals(other.getOrderNo()))
&& (this.getRechargeType() == null ? other.getRechargeType() == null : this.getRechargeType().equals(other.getRechargeType()))
&& (this.getChildOrderNo() == null ? other.getChildOrderNo() == null : this.getChildOrderNo().equals(other.getChildOrderNo()))
&& (this.getMemDiscountId() == null ? other.getMemDiscountId() == null : this.getMemDiscountId().equals(other.getMemDiscountId()))
&& (this.getMemDiscountName() == null ? other.getMemDiscountName() == null : this.getMemDiscountName().equals(other.getMemDiscountName()))
&& (this.getUserId() == null ? other.getUserId() == null : this.getUserId().equals(other.getUserId()))
&& (this.getUserName() == null ? other.getUserName() == null : this.getUserName().equals(other.getUserName()))
&& (this.getUserPhone() == null ? other.getUserPhone() == null : this.getUserPhone().equals(other.getUserPhone()))
&& (this.getGoodsId() == null ? other.getGoodsId() == null : this.getGoodsId().equals(other.getGoodsId()))
&& (this.getRechargeContent() == null ? other.getRechargeContent() == null : this.getRechargeContent().equals(other.getRechargeContent()))
&& (this.getPayType() == null ? other.getPayType() == null : this.getPayType().equals(other.getPayType()))
&& (this.getLaborUnionCard() == null ? other.getLaborUnionCard() == null : this.getLaborUnionCard().equals(other.getLaborUnionCard()))
&& (this.getIntegralNum() == null ? other.getIntegralNum() == null : this.getIntegralNum().equals(other.getIntegralNum()))
&& (this.getDiscountDeductionPrice() == null ? other.getDiscountDeductionPrice() == null : this.getDiscountDeductionPrice().equals(other.getDiscountDeductionPrice()))
&& (this.getIntegralDeductionPrice() == null ? other.getIntegralDeductionPrice() == null : this.getIntegralDeductionPrice().equals(other.getIntegralDeductionPrice()))
&& (this.getPayPrice() == null ? other.getPayPrice() == null : this.getPayPrice().equals(other.getPayPrice()))
&& (this.getOrderPrice() == null ? other.getOrderPrice() == null : this.getOrderPrice().equals(other.getOrderPrice()))
&& (this.getPayRealPrice() == null ? other.getPayRealPrice() == null : this.getPayRealPrice().equals(other.getPayRealPrice()))
&& (this.getPaySerialNo() == null ? other.getPaySerialNo() == null : this.getPaySerialNo().equals(other.getPaySerialNo()))
&& (this.getPayStatus() == null ? other.getPayStatus() == null : this.getPayStatus().equals(other.getPayStatus()))
&& (this.getRechargeStatus() == null ? other.getRechargeStatus() == null : this.getRechargeStatus().equals(other.getRechargeStatus()))
&& (this.getRechargeName() == null ? other.getRechargeName() == null : this.getRechargeName().equals(other.getRechargeName()))
&& (this.getCreateTimed() == null ? other.getCreateTimed() == null : this.getCreateTimed().equals(other.getCreateTimed()))
&& (this.getPayTime() == null ? other.getPayTime() == null : this.getPayTime().equals(other.getPayTime()))
&& (this.getCancelTime() == null ? other.getCancelTime() == null : this.getCancelTime().equals(other.getCancelTime()))
&& (this.getFinishTime() == null ? other.getFinishTime() == null : this.getFinishTime().equals(other.getFinishTime()))
&& (this.getRemarks() == null ? other.getRemarks() == null : this.getRemarks().equals(other.getRemarks()))
&& (this.getOutRefundNo() == null ? other.getOutRefundNo() == null : this.getOutRefundNo().equals(other.getOutRefundNo()))
&& (this.getOrderPrice() == null ? other.getOrderPrice() == null : this.getOrderPrice().equals(other.getOrderPrice()))
&& (this.getRefundTime() == null ? other.getRefundTime() == null : this.getRefundTime().equals(other.getRefundTime()))
&& (this.getTpRefundOrderNo() == null ? other.getTpRefundOrderNo() == null : this.getTpRefundOrderNo().equals(other.getTpRefundOrderNo()))
&& (this.getRefundId() == null ? other.getRefundId() == null : this.getRefundId().equals(other.getRefundId()))
&& (this.getRefundFee() == null ? other.getRefundFee() == null : this.getRefundFee().equals(other.getRefundFee()))
&& (this.getCompanyId() == null ? other.getCompanyId() == null : this.getCompanyId().equals(other.getCompanyId()))
&& (this.getPayStatus() == null ? other.getPayStatus() == null : this.getPayStatus().equals(other.getPayStatus()))
&& (this.getMerchId() == null ? other.getMerchId() == null : this.getMerchId().equals(other.getMerchId()))
&& (this.getRechargeStatus() == null ? other.getRechargeStatus() == null : this.getRechargeStatus().equals(other.getRechargeStatus()))
&& (this.getExt1() == null ? other.getExt1() == null : this.getExt1().equals(other.getExt1()))
&& (this.getExt2() == null ? other.getExt2() == null : this.getExt2().equals(other.getExt2()))
&& (this.getExt3() == null ? other.getExt3() == null : this.getExt3().equals(other.getExt3()))
&& (this.getRechargeName() == null ? other.getRechargeName() == null : this.getRechargeName().equals(other.getRechargeName()))
&& (this.getRemarks() == null ? other.getRemarks() == null : this.getRemarks().equals(other.getRemarks()))
&& (this.getAgentKey() == null ? other.getAgentKey() == null : this.getAgentKey().equals(other.getAgentKey()))
&& (this.getObjectId() == null ? other.getObjectId() == null : this.getObjectId().equals(other.getObjectId()))
&& (this.getRechargeType() == null ? other.getRechargeType() == null : this.getRechargeType().equals(other.getRechargeType()))
&& (this.getAbnormalMsg() == null ? other.getAbnormalMsg() == null : this.getAbnormalMsg().equals(other.getAbnormalMsg()))
&& (this.getExt1() == null ? other.getExt1() == null : this.getExt1().equals(other.getExt1()))
&& (this.getExt2() == null ? other.getExt2() == null : this.getExt2().equals(other.getExt2()))
&& (this.getExt3() == null ? other.getExt3() == null : this.getExt3().equals(other.getExt3()))
&& (this.getGoodsId() == null ? other.getGoodsId() == null : this.getGoodsId().equals(other.getGoodsId()))
&& (this.getRechargeContent() == null ? other.getRechargeContent() == null : this.getRechargeContent().equals(other.getRechargeContent()))
&& (this.getCompanyId() == null ? other.getCompanyId() == null : this.getCompanyId().equals(other.getCompanyId()))
&& (this.getMerchId() == null ? other.getMerchId() == null : this.getMerchId().equals(other.getMerchId()))
&& (this.getWhetherRebate() == null ? other.getWhetherRebate() == null : this.getWhetherRebate().equals(other.getWhetherRebate()));
}
@ -641,49 +664,50 @@ public class OutRechargeOrder implements Serializable {
final int prime = 31;
int result = 1;
result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
result = prime * result + ((getRechargePrice() == null) ? 0 : getRechargePrice().hashCode());
result = prime * result + ((getType() == null) ? 0 : getType().hashCode());
result = prime * result + ((getOperatorName() == null) ? 0 : getOperatorName().hashCode());
result = prime * result + ((getOperatorType() == null) ? 0 : getOperatorType().hashCode());
result = prime * result + ((getRechargePrice() == null) ? 0 : getRechargePrice().hashCode());
result = prime * result + ((getOrderNo() == null) ? 0 : getOrderNo().hashCode());
result = prime * result + ((getRechargeType() == null) ? 0 : getRechargeType().hashCode());
result = prime * result + ((getChildOrderNo() == null) ? 0 : getChildOrderNo().hashCode());
result = prime * result + ((getMemDiscountId() == null) ? 0 : getMemDiscountId().hashCode());
result = prime * result + ((getMemDiscountName() == null) ? 0 : getMemDiscountName().hashCode());
result = prime * result + ((getUserId() == null) ? 0 : getUserId().hashCode());
result = prime * result + ((getUserName() == null) ? 0 : getUserName().hashCode());
result = prime * result + ((getUserPhone() == null) ? 0 : getUserPhone().hashCode());
result = prime * result + ((getGoodsId() == null) ? 0 : getGoodsId().hashCode());
result = prime * result + ((getRechargeContent() == null) ? 0 : getRechargeContent().hashCode());
result = prime * result + ((getPayType() == null) ? 0 : getPayType().hashCode());
result = prime * result + ((getLaborUnionCard() == null) ? 0 : getLaborUnionCard().hashCode());
result = prime * result + ((getIntegralNum() == null) ? 0 : getIntegralNum().hashCode());
result = prime * result + ((getDiscountDeductionPrice() == null) ? 0 : getDiscountDeductionPrice().hashCode());
result = prime * result + ((getIntegralDeductionPrice() == null) ? 0 : getIntegralDeductionPrice().hashCode());
result = prime * result + ((getPayPrice() == null) ? 0 : getPayPrice().hashCode());
result = prime * result + ((getOrderPrice() == null) ? 0 : getOrderPrice().hashCode());
result = prime * result + ((getPayRealPrice() == null) ? 0 : getPayRealPrice().hashCode());
result = prime * result + ((getPaySerialNo() == null) ? 0 : getPaySerialNo().hashCode());
result = prime * result + ((getPayStatus() == null) ? 0 : getPayStatus().hashCode());
result = prime * result + ((getRechargeStatus() == null) ? 0 : getRechargeStatus().hashCode());
result = prime * result + ((getRechargeName() == null) ? 0 : getRechargeName().hashCode());
result = prime * result + ((getCreateTimed() == null) ? 0 : getCreateTimed().hashCode());
result = prime * result + ((getPayTime() == null) ? 0 : getPayTime().hashCode());
result = prime * result + ((getCancelTime() == null) ? 0 : getCancelTime().hashCode());
result = prime * result + ((getFinishTime() == null) ? 0 : getFinishTime().hashCode());
result = prime * result + ((getRemarks() == null) ? 0 : getRemarks().hashCode());
result = prime * result + ((getOutRefundNo() == null) ? 0 : getOutRefundNo().hashCode());
result = prime * result + ((getOrderPrice() == null) ? 0 : getOrderPrice().hashCode());
result = prime * result + ((getRefundTime() == null) ? 0 : getRefundTime().hashCode());
result = prime * result + ((getTpRefundOrderNo() == null) ? 0 : getTpRefundOrderNo().hashCode());
result = prime * result + ((getRefundId() == null) ? 0 : getRefundId().hashCode());
result = prime * result + ((getRefundFee() == null) ? 0 : getRefundFee().hashCode());
result = prime * result + ((getCompanyId() == null) ? 0 : getCompanyId().hashCode());
result = prime * result + ((getPayStatus() == null) ? 0 : getPayStatus().hashCode());
result = prime * result + ((getMerchId() == null) ? 0 : getMerchId().hashCode());
result = prime * result + ((getRechargeStatus() == null) ? 0 : getRechargeStatus().hashCode());
result = prime * result + ((getExt1() == null) ? 0 : getExt1().hashCode());
result = prime * result + ((getExt2() == null) ? 0 : getExt2().hashCode());
result = prime * result + ((getExt3() == null) ? 0 : getExt3().hashCode());
result = prime * result + ((getRechargeName() == null) ? 0 : getRechargeName().hashCode());
result = prime * result + ((getRemarks() == null) ? 0 : getRemarks().hashCode());
result = prime * result + ((getAgentKey() == null) ? 0 : getAgentKey().hashCode());
result = prime * result + ((getObjectId() == null) ? 0 : getObjectId().hashCode());
result = prime * result + ((getRechargeType() == null) ? 0 : getRechargeType().hashCode());
result = prime * result + ((getAbnormalMsg() == null) ? 0 : getAbnormalMsg().hashCode());
result = prime * result + ((getExt1() == null) ? 0 : getExt1().hashCode());
result = prime * result + ((getExt2() == null) ? 0 : getExt2().hashCode());
result = prime * result + ((getExt3() == null) ? 0 : getExt3().hashCode());
result = prime * result + ((getGoodsId() == null) ? 0 : getGoodsId().hashCode());
result = prime * result + ((getRechargeContent() == null) ? 0 : getRechargeContent().hashCode());
result = prime * result + ((getCompanyId() == null) ? 0 : getCompanyId().hashCode());
result = prime * result + ((getMerchId() == null) ? 0 : getMerchId().hashCode());
result = prime * result + ((getWhetherRebate() == null) ? 0 : getWhetherRebate().hashCode());
return result;
}
@ -695,49 +719,50 @@ public class OutRechargeOrder implements Serializable {
sb.append(" [");
sb.append("Hash = ").append(hashCode());
sb.append(", id=").append(id);
sb.append(", rechargePrice=").append(rechargePrice);
sb.append(", type=").append(type);
sb.append(", operatorName=").append(operatorName);
sb.append(", operatorType=").append(operatorType);
sb.append(", rechargePrice=").append(rechargePrice);
sb.append(", orderNo=").append(orderNo);
sb.append(", rechargeType=").append(rechargeType);
sb.append(", childOrderNo=").append(childOrderNo);
sb.append(", memDiscountId=").append(memDiscountId);
sb.append(", memDiscountName=").append(memDiscountName);
sb.append(", userId=").append(userId);
sb.append(", userName=").append(userName);
sb.append(", userPhone=").append(userPhone);
sb.append(", goodsId=").append(goodsId);
sb.append(", rechargeContent=").append(rechargeContent);
sb.append(", payType=").append(payType);
sb.append(", laborUnionCard=").append(laborUnionCard);
sb.append(", integralNum=").append(integralNum);
sb.append(", discountDeductionPrice=").append(discountDeductionPrice);
sb.append(", integralDeductionPrice=").append(integralDeductionPrice);
sb.append(", payPrice=").append(payPrice);
sb.append(", orderPrice=").append(orderPrice);
sb.append(", payRealPrice=").append(payRealPrice);
sb.append(", paySerialNo=").append(paySerialNo);
sb.append(", payStatus=").append(payStatus);
sb.append(", rechargeStatus=").append(rechargeStatus);
sb.append(", rechargeName=").append(rechargeName);
sb.append(", createTimed=").append(createTimed);
sb.append(", payTime=").append(payTime);
sb.append(", cancelTime=").append(cancelTime);
sb.append(", finishTime=").append(finishTime);
sb.append(", remarks=").append(remarks);
sb.append(", outRefundNo=").append(outRefundNo);
sb.append(", orderPrice=").append(orderPrice);
sb.append(", refundTime=").append(refundTime);
sb.append(", tpRefundOrderNo=").append(tpRefundOrderNo);
sb.append(", refundId=").append(refundId);
sb.append(", refundFee=").append(refundFee);
sb.append(", companyId=").append(companyId);
sb.append(", payStatus=").append(payStatus);
sb.append(", merchId=").append(merchId);
sb.append(", rechargeStatus=").append(rechargeStatus);
sb.append(", ext1=").append(ext1);
sb.append(", ext2=").append(ext2);
sb.append(", ext3=").append(ext3);
sb.append(", rechargeName=").append(rechargeName);
sb.append(", remarks=").append(remarks);
sb.append(", agentKey=").append(agentKey);
sb.append(", objectId=").append(objectId);
sb.append(", rechargeType=").append(rechargeType);
sb.append(", abnormalMsg=").append(abnormalMsg);
sb.append(", ext1=").append(ext1);
sb.append(", ext2=").append(ext2);
sb.append(", ext3=").append(ext3);
sb.append(", goodsId=").append(goodsId);
sb.append(", rechargeContent=").append(rechargeContent);
sb.append(", companyId=").append(companyId);
sb.append(", merchId=").append(merchId);
sb.append(", whetherRebate=").append(whetherRebate);
sb.append(", serialVersionUID=").append(serialVersionUID);
sb.append("]");

@ -16,6 +16,10 @@ import java.util.Date;
@Data
public class OrderCouponModel {
@ColumnWidth(25)
@ExcelProperty(value = "分公司")
private String companyName;
@ColumnWidth(25)
@ExcelProperty(value = "交易订单号")
private String orderNo;
@ -24,6 +28,10 @@ public class OrderCouponModel {
@ExcelProperty(value = "客户电话")
private String memPhone;
@ColumnWidth(20)
@ExcelProperty(value = "卡券编号")
private String couponKey;
@ColumnWidth(30)
@ExcelProperty(value = "卡券名称")
private String couponName;
@ -32,6 +40,10 @@ public class OrderCouponModel {
@ExcelProperty(value = "卡券面值")
private String couponPrice;
@ColumnWidth(13)
@ExcelProperty(value = "卡券来源")
private String couponSource;
@ColumnWidth(13)
@ExcelProperty(value = "订单总额")
private BigDecimal totalPrice;

@ -38,19 +38,19 @@ public interface OrderService {
/**
* 订单取消
* @param orderNo 订单
* @param order 订单
* @param remarks 备注
* @return
*/
HighOrder cancelOrder(String orderNo,String remarks);
HighOrder cancelOrder(HighOrder order,String remarks);
/**
* 订单退款
* @param orderNo
* @param order
* @param remarks
* @return
*/
HighOrder refundOrder(String orderNo,String remarks) throws Exception;
HighOrder refundOrder(HighOrder order,String remarks) throws Exception;
/**
* 子订单退款

@ -262,7 +262,7 @@ public class OrderCreateHandleServiceImpl implements OrderCreateHandleService {
}
HighChildOrder childOrder = new HighChildOrder();
childOrder.setChildOrderNo(OrderUtil.generateChildOrderNo());
childOrder.setGoodsType(OrderChildGoodsType.TYPE1.getNumber());
childOrder.setGoodsType(OrderChildGoodsType.TYPE2.getNumber());
childOrder.setGoodsId(user.getId());
childOrder.setGoodsName(user.getName());
childOrder.setGoodsImg(user.getHeaderImg());

@ -101,7 +101,13 @@ public class OrderPaySuccessServiceImpl implements OrderPaySuccessService {
order.setPayRealPrice(payRealPrice);
order.setPayTime(new Date());
order.setPayType(payType != null?payType.getNumber():null);
order.setOrderStatus(OrderStatusEnum.type2.getType());
if (order.getProductType().equals(OrderProductType.PRODUCT_TYPE6.getNumber())) {
order.setOrderStatus(OrderStatusEnum.type3.getType());
} else {
order.setOrderStatus(OrderStatusEnum.type2.getType());
}
if (userCard != null) {
order.setMemCardId(userCard.getId());
order.setMemCardNo(userCard.getCardNo());

@ -443,8 +443,8 @@ public class OrderServiceImpl implements OrderService {
isolation = Isolation.READ_COMMITTED,
timeout = 10,
rollbackFor = Exception.class)
public HighOrder cancelOrder(String orderNo,String remarks) {
HighOrder order = getOrderDetailByNo(orderNo);
@CacheUpdate(name = "order:", key = "#order.orderNo", value = "#order")
public HighOrder cancelOrder(HighOrder order,String remarks) {
if (!order.getOrderStatus().equals(OrderStatus.STATUS1.getNumber())) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "订单状态错误");
}
@ -497,8 +497,8 @@ public class OrderServiceImpl implements OrderService {
isolation = Isolation.READ_COMMITTED,
timeout = 10,
rollbackFor = Exception.class)
public HighOrder refundOrder(String orderNo, String remarks) throws Exception {
HighOrder order = getOrderDetailByNo(orderNo);
@CacheUpdate(name = "order:", key = "#order.orderNo", value = "#order")
public HighOrder refundOrder(HighOrder order, String remarks) throws Exception {
if (!order.getOrderStatus().equals(OrderStatus.STATUS2.getNumber())
&& !order.getOrderStatus().equals(OrderStatus.STATUS3.getNumber())) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "订单状态错误");
@ -532,13 +532,13 @@ public class OrderServiceImpl implements OrderService {
order.setRefundTime(new Date());
order.setOrderStatus(OrderStatus.STATUS4.getNumber());
// todo 退款金额,原路返回
// 退回金额,原路返回
RefundPriceModel refundPrice = orderRefundService.refundPrice(refundOrderNo
, order
, OrderPayType.getDataByType(order.getPayType())
, order.getPayRealPrice()
, order.getPayGold());
if (refundPrice.getRefundSuccess() == true) {
if (refundPrice.getRefundSuccess() == false) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "退款失败,请稍后重试");
}
@ -546,6 +546,7 @@ public class OrderServiceImpl implements OrderService {
for (HighOrderRefund orderRefund : refundList) {
orderRefund.setRefundStatus(OrderRefundStatus.STATUS2.getNumber());
orderRefund.setRefundTime(new Date());
orderRefund.setThirdPartyRefundOrderNo(refundPrice.getThirdPartyRefundOrderNo());
orderRefundService.update(orderRefund);
rocketMQTemplate.syncSend(OrderTopic.ORDER_TOPIC_REFUND_SUCCESS.getTopic(), orderRefund);
@ -580,13 +581,13 @@ public class OrderServiceImpl implements OrderService {
orderChild.setChildOrderStatus(OrderChildStatus.STATUS4.getNumber());
}
// todo 退款金额,原路返回
// 退回金额,原路返回
RefundPriceModel refundPrice = orderRefundService.refundPrice(orderRefund.getRefundOrderNo()
, order
, OrderPayType.getDataByType(order.getPayType())
, orderRefund.getRefundPrice()
, orderRefund.getRefundIntegral());
if (!refundPrice.getRefundSuccess() == true) {
if (refundPrice.getRefundSuccess() == false) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "退款失败,请稍后重试");
}

Loading…
Cancel
Save