代码提交

src/main/java/org/springblade/modules/desk/controller/CustomMadeInfoController.java

@@ -75,6 +75,24 @@ public class CustomMadeInfoController extends BladeController {
 		return R.data(detail);
 	}
 
+	/**
+	 * 详情
+	 */
+	@GetMapping("/get-newest")
+	public R<CustomMadeInfo> getNewest(String phone) {
+		CustomMadeInfo info = new CustomMadeInfo();
+		List<CustomMadeInfo> infoList = iCustomMadeInfoService.list(Wrappers.<CustomMadeInfo>lambdaQuery()
+			.eq(CustomMadeInfo::getPhone, phone)
+			.orderByDesc(CustomMadeInfo::getCreateTime)
+		);
+		if (Func.isNotEmpty(infoList) && infoList.size() > 0) {
+			info = infoList.get(0);
+		}
+
+		return R.data(info);
+	}
+
+
 	/**
 	 * 分页
 	 */

src/main/java/org/springblade/modules/desk/controller/OrderController.java

@@ -4,7 +4,10 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.sun.org.apache.xalan.internal.xsltc.compiler.util.ErrorMsg;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.cache.AddressCache;
@@ -65,7 +68,7 @@ public class OrderController {
 		if (Func.isNotEmpty(orderNo)) {
 			wrapper.like(Order::getOrderNo, orderNo);
 		}
-		if (Func.isNotEmpty(orderNo)) {
+		if (Func.isNotEmpty(status)) {
 			wrapper.eq(Order::getStatus, status);
 		}
 
@@ -116,11 +119,16 @@ public class OrderController {
 		// 生成订单号, 年月日+4位自增
 		info.setOrderNo(DateUtil.format(DateUtil.now(), "yyyyMMddHH") + orderService.getAutoIncreSerialNumber());
 
-		String goodsName = DictBizCache.getValue(DictConstant.GOODS_INFO, DictConstant.GOODS_INFO_KEY_NAME);
-		info.setGoodsName(goodsName);
-		info.setGoodsNum(1);
 		String price = DictBizCache.getValue(DictConstant.GOODS_INFO, DictConstant.GOODS_INFO_KEY_PRICE);
 		info.setGoodsPrice(Func.toDouble(price));
+		String goodsName = DictBizCache.getValue(DictConstant.GOODS_INFO, DictConstant.GOODS_INFO_KEY_NAME);
+		info.setGoodsName(goodsName);
+		int goodsNum = 1;
+		if (Func.isNotEmpty(info.getGoodsNum()) && info.getGoodsNum() > 0) {
+			goodsNum = info.getGoodsNum();
+		}
+		info.setGoodsNum(goodsNum);
+		info.setTotalPrice(Func.toDouble(info.getGoodsPrice() * goodsNum));
 
 		// 设置默认地址
 		WeChatAddress address = AddressCache.getAddress(info.getBuyerPhone());
@@ -216,4 +224,27 @@ public class OrderController {
 
 		return R.status(orderService.update(null, lambdaUpdateWrapper));
 	}
+
+	/**
+	 * 确认收货
+	 */
+	@PostMapping("/cancel")
+	public R cancel(@RequestParam String id) {
+		LambdaUpdateWrapper<Order> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
+		lambdaUpdateWrapper
+			.eq(Order::getId, id)
+			.set(Order::getStatus, OrderStatusEnum.ORDER_STATUS_CANCEL.getCode())
+		;
+
+		return R.status(orderService.update(null, lambdaUpdateWrapper));
+	}
+
+	/**
+	 * 删除
+	 */
+	@PostMapping("/remove")
+	public R remove(@ApiParam(value = "主键集合") @RequestParam String ids) {
+		boolean temp = orderService.deleteLogic(Func.toLongList(ids));
+		return R.status(temp);
+	}
 }

src/main/java/org/springblade/modules/desk/entity/Order.java

@@ -38,6 +38,10 @@ public class Order extends BaseEntity {
 	 * 商品价格
 	 */
 	private Double goodsPrice;
+	/**
+	 * 商品价格
+	 */
+	private Double totalPrice;
 
 	/**
 	 * 购买人

src/main/java/org/springblade/modules/weixin/controller/WeChatAddressController.java

@@ -3,6 +3,7 @@ package org.springblade.modules.weixin.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.AllArgsConstructor;
+import org.springblade.common.cache.AddressCache;
 import org.springblade.core.cache.utils.CacheUtil;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
@@ -20,27 +21,34 @@ import static org.springblade.core.cache.constant.CacheConstant.DEFAULT_CACHE;
 @RequestMapping("/address")
 public class WeChatAddressController {
 
-    private final IWeChatAddressService weChatAddressService;
-
-    @GetMapping("/list")
-    public R<IPage<WeChatAddress>> list(WeChatUser weChatUser, Query query) {
-        return R.data(weChatAddressService.page(Condition.getPage(query), Wrappers.<WeChatAddress>lambdaQuery().eq(weChatUser.getId() != null, WeChatAddress::getUserId, weChatUser.getId())));
-    }
-
-    @PostMapping("/save")
-    public R save(@RequestBody WeChatAddress weChatAddress) {
-        return R.status(weChatAddressService.add(weChatAddress));
-    }
-
-    @PostMapping("/update")
-    public R update(@RequestBody WeChatAddress weChatAddress) {
-        CacheUtil.clear(DEFAULT_CACHE);
-        return R.status(weChatAddressService.edit(weChatAddress));
-    }
-
-    @PostMapping("/delete")
-    public R delete(@RequestParam String ids) {
-        return R.status(weChatAddressService.deleteLogic(Func.toLongList(ids)));
-    }
+	private final IWeChatAddressService weChatAddressService;
+
+	@GetMapping("/list")
+	public R<IPage<WeChatAddress>> list(WeChatUser weChatUser, Query query) {
+		return R.data(weChatAddressService.page(Condition.getPage(query), Wrappers.<WeChatAddress>lambdaQuery().eq(weChatUser.getId() != null, WeChatAddress::getUserId, weChatUser.getId())));
+	}
+
+	@GetMapping("/get-default-address")
+	public R<WeChatAddress> getDefaultAddress(String phone) {
+		// 设置默认地址
+		WeChatAddress address = AddressCache.getAddress(phone);
+		return R.data(address);
+	}
+
+	@PostMapping("/save")
+	public R save(@RequestBody WeChatAddress weChatAddress) {
+		return R.status(weChatAddressService.add(weChatAddress));
+	}
+
+	@PostMapping("/update")
+	public R update(@RequestBody WeChatAddress weChatAddress) {
+		CacheUtil.clear(DEFAULT_CACHE);
+		return R.status(weChatAddressService.edit(weChatAddress));
+	}
+
+	@PostMapping("/delete")
+	public R delete(@RequestParam String ids) {
+		return R.status(weChatAddressService.deleteLogic(Func.toLongList(ids)));
+	}
 
 }