新增商家线下订

lidongdong

2023-11-23 b3ea93fb8b59b2c7a0b505b6dd6114d933eeaa61

新增商家线下订

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java

@@ -646,8 +646,6 @@

    /**
     * 每日签到记录列表  前15条
     * @param userId
     * @param communityId
     * @return
     */
    @ApiOperation(value = "每日签到记录列表  前15条", response = IntegratingTaskVO.class)
@@ -691,10 +689,12 @@
                          @RequestParam(value = "orderNumber", required = false)String orderNumber,
                          @RequestParam(value = "goodName", required = false)String goodName,
                          @RequestParam(value = "name", required = false)String name,
                          @RequestParam(value = "cancelType", required = false)String cancelType)
                          @RequestParam(value = "cancelType", required = false)String cancelType,
                          @RequestParam(value = "merchantId", required = false) String merchantId,
                          @RequestParam(value = "orderType", required = false) String orderType)
    {
        return newStriveForFeign.orderGetList(pageNum,pageSize,userId,goodsId,orderNumber,
                goodName,name,cancelType,getCommunityId()+"");
                goodName,name,cancelType,getCommunityId()+"",merchantId,orderType);
    }

    /**
@@ -720,6 +720,7 @@
    {
        item.setCommunityId(getCommunityId()+"");
        item.setUserId(getUserId()+"");
        item.setOrderType("1");
        return newStriveForFeign.orderAddData(item);
    }


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/building/NewFightShoppingOrderVO.java

@@ -81,6 +81,15 @@
    @ApiModelProperty(value = "经度")
    private String lng;

    @ApiModelProperty(value = "商家id")
    private String merchantId;

    @ApiModelProperty(value = "备注")
    private String remark;

    @ApiModelProperty(value = "订单类型  1 线上订单    2线下商家订单")
    private String orderType;

    @ApiModelProperty(value = "兑换状态（1每天  2周一到周五   3周末）")
    private String businessType;


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/NewStriveForFeign.java

@@ -441,7 +441,9 @@
                          @RequestParam(value = "goodName", required = false)String goodName,
                          @RequestParam(value = "name", required = false)String name,
                          @RequestParam(value = "cancelType", required = false)String cancelType,
                          @RequestParam(value = "communityId", required = false)String communityId);
                          @RequestParam(value = "communityId", required = false)String communityId,
                          @RequestParam(value = "merchantId", required = false) String merchantId,
                          @RequestParam(value = "orderType", required = false) String orderType);

    /**
     * 分页详情

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/NewStriveApi.java

@@ -357,10 +357,12 @@
                          @RequestParam(value = "orderNumber", required = false)String orderNumber,
                          @RequestParam(value = "goodName", required = false)String goodName,
                          @RequestParam(value = "name", required = false)String name,
                          @RequestParam(value = "cancelType", required = false)String cancelType)
                          @RequestParam(value = "cancelType", required = false)String cancelType,
                          @RequestParam(value = "merchantId", required = false) String merchantId,
                          @RequestParam(value = "orderType", required = false) String orderType)
    {
        return newStriveForFeign.orderGetList(pageNum,pageSize,userId,goodsId,orderNumber,
                goodName,name,cancelType,getCommunityId()+"");
                goodName,name,cancelType,getCommunityId()+"",merchantId,orderType);
    }

    /**
@@ -386,6 +388,7 @@
    {
        item.setCommunityId(getCommunityId()+"");
        item.setUserId(getUserId()+"");
        item.setOrderType("2");
        return newStriveForFeign.orderAddData(item);
    }


 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NewFightShoppingOrderApi.java

@@ -11,7 +11,7 @@


@Slf4j
@Api(tags = {"社区动态/随手拍/微心愿/社区活动"})
@Api(tags = {"新增双争双评"})
@RestController
@RequestMapping("/NewFightOrder")
public class NewFightShoppingOrderApi
@@ -28,16 +28,18 @@
    @GetMapping("/orderGetList")
    public R orderGetList(@RequestParam("pageNum") int pageNum,
                          @RequestParam("pageSize") int pageSize,
                          @RequestParam(value = "userId", required = false)String userId,
                          @RequestParam(value = "goodsId", required = false)String goodsId,
                          @RequestParam(value = "orderNumber", required = false)String orderNumber,
                          @RequestParam(value = "goodName", required = false)String goodName,
                          @RequestParam(value = "name", required = false)String name,
                          @RequestParam(value = "cancelType", required = false)String cancelType,
                          @RequestParam(value = "communityId", required = false)String communityId)
                          @RequestParam(value = "userId", required = false) String userId,
                          @RequestParam(value = "goodsId", required = false) String goodsId,
                          @RequestParam(value = "orderNumber", required = false) String orderNumber,
                          @RequestParam(value = "goodName", required = false) String goodName,
                          @RequestParam(value = "name", required = false) String name,
                          @RequestParam(value = "cancelType", required = false) String cancelType,
                          @RequestParam(value = "communityId", required = false) String communityId,
                          @RequestParam(value = "merchantId", required = false) String merchantId,
                          @RequestParam(value = "orderType", required = false) String orderType)
    {
        return orderService.getList(pageNum,pageSize,userId,goodsId,orderNumber,
                goodName,name,cancelType,communityId);
                goodName,name,cancelType,communityId,merchantId,orderType);
    }

    /**

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/NewFightShoppingOrderDao.java

@@ -24,7 +24,9 @@
                                           @Param("goodName") String goodName,
                                           @Param("name") String name,
                                           @Param("cancelType") String cancelType,
                                           @Param("communityId") String communityId);
                                           @Param("communityId") String communityId,
                                           @Param("merchantId") String merchantId,
                                           @Param("orderType") String orderType);

    /**
     * 详情

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/entity/NewFightShoppingOrder.java

@@ -82,9 +82,18 @@
    @ApiModelProperty(value = "经度")
    private String lng;

    @ApiModelProperty(value = "商家id")
    private String merchantId;

    @ApiModelProperty(value = "订单类型  1 线上订单    2线下商家订单")
    private String orderType;

    @ApiModelProperty(value = "兑换状态（1每天  2周一到周五   3周末）")
    private String businessType;

    @ApiModelProperty(value = "备注")
    private String remark;

    @ApiModelProperty(value = "兑换开始时间")
    private String businessStartTime;


 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NewFightShoppingOrderService.java

@@ -4,6 +4,7 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.building.NewFightShoppingOrderVO;
import com.panzhihua.service_dangjian.entity.NewFightShoppingOrder;
import org.apache.ibatis.annotations.Param;

public interface NewFightShoppingOrderService extends IService<NewFightShoppingOrder>
{
@@ -13,7 +14,8 @@
     * @return
     */
    R getList(int pageNum,int pageSize,String userId,String goodsId,String orderNumber,
              String goodName,String name,String cancelType,String communityId);
              String goodName,String name,String cancelType,String communityId,String merchantId,
              String orderType);

    NewFightShoppingOrder getDetails(String id, String communityId);
    /**

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NewFightShoppingOrderServiceImpl.java

@@ -14,6 +14,7 @@
import com.panzhihua.service_dangjian.service.*;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
@@ -34,10 +35,11 @@

    @Override
    public R getList(int pageNum,int pageSize,String userId,String goodsId,String orderNumber,
                     String goodName,String name,String cancelType,String communityId)
                     String goodName,String name,String cancelType,String communityId,String merchantId,String orderType)
    {
        Page page = new Page<NewFightShopping>(pageNum,pageSize);
        return R.ok(baseMapper.getList(page,userId,goodsId,orderNumber,goodName,name,cancelType,communityId));
        return R.ok(baseMapper.getList(page,userId,goodsId,orderNumber,goodName,name,cancelType,
                communityId, merchantId,orderType));
    }

    @Override
@@ -50,6 +52,15 @@
    public R addData(NewFightShoppingOrderVO item)
    {
        item.setOrderNumber(Snowflake.getId()+"");


        //判断是线上下单  还是商家线下下单  1线上   2线下
        if(StringUtils.equals("1",item.getOrderType()))
        {

        }


        NewFightShopping goods=shoppingService.getDetails(item.getGoodsId());

        int allMoney=0;
@@ -104,7 +115,7 @@
        {
            return R.ok();
        }
        return R.fail("添加失败");
        return R.fail("失败");
    }

    @Override

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/NewFightShoppingOrderMapper.xml

@@ -14,6 +14,9 @@
        <result property="updateTime" column="update_time" />
        <result property="abolishTime" column="abolish_time" />
        <result property="communityId" column="community_id" />
        <result property="merchantId" column="merchant_id" />
        <result property="orderType" column="order_type" />
        <result property="remark" column="remark" />
    </resultMap>

    <!-- 分页查询 -->
@@ -40,6 +43,9 @@
            jso.cancel_time,
            jso.abolish_time,
            jso.community_id,
            jso.merchant_id,
            jso.order_type,
            jso.remark,
            jso.paly_money
        from new_fight_shopping_order as jso
        LEFT JOIN sys_user su ON jso.user_id = su.user_id
@@ -47,6 +53,12 @@
        LEFT JOIN new_fight_community_config as vcc ON vcc.community_id=jso.community_id
        <where>
            1=1
            <if test="merchantId !=null and merchantId !='' ">
                and jso.merchant_id=#{merchantId}
            </if>
            <if test="orderType !=null and orderType !='' ">
                and jso.order_type=#{orderType}
            </if>
            <if test="communityId !=null and communityId !='' ">
                and jso.community_id=#{communityId}
            </if>
@@ -96,6 +108,9 @@
            jso.cancel_time,
            jso.abolish_time,
            jso.community_id,
            jso.merchant_id,
            jso.order_type,
            jso.remark,
            jso.paly_money
        from new_fight_shopping_order as jso
        LEFT JOIN sys_user su ON jso.user_id = su.user_id
@@ -135,6 +150,15 @@
            <if test="item.communityId !=null and item.communityId !='' ">
                community_id,
            </if>
            <if test="item.merchantId !=null and item.merchantId !='' ">
                merchant_id,
            </if>
            <if test="item.orderType !=null and item.orderType !='' ">
                order_type,
            </if>
            <if test="item.remark !=null and item.remark !='' ">
                remark,
            </if>
            creation_time
        </trim>
        values
@@ -165,6 +189,15 @@
            </if>
            <if test="item.communityId !=null and item.communityId !='' ">
                #{item.communityId},
            </if>
            <if test="item.merchantId !=null and item.merchantId !='' ">
                #{item.merchantId},
            </if>
            <if test="item.orderType !=null and item.orderType !='' ">
                #{item.orderType},
            </if>
            <if test="item.remark !=null and item.remark !='' ">
                #{item.remark},
            </if>
            sysdate()
        </trim>
@@ -200,6 +233,15 @@
            <if test="item.communityId !=null and item.communityId !='' ">
                community_id=#{item.communityId},
            </if>
            <if test="item.merchantId !=null and item.merchantId !='' ">
                merchant_id=#{item.merchantId},
            </if>
            <if test="item.orderType !=null and item.orderType !='' ">
                order_type=#{item.orderType},
            </if>
            <if test="item.remark !=null and item.remark !='' ">
                remark=#{item.remark},
            </if>
            update_time=sysdate()
        </set>
        where id = #{item.id}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java

@@ -900,7 +900,7 @@

        SysUserRoleDO sysUserRoleDO=sysUserRoleDAO.selectOne(new QueryWrapper<SysUserRoleDO>()
                .lambda().eq(SysUserRoleDO::getUserId,sysUserDO.getUserId()));
        if(sysUserRoleDO!=null )
        if(sysUserRoleDO!=null && sysUserRoleDO.getRoleId()!=null )
        {
            loginUserInfoVO.setRoleId(sysUserRoleDO.getRoleId()+"");
        }