小程序 接口开发

rk

11 小时以前 77970ad391881f9c49a3f15dda8bb447e9326fd2

 server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java

@@ -767,6 +767,8 @@
            }
            goodsorder.setPickUpShopId(shop.getId());
            goodsorder.setDistributionShopId(shop.getId());
            goodsorder.setLinkname(member.getName());
            goodsorder.setLinkphone(member.getPhone());
            if(Objects.isNull(member.getBindShopId())){
                member.setBindShopId(shop.getId());
                member.setBindShopDate(new Date());
@@ -1654,7 +1656,7 @@
        this.orderAddShopIntegral(goodsorder);
        //下单完成 根据信息确认是否需要赠送邀请者优惠券
        this.orderDoneRewardInviteCoupon(goodsorder);
        //消费者确认收货
        //赠送消费者下单积分
        this.orderAddMemberIntegral(goodsorder);
        //经销商 结算金额
        this.orderAddShopCash(goodsorder);
@@ -1703,12 +1705,18 @@
                    continue;
                }
                MemberCoupon memberCoupon = MemberCoupon.couponToBean(coupon,inviteMember,new Date(),Constants.ONE,null);
                if(Constants.equalsInteger(memberCoupon.getCouponType(),Constants.ZERO)){
                    memberCoupon.setMaxPrice(memberCoupon.getPrice());
                }else if(Constants.equalsInteger(memberCoupon.getCouponType(),Constants.ONE)){
                    memberCoupon.setMaxPrice(memberCoupon.getLimitPrice().subtract(memberCoupon.getLimitPrice().multiply(memberCoupon.getPrice()).divide(new BigDecimal("100"),2, RoundingMode.HALF_UP)));
                }else{
                    memberCoupon.setMaxPrice(BigDecimal.ZERO);
                }
                for (int i = 0; i < num; i++) {
                    memberCouponList.add(memberCoupon);
                }
                couponIds = couponIds + (StringUtils.isBlank(couponIds)? ",":"" )+ couponId ;
                couponNames = couponNames + (StringUtils.isBlank(couponNames)? ",":"" )+ coupon.getName() ;


                CouponNoticeRequest couponNoticeRequest = new CouponNoticeRequest();
                couponNoticeRequest.setMemberCoupon(memberCoupon);