java/mx_charging_pile.git

			@@ -17,6 +17,9 @@
			import com.ruoyi.common.core.utils.OrderCodeUtil;
			import com.ruoyi.common.core.web.domain.AjaxResult;
			import com.ruoyi.common.core.web.page.PageInfo;
			import com.ruoyi.common.log.annotation.Log;
			import com.ruoyi.common.log.enums.BusinessType;
			import com.ruoyi.common.log.enums.OperatorType;
			import com.ruoyi.common.security.annotation.Logical;
			import com.ruoyi.common.security.annotation.RequiresPermissions;
			import com.ruoyi.common.security.service.TokenService;
			@@ -239,7 +242,8 @@
			shoppingOrderRefundService.save(tShoppingOrderRefund);
			//手续费
			Map<String, Object> amount1 = (Map<String, Object>) stringR.getData().get("amount");
			BigDecimal refund_fee = new BigDecimal(amount1.get("refund_fee").toString()).divide(new BigDecimal(100));
			Object refund_fee1 = amount1.get("refund_fee");
			BigDecimal refund_fee = new BigDecimal(null == refund_fee1 ? "0" : refund_fee1.toString()).divide(new BigDecimal(100));
			tShoppingOrderRefund.setRefundFee(refund_fee);
			shoppingOrderRefundService.updateById(tShoppingOrderRefund);
			}
			@@ -293,12 +297,16 @@
			return AjaxResult.success();
			}



			@GetMapping("/getMyShoppingOrderList")
			@ApiOperation(value = "获取购买订单列表", tags = {"小程序-商城购买订单"})
			public AjaxResult<Map<String, Object>> getMyShoppingOrderList(GetMyShoppingOrderList query) {
			Map<String, Object> list = shoppingOrderService.getMyShoppingOrderList(query);
			return AjaxResult.success(list);
			}



			@GetMapping("/getMyShoppingOrderListNum")
			@ApiOperation(value = "获取购买订单列表数量", tags = {"小程序-商城购买订单"})
			@@ -331,7 +339,6 @@
			}



			@GetMapping("/getMyShoppingOrderInfo1/{id}")
			@ApiOperation(value = "获取购买订单详情", tags = {"小程序-商城购买订单"})
			public AjaxResult<MyShoppingOrderInfo> getMyShoppingOrderInfo1(@PathVariable String id) {
			@@ -344,7 +351,7 @@
			return AjaxResult.success(info);
			}


			@Log(title = "【我的】确认收货操作", businessType = BusinessType.UPDATE,operatorType = OperatorType.MOBILE)
			@PutMapping("/confirmReceipt/{id}")
			@ApiOperation(value = "确认收货操作", tags = {"小程序-商城购买订单"})
			public AjaxResult confirmReceipt(@PathVariable String id) {
			@@ -369,6 +376,7 @@
			}


			@Log(title = "【我的】取消订单操作", businessType = BusinessType.UPDATE,operatorType = OperatorType.MOBILE)
			@PutMapping("/cancelOrder/{id}")
			@ApiOperation(value = "取消订单操作", tags = {"小程序-商城购买订单"})
			public AjaxResult cancelOrder(@PathVariable String id) {