Merge remote-tracking branch 'origin/dev' into dev

ace-common/src/main/java/com/github/wxiaoqi/security/common/util/process/ResultCode.java

@@ -45,6 +45,9 @@ public class ResultCode {
 
 	public static int ORDER_NOT_EXIST = Integer.valueOf(SystemProperty.getResultConfig("ORDER_NOT_EXIST"));
 
+	public static int ORDER_GOODS_EXIST = Integer.valueOf(SystemProperty.getResultConfig("ORDER_GOODS_EXIST"));
+
+
 	public static int GET_AUTH_INFO_FAILED_CODE = Integer.valueOf(SystemProperty.getResultConfig("GET_AUTH_INFO_FAILED_CODE"));
 
 	public static int WRONG_FORMAT_OF_ID_CARD = Integer.valueOf(SystemProperty.getResultConfig("WRONG_FORMAT_OF_ID_CARD"));

ace-common/src/main/resources/properties/resultcod.properties

@@ -75,6 +75,11 @@ INCOMPLETE_DATA=4006
 ORDER_NOT_EXIST = 20001
 20001 = 该订单不存在
 
+ORDER_GOODS_EXIST = 20002
+20002 = 购物车商品已存在
+
+
+
 #参数时效已过时
 PARAM_EXPIRE_CODE=1010
 1010=参数时效已过时，不能使用
@@ -86,3 +91,4 @@ GET_APPUSER_FAILED_CODE=4003
 #手机号已绑定微信
 WX_BIND_CODE=4002
 4002=手机号已绑定微信
+

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/AppUserManageDTO.java

@@ -78,6 +78,8 @@ public class AppUserManageDTO {
      * 状态：0-启用，1-禁用
      */
 	private Integer status;
+
+	private String nickname;
 //    /**
 //     * 接收前台时间范围
 //     */

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/vo/AppUserManageVo.java

@@ -43,7 +43,7 @@ public class AppUserManageVo {
      * 昵称
      */
     @Column(name = "nickname")
-    private String nickName;
+    private String nickname;
 
     /**
      * 用户来源:0-自来,1-用户邀请

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserManageBiz.java

@@ -58,9 +58,6 @@ public class AppUserManageBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
 		PageHelper.startPage(appUserManageDTO.getPage(), appUserManageDTO.getLimit());
 		List<AppUserManageVo> appUserManageVos = mapper.selectAppUser(appUserManageDTO);
 		PageInfo<AppUserManageVo> pageInfo = PageInfo.of(appUserManageVos);
-		if (pageInfo.getList() == null || pageInfo.getList().size() == 0) {
-			return new PageInfo<>();
-		}
 		return pageInfo;
 	}
 

ace-modules/ace-admin/src/main/resources/mapper/AppUserDetailMapper.xml

@@ -185,10 +185,10 @@
             and l.status = #{status}
         </if>
         <if test="nickname !=null and  nickname != ''">
-            and d.nickname like CONCAT('%',#{nickname},'%')
+            and (d.nickname like CONCAT('%',#{nickname},'%') or d.realname like CONCAT('%',#{nickname},'%'))
         </if>
         <if test="realName !=null and  realName != ''">
-            and d.realname like CONCAT('%',#{realName},'%')
+            and (d.realname like CONCAT('%',#{realName},'%') or d.nickname like CONCAT('%',#{realName},'%'))
         </if>
         order by l.id ASC
     </select>

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/biz/OrderInfoBiz.java

@@ -542,15 +542,14 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
 
 	/**
 	 * 取消订单
-	 * @param orderId
-	 * @param remark
+	 * @param param
 	 * @return
 	 */
-	public ObjectRestResponse cancelOrder(Long orderId, String remark) {
-		if (orderId == null) {
+	public ObjectRestResponse cancelOrder(OrderInfo param) {
+		if (param == null || param.getOrderId() == null) {
 			return ObjectRestResponse.paramIsEmpty();
 		}
-		OrderInfo orderInfo = selectById(orderId);
+		OrderInfo orderInfo = selectById(param.getOrderId());
 		if (orderInfo == null || orderInfo.getStatus().equals(OrderStatusEnum.ORDER_DELETE.getType())) {
 			return ObjectRestResponse.createFailedResult(ResultCode.ORDER_NOT_EXIST, ResultCode.getMsg(ResultCode.ORDER_NOT_EXIST));
 		}
@@ -564,8 +563,8 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
 		} else if (orderInfo.getStatus() > 3) { //已发货订单不可取消
 			return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "订单不可取消");
 		}
-		if (StringUtils.isNotBlank(remark)) {
-			orderInfo.setCancelRemark(remark);
+		if (StringUtils.isNotBlank(param.getRemark())) {
+			orderInfo.setCancelRemark(param.getRemark());
 		}
 		updateSelectiveByIdRe(orderInfo);
 		return ObjectRestResponse.succ();
@@ -590,4 +589,39 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
 	}
 
 
+	/**
+	 * 查询用户所有订单
+	 * @param userOrderDto
+	 * @return
+	 */
+	public ObjectRestResponse getOrderList(UserOrderDto userOrderDto) {
+		Query query = new Query(userOrderDto);
+		Example example = new Example(OrderInfo.class);
+		Example orderItemExample = new Example(OrderItem.class);
+		Example.Criteria orderInfoCriteria = example.createCriteria();
+		Example.Criteria orderItemCriteria = orderItemExample.createCriteria();
+		if (userOrderDto.getStatus() != null) {
+			orderInfoCriteria.andEqualTo("status", userOrderDto.getStatus());
+		}
+		if (userOrderDto.getPayStatus() != null) {
+			orderInfoCriteria.andEqualTo("payStatus", userOrderDto.getPayStatus());
+		}
+		if (userOrderDto.getUserId() != null) {
+			orderInfoCriteria.andEqualTo("userId", userOrderDto.getUserId());
+		}
+		if (StringUtils.isNotBlank(userOrderDto.getName())) {
+			orderItemCriteria.andLike("name", "%"+ userOrderDto.getName() +"%");
+		}
+		orderInfoCriteria.andNotEqualTo("status", -1);
+		example.orderBy("updTime").desc();
+		PageDataVO<OrderInfo> pageDataVO = PageDataVO.pageInfo(query, () -> mapper.selectByExample(example));
+		if (pageDataVO != null && pageDataVO.getData() != null) {
+			fillOrderItem(pageDataVO.getData());
+			fillOrderEInvoice(pageDataVO.getData());
+			return ObjectRestResponse.succ(pageDataVO);
+		}
+		return ObjectRestResponse.succ(new PageDataVO<>());
+	}
+
+
 }
\ No newline at end of file

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/biz/ShoppingCartInfoBiz.java

@@ -123,9 +123,7 @@ public class ShoppingCartInfoBiz extends BaseBiz<ShoppingCartInfoMapper, Shoppin
 				ImageDataVO imageDataVO = imageDataVOList.get(0);
 				ShoppingCartInfo old = selectByUser(appUserDTO.getUserid(), Long.valueOf(imageDataVO.getId()));
 				if (old != null) {
-					old.setNumber(old.getNumber() + orderInfoDto.getNumber());
-					old.setTotalAmount(old.getPrice().multiply(new BigDecimal(old.getNumber())));
-					updateSelectiveByIdRe(old);
+					return ObjectRestResponse.createFailedResult(ResultCode.ORDER_GOODS_EXIST, ResultCode.getMsg(ResultCode.ORDER_GOODS_EXIST));
 				} else {
 					ShoppingCartInfo shoppingCartInfo = new ShoppingCartInfo();
 					shoppingCartInfo.setDetailId(Long.valueOf(imageDataVO.getId()));
@@ -154,9 +152,7 @@ public class ShoppingCartInfoBiz extends BaseBiz<ShoppingCartInfoMapper, Shoppin
 			if (imageImgStorage != null) {
 				ShoppingCartInfo old = selectByUser(appUserDTO.getUserid(), Long.valueOf(imageImgStorage.getId()));
 				if (old != null) {
-					old.setNumber(old.getNumber() + orderInfoDto.getNumber());
-					old.setTotalAmount(old.getPrice().multiply(new BigDecimal(old.getNumber())));
-					updateSelectiveByIdRe(old);
+					return ObjectRestResponse.createFailedResult(ResultCode.ORDER_GOODS_EXIST, ResultCode.getMsg(ResultCode.ORDER_GOODS_EXIST));
 				} else {
 					ShoppingCartInfo shoppingCartInfo = new ShoppingCartInfo();
 					shoppingCartInfo.setDetailId(Long.valueOf(imageImgStorage.getId()));
@@ -187,9 +183,7 @@ public class ShoppingCartInfoBiz extends BaseBiz<ShoppingCartInfoMapper, Shoppin
 			if (industryApplicationInfo != null) {
 				ShoppingCartInfo old = selectByUser(appUserDTO.getUserid(), Long.valueOf(industryApplicationInfo.getId()));
 				if (old != null) {
-					old.setNumber(old.getNumber() + orderInfoDto.getNumber());
-					old.setTotalAmount(old.getPrice().multiply(new BigDecimal(old.getNumber())));
-					updateSelectiveByIdRe(old);
+					return ObjectRestResponse.createFailedResult(ResultCode.ORDER_GOODS_EXIST, ResultCode.getMsg(ResultCode.ORDER_GOODS_EXIST));
 				} else {
 					ShoppingCartInfo shoppingCartInfo = new ShoppingCartInfo();
 					shoppingCartInfo.setDetailId(Long.valueOf(industryApplicationInfo.getId()));

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/controller/OrderInfoController.java

 package com.upyuns.platform.rs.website.controller;
 
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.upyuns.platform.rs.website.biz.OrderInfoBiz;
+import com.upyuns.platform.rs.website.dto.UserOrderDto;
 import com.upyuns.platform.rs.website.entity.OrderInfo;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -10,4 +13,13 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("orderInfo")
 public class OrderInfoController extends BaseController<OrderInfoBiz,OrderInfo> {
 
+	@GetMapping(value = "getOrderList")
+	public ObjectRestResponse getOrderList(UserOrderDto userOrderDto) {
+		return baseBiz.getOrderList(userOrderDto);
+	}
+
+	@GetMapping(value = "detail")
+	public ObjectRestResponse detail(Long orderId) {
+		return ObjectRestResponse.succ(baseBiz.getOrderDetail(orderId));
+	}
 }
\ No newline at end of file

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/controller/web/OrderInfoWebController.java

@@ -3,9 +3,7 @@ package com.upyuns.platform.rs.website.controller.web;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.upyuns.platform.rs.website.biz.OrderInfoBiz;
-import com.upyuns.platform.rs.website.dto.ConfirmOrderDto;
-import com.upyuns.platform.rs.website.dto.OrderInfoDto;
-import com.upyuns.platform.rs.website.dto.UserOrderDto;
+import com.upyuns.platform.rs.website.dto.*;
 import com.upyuns.platform.rs.website.entity.OrderInfo;
 import com.upyuns.platform.rs.website.service.ConfirmOrderService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,4 +35,39 @@ public class OrderInfoWebController extends BaseController<OrderInfoBiz,OrderInf
 	public ObjectRestResponse getDetail(Long id) {
 		return ObjectRestResponse.succ(baseBiz.getOrderDetail(id));
 	}
+
+	@GetMapping(value = "confirmReceived")
+	public ObjectRestResponse confirmReceived(Long orderId) {
+		return baseBiz.confirmReceived(orderId);
+	}
+
+	@PostMapping(value = "orderSend")
+	public ObjectRestResponse orderSend(@RequestBody ConfirmReceivedDto confirmReceivedDto) {
+		return baseBiz.orderSend(confirmReceivedDto);
+	}
+
+	@PostMapping(value = "setInvoice")
+	public ObjectRestResponse setInvoice(@RequestBody OrderInvoiceDto orderInvoiceDto) {
+		return baseBiz.setInvoice(orderInvoiceDto);
+	}
+
+	@PostMapping(value = "invoiceSend")
+	public ObjectRestResponse invoiceSend(@RequestBody ConfirmReceivedDto confirmReceivedDto) {
+		return baseBiz.invoiceSend(confirmReceivedDto);
+	}
+
+	@GetMapping(value = "confirmOrderInvoice")
+	public ObjectRestResponse confirmOrderInvoice(Long orderId) {
+		return baseBiz.confirmOrderInvoice(orderId);
+	}
+
+	@PostMapping(value = "cancelOrder")
+	public ObjectRestResponse cancelOrder(@RequestBody OrderInfo orderInfo) {
+		return baseBiz.cancelOrder(orderInfo);
+	}
+
+	@DeleteMapping(value = "deleteOrder")
+	public ObjectRestResponse deleteOrder(Long orderId) {
+		return baseBiz.deleteOrder(orderId);
+	}
 }
\ No newline at end of file