订单修改

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/UserOrderDao.java

@@ -26,6 +26,14 @@ public interface UserOrderDao extends BaseMapper<UserOrder>{
 	 * @return: com.yonge.cooleshow.biz.dal.vo.OrderVo
 	 */
 	UserOrderVo detailByOrderNo(@Param("orderNo") String orderNo);
+	/***
+	 * app查询
+	 * @author liweifan
+	 * @param: id
+	 * @updateTime 2022/4/20 15:57
+	 * @return: com.yonge.cooleshow.biz.dal.vo.UserOrderVo
+	 */
+	UserOrderVo detailApp(@Param("id")Long id);
 	/**
 	 * 分页查询
      * @author liweifan
@@ -56,4 +64,5 @@ public interface UserOrderDao extends BaseMapper<UserOrder>{
 	 * @return: java.lang.Integer
 	 */
     Integer updateStatusByOrderNo(@Param("orderNo")String orderNo,@Param("orderStatus") String orderStatus);
+
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/req/OrderReq.java

@@ -48,8 +48,8 @@ public class OrderReq {
         private GoodTypeEnum goodType;
         @ApiModelProperty("商品名称 ")
         private String goodName;
-        @ApiModelProperty(value = "业务内容 订单业务内容json")
-        private String bizContent;
+        @ApiModelProperty(value = "业务内容")
+        private Object bizContent;
 
         public Long getUserId() {
             return userId;
@@ -67,11 +67,11 @@ public class OrderReq {
             this.goodType = goodType;
         }
 
-        public String getBizContent() {
+        public Object getBizContent() {
             return bizContent;
         }
 
-        public void setBizContent(String bizContent) {
+        public void setBizContent(Object bizContent) {
             this.bizContent = bizContent;
         }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/OrderSearch.java

@@ -36,6 +36,9 @@ public class OrderSearch extends QueryInfo{
 	@ApiModelProperty("卖家id")
 	private Long merchId;
 
+	@ApiModelProperty("查询时间（yyyy-mm） ")
+	private String searchDate;
+
 	public String getSearchNo() {
 		return searchNo;
 	}
@@ -91,4 +94,13 @@ public class OrderSearch extends QueryInfo{
 	public void setMerchId(Long merchId) {
 		this.merchId = merchId;
 	}
+
+
+	public String getSearchDate() {
+		return searchDate;
+	}
+
+	public void setSearchDate(String searchDate) {
+		this.searchDate = searchDate;
+	}
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/TeacherWithdrawalSearch.java

@@ -30,8 +30,8 @@ public class TeacherWithdrawalSearch extends QueryInfo{
 	private Date endTime;
 
 
-	@ApiModelProperty("提现时间（yyyy-mm） ")
-	private String withdrawalDate;
+	@ApiModelProperty("查询时间（yyyy-mm） ")
+	private String searchDate;
 
 	private Long userId;
 
@@ -67,12 +67,12 @@ public class TeacherWithdrawalSearch extends QueryInfo{
 		this.endTime = endTime;
 	}
 
-	public String getWithdrawalDate() {
-		return withdrawalDate;
+	public String getSearchDate() {
+		return searchDate;
 	}
 
-	public void setWithdrawalDate(String withdrawalDate) {
-		this.withdrawalDate = withdrawalDate;
+	public void setSearchDate(String searchDate) {
+		this.searchDate = searchDate;
 	}
 
 	public Long getUserId() {

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/UserOrderService.java

@@ -75,4 +75,6 @@ public interface UserOrderService extends IService<UserOrder>  {
 	 * @updateTime 2022/4/13 16:27
 	 */
     void pollingOrder();
+
+	UserOrderVo detailApp(Long id);
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/UserOrderServiceImpl.java

@@ -109,6 +109,15 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
     }
 
     @Override
+    public UserOrderVo detailApp(Long id) {
+        UserOrderVo userOrderVo = baseMapper.detailApp(id);
+        if (null != userOrderVo) {
+            userOrderVo.setOrderDetailList(orderDetailService.getOrderDetilListByOrderNo(userOrderVo.getOrderNo()));
+        }
+        return userOrderVo;
+    }
+
+    @Override
     public IPage<UserOrderVo> selectPage(IPage<UserOrderVo> page, OrderSearch query) {
         return page.setRecords(baseMapper.selectPage(page, query));
     }
@@ -193,7 +202,6 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
         }
     }
 
-
     @Override
     public void pollingOrder() {
         //查询创建时间超过半小时还在交易中的订单
@@ -212,6 +220,8 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
         }
     }
 
+
+
     /***
      * 处理支付失败订单
      * @author liweifan

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/VipCardServiceImpl.java

@@ -55,7 +55,7 @@ public class VipCardServiceImpl extends ServiceImpl<VipCardDao, VipCard> impleme
 
     @Override
     public HttpResponseResult<OrderCreateRes> orderCreate(OrderReq.OrderReqInfo orderReqInfo) {
-        VipCardVo detail = detail(Long.parseLong(orderReqInfo.getBizContent()));
+        VipCardVo detail = detail(Long.parseLong(orderReqInfo.getBizContent().toString()));
         if (null == detail) {
             return HttpResponseResult.failed("未找到会员卡信息");
         }

cooleshow-user/user-biz/src/main/resources/config/mybatis/UserOrderMapper.xml

@@ -121,6 +121,7 @@
         where (t.status_ = 'WAIT_PAY' or t.status_ = 'PAYING')
         and t.create_time_ <= date_sub(now(),interval 30 minute)
     </select>
+    <select id="detailApp" resultType="com.yonge.cooleshow.biz.dal.vo.UserOrderVo"></select>
 
     <update id="updateStatusByOrderNo">
         update user_order set status_ = #{orderStatus} where order_no_ = #{orderNo}

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/controller/UserOrderController.java

@@ -1,31 +1,37 @@
 package com.yonge.cooleshow.student.controller;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dto.req.OrderPayReq;
 import com.yonge.cooleshow.biz.dal.dto.req.OrderReq;
+import com.yonge.cooleshow.biz.dal.dto.search.OrderSearch;
 import com.yonge.cooleshow.biz.dal.entity.UserOrder;
 import com.yonge.cooleshow.biz.dal.enums.CacheNameEnum;
 import com.yonge.cooleshow.biz.dal.service.UserOrderService;
 import com.yonge.cooleshow.biz.dal.support.DistributedLock;
+import com.yonge.cooleshow.biz.dal.support.PageUtil;
+import com.yonge.cooleshow.biz.dal.vo.UserOrderVo;
 import com.yonge.cooleshow.biz.dal.vo.res.OrderPayRes;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.yonge.cooleshow.common.exception.BizException;
+import com.yonge.cooleshow.common.page.PageInfo;
+import com.yonge.toolset.utils.date.DateUtil;
+import com.yonge.toolset.utils.string.StringUtil;
+import com.yonge.toolset.utils.string.ValueUtil;
 import com.yonge.toolset.utils.web.WebUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.redisson.Redisson;
 import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
-import java.util.concurrent.ExecutionException;
+import java.util.Calendar;
+import java.util.Date;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 
@@ -85,4 +91,41 @@ public class UserOrderController extends BaseController {
             return HttpResponseResult.failed("付款失败");
         }
     }
+
+    /**
+     * 查询分页
+     */
+    @PostMapping("/page")
+    @ApiOperation(value = "查询分页", notes = "传入orderSearch")
+    public HttpResponseResult<PageInfo<UserOrderVo>> page(@RequestBody OrderSearch query) {
+        SysUser user = sysUserFeignService.queryUserInfo();
+        if (user == null || null == user.getId()) {
+            return failed(HttpStatus.FORBIDDEN, "请登录");
+        }
+        query.setUserId(user.getId());
+        if (StringUtil.isEmpty(query.getSearchDate())) {
+            query.setSearchDate(DateUtil.format(new Date(), "yyyy-MM"));
+        }
+        try {
+            Calendar calendar = Calendar.getInstance();
+            String[] classDateSp = query.getSearchDate().split("-");
+            calendar.set(Integer.parseInt(classDateSp[0]), Integer.parseInt(classDateSp[1]), 1, 0, 0, 0);
+            query.setStartTime(calendar.getTime());
+            query.setEndTime(DateUtil.dayEnd(DateUtil.getLastDayOfMonth(calendar.getTime())));
+        } catch (Exception e) {
+            throw new BizException("查询时间格式不正确 [" + query.getSearchDate() + "]");
+        }
+        IPage<UserOrderVo> pages = userOrderService.selectPage(PageUtil.getPage(query), query);
+        return succeed(PageUtil.pageInfo(pages));
+    }
+
+    /**
+     * 查询单条
+     */
+    @GetMapping("/detail/{id}")
+    @ApiOperation(value = "详情", notes = "传入id")
+    public HttpResponseResult<UserOrderVo> detail(@PathVariable("id") Long id) {
+        UserOrderVo detail = userOrderService.detailApp(id);
+        return succeed();
+    }
 }

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/UserWithdrawalController.java

@@ -65,17 +65,17 @@ public class UserWithdrawalController extends BaseController {
             return failed(HttpStatus.FORBIDDEN, "请登录");
         }
         withdrawalSearch.setUserId(user.getId());
-        if (StringUtil.isEmpty(withdrawalSearch.getWithdrawalDate())) {
-            withdrawalSearch.setWithdrawalDate(DateUtil.format(new Date(), "yyyy-MM"));
+        if (StringUtil.isEmpty(withdrawalSearch.getSearchDate())) {
+            withdrawalSearch.setSearchDate(DateUtil.format(new Date(), "yyyy-MM"));
         }
         try {
             Calendar calendar = Calendar.getInstance();
-            String[] classDateSp = withdrawalSearch.getWithdrawalDate().split("-");
+            String[] classDateSp = withdrawalSearch.getSearchDate().split("-");
             calendar.set(Integer.parseInt(classDateSp[0]), Integer.parseInt(classDateSp[1]), 1, 0, 0, 0);
             withdrawalSearch.setStartTime(calendar.getTime());
             withdrawalSearch.setEndTime(DateUtil.dayEnd(DateUtil.getLastDayOfMonth(calendar.getTime())));
         } catch (Exception e) {
-            throw new BizException("查询时间格式不正确 [" + withdrawalSearch.getWithdrawalDate() + "]");
+            throw new BizException("查询时间格式不正确 [" + withdrawalSearch.getSearchDate() + "]");
         }
         IPage<UserWithdrawalVo> pages = userWithdrawalService.selectPage(PageUtil.getPage(withdrawalSearch), withdrawalSearch);
         return succeed(PageUtil.pageInfo(pages));