修改bug
This commit is contained in:
parent
92e3019ecf
commit
d4d4c2d91e
|
@ -512,4 +512,13 @@ public class ArtificerController {
|
|||
return ordersService.jszd(orderId, artificerId);
|
||||
}
|
||||
|
||||
@PostMapping("/updateJfgz")
|
||||
@ApiOperation("修改技师是否参与积分规则计算")
|
||||
public Result updateArtificer(Long userId,Integer ynJfgz){
|
||||
Artificer artificer = artificerService.selectArtificerByUserId(userId);
|
||||
artificer.setYnJfgz(ynJfgz);
|
||||
artificerService.updateById(artificer);
|
||||
return Result.success();
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -45,4 +45,6 @@ public interface ArtificerDao extends BaseMapper<Artificer> {
|
|||
List<Artificer> getYxjsList();
|
||||
|
||||
List<Artificer> selectInlineList(Artificer artificer);
|
||||
|
||||
Artificer selectByPhone(@Param("phone")String mobile);
|
||||
}
|
|
@ -45,4 +45,6 @@ public interface ArtificerService extends IService<Artificer> {
|
|||
Result getJifenList(Long userId, String startTime, String endTime);
|
||||
|
||||
Result updateShz(Artificer artificer);
|
||||
|
||||
Artificer selectByPhone(String mobile);
|
||||
}
|
|
@ -823,6 +823,11 @@ public class ArtificerServiceImpl extends ServiceImpl<ArtificerDao, Artificer> i
|
|||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public Artificer selectByPhone(String mobile) {
|
||||
return baseMapper.selectByPhone(mobile);
|
||||
}
|
||||
|
||||
// public static void main(String[] args) {
|
||||
// String lifePhoto = "http://1.92.152.160/file/uploadPath/2024/07/09/a892623c518812421cec310d3d5e8d0a.jpg";
|
||||
// String artificerImg = "https://sausers.blxinchuang.com/file/uploadPath/2024/07/03/423843a244c16b04819a131c2160c0af.png";
|
||||
|
|
|
@ -2,16 +2,23 @@ package com.sqx.modules.consortia.controller;
|
|||
|
||||
import com.sqx.common.utils.DateUtils;
|
||||
import com.sqx.common.utils.Result;
|
||||
import com.sqx.modules.app.annotation.Login;
|
||||
import com.sqx.modules.app.annotation.LoginUser;
|
||||
import com.sqx.modules.app.entity.UserEntity;
|
||||
import com.sqx.modules.artificer.entity.Artificer;
|
||||
import com.sqx.modules.artificer.service.ArtificerService;
|
||||
import com.sqx.modules.consortia.entity.Consortia;
|
||||
import com.sqx.modules.consortia.service.ConsortiaService;
|
||||
import com.sqx.modules.coupon.entity.CouponCardType;
|
||||
import com.sqx.modules.coupon.service.CouponCardService;
|
||||
import com.sqx.modules.coupon.service.CouponCardTypeService;
|
||||
import com.sqx.modules.sys.controller.AbstractController;
|
||||
import com.sqx.modules.sys.entity.SysUserEntity;
|
||||
import com.sqx.modules.utils.excel.ExcelData;
|
||||
import com.sqx.modules.utils.excel.ExportExcelUtils;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
|
@ -26,6 +33,9 @@ public class ConsortiaController extends AbstractController {
|
|||
@Autowired
|
||||
private ConsortiaService consortiaService;
|
||||
|
||||
@Autowired
|
||||
private ArtificerService artificerService;
|
||||
|
||||
@PostMapping("/insertConsortia")
|
||||
@ApiOperation("添加商家")
|
||||
public Result insertConsortia(@RequestBody Consortia consortia){
|
||||
|
@ -81,6 +91,19 @@ public class ConsortiaController extends AbstractController {
|
|||
}
|
||||
|
||||
|
||||
@Login
|
||||
@GetMapping("/selectConsortiaListNew")
|
||||
@ApiOperation("pc查询下自己的商家信息")
|
||||
public Result selectConsortiaListNew(){
|
||||
SysUserEntity user = getUser();
|
||||
System.out.println("user-->"+user);
|
||||
Artificer artificer = artificerService.selectByPhone(user.getMobile());
|
||||
Long userId = 0L;
|
||||
if(artificer!=null){
|
||||
userId = artificer.getUserId();
|
||||
}
|
||||
return consortiaService.selectConsortiaUserId(userId);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -220,4 +220,11 @@
|
|||
and a.status = ${status}
|
||||
</if>
|
||||
</select>
|
||||
|
||||
|
||||
<select id="selectByPhone" resultType="com.sqx.modules.artificer.entity.Artificer">
|
||||
select a.* from artificer a
|
||||
inner join tb_user u on a.user_id=u.user_id
|
||||
where u.phone = #{phone}
|
||||
</select>
|
||||
</mapper>
|
Loading…
Reference in New Issue