Browse Source

businessCircle tran

release_toaliyun_real
xhxu 5 years ago
parent
commit
bc452cfe87
4 changed files with 10 additions and 8 deletions
  1. +3
    -3
      mallinkPublicApi/src/main/java/com/iformall/controller/UserThirdCircleOrderController.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/WxThirdPartyOrdersService.java
  3. +3
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java
  4. +3
    -2
      mallinkService/src/main/resources/mapper/WxThirdPartyOrdersMapper.xml

+ 3
- 3
mallinkPublicApi/src/main/java/com/iformall/controller/UserThirdCircleOrderController.java View File

@@ -102,7 +102,7 @@ public class UserThirdCircleOrderController extends BaseController {
logger.error(e.getMessage());
return new ResultData(e.getErrorCode(), e.getMessage());
}catch(Exception e){
e.printStackTrace();
logger.error("异常:" + e);
return new ResultData(ErrorCode.SYS_SERVER_ERROR);
}

@@ -162,7 +162,7 @@ public class UserThirdCircleOrderController extends BaseController {
logger.error(e.getMessage());
return new ResultData(e.getErrorCode(), e.getMessage());
}catch(Exception e){
e.printStackTrace();
logger.error("异常:" + e);
return new ResultData(ErrorCode.SYS_SERVER_ERROR);
}

@@ -237,7 +237,7 @@ public class UserThirdCircleOrderController extends BaseController {
logger.error(e.getMessage());
return new ResultData(e.getErrorCode(), e.getMessage());
}catch(Exception e){
e.printStackTrace();
logger.error("异常:" + e);
return new ResultData(ErrorCode.SYS_SERVER_ERROR);
}
}


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/WxThirdPartyOrdersService.java View File

@@ -32,7 +32,7 @@ public interface WxThirdPartyOrdersService {
* @return
*/
WxThirdPartyOrders getOrderByTransactionId(EnumThirdOrderType orderType, String transactionId, String tenantId);
WxThirdPartyOrders getRefundOrderByRefundId(String refundId, String tenantId);
WxThirdPartyOrders getRefundOrderByRefundId(EnumThirdOrderType orderType,String refundId, String tenantId);
List<WxThirdPartyOrders> getRefundOrderByTransactionId(EnumThirdOrderType orderType, String transactionId, String tenantId);




+ 3
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java View File

@@ -72,8 +72,9 @@ public class WxThirdPartyOrdersServiceImpl implements WxThirdPartyOrdersService
}

@Override
public WxThirdPartyOrders getRefundOrderByRefundId(String refundId, String tenantId) {
public WxThirdPartyOrders getRefundOrderByRefundId(EnumThirdOrderType orderType,String refundId, String tenantId) {
WxThirdPartyOrders recordQ = new WxThirdPartyOrders();
recordQ.setSourceType(orderType.getCode());
recordQ.setRefundId(refundId);
recordQ.setTenantId(tenantId);
return wxThirdPartyOrdersMapper.getRefundOrderByRefundId(recordQ);
@@ -191,7 +192,7 @@ public class WxThirdPartyOrdersServiceImpl implements WxThirdPartyOrdersService
logger.error("--第三方退款--付款消息未找到--transactionId="+record.getTransactionId());
throw new MallinkException(ErrorCode.SYS_PARAMETER_ERROR.getCode(), "付款消息未找到");
}else{
WxThirdPartyOrders refundOrder = this.getRefundOrderByRefundId(record.getRefundId(),record.getTenantId());
WxThirdPartyOrders refundOrder = this.getRefundOrderByRefundId(EnumThirdOrderType.RMB_PAY,record.getRefundId(),record.getTenantId());
if(refundOrder != null){
logger.error("--Ali商圈退款--退款消息已存在---RefundId="+record.getRefundId());
}else{


+ 3
- 2
mallinkService/src/main/resources/mapper/WxThirdPartyOrdersMapper.xml View File

@@ -158,7 +158,7 @@
<include refid="allColumns"/>
from wx_third_party_orders
where `is_refund` = 0
and `sourceType` = #{sourceType}
and `source_type` = #{sourceType}
and `tenant_id` = #{tenantId}
and `transaction_id` = #{transactionId}
</select>
@@ -168,6 +168,7 @@
<include refid="allColumns"/>
from wx_third_party_orders
where `is_refund` = 1
and `source_type` = #{sourceType}
and tenant_id = #{tenantId}
and `refund_id` = #{refundId}
</select>
@@ -177,7 +178,7 @@
<include refid="allColumns"/>
from wx_third_party_orders
where `is_refund` = 1
and `sourceType` = #{sourceType}
and `source_type` = #{sourceType}
and `tenant_id` = #{tenantId}
and `transaction_id` = #{transactionId}
</select>


Loading…
Cancel
Save