提交代码

dev-discount
胡锐 2 years ago
parent 79222cab93
commit 50f8c1942e
  1. 7
      hai-order/src/main/java/com/web/controller/OrderRefundController.java
  2. 20
      hai-service/src/main/java/com/hai/dao/HighOrderRefundMapper.java
  3. 28
      hai-service/src/main/java/com/hai/dao/HighOrderRefundSqlProvider.java
  4. 32
      hai-service/src/main/java/com/hai/entity/HighOrderRefund.java
  5. 130
      hai-service/src/main/java/com/hai/entity/HighOrderRefundExample.java
  6. 1
      hai-service/src/main/java/com/hai/enum_type/DiscountUseScope.java
  7. 8
      hai-service/src/main/java/com/hai/order/model/ExportOrderRefundModel.java
  8. 14
      hai-service/src/main/java/com/hai/order/service/impl/OrderRefundServiceImpl.java
  9. 6
      hai-service/src/main/resources/prod-9401/commonConfig.properties
  10. 8
      hai-service/src/main/resources/prod/commonConfig.properties

@ -229,6 +229,7 @@ public class OrderRefundController {
public ResponseData excelRefund(@RequestParam(name = "orderNo", required = false) String orderNo,
@RequestParam(name = "orderChildNo", required = false) String orderChildNo,
@RequestParam(name = "refundOrderNo", required = false) String refundOrderNo,
@RequestParam(name = "payType", required = false) Integer payType,
@RequestParam(name = "memPhone", required = false) String memPhone,
@RequestParam(name = "goodsType", required = false) Integer goodsType,
@RequestParam(name = "goodsName", required = false) String goodsName,
@ -242,6 +243,7 @@ public class OrderRefundController {
param.put("orderNo", orderNo);
param.put("orderChildNo", orderChildNo);
param.put("refundOrderNo", refundOrderNo);
param.put("payType", payType);
param.put("memPhone", memPhone);
param.put("goodsType", goodsType);
param.put("goodsName", goodsName);
@ -259,6 +261,8 @@ public class OrderRefundController {
for (HighOrderRefund orderRefund : list) {
orderRefundModel = new ExportOrderRefundModel();
orderRefundModel.setOrderNo(orderRefund.getOrderNo());
OrderPayType orderPayType = OrderPayType.getDataByType(orderRefund.getPayType());
orderRefundModel.setPayTypeName(orderPayType!=null?orderPayType.getName():"未知");
orderRefundModel.setChildOrderNo(orderRefund.getOrderChildNo());
orderRefundModel.setMemPhone(orderRefund.getMemPhone());
orderRefundModel.setGoodsType(OrderChildGoodsType.getDataByType(orderRefund.getGoodsType()).getName());
@ -268,6 +272,7 @@ public class OrderRefundController {
orderRefundModel.setReturnTotalPrice(orderRefund.getReturnTotalPrice());
orderRefundModel.setRefundPrice(orderRefund.getRefundPrice());
orderRefundModel.setRefundIntegral(orderRefund.getRefundIntegral());
orderRefundModel.setAccountMerchantNum(orderRefund.getAccountMerchantNum());
orderRefundModel.setRefundStatus(OrderRefundStatus.getDataByType(orderRefund.getRefundStatus()).getName());
orderRefundModel.setCreateTime(orderRefund.getCreateTime());
orderRefundModel.setRefundTime(orderRefund.getRefundTime());
@ -286,7 +291,7 @@ public class OrderRefundController {
.sheet("交易退款记录")
.doWrite(orderRefundModelList);
return ResponseMsgUtil.success(fileUrl+pathName);
return ResponseMsgUtil.success("/temporary/" + pathName);
} catch (Exception e) {
log.error("OrderRefundController -> excelRefund() error!",e);

@ -45,7 +45,8 @@ public interface HighOrderRefundMapper extends HighOrderRefundMapperExt {
"goods_type, goods_id, ",
"goods_name, goods_desc, ",
"goods_img, goods_spec_name, ",
"goods_count, refund_order_no, ",
"goods_count, pay_type, ",
"account_merchant_num, refund_order_no, ",
"third_party_refund_order_no, return_total_price, ",
"refund_goods_num, refund_price, ",
"refund_integral, refund_remark, ",
@ -61,7 +62,8 @@ public interface HighOrderRefundMapper extends HighOrderRefundMapperExt {
"#{goodsType,jdbcType=INTEGER}, #{goodsId,jdbcType=BIGINT}, ",
"#{goodsName,jdbcType=VARCHAR}, #{goodsDesc,jdbcType=VARCHAR}, ",
"#{goodsImg,jdbcType=VARCHAR}, #{goodsSpecName,jdbcType=VARCHAR}, ",
"#{goodsCount,jdbcType=INTEGER}, #{refundOrderNo,jdbcType=VARCHAR}, ",
"#{goodsCount,jdbcType=INTEGER}, #{payType,jdbcType=INTEGER}, ",
"#{accountMerchantNum,jdbcType=VARCHAR}, #{refundOrderNo,jdbcType=VARCHAR}, ",
"#{thirdPartyRefundOrderNo,jdbcType=VARCHAR}, #{returnTotalPrice,jdbcType=DECIMAL}, ",
"#{refundGoodsNum,jdbcType=INTEGER}, #{refundPrice,jdbcType=DECIMAL}, ",
"#{refundIntegral,jdbcType=INTEGER}, #{refundRemark,jdbcType=VARCHAR}, ",
@ -96,6 +98,8 @@ public interface HighOrderRefundMapper extends HighOrderRefundMapperExt {
@Result(column="goods_img", property="goodsImg", jdbcType=JdbcType.VARCHAR),
@Result(column="goods_spec_name", property="goodsSpecName", jdbcType=JdbcType.VARCHAR),
@Result(column="goods_count", property="goodsCount", jdbcType=JdbcType.INTEGER),
@Result(column="pay_type", property="payType", jdbcType=JdbcType.INTEGER),
@Result(column="account_merchant_num", property="accountMerchantNum", jdbcType=JdbcType.VARCHAR),
@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),
@ -124,10 +128,10 @@ 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, 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, op_user_type, op_user_id, op_user_name, ",
"ext_1, ext_2, ext_3, ext_4, ext_5, ext_6",
"pay_type, account_merchant_num, 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, op_user_type, ",
"op_user_id, op_user_name, ext_1, ext_2, ext_3, ext_4, ext_5, ext_6",
"from high_order_refund",
"where id = #{id,jdbcType=BIGINT}"
})
@ -147,6 +151,8 @@ public interface HighOrderRefundMapper extends HighOrderRefundMapperExt {
@Result(column="goods_img", property="goodsImg", jdbcType=JdbcType.VARCHAR),
@Result(column="goods_spec_name", property="goodsSpecName", jdbcType=JdbcType.VARCHAR),
@Result(column="goods_count", property="goodsCount", jdbcType=JdbcType.INTEGER),
@Result(column="pay_type", property="payType", jdbcType=JdbcType.INTEGER),
@Result(column="account_merchant_num", property="accountMerchantNum", jdbcType=JdbcType.VARCHAR),
@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),
@ -196,6 +202,8 @@ public interface HighOrderRefundMapper extends HighOrderRefundMapperExt {
"goods_img = #{goodsImg,jdbcType=VARCHAR},",
"goods_spec_name = #{goodsSpecName,jdbcType=VARCHAR},",
"goods_count = #{goodsCount,jdbcType=INTEGER},",
"pay_type = #{payType,jdbcType=INTEGER},",
"account_merchant_num = #{accountMerchantNum,jdbcType=VARCHAR},",
"refund_order_no = #{refundOrderNo,jdbcType=VARCHAR},",
"third_party_refund_order_no = #{thirdPartyRefundOrderNo,jdbcType=VARCHAR},",
"return_total_price = #{returnTotalPrice,jdbcType=DECIMAL},",

@ -84,6 +84,14 @@ public class HighOrderRefundSqlProvider {
sql.VALUES("goods_count", "#{goodsCount,jdbcType=INTEGER}");
}
if (record.getPayType() != null) {
sql.VALUES("pay_type", "#{payType,jdbcType=INTEGER}");
}
if (record.getAccountMerchantNum() != null) {
sql.VALUES("account_merchant_num", "#{accountMerchantNum,jdbcType=VARCHAR}");
}
if (record.getRefundOrderNo() != null) {
sql.VALUES("refund_order_no", "#{refundOrderNo,jdbcType=VARCHAR}");
}
@ -192,6 +200,8 @@ public class HighOrderRefundSqlProvider {
sql.SELECT("goods_img");
sql.SELECT("goods_spec_name");
sql.SELECT("goods_count");
sql.SELECT("pay_type");
sql.SELECT("account_merchant_num");
sql.SELECT("refund_order_no");
sql.SELECT("third_party_refund_order_no");
sql.SELECT("return_total_price");
@ -290,6 +300,14 @@ public class HighOrderRefundSqlProvider {
sql.SET("goods_count = #{record.goodsCount,jdbcType=INTEGER}");
}
if (record.getPayType() != null) {
sql.SET("pay_type = #{record.payType,jdbcType=INTEGER}");
}
if (record.getAccountMerchantNum() != null) {
sql.SET("account_merchant_num = #{record.accountMerchantNum,jdbcType=VARCHAR}");
}
if (record.getRefundOrderNo() != null) {
sql.SET("refund_order_no = #{record.refundOrderNo,jdbcType=VARCHAR}");
}
@ -397,6 +415,8 @@ public class HighOrderRefundSqlProvider {
sql.SET("goods_img = #{record.goodsImg,jdbcType=VARCHAR}");
sql.SET("goods_spec_name = #{record.goodsSpecName,jdbcType=VARCHAR}");
sql.SET("goods_count = #{record.goodsCount,jdbcType=INTEGER}");
sql.SET("pay_type = #{record.payType,jdbcType=INTEGER}");
sql.SET("account_merchant_num = #{record.accountMerchantNum,jdbcType=VARCHAR}");
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}");
@ -484,6 +504,14 @@ public class HighOrderRefundSqlProvider {
sql.SET("goods_count = #{goodsCount,jdbcType=INTEGER}");
}
if (record.getPayType() != null) {
sql.SET("pay_type = #{payType,jdbcType=INTEGER}");
}
if (record.getAccountMerchantNum() != null) {
sql.SET("account_merchant_num = #{accountMerchantNum,jdbcType=VARCHAR}");
}
if (record.getRefundOrderNo() != null) {
sql.SET("refund_order_no = #{refundOrderNo,jdbcType=VARCHAR}");
}

@ -99,6 +99,16 @@ public class HighOrderRefund implements Serializable {
*/
private Integer goodsCount;
/**
* 支付类型 数据字典ORDER_PAY_TYPE
*/
private Integer payType;
/**
* 入账商户号
*/
private String accountMerchantNum;
/**
* 退款订单号
*/
@ -311,6 +321,22 @@ public class HighOrderRefund implements Serializable {
this.goodsCount = goodsCount;
}
public Integer getPayType() {
return payType;
}
public void setPayType(Integer payType) {
this.payType = payType;
}
public String getAccountMerchantNum() {
return accountMerchantNum;
}
public void setAccountMerchantNum(String accountMerchantNum) {
this.accountMerchantNum = accountMerchantNum;
}
public String getRefundOrderNo() {
return refundOrderNo;
}
@ -506,6 +532,8 @@ public class HighOrderRefund implements Serializable {
&& (this.getGoodsImg() == null ? other.getGoodsImg() == null : this.getGoodsImg().equals(other.getGoodsImg()))
&& (this.getGoodsSpecName() == null ? other.getGoodsSpecName() == null : this.getGoodsSpecName().equals(other.getGoodsSpecName()))
&& (this.getGoodsCount() == null ? other.getGoodsCount() == null : this.getGoodsCount().equals(other.getGoodsCount()))
&& (this.getPayType() == null ? other.getPayType() == null : this.getPayType().equals(other.getPayType()))
&& (this.getAccountMerchantNum() == null ? other.getAccountMerchantNum() == null : this.getAccountMerchantNum().equals(other.getAccountMerchantNum()))
&& (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()))
@ -548,6 +576,8 @@ public class HighOrderRefund implements Serializable {
result = prime * result + ((getGoodsImg() == null) ? 0 : getGoodsImg().hashCode());
result = prime * result + ((getGoodsSpecName() == null) ? 0 : getGoodsSpecName().hashCode());
result = prime * result + ((getGoodsCount() == null) ? 0 : getGoodsCount().hashCode());
result = prime * result + ((getPayType() == null) ? 0 : getPayType().hashCode());
result = prime * result + ((getAccountMerchantNum() == null) ? 0 : getAccountMerchantNum().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());
@ -593,6 +623,8 @@ public class HighOrderRefund implements Serializable {
sb.append(", goodsImg=").append(goodsImg);
sb.append(", goodsSpecName=").append(goodsSpecName);
sb.append(", goodsCount=").append(goodsCount);
sb.append(", payType=").append(payType);
sb.append(", accountMerchantNum=").append(accountMerchantNum);
sb.append(", refundOrderNo=").append(refundOrderNo);
sb.append(", thirdPartyRefundOrderNo=").append(thirdPartyRefundOrderNo);
sb.append(", returnTotalPrice=").append(returnTotalPrice);

@ -1106,6 +1106,136 @@ public class HighOrderRefundExample {
return (Criteria) this;
}
public Criteria andPayTypeIsNull() {
addCriterion("pay_type is null");
return (Criteria) this;
}
public Criteria andPayTypeIsNotNull() {
addCriterion("pay_type is not null");
return (Criteria) this;
}
public Criteria andPayTypeEqualTo(Integer value) {
addCriterion("pay_type =", value, "payType");
return (Criteria) this;
}
public Criteria andPayTypeNotEqualTo(Integer value) {
addCriterion("pay_type <>", value, "payType");
return (Criteria) this;
}
public Criteria andPayTypeGreaterThan(Integer value) {
addCriterion("pay_type >", value, "payType");
return (Criteria) this;
}
public Criteria andPayTypeGreaterThanOrEqualTo(Integer value) {
addCriterion("pay_type >=", value, "payType");
return (Criteria) this;
}
public Criteria andPayTypeLessThan(Integer value) {
addCriterion("pay_type <", value, "payType");
return (Criteria) this;
}
public Criteria andPayTypeLessThanOrEqualTo(Integer value) {
addCriterion("pay_type <=", value, "payType");
return (Criteria) this;
}
public Criteria andPayTypeIn(List<Integer> values) {
addCriterion("pay_type in", values, "payType");
return (Criteria) this;
}
public Criteria andPayTypeNotIn(List<Integer> values) {
addCriterion("pay_type not in", values, "payType");
return (Criteria) this;
}
public Criteria andPayTypeBetween(Integer value1, Integer value2) {
addCriterion("pay_type between", value1, value2, "payType");
return (Criteria) this;
}
public Criteria andPayTypeNotBetween(Integer value1, Integer value2) {
addCriterion("pay_type not between", value1, value2, "payType");
return (Criteria) this;
}
public Criteria andAccountMerchantNumIsNull() {
addCriterion("account_merchant_num is null");
return (Criteria) this;
}
public Criteria andAccountMerchantNumIsNotNull() {
addCriterion("account_merchant_num is not null");
return (Criteria) this;
}
public Criteria andAccountMerchantNumEqualTo(String value) {
addCriterion("account_merchant_num =", value, "accountMerchantNum");
return (Criteria) this;
}
public Criteria andAccountMerchantNumNotEqualTo(String value) {
addCriterion("account_merchant_num <>", value, "accountMerchantNum");
return (Criteria) this;
}
public Criteria andAccountMerchantNumGreaterThan(String value) {
addCriterion("account_merchant_num >", value, "accountMerchantNum");
return (Criteria) this;
}
public Criteria andAccountMerchantNumGreaterThanOrEqualTo(String value) {
addCriterion("account_merchant_num >=", value, "accountMerchantNum");
return (Criteria) this;
}
public Criteria andAccountMerchantNumLessThan(String value) {
addCriterion("account_merchant_num <", value, "accountMerchantNum");
return (Criteria) this;
}
public Criteria andAccountMerchantNumLessThanOrEqualTo(String value) {
addCriterion("account_merchant_num <=", value, "accountMerchantNum");
return (Criteria) this;
}
public Criteria andAccountMerchantNumLike(String value) {
addCriterion("account_merchant_num like", value, "accountMerchantNum");
return (Criteria) this;
}
public Criteria andAccountMerchantNumNotLike(String value) {
addCriterion("account_merchant_num not like", value, "accountMerchantNum");
return (Criteria) this;
}
public Criteria andAccountMerchantNumIn(List<String> values) {
addCriterion("account_merchant_num in", values, "accountMerchantNum");
return (Criteria) this;
}
public Criteria andAccountMerchantNumNotIn(List<String> values) {
addCriterion("account_merchant_num not in", values, "accountMerchantNum");
return (Criteria) this;
}
public Criteria andAccountMerchantNumBetween(String value1, String value2) {
addCriterion("account_merchant_num between", value1, value2, "accountMerchantNum");
return (Criteria) this;
}
public Criteria andAccountMerchantNumNotBetween(String value1, String value2) {
addCriterion("account_merchant_num not between", value1, value2, "accountMerchantNum");
return (Criteria) this;
}
public Criteria andRefundOrderNoIsNull() {
addCriterion("refund_order_no is null");
return (Criteria) this;

@ -15,6 +15,7 @@ public enum DiscountUseScope {
type5(5 , "星巴克"),
type6(6 , "会员充值"),
type7(7 , "加油服务"),
type8(8 , "重庆中石油"),
;
private Integer type;

@ -20,6 +20,10 @@ public class ExportOrderRefundModel {
@ExcelProperty("交易单号")
private String orderNo;
@ColumnWidth(25)
@ExcelProperty("支付方式")
private String payTypeName;
@ColumnWidth(25)
@ExcelProperty("产品单号")
private String childOrderNo;
@ -56,6 +60,10 @@ public class ExportOrderRefundModel {
@ExcelProperty("退款积分")
private Integer refundIntegral;
@ColumnWidth(20)
@ExcelProperty("退款入账商户")
private String accountMerchantNum;
@ColumnWidth(15)
@ExcelProperty("退款状态")
private String refundStatus;

@ -106,6 +106,7 @@ public class OrderRefundServiceImpl implements OrderRefundService {
HighOrderRefund orderRefund = new HighOrderRefund();
orderRefund.setOrderId(orderChild.getOrderId());
orderRefund.setOrderNo(orderChild.getOrderNo());
orderRefund.setPayType(order.getPayType());
orderRefund.setOrderChildId(orderChild.getId());
orderRefund.setOrderChildNo(orderChild.getChildOrderNo());
orderRefund.setMemId(orderChild.getMemId());
@ -130,6 +131,15 @@ public class OrderRefundServiceImpl implements OrderRefundService {
orderRefund.setOpUserType(opUserType.getNumber());
orderRefund.setOpUserId(opUserId);
orderRefund.setOpUserName(opUserName);
if (order.getPayType().equals(OrderPayType.PAY_TYPE4.getNumber())
|| order.getPayType().equals(OrderPayType.PAY_TYPE7.getNumber())
|| order.getPayType().equals(OrderPayType.PAY_TYPE8.getNumber())) {
orderRefund.setAccountMerchantNum(order.getMemCardNo());
} else {
orderRefund.setAccountMerchantNum(order.getAccountMerchantNum());
}
orderRefundMapper.insert(orderRefund);
return orderRefund;
}
@ -239,6 +249,10 @@ public class OrderRefundServiceImpl implements OrderRefundService {
criteria.andMemPhoneEqualTo(MapUtils.getString(param, "memPhone"));
}
if (MapUtils.getInteger(param, "payType") != null) {
criteria.andPayTypeEqualTo(MapUtils.getInteger(param, "payType"));
}
if (MapUtils.getLong(param, "memId") != null) {
criteria.andMemIdEqualTo(MapUtils.getLong(param, "memId"));
}

@ -1,6 +1,12 @@
hsgDomainName=https://hsg.dctpay.com
gasDefaultOilStationImg=https://hsg.dctpay.com/filesystem/default/default_oil_station.jpg
# ChongQingCNPC configuration parameters
ChongQingCnpcUrl=http://cqpingan.wisdomyt.cn/d/cross/api
ChongQingCnpcMerNo=7ygt1b2b8rpl7vttm6
ChongQingCnpcMerKey=5ojd0nkdqb1ff84t
ChongQingCnpcCouponSignKey=pzj69n2r8l1l3kry
tuanYouUrl=https://hcs.czb365.com
tuanYouAppKey=210091174083104
tuanYouAppSecret=f9811df6791d309bf48f4a8db9edaa45

@ -1,5 +1,11 @@
hsgDomainName=https://hsg.dctpay.com
gasDefaultOilStationImg=https://hsgcs.dctpay.com/filesystem/default/default_oil_station.jpg
gasDefaultOilStationImg=https://hsg.dctpay.com/filesystem/default/default_oil_station.jpg
# ChongQingCNPC configuration parameters
ChongQingCnpcUrl=http://cqpingan.wisdomyt.cn/d/cross/api
ChongQingCnpcMerNo=7ygt1b2b8rpl7vttm6
ChongQingCnpcMerKey=5ojd0nkdqb1ff84t
ChongQingCnpcCouponSignKey=pzj69n2r8l1l3kry
tuanYouUrl=https://hcs.czb365.com
tuanYouAppKey=210091174083104

Loading…
Cancel
Save