|
@@ -6,6 +6,7 @@ import cn.hutool.json.JSONObject;
|
|
|
import cn.hutool.json.JSONUtil;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.pj.api.pushfee.tools.EncryptTools;
|
|
|
+import com.pj.api.pushfee.tools.http.HttpUtils;
|
|
|
import com.pj.api.pushfee.tools.message.api.OdsOrderPayDetailDTO;
|
|
|
import com.pj.api.pushfee.tools.message.api.OrderPayDetailMessage;
|
|
|
import com.pj.current.config.PartConfig;
|
|
@@ -93,7 +94,7 @@ public class FeeDetailSyncTask {
|
|
|
//String response = "{\"msg\":\"测试\",\"code\":200,\"timestamp\":\"2022-07-27 18:13:17\"}";
|
|
|
String response = "{}";
|
|
|
try {
|
|
|
- response = tools.http.HttpUtils.doPost(pushfeeConfig.getSyncUrl(), encryptMessage);
|
|
|
+ response = HttpUtils.doPost(pushfeeConfig.getSyncUrl(), encryptMessage);
|
|
|
log.info("pushfee_response: " + response);
|
|
|
} catch (IOException e) {
|
|
|
log.error("pushfee_error: " + e.getMessage());
|
|
@@ -144,11 +145,11 @@ public class FeeDetailSyncTask {
|
|
|
.setCarNo(fd.getCarNo())
|
|
|
.setWeight(fd.getWeight() != null ? fd.getWeight()+"": "0")
|
|
|
.setNum(fd.getNum()+"")
|
|
|
- .setPrice(fd.getUnitPrice().toString()).setTotalPrice(fd.getItemPrice().toString())
|
|
|
+ .setPrice(fd.getUnitPrice()).setTotalPrice(fd.getItemPrice())
|
|
|
.setSettleStatusName("已结算").setSettleStatusId(fd.getIsSettle()+"")
|
|
|
- .setTaxRate(fd.getTaxRate().multiply(BigDecimal.valueOf(100)).toString())
|
|
|
- .setTaxPayment(fd.getTaxPrice().toString())
|
|
|
- .setTaxAmount(fd.getItemPrice().toString()).setNoTaxAmount(fd.getNoTaxPrice().toString())
|
|
|
+ .setTaxRate(fd.getTaxRate().multiply(BigDecimal.valueOf(100)))
|
|
|
+ .setTaxPayment(fd.getTaxPrice())
|
|
|
+ .setTaxAmount(fd.getItemPrice()).setNoTaxAmount(fd.getNoTaxPrice())
|
|
|
.setPaymentWayName("微信支付").setPaymentWayId(fd.getPayType()+"")
|
|
|
.setSysSerialNo(fd.getOutTradeNo())
|
|
|
.setPayNo(fd.getTransactionId())
|