| @@ -16,6 +16,7 @@ import com.iformall.domain.po.MallUserInfo; | |||||
| import com.iformall.domain.po.base.BaseEntity; | import com.iformall.domain.po.base.BaseEntity; | ||||
| import com.iformall.domain.po.sm.PersonMould; | import com.iformall.domain.po.sm.PersonMould; | ||||
| import com.iformall.domain.po.sm.ServiceInfo; | import com.iformall.domain.po.sm.ServiceInfo; | ||||
| import com.iformall.domain.po.sm.ServicePersonMould; | |||||
| import com.iformall.domain.po.sm.ServiceVideoRecord; | import com.iformall.domain.po.sm.ServiceVideoRecord; | ||||
| import com.iformall.enums.EnumProject; | import com.iformall.enums.EnumProject; | ||||
| import com.iformall.enums.EnumUserAdmin; | import com.iformall.enums.EnumUserAdmin; | ||||
| @@ -171,11 +172,11 @@ public class ServiceInfoController extends MallUserInfoBaseController{ | |||||
| @ApiVersion(group = SwaggerConstant.V_1_0_0) | @ApiVersion(group = SwaggerConstant.V_1_0_0) | ||||
| @ApiOperation("设置关联模板") | @ApiOperation("设置关联模板") | ||||
| @PostMapping("/associatedMould") | @PostMapping("/associatedMould") | ||||
| public R<Void> associatedMould(Long[] mouldIds,Long serviceId) { | |||||
| if (null == mouldIds || mouldIds.length <= 0 ) { | |||||
| public R<Void> associatedMould(@RequestBody ServicePersonMould spm) { | |||||
| if (null == spm.getMouldIds() || spm.getMouldIds().size() <= 0 ) { | |||||
| throw new BizException(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"请选择模板"); | throw new BizException(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"请选择模板"); | ||||
| } | } | ||||
| serviceInfoService.associatedMoulds(mouldIds, serviceId); | |||||
| serviceInfoService.associatedMoulds(spm.getMouldIds(), spm.getServiceId()); | |||||
| return R.ok(); | return R.ok(); | ||||
| } | } | ||||
| @@ -210,7 +210,10 @@ suimang: | |||||
| digital_avatar: xxx | digital_avatar: xxx | ||||
| digital_avatar_hy: xxx | digital_avatar_hy: xxx | ||||
| callbackUrl: xxx | callbackUrl: xxx | ||||
| local_deploy: false | |||||
| sdk: | |||||
| sm: | |||||
| base-url: https://mtest.metavatar.cc/public | |||||
| swagger: | swagger: | ||||
| base-package: com.iformall.controller | base-package: com.iformall.controller | ||||
| title: 遂芒_metavatar_接口文档 | title: 遂芒_metavatar_接口文档 | ||||
| @@ -165,4 +165,8 @@ suimang: | |||||
| photo_speak_hy: xxx | photo_speak_hy: xxx | ||||
| digital_avatar: xxx | digital_avatar: xxx | ||||
| digital_avatar_hy: xxx | digital_avatar_hy: xxx | ||||
| callbackUrl: xxx | |||||
| callbackUrl: xxx | |||||
| local_deploy: false | |||||
| sdk: | |||||
| sm: | |||||
| base-url: https://test.metavatar.cc/public | |||||
| @@ -37,8 +37,7 @@ CREATE TABLE `service_person_mould` ( | |||||
| `person_mould_id` bigint NOT NULL COMMENT 'PersonMould编号', | `person_mould_id` bigint NOT NULL COMMENT 'PersonMould编号', | ||||
| `service_id` bigint NOT NULL COMMENT 'ServiceInfo编码', | `service_id` bigint NOT NULL COMMENT 'ServiceInfo编码', | ||||
| `create_date` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', | `create_date` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', | ||||
| `update_date` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间', | |||||
| `wx_third_party_api_id` bigint NOT NULL, | |||||
| `update_date` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间' | |||||
| PRIMARY KEY (`id`) USING BTREE, | PRIMARY KEY (`id`) USING BTREE, | ||||
| UNIQUE KEY `id_UNIQUE` (`id`) USING BTREE | UNIQUE KEY `id_UNIQUE` (`id`) USING BTREE | ||||
| ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='接入方关联模板'; | ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='接入方关联模板'; | ||||
| @@ -47,3 +46,6 @@ ALTER TABLE `service_video_record` | |||||
| ADD COLUMN video_url varchar(300) COMMENT '视频链接'; | ADD COLUMN video_url varchar(300) COMMENT '视频链接'; | ||||
| #wx_c_author 新增了user_name | |||||
| @@ -1,11 +1,13 @@ | |||||
| package com.iformall.domain.po.sm; | package com.iformall.domain.po.sm; | ||||
| import com.baomidou.mybatisplus.annotation.TableField; | |||||
| import com.baomidou.mybatisplus.annotation.TableName; | import com.baomidou.mybatisplus.annotation.TableName; | ||||
| import com.iformall.domain.po.base.BaseEntity; | import com.iformall.domain.po.base.BaseEntity; | ||||
| import lombok.Data; | import lombok.Data; | ||||
| import lombok.EqualsAndHashCode; | import lombok.EqualsAndHashCode; | ||||
| import lombok.ToString; | import lombok.ToString; | ||||
| import java.util.Date; | import java.util.Date; | ||||
| import java.util.List; | |||||
| @TableName(value = "service_person_mould") | @TableName(value = "service_person_mould") | ||||
| @Data | @Data | ||||
| @@ -25,4 +27,6 @@ public class ServicePersonMould extends BaseEntity { | |||||
| private Date createDate; | private Date createDate; | ||||
| @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") | @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") | ||||
| private Date updateDate; | private Date updateDate; | ||||
| @TableField(exist = false) | |||||
| private List<Long> mouldIds; | |||||
| } | } | ||||
| @@ -52,7 +52,7 @@ public interface ServiceInfoService { | |||||
| ServiceInfo getServiceInfo(Long id); | ServiceInfo getServiceInfo(Long id); | ||||
| ServiceInfo getServiceInfoByMallUserInfo(Long mallUserInfoId); | ServiceInfo getServiceInfoByMallUserInfo(Long mallUserInfoId); | ||||
| void associatedMoulds(Long[] mouldIds,Long id); | |||||
| void associatedMoulds(List<Long> mouldIds,Long id); | |||||
| void reduceTimes(Long serviceId,Long seconds); | void reduceTimes(Long serviceId,Long seconds); | ||||
| @@ -109,14 +109,14 @@ public class ServiceInfoServiceImpl implements ServiceInfoService { | |||||
| } | } | ||||
| @Override | @Override | ||||
| public void associatedMoulds(Long[] mouldIds, Long id) { | |||||
| public void associatedMoulds(List<Long> mouldIds, Long id) { | |||||
| servicePersonMouldMapper.deleteByServiceId(id); | servicePersonMouldMapper.deleteByServiceId(id); | ||||
| if (null != mouldIds && mouldIds.length > 0 ) { | |||||
| if (null != mouldIds && mouldIds.size() > 0 ) { | |||||
| List<ServicePersonMould> spmlist = new ArrayList<ServicePersonMould>(); | List<ServicePersonMould> spmlist = new ArrayList<ServicePersonMould>(); | ||||
| for (int i = 0 ; i < mouldIds.length ; i ++) { | |||||
| for (int i = 0 ; i < mouldIds.size() ; i ++) { | |||||
| ServicePersonMould spm = new ServicePersonMould(); | ServicePersonMould spm = new ServicePersonMould(); | ||||
| spm.setId(IdWorker.get().nextId()); | spm.setId(IdWorker.get().nextId()); | ||||
| spm.setPersonMouldId(mouldIds[i]); | |||||
| spm.setPersonMouldId(mouldIds.get(i)); | |||||
| spm.setServiceId(id); | spm.setServiceId(id); | ||||
| spm.setCreateDate(new Date()); | spm.setCreateDate(new Date()); | ||||
| spm.setUpdateDate(new Date()); | spm.setUpdateDate(new Date()); | ||||