java/HongRuiTang.git

			@@ -236,8 +236,8 @@
			couponType = appMemberCouponVo.getCouponType();
			if (couponType == 1 && appMemberCouponVo.getMoneyThreshold() != null && appMemberCouponVo.getDiscountMoney() != null) {
			moneyThreshold = appMemberCouponVo.getMoneyThreshold();
			if (goodsTotalPrice.compareTo(moneyThreshold) >= 0) {
			discountMoney = appMemberCouponVo.getDiscountMoney();
			discountMoney = appMemberCouponVo.getDiscountMoney();
			if (goodsTotalPrice.compareTo(moneyThreshold) >= 0 && goodsTotalPrice.compareTo(discountMoney)>0) {
			goodsRealPrice = goodsTotalPrice.subtract(discountMoney);
			useCoupon = 1;
			userCouponIdSet.add(memberCouponId);
			@@ -252,13 +252,15 @@
			appSureOrderGoodsVo.setMemberCouponId(memberCouponId);
			} else if (couponType == 3 && appMemberCouponVo.getDiscountMoney() != null) {
			discountMoney = appMemberCouponVo.getDiscountMoney();
			goodsRealPrice = goodsTotalPrice.subtract(discountMoney);
			if(goodsRealPrice.compareTo(BigDecimal.ZERO)<0){
			goodsRealPrice = BigDecimal.ZERO;
			if(goodsTotalPrice.compareTo(discountMoney)>0){
			goodsRealPrice = goodsTotalPrice.subtract(discountMoney);
			if(goodsRealPrice.compareTo(BigDecimal.ZERO)<0){
			goodsRealPrice = BigDecimal.ZERO;
			}
			useCoupon = 1;
			userCouponIdSet.add(memberCouponId);
			appSureOrderGoodsVo.setMemberCouponId(memberCouponId);
			}
			useCoupon = 1;
			userCouponIdSet.add(memberCouponId);
			appSureOrderGoodsVo.setMemberCouponId(memberCouponId);
			}
			}
			}
			@@ -302,10 +304,14 @@
			appGoodsMemberCouponVoList = new ArrayList<>();
			for(AppMemberCouponVo entity : appMemberCouponVoList){
			if(StringUtils.isBlank(entity.getRelGoodsIds())\|\|entity.getRelGoodsIds().contains(sureOrderGoodsVo.getGoodsId())){
			if(entity.getCouponType()!=1){
			if(entity.getCouponType()==1){
			if(entity.getMoneyThreshold().compareTo(sureOrderGoodsVo.getGoodsTotalPrice())<0&&entity.getDiscountMoney().compareTo(sureOrderGoodsVo.getGoodsTotalPrice())<0){
			appGoodsMemberCouponVoList.add(entity);
			}
			}else if(entity.getCouponType()==2){
			appGoodsMemberCouponVoList.add(entity);
			}else{
			if(entity.getMoneyThreshold().compareTo(sureOrderGoodsVo.getGoodsTotalPrice())<0){
			}else if(entity.getCouponType()==3){
			if(entity.getDiscountMoney().compareTo(sureOrderGoodsVo.getGoodsTotalPrice())<0){
			appGoodsMemberCouponVoList.add(entity);
			}
			}
			@@ -422,6 +428,7 @@
			if(goods.getGoodsStatus()!=1){
			throw new ServiceException(AppErrorConstant.GOODS_DOWN);
			}
			appPanicBuyVo.setActivityId(activityId);
			appPanicBuyVo.setGoodsId(goodsId);
			appPanicBuyVo.setGoodsName(goods.getGoodsName());
			appPanicBuyVo.setGoodsIntroduction(goods.getGoodsIntroduction());
			@@ -1241,8 +1248,12 @@
			order.setOfflinePayMoney(relPayMoney);
			order.setOffPayTime(nowTime);
			order.setPayMoney(order.getPayMoney().add(relPayMoney));
			order.setCloseFlag(1);
			order.setChangeReceivableMoney(relReceiveMoney);
			if(order.getPayMoney().compareTo(order.getChangeReceivableMoney())>=0){
			order.setCloseFlag(1);
			}else{
			order.setCloseFlag(0);
			}
			this.saveOrUpdate(order);
			//创建服务商品
			List<AppUserOrderGoodsPageVo> appUserOrderGoodsPageVoList = orderGoodsService.listAppVoByOrderId(orderId);
			@@ -1530,10 +1541,14 @@
			@Override
			public void merCloseOrder(MerCloseOrderDto merCloseOrderDto) {
			Order order = this.getById(merCloseOrderDto.getOrderId());
			order.setOfflinePayMoney(merCloseOrderDto.getPayMoney());
			order.setOfflinePayMoney(order.getOfflinePayMoney().add(merCloseOrderDto.getPayMoney()));
			order.setOffPayTime(new Date());
			order.setPayMoney(order.getPayMoney().add(merCloseOrderDto.getPayMoney()));
			order.setCloseFlag(1);
			if(order.getPayMoney().compareTo(order.getChangeReceivableMoney())>=0){
			order.setCloseFlag(0);
			}else{
			order.setCloseFlag(1);
			}
			this.saveOrUpdate(order);
			}

			@@ -1734,7 +1749,6 @@
			order.setPayMoney(orderPayMoney);
			order.setOnlinePayMoney(new BigDecimal("0.00"));
			order.setOfflinePayMoney(orderPayMoney);
			order.setCloseFlag(1);
			order.setOrderRemark(merNewOrderDto.getOrderRemark());
			order.setGoodsNum(goodsNum);
			order.setCreateTime(nowTime);
			@@ -1746,7 +1760,11 @@
			order.setOfflinePayMoney(merNewOrderDto.getPayMoney());
			order.setOffPayTime(nowTime);
			order.setPayType(1);
			order.setCloseFlag(1);
			if(order.getPayMoney().compareTo(order.getChangeReceivableMoney())>=0){
			order.setCloseFlag(0);
			}else{
			order.setCloseFlag(1);
			}
			this.save(order);
			//创建服务
			List<AppUserOrderGoodsPageVo> appUserOrderGoodsPageVoList = orderGoodsService.listAppVoByOrderId(orderId);
			@@ -2777,11 +2795,15 @@
			throw new ServiceException(AppErrorConstant.COUPON_EXPIRED);
			} else if (couponStatus == 2) {
			throw new ServiceException(AppErrorConstant.COUPON_USED);
			} else if (couponStatus != 0) {
			} else if (couponStatus != 1) {
			throw new ServiceException(AppErrorConstant.COUPON_NO_FIND);
			}
			if (!memberCoupon.getShopId().equals(shopId)) {
			if (memberCoupon.getCouponFrom()==2&&!memberCoupon.getShopId().equals(shopId)) {
			throw new ServiceException(AppErrorConstant.VERIFY_SHOP_ERROR);
			}
			//如果是平台优惠券
			if(memberCoupon.getCouponFrom()==1&&memberCoupon.getShopId()==null){
			memberCoupon.setShopId(shopId);
			}
			List<Goods> goodsList = verifyCouponGetVo.getGoodsList();
			Long userId = verifyCouponGetVo.getUserId();
			@@ -3102,7 +3124,9 @@
			*/
			@Override
			public MerTotalOrderVo totalMerOrder(MerBaseDto merBaseDto) {
			return orderMapper.totalMerOrder(merBaseDto.getShopId());
			MerTotalOrderVo merTotalOrderVo = new MerTotalOrderVo();
			merTotalOrderVo = orderMapper.totalMerOrder(merBaseDto.getShopId());
			return merTotalOrderVo;
			}

			/**