增加根据订单编号查询订单

share-front/src/main/java/share/web/controller/system/SOrderController.java

@@ -63,6 +63,14 @@ public class SOrderController extends BaseController
     }
 
     /**
+     * 获取订单详细信息
+     */
+    @GetMapping(value = "/orderNo")
+    public AjaxResult queryByOrderNo(@RequestParam("orderNo") String orderNo) {
+        return success(sOrderService.selectSOrderByOrderNo(orderNo));
+    }
+
+    /**
      * 开门
      */
     @ApiOperation(value = "开门")

share-system/src/main/java/share/system/domain/SOrder.java

@@ -134,4 +134,8 @@ public class SOrder extends BaseEntity
     @TableField(select = false)
     private Integer isDelete;
 
+
+    @TableField(exist = false)
+    private Integer buyType;
+
 }

share-system/src/main/java/share/system/mapper/SConsumerCouponMapper.java

@@ -61,4 +61,6 @@ public interface SConsumerCouponMapper extends BaseMapper<SConsumerCoupon>
     public int deleteSConsumerCouponByIds(Long[] ids);
 
     int selectSConsumerCouponConut(SConsumerCoupon sConsumerCoupon);
+
+    List<SConsumerCoupon> querySConsumerCouponList(SConsumerCoupon sConsumerCoupon);
 }

share-system/src/main/java/share/system/service/ISOrderService.java

@@ -122,4 +122,6 @@ public interface ISOrderService extends IService<SOrder>
      * @return
      */
     boolean cancel(String orderNo);
+
+    SOrder selectSOrderByOrderNo(String orderNo);
 }

share-system/src/main/java/share/system/service/impl/QPServiceImpl.java

@@ -60,29 +60,29 @@ public class QPServiceImpl implements QPService {
         //执行验券
 //        List<TuangouReceiptConsumeResponseEntity> consume = consume(code, count);
 //        consume.forEach(item -> {
-            SConsumer user = FrontTokenComponent.getWxSConsumerEntry();
-            SConsumerCoupon sConsumerCoupon = new SConsumerCoupon();
-            sConsumerCoupon.setConsumerId(user.getId());
-            //取订单ID，如果为空，则取套餐ID
+        SConsumer user = FrontTokenComponent.getWxSConsumerEntry();
+        SConsumerCoupon sConsumerCoupon = new SConsumerCoupon();
+        sConsumerCoupon.setConsumerId(user.getId());
+        //取订单ID，如果为空，则取套餐ID
         sConsumerCoupon.setCouponId(prepare.getDeal_id());
-            sConsumerCoupon.setCouponCode(code);
+        sConsumerCoupon.setCouponCode(code);
         sConsumerCoupon.setName(prepare.getDeal_title());
-            sConsumerCoupon.setCouponType(sCoupon.getCouponType());
-            sConsumerCoupon.setStoreType(sCoupon.getStoreType());
-            sConsumerCoupon.setRoomType(sCoupon.getRoomType());
-            sConsumerCoupon.setMinDuration(sCoupon.getMinDuration());
-            sConsumerCoupon.setMaxDuration(sCoupon.getMaxDuration());
-            sConsumerCoupon.setDuration(sCoupon.getDuration());
-            sConsumerCoupon.setMinPrice(sCoupon.getMinPrice());
-            sConsumerCoupon.setSubPrice(sCoupon.getSubPrice());
-            sConsumerCoupon.setSourceType(SourceTypeEnum.CHECK.getCode());
-            sConsumerCoupon.setPlatformType(PlatformTypeEnum.MEITUAN.getCode());
-            sConsumerCoupon.setStartDate(sCoupon.getStartDate());
+        sConsumerCoupon.setCouponType(sCoupon.getCouponType());
+        sConsumerCoupon.setStoreType(sCoupon.getStoreType());
+        sConsumerCoupon.setRoomType(sCoupon.getRoomType());
+        sConsumerCoupon.setMinDuration(sCoupon.getMinDuration());
+        sConsumerCoupon.setMaxDuration(sCoupon.getMaxDuration());
+        sConsumerCoupon.setDuration(sCoupon.getDuration());
+        sConsumerCoupon.setMinPrice(sCoupon.getMinPrice());
+        sConsumerCoupon.setSubPrice(sCoupon.getSubPrice());
+        sConsumerCoupon.setSourceType(SourceTypeEnum.CHECK.getCode());
+        sConsumerCoupon.setPlatformType(PlatformTypeEnum.MEITUAN.getCode());
+        sConsumerCoupon.setStartDate(sCoupon.getStartDate());
         sConsumerCoupon.setEndDate(prepare.getReceiptEndDate());
-            sConsumerCoupon.setCouponTimeStart(sCoupon.getValidStartTime());
-            sConsumerCoupon.setCouponTimeEnd(sCoupon.getValidEndTime());
-            sConsumerCoupon.setCreateBy(String.valueOf(user.getId()));
-            isConsumerCouponService.insertSConsumerCoupon(sConsumerCoupon);
+        sConsumerCoupon.setCouponTimeStart(sCoupon.getValidStartTime());
+        sConsumerCoupon.setCouponTimeEnd(sCoupon.getValidEndTime());
+        sConsumerCoupon.setCreateBy(String.valueOf(user.getId()));
+        isConsumerCouponService.insertSConsumerCoupon(sConsumerCoupon);
 //        });
 
         SimpleDateFormat format2 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -99,7 +99,7 @@ public class QPServiceImpl implements QPService {
         if (byId == null) {
             throw new RuntimeException("未找到对应的券码");
         }
-        if(StringUtils.isBlank(byId.getCouponCode())){
+        if (StringUtils.isBlank(byId.getCouponCode())) {
             throw new RuntimeException("未找到对应的券码");
         }
         TuangouReceiptGetConsumedReponseEntity getconsumed = getconsumed(byId.getCouponCode());

share-system/src/main/java/share/system/service/impl/SConsumerCouponServiceImpl.java

@@ -130,7 +130,7 @@ public class SConsumerCouponServiceImpl extends ServiceImpl<SConsumerCouponMappe
         sConsumerCoupon.setUseStatus(ConsumerCouponUseStatusEnum.WAIT_USE.getCode());
         sConsumerCoupon.setConsumerId(user.getId());
         //查询用户未使用的优惠券
-        List<SConsumerCoupon> sConsumerCoupons = sConsumerCouponMapper.selectSConsumerCouponList(sConsumerCoupon);
+        List<SConsumerCoupon> sConsumerCoupons = sConsumerCouponMapper.querySConsumerCouponList(sConsumerCoupon);
         //计算时长
         BigDecimal bigDecimal = DateUtils.differentHour(couponRequest.getPreStartDate(), couponRequest.getPreEndDate());
         if (CollectionUtils.isEmpty(sConsumerCoupons)) {

share-system/src/main/java/share/system/service/impl/SOrderServiceImpl.java

@@ -233,6 +233,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper,SOrder> implemen
         sOrder.setTotalPrice(request.getTotalFee());
         sOrder.setCouponPrice(request.getCouponFee());
         sOrder.setPayPrice(request.getPayFee());
+        sOrder.setBuyType(request.getBuyType());
         //设置订单号
         sOrder.setOrderNo(BaseUtil.getOrderNo(PayTypeEnum.getEnumByCode(request.getPayType()).getValue()));
         sOrder.setConsumerId(user.getId());
@@ -241,6 +242,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper,SOrder> implemen
         sOrder.setPayStatus(YesNoEnum.no.getIndex());
         sOrder.setStatus(OrderStatusEnum.UNUSED.getCode());
         sOrder.setRefundStatus(RefundStatusEnum.UNREFUND.getCode());
+        sOrder.setPackId(request.getPackId());
         //计算订单时长
         sOrder.setTimeLong(DateUtils.differentHour(sOrder.getPreStartDate(),sOrder.getPreEndDate()).toString());
         if(Objects.nonNull(sOrder.getPackId())&& sOrder.getPackId() != 0){
@@ -380,6 +382,13 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper,SOrder> implemen
     }
 
     @Override
+    public SOrder selectSOrderByOrderNo(String orderNo) {
+        LambdaQueryWrapper<SOrder> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(SOrder::getOrderNo, orderNo);
+        return getOne(queryWrapper);
+    }
+
+    @Override
     public String openDoor(Long id) {
         SOrder sOrder = sOrderMapper.selectSOrderById(id);
         if (Objects.isNull(sOrder)) {
@@ -455,7 +464,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper,SOrder> implemen
      * 计算使用优惠券后的订单金额
      */
     private void computedCouponPrice(ComputedOrderPriceResponse priceResponse, SConsumer user, SConsumerCoupon consumerCoupon){
-        if (ObjectUtil.isNull(consumerCoupon) || !consumerCoupon.getCouponId().equals(user.getId())) {
+        if (ObjectUtil.isNull(consumerCoupon) || !consumerCoupon.getConsumerId().equals(user.getId())) {
             throw new BaseException("优惠券领取记录不存在！");
         }
         if (CouponStatusEnum.USED.getValue().compareTo(consumerCoupon.getUseStatus()) == 0) {

share-system/src/main/resources/mapper/system/SConsumerCouponMapper.xml

@@ -74,6 +74,16 @@
     <select id="selectSConsumerCouponConut" resultType="java.lang.Integer">
         select count(1) from s_consumer_coupon where consumer_id = #{consumerId} and use_status = 0
     </select>
+    <select id="querySConsumerCouponList" parameterType="SConsumerCoupon" resultMap="SConsumerCouponResult">
+        <include refid="selectSConsumerCouponVo"/>
+        <where>
+            1=1
+            and is_delete = '0'
+            and end_date >= NOW()
+            and use_status = '0'
+            <if test="consumerId != null ">and consumer_id = #{consumerId}</if>
+        </where>
+    </select>
 
     <insert id="insertSConsumerCoupon" parameterType="SConsumerCoupon" useGeneratedKeys="true" keyProperty="id">
         insert into s_consumer_coupon