|
|
@@ -6,10 +6,7 @@ import com.github.binarywang.wxpay.bean.ecommerce.SignatureHeader; |
|
|
import com.iformall.common.ErrorCode; |
|
|
import com.iformall.common.ErrorCode; |
|
|
import com.iformall.common.ResultData; |
|
|
import com.iformall.common.ResultData; |
|
|
import com.iformall.controller.base.BaseController; |
|
|
import com.iformall.controller.base.BaseController; |
|
|
import com.iformall.domain.po.WxAppinfo; |
|
|
|
|
|
import com.iformall.domain.po.WxBatchOrder; |
|
|
|
|
|
import com.iformall.domain.po.WxPayAccount; |
|
|
|
|
|
import com.iformall.domain.po.WxPayOrder; |
|
|
|
|
|
|
|
|
import com.iformall.domain.po.*; |
|
|
import com.iformall.domain.po.base.TenantEntity; |
|
|
import com.iformall.domain.po.base.TenantEntity; |
|
|
import com.iformall.domain.po.msg.FmInsideNotifyRefundSuccessMsg; |
|
|
import com.iformall.domain.po.msg.FmInsideNotifyRefundSuccessMsg; |
|
|
import com.iformall.douyin.pay.DouYinPayHelper; |
|
|
import com.iformall.douyin.pay.DouYinPayHelper; |
|
|
@@ -48,6 +45,9 @@ public class TtPayController extends BaseController { |
|
|
@Autowired |
|
|
@Autowired |
|
|
private WxPayAccountService payAccountService; |
|
|
private WxPayAccountService payAccountService; |
|
|
|
|
|
|
|
|
|
|
|
@Autowired |
|
|
|
|
|
private WxProfitSharingOrderService wxProfitSharingOrderService; |
|
|
|
|
|
|
|
|
@Autowired |
|
|
@Autowired |
|
|
private WxRefundOrderService wxRefundOrderService; |
|
|
private WxRefundOrderService wxRefundOrderService; |
|
|
|
|
|
|
|
|
@@ -227,10 +227,21 @@ public class TtPayController extends BaseController { |
|
|
|
|
|
|
|
|
resultMap.put("err_no",0); |
|
|
resultMap.put("err_no",0); |
|
|
resultMap.put("err_tips","success"); |
|
|
resultMap.put("err_tips","success"); |
|
|
}else if("settle".equals(type)){ |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}else if("settle".equals(type)){//分账回调 |
|
|
|
|
|
String order_id = (String) pMap.get("order_id"); |
|
|
|
|
|
String settle_id = (String) pMap.get("settle_id"); |
|
|
|
|
|
String out_settle_no = (String) pMap.get("out_settle_no"); |
|
|
|
|
|
String status = (String) pMap.get("status"); |
|
|
|
|
|
WxProfitSharingOrder wxProfitSharingOrder = new WxProfitSharingOrder(); |
|
|
|
|
|
wxProfitSharingOrder.setTenantId(appinfo.getTenantId()); |
|
|
|
|
|
wxProfitSharingOrder.setOutSettleNo(Long.parseLong(out_settle_no)); |
|
|
|
|
|
WxProfitSharingOrder one = wxProfitSharingOrderService.findOne(wxProfitSharingOrder); |
|
|
|
|
|
if(one != null){ |
|
|
|
|
|
wxProfitSharingOrderService.querySharingOrder(wxProfitSharingOrder); |
|
|
|
|
|
resultMap.put("err_no",0); |
|
|
|
|
|
resultMap.put("err_tips","success"); |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
return resultMap; |
|
|
return resultMap; |
|
|
} catch (Exception e){ |
|
|
} catch (Exception e){ |
|
|
logger.error(e.getMessage()); |
|
|
logger.error(e.getMessage()); |
|
|
|