Преглед изворни кода

[储值卡][新增]:储值卡花费及补贴及分账

release_toaliyun_real
Stormeye Wu пре 7 година
родитељ
комит
a89fcae66e
3 измењених фајлова са 28 додато и 2 уклоњено
  1. +10
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxCouponMerchant.java
  2. +5
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java
  3. +13
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java

+ 10
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxCouponMerchant.java Прегледај датотеку

@@ -40,6 +40,9 @@ public class WxCouponMerchant implements Serializable {
} }




/**租户ID**/
@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
private String tenantId;
/***/ /***/
@io.swagger.annotations.ApiModelProperty(value="",name="productId") @io.swagger.annotations.ApiModelProperty(value="",name="productId")
private Long productId; private Long productId;
@@ -62,6 +65,13 @@ public class WxCouponMerchant implements Serializable {
private Integer status; private Integer status;




public String getTenantId() {
return tenantId;
}

public void setTenantId(String tenantId) {
this.tenantId = tenantId;
}


public Long getProductId() { public Long getProductId() {
return productId; return productId;


+ 5
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java Прегледај датотеку

@@ -20,7 +20,10 @@ public class WxMerchantSubsidy implements Serializable {
protected List<Long> ids; protected List<Long> ids;
@Transient @Transient
protected String sortColumns; protected String sortColumns;

/**租户ID**/
@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
private String tenantId;
/**订单ID*/ /**订单ID*/
@io.swagger.annotations.ApiModelProperty(value="订单ID",name="orderId") @io.swagger.annotations.ApiModelProperty(value="订单ID",name="orderId")
private Long orderId; private Long orderId;
@@ -66,6 +69,7 @@ public class WxMerchantSubsidy implements Serializable {
public static enum Field public static enum Field
{ {
Id_ASC("`id` ASC"),Id_DESC("`id` DESC") Id_ASC("`id` ASC"),Id_DESC("`id` DESC")
,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC")
,OrderId_ASC("`order_id` ASC"),OrderId_DESC("`order_id` DESC") ,OrderId_ASC("`order_id` ASC"),OrderId_DESC("`order_id` DESC")
,OrderType_ASC("`order_type` ASC"),OrderType_DESC("`order_type` DESC") ,OrderType_ASC("`order_type` ASC"),OrderType_DESC("`order_type` DESC")
,MerchantId_ASC("`merchant_id` ASC"),MerchantId_DESC("`merchant_id` DESC") ,MerchantId_ASC("`merchant_id` ASC"),MerchantId_DESC("`merchant_id` DESC")


+ 13
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java Прегледај датотеку

@@ -66,6 +66,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService {
// 2. coupon 补贴 rate // 2. coupon 补贴 rate
WxCouponMerchant couponMerchant = null; WxCouponMerchant couponMerchant = null;
WxCouponMerchant couponMerchantQ = new WxCouponMerchant(); WxCouponMerchant couponMerchantQ = new WxCouponMerchant();
couponMerchantQ.setTenantId(record.getTenantId());
couponMerchantQ.setProductId(cardInfo.getCouponId()); couponMerchantQ.setProductId(cardInfo.getCouponId());
couponMerchantQ.setMerchantId(record.getMerchantId()); couponMerchantQ.setMerchantId(record.getMerchantId());
couponMerchantQ.setStatus(EnumCouponMerchantStatus.COUPON_MERCHANT_STATUS_VALID.getCode()); couponMerchantQ.setStatus(EnumCouponMerchantStatus.COUPON_MERCHANT_STATUS_VALID.getCode());
@@ -141,6 +142,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService {
Integer realSubsidyFee = subsidyFee - dSubChargeFee.intValue(); Integer realSubsidyFee = subsidyFee - dSubChargeFee.intValue();
WxMerchantSubsidy merchantSubsidy = new WxMerchantSubsidy(); WxMerchantSubsidy merchantSubsidy = new WxMerchantSubsidy();
merchantSubsidy.setId(idWorker.nextId()); merchantSubsidy.setId(idWorker.nextId());
merchantSubsidy.setTenantId(record.getTenantId());
merchantSubsidy.setOrderId(order.getId()); merchantSubsidy.setOrderId(order.getId());
merchantSubsidy.setOrderType(EnumOrderType.PREPAIDCARD.getCode()); merchantSubsidy.setOrderType(EnumOrderType.PREPAIDCARD.getCode());
merchantSubsidy.setMerchantId(record.getMerchantId()); merchantSubsidy.setMerchantId(record.getMerchantId());
@@ -161,7 +163,11 @@ public class WxCardSpendServiceImpl implements WxCardSpendService {
return new ResultData(ErrorCode.DB_FAIL.getCode(), "merchantSubsidy info 插入出错!"); return new ResultData(ErrorCode.DB_FAIL.getCode(), "merchantSubsidy info 插入出错!");
} }
// 9. 分账 // 9. 分账

try {
shareForCardPay(record.getTenantId(), record.getCardId(), record.getOrderId(), record.getId());
} catch (Exception e) {
logger.error("分账失败");
}


return new ResultData(record); return new ResultData(record);
} }
@@ -203,6 +209,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService {
int psNum = 0; int psNum = 0;
try { try {
WxCardSpend cardSpendQ = new WxCardSpend(); WxCardSpend cardSpendQ = new WxCardSpend();
cardSpendQ.setTenantId(tenantId);
cardSpendQ.setCardId(cardId); cardSpendQ.setCardId(cardId);
psNum = wxCardSpendMapper.selectCount(cardSpendQ); psNum = wxCardSpendMapper.selectCount(cardSpendQ);
if (psNum >= 20) { if (psNum >= 20) {
@@ -238,6 +245,11 @@ public class WxCardSpendServiceImpl implements WxCardSpendService {
shareOrder.setTransactionId(cardInfo.getTransactionId()); shareOrder.setTransactionId(cardInfo.getTransactionId());
shareOrder.setShareAmount(cardSpend.getRealPayment()); shareOrder.setShareAmount(cardSpend.getRealPayment());
profitSharingOrderService.createSharingOrder(shareOrder); profitSharingOrderService.createSharingOrder(shareOrder);
if(cardSpend.getCardRemainRealAmount() == 0) {
shareOrder.setPayAmount(cardInfo.getSaleAmount());
shareOrder.setType(EnumProfitSharingOrderType.PROFIT_SHARING_FINISH.getCode());
profitSharingOrderService.finishSharingOrder(shareOrder);
}
} else { } else {
logger.error("微信分账: 未找到payorder or merchant at orderid-" + orderId); logger.error("微信分账: 未找到payorder or merchant at orderid-" + orderId);
} }


Loading…
Откажи
Сачувај