ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TShoppingOrder.java
@@ -156,6 +156,10 @@ @TableField("refund_serial_number") private String refundSerialNumber; @ApiModelProperty(value = "地址json") @TableField("address_json") private String addressJson; @ApiModelProperty(value = "退款成功时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @TableField("refund_time") ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TCharingOrderMapVO.java
@@ -16,4 +16,6 @@ private List<Map<String,Object>> maps; @ApiModelProperty("下方折线图") private List<Map<String,Object>> maps1; private BigDecimal allMoney; private BigDecimal commissionAmount; } ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
@@ -942,8 +942,16 @@ tCharingOrderMapVO.setMaps(maps); BigDecimal allMoney = new BigDecimal(0); for (Map<String, Object> map : maps) { BigDecimal periodElectricPrice = (BigDecimal) map.get("period_electric_price"); allMoney = allMoney.add(periodElectricPrice); BigDecimal total_amount = (BigDecimal) map.get("total_amount"); allMoney = allMoney.add(total_amount); } allMoney = allMoney.multiply(new BigDecimal("0.006")); tCharingOrderMapVO.setAllMoney(allMoney); return R.ok(tCharingOrderMapVO); } ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TShoppingOrderController.java
@@ -5,9 +5,11 @@ import java.time.LocalDateTime; import com.alibaba.fastjson2.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.ruoyi.account.api.feignClient.AppCouponClient; import com.ruoyi.account.api.feignClient.AppUserAddressClient; import com.ruoyi.account.api.feignClient.AppUserClient; import com.ruoyi.account.api.model.TAppUserAddress; import com.ruoyi.common.core.domain.R; @@ -347,7 +349,9 @@ List<MyShoppingOrderList> list = shoppingOrderService.getNoInvoicedOrder(query); return AjaxResult.success(list); } @Resource private AppUserAddressClient appUserAddressClient; @PostMapping("/create") public R<TShoppingOrder> shopCreate(@RequestBody ExchangeDto exchangeDto) { TShoppingOrder shoppingOrder = new TShoppingOrder(); @@ -380,6 +384,10 @@ shoppingOrder.setPhone(exchangeDto.getPhone()); shoppingOrder.setCreateTime(LocalDateTime.now()); shoppingOrder.setDelFlag(false); TAppUserAddress data = appUserAddressClient.getAppUserAddressById(exchangeDto.getAddressId()).getData(); shoppingOrder.setAddressJson(JSON.toJSONString(data)); shoppingOrderService.save(shoppingOrder); return R.ok(shoppingOrder);
