前端订单及扫码等

src/main/java/io/renren/modules/admin/controller/MeetingController.java

@@ -82,13 +82,6 @@ public class MeetingController {
    @RequiresPermissions("admin:meeting:info")
    public R info(@PathVariable("id") Long id){
		MeetingEntity meeting = meetingService.getById(id);
        Long sId = meeting.getServiceId();
        if (sId == null || sId == 0) {
              meeting.setServiceName("");
        } else{
            EmployeeEntity employee = employeeService.getById(sId);
            meeting.setServiceName(employee.getTruename());
        }
        
        return R.ok().put("meeting", meeting);
    }

src/main/java/io/renren/modules/admin/dao/PaymentDao.java

@@ -39,4 +39,10 @@ public interface PaymentDao extends BaseMapper<PaymentEntity> {
    @Update("UPDATE payment SET `is_pay`=#{status} where id=#{id}")
    int updatePayStatus(Long id, Integer status);
    @Select("SELECT p.id, p.order_id orderId, p.is_pay isPay, p.pay_time payTime, a.name attendersName, a.organization, m.name_cn meetingName FROM payment p JOIN attenders a ON p.attenders_id=a.id JOIN meeting m ON p.meeting_id=m.id WHERE a.member_id=#{memberId};")
    List<Map<String, Object>> queryOrderListByMemberId(Long memberId);
    @Select("SELECT a.id attendersId, a.name attendersName, a.organization, a.position, p.is_pay isPay, m.id meetingId, m.name_cn meetingName, m.start_time startTime, m.end_time endTime FROM payment p JOIN attenders a ON p.attenders_id=a.id JOIN meeting m ON p.meeting_id=m.id where order_id=#{orderId};")
    Map<String, Object> queryOrderInfoByOrderId(String orderId);
}

src/main/java/io/renren/modules/admin/service/PaymentService.java

@@ -41,5 +41,9 @@ public interface PaymentService extends IService<PaymentEntity> {
    BigDecimal getTotalMoney(Long meetingId, String where);
	int updatePayStatus(Long id, Integer status);
	List<Map<String, Object>> queryOrderListByMemberId(Long memberId);
	Map<String, Object> queryOrderInfoByOrderId(String orderId);
}

src/main/java/io/renren/modules/admin/service/impl/PaymentServiceImpl.java

@@ -81,4 +81,14 @@ public class PaymentServiceImpl extends ServiceImpl<PaymentDao, PaymentEntity> i
    public int updatePayStatus(Long id, Integer status) {
       return baseMapper.updatePayStatus(id, status);
    }
    @Override
    public List<Map<String, Object>> queryOrderListByMemberId(Long memberId) {
        return baseMapper.queryOrderListByMemberId(memberId);
    }
    @Override
    public Map<String, Object> queryOrderInfoByOrderId(String orderId) {
        return baseMapper.queryOrderInfoByOrderId(orderId);
    }
}

src/main/java/io/renren/modules/app/controller/AppOrderController.java

@@ -19,16 +19,12 @@ import org.springframework.web.bind.annotation.PathVariable;
import io.renren.common.utils.R;
import io.renren.modules.admin.entity.AttendersEntity;
import io.renren.modules.admin.entity.MeetingEntity;
import io.renren.modules.admin.entity.PaymentEntity;
import io.renren.modules.admin.service.AttendersService;
import io.renren.modules.admin.service.MeetingService;
import io.renren.modules.admin.service.PaymentService;
import io.renren.modules.app.annotation.Login;
import io.renren.modules.app.annotation.LoginUser;
import io.renren.modules.app.dao.UserDao;
import io.renren.modules.app.entity.UserEntity;
import io.renren.modules.app.service.UserService;
/**
 * @author chenshun
@@ -41,8 +37,6 @@ public class AppOrderController {
    @Autowired
    private AttendersService attendersService;
    @Autowired
    private UserService userService;
    @Autowired
    private PaymentService paymentService;
    
    /**
@@ -51,10 +45,9 @@ public class AppOrderController {
    @Login
    @GetMapping("/list")
    public R orderList(@RequestAttribute("userId") Integer userId){
        System.out.println(userId);
        Long memberId = Long.valueOf(userId);
        List<Map<String, Object>> orderList = userService.queryOrderList(memberId);        
        List<Map<String, Object>> orderList = paymentService.queryOrderListByMemberId(memberId);        
        return R.ok().put("orderList", orderList);
    }
@@ -128,24 +121,13 @@ public class AppOrderController {
        return R.ok();
    }
    @GetMapping("/infobyaid/{aid}")
    public R infoByAttendersId(@PathVariable("aid") Long aid){
        System.out.println(aid);
        Map<String, Object> orderInfo = userService.queryOrderInfoByAttendersId(aid);
    @GetMapping("/infobyorderid/{orderId}")
    public R infoByAttendersId(@PathVariable("orderId") String orderId){
        Map<String, Object> orderInfo = paymentService.queryOrderInfoByOrderId(orderId);
        return R.ok().put("orderInfo", orderInfo);
    }
    // /**
    //  * 修改
    //  */
    // @Login
    // @PostMapping("/update")
    // public R update(@RequestBody AttendersEntity attenders){
	// 	attendersService.updateById(attenders);
    //     return R.ok();
    // }
    // /**
    //  * 删除
    //  */

src/main/java/io/renren/modules/app/controller/AppTestController.java

@@ -10,8 +10,6 @@ package io.renren.modules.app.controller;
import io.renren.common.utils.R;
import io.renren.modules.app.annotation.Login;
import io.renren.modules.app.annotation.LoginUser;
import io.renren.modules.app.entity.UserEntity;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;

src/main/java/io/renren/modules/app/controller/QRCodeTest.java

@@ -69,7 +69,7 @@ public class QRCodeTest {
		String imgpath = "/kexiu/webdata/data/qcode";
                String rpath = "www.ekexiu.com/data/qcode/";
		String imgurl = "";
                try{
		try{
		     String file = qRCodeUtils.encode(text, null, imgpath, false);
		     imgurl = rpath+file;
		}catch(Exception e){
@@ -81,15 +81,13 @@ public class QRCodeTest {
	@Login
	@GetMapping("qrcode.jpg")
    @ApiOperation("获取二维码图片")
    public void  getCodeImg(HttpServletResponse response, String attenders_id)throws IOException {
    public void  getCodeImg(HttpServletResponse response, String orderId)throws IOException {
        response.setHeader("Cache-Control", "no-store, no-cache");
		response.setContentType("image/jpeg");
		//获取图片验证码
		// BufferedImage image = qRCodeUtils.encode(text);
		String text = qrcodeurl + attenders_id;
		String text = qrcodeurl + orderId;
		ServletOutputStream out = response.getOutputStream();
		// ImageIO.write(image, "jpg", out);
		try{
			qRCodeUtils.encode(text, out);
			IOUtils.closeQuietly(out);

src/main/java/io/renren/modules/app/controller/Sign.java

@@ -14,9 +14,8 @@ import org.springframework.web.bind.annotation.RestController;
import io.renren.common.utils.R;
import io.renren.modules.admin.entity.SignEntity;
import io.renren.modules.admin.service.PaymentService;
import io.renren.modules.admin.service.SignService;
import io.renren.modules.app.service.UserService;
/**
@@ -32,34 +31,40 @@ public class Sign {
    @Autowired
    private SignService signService;
    @Autowired
    private UserService userService;
    private PaymentService paymentService;
    /**
     * 保存
     */
    @PostMapping("/signin")
    public R save(@RequestParam Map<String, Object> params){
        Long attendersId = Long.valueOf(params.get("attendersId").toString());
        String orderId = (String) params.get("orderId");
        Map<String, Object> orderInfo = paymentService.queryOrderInfoByOrderId(orderId);
        if (Integer.valueOf(orderInfo.get("isPay").toString()) == 0) {
            return R.error(1, "未缴费");
        }
        
        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        try {
            Date dateStart = simpleDateFormat.parse(orderInfo.get("startTime").toString());
            long startTime = dateStart.getTime();
            Date dateEnd = simpleDateFormat.parse(orderInfo.get("endTime").toString());
            long endTime = dateEnd.getTime();
            long nowtime = System.currentTimeMillis();
            if (nowtime < startTime || nowtime > endTime) {
                return R.error(2, "非会期");
            }
        } catch (Exception e) {
            return R.error();
        }
        
        Long attendersId = Long.valueOf(orderInfo.get("attendersId").toString());
        SignEntity sEntity =  signService.getOne(
            new QueryWrapper<SignEntity>().eq("attenders_id", attendersId)
        );
        if (sEntity == null) {
            Map<String, Object> orderInfo = userService.queryOrderInfoByAttendersId(attendersId);
            if (Integer.valueOf(orderInfo.get("isCheck").toString()) == 0) {
                return R.error(1, "签到未成功");
            }
            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
            try {
                Date dateStart = simpleDateFormat.parse(orderInfo.get("startTime").toString());
                long startTime = dateStart.getTime();
                Date dateEnd = simpleDateFormat.parse(orderInfo.get("endTime").toString());
                long endTime = dateEnd.getTime();
                long nowtime = System.currentTimeMillis();
                if (nowtime < startTime || nowtime > endTime) {
                    return R.error(2, "签到未成功");
                }
            } catch (Exception e) {
                return R.error();
            }
            SignEntity signEntity = new SignEntity();
            signEntity.setAttendersId(attendersId);
            signEntity.setMeetingId(Long.valueOf(orderInfo.get("meetingId").toString()));

src/main/java/io/renren/modules/app/controller/UserController.java

@@ -56,20 +56,6 @@ public class UserController {
        return R.ok();
    }
    /**
     * 订单列表
     */
    @Login
    @GetMapping("/orderlist")
    @ApiOperation("获取订单列表")
    public R orderList(@RequestAttribute("userId") Integer userId){
        // System.out.println(userId);
        Long memberId = Long.valueOf(userId);        
        List<Map<String, Object>> orderList = userService.queryOrderList(memberId);        
        return R.ok().put("orderList", orderList);
    }
    /**
     * 重置密码
     */

src/main/java/io/renren/modules/app/dao/UserDao.java

@@ -8,7 +8,6 @@
package io.renren.modules.app.dao;
import java.util.List;
import java.util.Map;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -24,12 +23,6 @@ import org.apache.ibatis.annotations.Update;
 */
@Mapper
public interface UserDao extends BaseMapper<UserEntity> {
    @Select("select p.id, p.order_id orderId, mem.truename, mem.organization, p.pay_time payTime,p.is_pay isPay,(select m.name_cn from meeting as m where m.id=p.meeting_id) as meetingName from attenders join payment p on attenders.id=p.attenders_id join member mem on mem.id=attenders.member_id where attenders.member_id=#{memberId};")
    List<Map<String, Object>> queryOrderList(Long memberId);
    @Select("select mem.truename, mem.organization, mem.position, (select m.name_cn from meeting as m where m.id=a.meeting_id) as meetingName, (select m.start_time from meeting as m where m.id=a.meeting_id) as startTime,(select m.end_time from meeting as m where m.id=a.meeting_id) as endTime,(select p.is_pay from payment as p where p.attenders_id = a.id) as IsPay from attenders a join member mem on mem.id=a.member_id where a.id = #{attendersId};")
    Map<String, Object> queryOrderInfoByAttendersId(Long attendersId);
    @Update("UPDATE member SET `password`=#{password}, `salt`=#{salt} WHERE `id`=#{id}")
    int updatePassWord(Long id, String password, String salt);
}

src/main/java/io/renren/modules/app/service/UserService.java

@@ -37,12 +37,6 @@ public interface UserService extends IService<UserEntity> {
	 */
	public void saveUser(UserEntity user);
	/**
	 * 根据用户id 获取订单信息
	 * @param memberId
	 */
	List<Map<String, Object>> queryOrderList(Long memberId);
	/**
	 * 
	 */

src/main/java/io/renren/modules/app/service/impl/UserServiceImpl.java

@@ -64,11 +64,6 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
		
		return baseMapper.updatePassWord(id, password, salt);
	}
	
	@Override
	public List<Map<String, Object>> queryOrderList(Long memberId) {
		return baseMapper.queryOrderList(memberId);
	}
	@Override
	public Map<String, Object> queryOrderInfoByAttendersId(Long attendersId) {

src/main/resources/application-dev.yml

@@ -3,7 +3,7 @@ spring:
        type: com.alibaba.druid.pool.DruidDataSource
        druid:
            driver-class-name: com.mysql.cj.jdbc.Driver
            url: jdbc:mysql://localhost:3306/meeting?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
            url: jdbc:mysql://192.168.3.233:3306/meeting?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
            username: root
            password: root001
            initial-size: 10
@@ -53,4 +53,4 @@ file:
    uploadFolder: /uploads
## 前台访问地址
url:
    qrcode: http://192.168.3.233/qrcode/webmeeting.html?attendersId=
    qrcode: http://192.168.3.233/qrcode/webmeeting.html?orderId=