20210420 签到

xiaoyong931011

2021-04-20 0dfe139c391e5598b241f714aba4ee053ba8dc97

20210420 签到

 zq-erp/src/main/java/com/matrix/system/activity/dao/ActivitySignWriteoffDao.java

@@ -26,5 +26,5 @@

    ShopDeliveryInfo selectShopDeliveryInfoByLogisticsId(@Param("logisticsId")Integer logisticsId);

    ActivitySignWriteoff selectActivitySignWriteoffByUserIDAndReceiveId(@Param("logisticsId")Long id, @Param("logisticsId")long receiveId);
    ActivitySignWriteoff selectActivitySignWriteoffByUserIDAndReceiveId(@Param("userId")Long userId, @Param("receiveId")long receiveId);
}

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

@@ -208,7 +208,7 @@
        activitySignWriteoffDao.updateById(activitySignWriteoff);
        //更新领取记录
        ActivitySignReceiveRecord activitySignReceiveRecord = activitySignReceiveRecordDao.selectById(receiveId);
        activitySignReceiveRecord.setState(ActivitySignReceiveRecord.STATE_THREE);
        activitySignReceiveRecord.setState(ActivitySignReceiveRecord.STATE_FOUR);
        activitySignReceiveRecord.setConsignee(logisticsSubmitDto.getShr());
        activitySignReceiveRecord.setConsigneeAddress(logisticsSubmitDto.getShdz());
        activitySignReceiveRecord.setConsigneePhone(logisticsSubmitDto.getLxdh());

 zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopActivitiesSignAction.java

@@ -9,7 +9,6 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.matrix.component.redis.RedisUserLoginUtils;
import com.matrix.core.exception.GlobleException;
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.tools.StringUtils;
import com.matrix.system.activity.dao.ActivitySignAwardSetDao;
@@ -28,9 +27,11 @@
import com.matrix.system.shopXcx.bean.ShopActivities;
import com.matrix.system.shopXcx.bean.ShopDeliveryInfo;
import com.matrix.system.shopXcx.bean.ShopLogisticsInfo;
import com.matrix.system.shopXcx.bean.ShopReceiveAddress;
import com.matrix.system.shopXcx.dao.ShopActivitiesDao;
import com.matrix.system.shopXcx.dao.ShopDeliveryInfoDao;
import com.matrix.system.shopXcx.dao.ShopLogisticsInfoDao;
import com.matrix.system.shopXcx.dao.ShopReceiveAddressDao;
import com.matrix.system.shopXcx.vo.SalesOrderVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -75,6 +76,8 @@

    @Autowired
    private ShopLogisticsInfoDao shopLogisticsInfoDao;
    @Autowired
    private ShopReceiveAddressDao shopReceiveAddressDao;

    @Autowired
    private WxShopLogisticsQueryService wxShopLogisticsQueryService;
@@ -520,9 +523,14 @@
        seeAwardTextDto.setUserId(loginUser.getId());
        seeAwardTextDto.setCompanyId(loginUser.getCompanyId());
        SeeAwardTextVo seeAwardTextVO = activitySignReceiveRecordDao.selectSeeAwardTextVOById(seeAwardTextDto);
        if(ObjectUtil.isEmpty(seeAwardTextVO)){
            return AjaxResult.buildFailInstance("奖品无法查看物流配送信息");
        }
        long receiveId = seeAwardTextVO.getId();

        //获取核销记录的ID
        ActivitySignWriteoff activitySignWriteoff = activitySignWriteoffDao.selectActivitySignWriteoffByUserIDAndReceiveId(loginUser.getId(),receiveId);
        if(ObjectUtil.isNotEmpty(activitySignWriteoff)){
        Integer logisticsId = activitySignWriteoff.getLogisticsId();
        ShopDeliveryInfo shopDeliveryInfo = shopDeliveryInfoDao.selectById(logisticsId);
        if(ObjectUtil.isNotEmpty(shopDeliveryInfo)){
@@ -531,8 +539,36 @@
            List<ShopLogisticsInfo> shopLogisticsInfos = shopLogisticsInfoDao.selectByDelieryId(shopDeliveryInfo.getId());
            seeAwardTextVO.setShopLogisticsInfos(shopLogisticsInfos);
        }
        }
        AjaxResult result=AjaxResult.buildSuccessInstance(seeAwardTextVO);
        return result;
    }

    /**
     * 物流配送收货地址保存
     *
     * @param
     * @return
     */
    @ApiOperation(value = "物流配送收货地址保存", notes = "")
    @GetMapping(value = "logisticsInsureAddress/{addressId}/{receiveId}")
    @ResponseBody
    public AjaxResult logisticsInsureAddress(@PathVariable("addressId") int addressId,@PathVariable("receiveId") long receiveId) {
        ShopReceiveAddress shopReceiveAddress = shopReceiveAddressDao.selectById(addressId);
        if(ObjectUtil.isEmpty(shopReceiveAddress)){
            return AjaxResult.buildFailInstance("收货地址无效");
        }
        ActivitySignReceiveRecord activitySignReceiveRecord = activitySignReceiveRecordDao.selectById(receiveId);
        //该奖品不是待领取状态
        if (ActivitySignReceiveRecord.STATE_ING != activitySignReceiveRecord.getState()) {
            return AjaxResult.buildFailInstance("该奖品不是待领取状态");
        }
        activitySignReceiveRecord.setConsigneeAddress(shopReceiveAddress.getAddrRegion()+"-"+shopReceiveAddress.getAddrDetailaddr()+"-"+shopReceiveAddress.getDormitory());
        activitySignReceiveRecord.setConsignee(shopReceiveAddress.getAddrLiaisonman());
        activitySignReceiveRecord.setConsigneePhone(shopReceiveAddress.getAddrTelephone());
        activitySignReceiveRecord.setState(ActivitySignReceiveRecord.STATE_THREE);
        activitySignReceiveRecordDao.updateById(activitySignReceiveRecord);
        return new AjaxResult(AjaxResult.STATUS_SUCCESS, "设置成功！");
    }

    /**
@@ -542,13 +578,13 @@
     * @return
     */
    @ApiOperation(value = "物流配送确认收货", notes = "")
    @GetMapping(value = "logisticsInsureById/{awardId}")
    @GetMapping(value = "logisticsInsureById/{receiveId}")
    @ResponseBody
    public AjaxResult logisticsInsureById(@PathVariable("awardId") long awardId) {
        ActivitySignReceiveRecord activitySignReceiveRecord = activitySignReceiveRecordDao.selectById(awardId);
    public AjaxResult logisticsInsureById(@PathVariable("receiveId") long receiveId) {
        ActivitySignReceiveRecord activitySignReceiveRecord = activitySignReceiveRecordDao.selectById(receiveId);
        //如果不是待收货状态
        if (ActivitySignReceiveRecord.STATE_FOUR != activitySignReceiveRecord.getState()) {
            throw new GlobleException("该奖品不是待收货状态！");
            return AjaxResult.buildFailInstance("该奖品不是待收货状态");
        }
        activitySignReceiveRecord.setState(ActivitySignReceiveRecord.STATE_DONE);
        activitySignReceiveRecordDao.updateById(activitySignReceiveRecord);

 zq-erp/src/main/java/com/matrix/system/shopXcx/api/vo/SeeAwardTextVo.java

@@ -48,9 +48,25 @@
    @ApiModelProperty(value ="客服微信")
    private String  wechatImg;

    @ApiModelProperty(value =" 是否已领取（1：待领取2:已领取）")
    @ApiModelProperty(value =" 状态(1:待兑换 2:待发货  3:已兑换  )")
    private Integer  state;

    /**
     * 收货人
     */
    @ApiModelProperty(value ="收货人")
    private String  consignee;
    /**
     * 联系电话
     */
    @ApiModelProperty(value ="联系电话")
    private String  consigneePhone;
    /**
     * 收货地址
     */
    @ApiModelProperty(value =" 收货地址")
    private String  consigneeAddress;

    @ApiModelProperty(value ="物流信息记录")
    private List<ShopLogisticsInfo> shopLogisticsInfos;


 zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignReceiveRecordDao.xml

@@ -118,6 +118,9 @@
        SELECT
            a.id id,
            a.state state,
            a.consignee_phone consigneePhone,
            a.consignee_address consigneeAddress,
            a.consignee
            a.receive_time receiveTime,
            a.write_off_code writeOffCode,
            1 total,
@@ -133,7 +136,7 @@
            activity_sign_receive_record a
                LEFT JOIN activity_sign_award_set b ON a.award_id = b.id
        WHERE
        a.id = #{record.awardId}
        a.award_id = #{record.awardId}
        and a.company_id = #{record.companyId}
        and a.user_id = #{record.userId}
    </select>

 zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignWriteoffDao.xml

@@ -105,8 +105,9 @@
        SELECT
            *
        FROM
            shop_delivery_info a
        where a.id = #{logisticsId}
            activity_sign_writeoff a
        where a.receive_id = #{logisticsId}
            and a.user_id = #{userId}
    </select>

</mapper>