ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/shop/Shop.java
@@ -39,7 +39,7 @@ @TableField("del_flag") private Integer delFlag; /** * 商户状态-1删除0冻结1正常2终止合作 * 商户状态-1删除0冻结1正常2合作终止3进件中 */ @TableField("shop_status") private Integer shopStatus; @@ -257,6 +257,19 @@ @TableField("shop_source") private String shopSource; /** * 冻结标记 */ @TableField("frozen_flag") private Integer frozenFlag; /** * 合作标记 */ @TableField("cooperative_flag") private Integer cooperativeFlag; @Override protected Serializable pkVal() { ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/MgtGoodsController.java
@@ -4,6 +4,7 @@ import com.ruoyi.common.core.domain.R; import com.ruoyi.common.security.utils.SecurityUtils; import com.ruoyi.goods.domain.dto.MerGoodsPageDto; import com.ruoyi.goods.domain.dto.MgtGoodsEditDto; import com.ruoyi.goods.domain.dto.MgtGoodsPageDto; import com.ruoyi.goods.domain.vo.MerGoodsPageVo; import com.ruoyi.goods.domain.vo.MgtGoodsPageVo; @@ -58,6 +59,13 @@ return R.ok(mgtGoodsTotalVo); } @RequestMapping(value = "/editMgtGoods", method = RequestMethod.POST) @ApiOperation(value = "平台编辑商品") public R editMgtGoods(@RequestBody MgtGoodsEditDto mgtGoodsEditDto) { Long userId = SecurityUtils.getUserId(); mgtGoodsEditDto.setUserId(userId); goodsService.editMgtGoods(mgtGoodsEditDto); return R.ok(); } } ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MgtGoodsEditDto.java
@@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.ruoyi.system.api.domain.dto.MgtBaseDto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -16,13 +17,13 @@ * @version: 1.0 */ @Data public class MgtGoodsEditDto { public class MgtGoodsEditDto extends MgtBaseDto { @ApiModelProperty(value = "商品id") @ApiModelProperty(value = "商品id 新增时不传") private String goodsId; @ApiModelProperty(value = "商品状态-1删除1上架2下架") @ApiModelProperty(value = "商品状态1上架2下架") private Integer goodsStatus; @ApiModelProperty(value = "商品类型1周期2服务3体验4单品") @@ -34,7 +35,16 @@ @ApiModelProperty(value = "商品名称") private String goodsName; @ApiModelProperty(value = "周期次数标记0否1是") @ApiModelProperty(value = "商品图片") private String goodsPicture; @ApiModelProperty(value = "商品视频") private String goodsVideo; @ApiModelProperty(value = "商品banner 多个用,号隔开") private String goodsBanners; @ApiModelProperty(value = "是否明确次数0否1是") private Integer cycleNumFlag; @ApiModelProperty(value = "服务次数") @@ -48,9 +58,6 @@ @ApiModelProperty(value = "最低售价") private BigDecimal mininumPrice; @ApiModelProperty(value = "订金标记0否1是") private Integer subscriptionFlag; @ApiModelProperty(value = "订金") private BigDecimal subscription; ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/goods/GoodsService.java
@@ -77,8 +77,14 @@ List<MgtGoodsPageVo> pageMgtGoods(Page page,MgtGoodsPageDto mgtGoodsPageDto); /** * * 平台获取商品统计 * @return */ MgtGoodsTotalVo getMgtGoodsTotal(); /** * 平台编辑商品 * @param mgtGoodsEditDto */ void editMgtGoods(MgtGoodsEditDto mgtGoodsEditDto); } ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/goods/GoodsServiceImpl.java
@@ -251,4 +251,16 @@ public MgtGoodsTotalVo getMgtGoodsTotal(){ return goodsMapper.getMgtGoodsTotal(); } /** * 平台编辑商品 * @param mgtGoodsEditDto */ @Override public void editMgtGoods(MgtGoodsEditDto mgtGoodsEditDto){ } } ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/account/BackMessage.java
@@ -31,7 +31,7 @@ * 报文id */ @TableId(value = "message_id", type = IdType.AUTO) private Integer messageId; private Long messageId; /** * 删除标记 */ ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/account/FinishOrder.java
@@ -31,7 +31,7 @@ * 完结id */ @TableId("finish_id") private Integer finishId; private Long finishId; /** * 删除标记 */ @@ -41,7 +41,7 @@ * 商户id */ @TableField("shop_id") private Integer shopId; private Long shopId; /** * 订单id */ ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/account/OrderPayment.java
@@ -42,12 +42,12 @@ * 用户id */ @TableField("user_id") private Integer userId; private Long userId; /** * 商户id */ @TableField("shop_id") private Integer shopId; private Long shopId; /** * 订单id */ ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/account/OrderRefund.java
@@ -46,7 +46,7 @@ * 售后id */ @TableField("after_sales_id") private Integer afterSalesId; private String afterSalesId; /** * 订单id */ @@ -56,12 +56,12 @@ * 用户id */ @TableField("user_id") private Integer userId; private Long userId; /** * 商户id */ @TableField("shop_id") private Integer shopId; private Long shopId; /** * 退款金额 */ ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/account/PaymentMessage.java
@@ -32,7 +32,7 @@ * 报文id */ @TableId(value = "message_id", type = IdType.AUTO) private Integer messageId; private Long messageId; /** * 删除标记 */ @@ -47,7 +47,7 @@ * 发起关联id */ @TableField("send_id") private Integer sendId; private Long sendId; /** * 发送报文 */ ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/account/ProfitSharing.java
@@ -48,7 +48,7 @@ * 商户id */ @TableField("shop_id") private Integer shopId; private Long shopId; /** * 订单id */ ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/order/ServiceRecordDetail.java
@@ -31,7 +31,7 @@ * id */ @TableId(value = "id", type = IdType.AUTO) private Integer id; private Long id; /** * 删除标记 */ ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java
@@ -49,7 +49,7 @@ } @RequestMapping(value = "/createMgtShop", method = RequestMethod.POST) @ApiOperation(value = "创建商户") @ApiOperation(value = "平台编辑商户") public R createMgtShop(@RequestBody MgtEditShopDto mgtEditShopDto) { Long userId = SecurityUtils.getUserId(); mgtEditShopDto.setUserId(userId); ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MgtEditShopDto.java
@@ -16,7 +16,7 @@ public class MgtEditShopDto extends MgtBaseDto { @ApiModelProperty(value = "商户id，新增不传") @ApiModelProperty(value = "商户id 新增不传") private Long shopId; @ApiModelProperty("商户名称") ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/AuthenticationProcess.java
@@ -32,7 +32,7 @@ * 步骤id */ @TableId(value = "process_id", type = IdType.AUTO) private Integer processId; private Long processId; /** * 删除标记 */ ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopAccount.java
@@ -31,7 +31,7 @@ * 商户id */ @TableId("shop_id") private Integer shopId; private Long shopId; /** * 删除标记 */ ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopAuthentication.java
@@ -42,7 +42,7 @@ * 商户id */ @TableField("shop_id") private Integer shopId; private Long shopId; /** * 申请编号 */ ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopFlow.java
@@ -2,6 +2,8 @@ import java.math.BigDecimal; import java.util.Date; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.activerecord.Model; @@ -31,8 +33,8 @@ /** * 流水id */ @TableId("flow_id") private Integer flowId; @TableId(value = "flow_id",type = IdType.AUTO) private Long flowId; /** * 删除标记 */ @@ -42,7 +44,7 @@ * 商户id */ @TableField("shop_id") private Integer shopId; private Long shopId; /** * 流水类型1订单收入2退款支出3分账支出 */ ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopFundRecord.java
@@ -42,7 +42,7 @@ * 商户id */ @TableField("shop_id") private Integer shopId; private Long shopId; /** * 记录类型1订单支付2取消订单3 */ @@ -72,7 +72,7 @@ * 关联用户id */ @TableField("relation_user_id") private Integer relationUserId; private Long relationUserId; /** * 关联订单id */ ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopProportion.java
@@ -42,7 +42,7 @@ * 商户id */ @TableField("shop_id") private Integer shopId; private Long shopId; /** * 商户类型 */ @@ -62,7 +62,7 @@ * 更新用户id */ @TableField("update_user_id") private Integer updateUserId; private Long updateUserId; @Override ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
@@ -1,4 +1,5 @@ package com.ruoyi.shop.service.impl.shop; import java.math.BigDecimal; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -75,6 +76,14 @@ @Resource private ShopStaffService shopStaffService; @Resource private ShopAccountService shopAccountService; @Resource private ShopAuthenticationService shopAuthenticationService; /** * 获取商户详情 * @param shopId @@ -117,6 +126,7 @@ @Override public void createShop(MgtEditShopDto MGTEditShopDto){ Shop shop = new Shop(); Boolean newShop = false; if(MGTEditShopDto.getShopId()!=null){ shop = this.getById(MGTEditShopDto.getShopId()); shop.setUpdateTime(DateUtils.getNowDate()); @@ -130,9 +140,12 @@ shopRelUserService.deleteByShopId(shop.getShopId()); shopStaffService.clearShopStaffRelation(shop.getShopId()); }else{ shop.setShopStatus(2); shop.setShopStatus(3); shop.setCreateTime(DateUtils.getNowDate()); shop.setCreateUserId(MGTEditShopDto.getUserId()); shop.setFrozenFlag(0); shop.setCooperativeFlag(0); newShop = true; } BeanUtils.copyProperties(MGTEditShopDto,shop); this.saveOrUpdate(shop); @@ -206,6 +219,23 @@ shopFileService.save(shopFile); } } if(newShop){ ShopAccount shopAccount = new ShopAccount(); shopAccount.setShopId(shop.getShopId()); shopAccount.setDelFlag(0); shopAccount.setTotalIncome(new BigDecimal("0")); shopAccount.setTotalDisburse(new BigDecimal("0")); shopAccount.setTotalRefund(new BigDecimal("0")); shopAccount.setTotalProfitsharing(new BigDecimal("0")); shopAccount.setTotalMoney(new BigDecimal("0")); shopAccountService.saveOrUpdate(shopAccount); String authId = IdUtils.simpleUUID(); ShopAuthentication shopAuthentication = new ShopAuthentication(); shopAuthentication.setAuthId(authId); shopAuthentication.setDelFlag(0); shopAuthentication.setShopId(shop.getShopId()); shopAuthenticationService.saveOrUpdate(shopAuthentication); } } /** ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopMapper.xml
@@ -51,6 +51,8 @@ <result property="shopTags" column="shop_tags" /> <result property="signUserId" column="sign_user_id" /> <result property="shopSource" column="shop_source" /> <result property="frozenFlag" column="frozen_flag" /> <result property="cooperativeFlag" column="cooperative_flag" /> </resultMap> <sql id="selectShopVo"> @@ -104,6 +106,8 @@ <if test="shopTags != null and shopTags != ''"> and shop_tags = #{shopTags}</if> <if test="signUserId != null "> and sign_user_id = #{signUserId}</if> <if test="shopSource != null and shopSource != ''"> and shop_source = #{shopSource}</if> <if test="frozenFlag != null and frozenFlag != ''"> and frozen_flag = #{frozenFlag}</if> <if test="cooperativeFlag != null and cooperativeFlag != ''"> and cooperative_flag = #{cooperativeFlag}</if> </where> </select>
