点餐订单

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/pos/controller/PosOrderGoodsController.java

@@ -19,9 +19,9 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.TokenUtils;
 import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.pos.entity.PosOrderGoods;
-import org.jeecg.modules.pos.entity.PosOrderGoodsDetail;
+import org.jeecg.modules.pos.entity.*;
 import org.jeecg.modules.pos.service.IPosOrderGoodsDetailService;
+import org.jeecg.modules.pos.service.IPosOrderGoodsPaymentService;
 import org.jeecg.modules.pos.service.IPosOrderGoodsService;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
+import org.jeecg.modules.pos.service.IPosTypeService;
 import org.jeecg.modules.rooms.entity.CesGoods;
 import org.jeecg.modules.rooms.service.CesGoodsServiceImpl;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
@@ -65,6 +66,10 @@ public class PosOrderGoodsController extends JeecgController<PosOrderGoods, IPos
 private IPosOrderGoodsDetailService posOrderGoodsDetailService;
 @Autowired
 private CesGoodsServiceImpl cesGoodsService;
+@Autowired
+private IPosTypeService posTypeService;
+@Autowired
+private IPosOrderGoodsPaymentService posOrderGoodsPaymentService;
 	/**
 	 * 分页列表查询
 	 *
@@ -84,6 +89,12 @@ private CesGoodsServiceImpl cesGoodsService;
 		QueryWrapper<PosOrderGoods> queryWrapper = QueryGenerator.initQueryWrapper(posOrderGoods, req.getParameterMap());
 		Page<PosOrderGoods> page = new Page<PosOrderGoods>(pageNo, pageSize);
 		IPage<PosOrderGoods> pageList = posOrderGoodsService.page(page, queryWrapper);
+		pageList.getRecords().forEach(item -> {
+			PosType posType = posTypeService.getById(item.getPosType());
+			if(posType!=null) {
+				item.setPosTypeName(posType.getName());
+			}
+		});
 		return Result.OK(pageList);
 	}
 
@@ -187,6 +198,50 @@ private CesGoodsServiceImpl cesGoodsService;
 		 return Result.OK("添加成功", posOrderGoods.getCode());
 	 }
 
+	 /**
+	  * 撤销结账
+	  * @param code
+	  * @return
+	  */
+	 @AutoLog(value = "cancelSettle")
+	 @ApiOperation(value="cancelSettle", notes="cancelSettle")
+	 @RequestMapping(value = "/cancelSettle", method = {RequestMethod.PUT,RequestMethod.POST})
+	 public Result<String> cancelSettle(@RequestParam(name="code",required=true) String code) {
+		 LambdaUpdateWrapper<PosOrderGoods> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
+		 lambdaUpdateWrapper.eq(PosOrderGoods::getCode, code);
+		 lambdaUpdateWrapper.set(PosOrderGoods::getStatus, 0);
+		 lambdaUpdateWrapper.set(PosOrderGoods::getPayInfo, "");
+		 posOrderGoodsService.update(lambdaUpdateWrapper);
+
+		 LambdaQueryWrapper<PosOrderGoodsPayment> LambdaQueryWrapper = new LambdaQueryWrapper<>();
+		 LambdaQueryWrapper.eq(PosOrderGoodsPayment::getOrderId, code);
+		 posOrderGoodsPaymentService.remove(LambdaQueryWrapper);
+		 return Result.OK("撤销成功!");
+	 }
+
+	 /**
+	  *   通过code删除
+	  *
+	  * @param code
+	  * @return
+	  */
+	 @AutoLog(value = "pos_order_goods-通过id删除")
+	 @ApiOperation(value="pos_order_goods-通过id删除", notes="pos_order_goods-通过id删除")
+	 //@RequiresPermissions("pos:pos_order_goods:delete")
+	 @DeleteMapping(value = "/deleteOrder")
+	 public Result<String> deleteOrder(@RequestParam(name="code",required=true) String code) {
+		 LambdaQueryWrapper<PosOrderGoods> LambdaQueryWrapper = new LambdaQueryWrapper<>();
+		 LambdaQueryWrapper.eq(PosOrderGoods::getCode, code);
+		 posOrderGoodsService.remove(LambdaQueryWrapper);
+
+		 LambdaQueryWrapper<PosOrderGoodsDetail> LambdaQueryWrapper2 = new LambdaQueryWrapper<>();
+		 LambdaQueryWrapper2.eq(PosOrderGoodsDetail::getOrderId, code);
+		 posOrderGoodsDetailService.remove(LambdaQueryWrapper2);
+
+		 return Result.OK("删除成功!");
+	 }
+
+
 	/**
 	 *  编辑
 	 *

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/pos/controller/PosOrderGoodsPaymentController.java

@@ -12,12 +12,15 @@ import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import org.apache.commons.lang3.ObjectUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.TokenUtils;
 import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.business.entity.BusRoomPayType;
+import org.jeecg.modules.business.service.IBusRoomPayTypeService;
 import org.jeecg.modules.pos.dto.OrderPaymentDto;
 import org.jeecg.modules.pos.entity.PosOrderGoods;
 import org.jeecg.modules.pos.entity.PosOrderGoodsPayment;
@@ -61,6 +64,8 @@ public class PosOrderGoodsPaymentController extends JeecgController<PosOrderGood
 	private IPosOrderGoodsPaymentService posOrderGoodsPaymentService;
 	 @Autowired
 	 private IPosOrderGoodsService posOrderGoodsService;
+	 @Autowired
+	 private IBusRoomPayTypeService busRoomPayTypeService;
 	/**
 	 * 分页列表查询
 	 *
@@ -97,23 +102,29 @@ public class PosOrderGoodsPaymentController extends JeecgController<PosOrderGood
 		if (ObjectUtils.isEmpty(dto.getPaymentList())) {
 			return Result.error("请先选择支付方式");
 		}
-		LambdaUpdateWrapper<PosOrderGoods> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
-		lambdaUpdateWrapper.eq(PosOrderGoods::getCode, dto.getOrderCode());
-		PosOrderGoods posOrderGoods = posOrderGoodsService.getOne(lambdaUpdateWrapper);
+		LambdaQueryWrapper<PosOrderGoods> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(PosOrderGoods::getCode, dto.getOrderCode());
+		PosOrderGoods posOrderGoods = posOrderGoodsService.getOne(lambdaQueryWrapper);
 		if (ObjectUtils.isEmpty(posOrderGoods)) {
 			return Result.error("订单不存在");
 		}
 		BigDecimal sum = BigDecimal.ZERO;
+		String payInfo="";
 		for (PosOrderGoodsPayment posOrderGoodsPayment : dto.getPaymentList()) {
 			posOrderGoodsPayment.setTenantId(posOrderGoods.getTenantId());
 			posOrderGoodsPayment.setHotelId(posOrderGoods.getHotelId());
 			sum = sum.add(posOrderGoodsPayment.getPayMoney());
+			BusRoomPayType busRoomPayType = busRoomPayTypeService.getById(posOrderGoodsPayment.getPaymentMethod());
+			if (busRoomPayType != null) {
+				payInfo += busRoomPayType.getName() + String.format("%.2f", posOrderGoodsPayment.getPayMoney());
+			}
 		}
 		posOrderGoodsPaymentService.saveBatch(dto.getPaymentList());
 		posOrderGoods.setSettleTime(new Date());
 		posOrderGoods.setStatus(1);
 		posOrderGoods.setPayMoney(sum);
 		posOrderGoods.setCouponMoney(posOrderGoods.getConsumeMoney().subtract(sum));
+		posOrderGoods.setPayInfo(payInfo);
 		posOrderGoodsService.updateById(posOrderGoods);
 		return Result.OK("添加成功！");
 	}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/pos/entity/PosOrderGoods.java

@@ -106,7 +106,14 @@ public class PosOrderGoods implements Serializable {
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "创建时间")
     private Date createTime;
+    /**支付信息*/
+    @Excel(name = "支付信息", width = 15)
+    @ApiModelProperty(value = "支付信息")
+    private String payInfo;
 
 	@TableField(exist = false)
 	private List<PosOrderGoodsDetail> posOrderGoodsDetailList;
+
+    @TableField(exist = false)
+    private String posTypeName;
 }