20210421 签到

xiaoyong931011

2021-04-21 1c818cf3788678695426e4002865604ceb50bdc0

 zq-erp/src/main/java/com/matrix/system/activity/service/ActivitySignWriteoffService.java

@@ -114,6 +114,8 @@
              Integer logisticsId = activitySignWriteoffLogistics.getLogisticsId();
            ShopDeliveryInfo shopDeliveryInfo = shopDeliveryInfoDao.selectById(logisticsId);
            if(ObjectUtil.isNotEmpty(shopDeliveryInfo)){
               signWriteoffVo.setLogisticsNum(shopDeliveryInfo.getWaybillNo());
               signWriteoffVo.setLogisticsCompany(shopDeliveryInfo.getLogisticsCompany());
               //查看物流信息
               wxShopLogisticsQueryService.selectLogisticsInfo(shopDeliveryInfo);
               List<ShopLogisticsInfo> shopLogisticsInfos = shopLogisticsInfoDao.selectByDelieryId(shopDeliveryInfo.getId());
@@ -143,11 +145,15 @@
        String writeOffCode = writeoffCodeSubmitDto.getWriteOffCode();
        /**
         * 验证核销码是不是匹配
       * 只能核销一次
         * 更新核销记录
         * 更新领取记录
         */
        //验证核销码是不是匹配
        ActivitySignWriteoff activitySignWriteoff = activitySignWriteoffDao.selectById(writeoffId);
        if(ActivitySignWriteoff.STATE_ONE != activitySignWriteoff.getState()){
         return new AjaxResult(AjaxResult.STATUS_FAIL, "兑奖码已失效");
      }
        if(ObjectUtil.isNotEmpty(activitySignWriteoff)) {
           String writeoffCodeReal = activitySignWriteoff.getWriteoffCode();
           if(!writeoffCodeReal.equals(writeOffCode)) {