修正limit错误,前台添加修改开票信息接口

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

@@ -4,7 +4,6 @@ import java.net.URLEncoder;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -34,7 +33,6 @@ import io.renren.common.utils.ExcelUtils;
import io.renren.common.utils.PageUtils;
import io.renren.common.utils.R;
import io.renren.modules.sys.controller.AbstractController;
import net.bytebuddy.asm.Advice.Exit;
import io.renren.modules.admin.service.PaymentService;
/**

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

@@ -3,9 +3,6 @@ package io.renren.modules.admin.controller;
import java.util.Arrays;
import java.util.Map;
import com.alibaba.druid.sql.ast.statement.SQLForeignKeyImpl.On;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import java.util.Date;
import java.util.List;
@@ -19,7 +16,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import io.renren.modules.admin.entity.AttendersEntity;
import io.renren.modules.admin.entity.LectureEntity;
import io.renren.modules.admin.service.AttendersService;
import io.renren.modules.admin.service.LectureService;

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

@@ -151,9 +151,9 @@ public class MeetingController {
        String titlePicture = "";
        for (int i = 0; i < titlePictures.length; i++) {
            if (i==0) {
                titlePicture += titlePictures[i].getUrl();
                titlePicture += titlePictures[i].getPicname();
            } else {
                titlePicture += "," + titlePictures[i].getUrl();
                titlePicture += "," + titlePictures[i].getPicname();
            }
        }
        meeting.setTitlePicture(titlePicture);
@@ -244,9 +244,9 @@ public class MeetingController {
        String titlePicture = "";
        for (int i = 0; i < titlePictures.length; i++) {
            if (i==0) {
                titlePicture += titlePictures[i].getUrl();
                titlePicture += titlePictures[i].getPicname();
            } else {
                titlePicture += "," + titlePictures[i].getUrl();
                titlePicture += "," + titlePictures[i].getPicname();
            }
        }
        meeting.setTitlePicture(titlePicture);

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

@@ -19,8 +19,8 @@ import org.apache.ibatis.annotations.Update;
 */
@Mapper
public interface AttendersDao extends BaseMapper<AttendersEntity> {
    @Select("SELECT a.id, m.truename as name, m.organization, m.phone, a.intention, a.room, a.transfer, a.note, a.modify_time, a.servicer, e.truename as servicerName, a.type_id as typeId, (select t.name from types_of_attenders t WHERE t.id=a.type_id) as typeName, (SELECT p.is_pay FROM  payment p WHERE p.attenders_id=a.id) as  isPay  FROM attenders a JOIN member m ON a.member_id=m.id LEFT JOIN employee e ON e.id=a.servicer  WHERE a.is_del=0 AND a.meeting_id=#{meetingId} AND (m.truename Like '%${truename}%' OR m.organization LIKE '%${organization}%') limit #{startLimt},#{endLimt};")
    List<Map<String, Object>> getPageList(Long meetingId, String truename, String organization, int startLimt, int endLimt);
    @Select("SELECT a.id, m.truename as name, m.organization, m.phone, a.intention, a.room, a.transfer, a.note, a.modify_time, a.servicer, e.truename as servicerName, a.type_id as typeId, (select t.name from types_of_attenders t WHERE t.id=a.type_id) as typeName, (SELECT p.is_pay FROM  payment p WHERE p.attenders_id=a.id) as  isPay  FROM attenders a JOIN member m ON a.member_id=m.id LEFT JOIN employee e ON e.id=a.servicer  WHERE a.is_del=0 AND a.meeting_id=#{meetingId} AND (m.truename Like '%${truename}%' OR m.organization LIKE '%${organization}%') limit #{offseet},#{limit};")
    List<Map<String, Object>> getPageList(Long meetingId, String truename, String organization, int offseet, int limit);
    @Select("SELECT count(*) FROM attenders a JOIN member m ON a.member_id=m.id LEFT JOIN employee e ON e.id=a.servicer  WHERE a.is_del=0 AND a.meeting_id=#{meetingId} AND (m.truename Like '%${truename}%' OR m.organization LIKE '%${organization}%');")
    int getCounts(Long meetingId, String truename, String organization);

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

@@ -18,8 +18,8 @@ import org.apache.ibatis.annotations.Select;
 */
@Mapper
public interface LectureDao extends BaseMapper<LectureEntity> {
    @Select("select l.id,a.id a_id,a.meeting_id,l.topic,l.branch_id,l.speech_time,m.truename,m.position,m.job_title,m.organization from attenders a join lecture l on a.id=l.attenders_id join member m on m.id=a.member_id where a.meeting_id=#{meetingId} and a.is_del=0 and l.is_del=0 and (l.topic like '%${key1}' or m.truename like '%${key2}%') limit #{startLimt},#{endLimt};")
    List<Map<String, Object>> getPageList(Long meetingId, String key1, String key2, int startLimt, int endLimt);
    @Select("select l.id,a.id a_id,a.meeting_id,l.topic,l.branch_id,l.speech_time,m.truename,m.position,m.job_title,m.organization from attenders a join lecture l on a.id=l.attenders_id join member m on m.id=a.member_id where a.meeting_id=#{meetingId} and a.is_del=0 and l.is_del=0 and (l.topic like '%${key1}' or m.truename like '%${key2}%') limit #{offset},#{limit};")
    List<Map<String, Object>> getPageList(Long meetingId, String key1, String key2, int offset, int limit);
    @Select("select count(*) from attenders a join lecture l on a.id=l.attenders_id join member m on m.id=a.member_id where a.meeting_id=#{meetingId} and a.is_del=0 and l.is_del=0 and (l.topic like '%${key1}%' or m.truename like '%${key2}%'); ")
    int getCounts(Long meetingId, String key1, String key2);

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

@@ -23,7 +23,7 @@ public interface MeetingDao extends BaseMapper<MeetingEntity> {
    int updateStatus(Long id, Integer isCheck);
    @Select("select m.id,c.companyname,m.name_cn,m.address,m.start_time from meeting as m left JOIN company as c on m.company_id = c.id where m.is_del = 0 and (m.name_cn LIKE '%${key}%' or m.name_en LIKE '%${key2}%') limit #{page},#{limit} ")
    List<Map<String, Object>> getPageList(int page, int limit, String key, String key2);
    List<Map<String, Object>> getPageList(int offset, int limit, String key, String key2);
    @Select("select count(*) from meeting  where is_del = 0 and (name_cn LIKE '%${key}%' or name_en LIKE '%${key2}%')")
    Integer getCounts(String key, String key2);

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

@@ -18,8 +18,8 @@ import org.apache.ibatis.annotations.Select;
 */
@Mapper
public interface PaperDao extends BaseMapper<PaperEntity> {
    @Select("select p.id,p.title,a.id a_id,m.truename,m.phone,m.email,p.paperurl,p.create_time from attenders a join paper p on a.id=p.attenders_id join member m on m.id=a.member_id where a.meeting_id=#{meetingId} and a.is_del =0 and p.is_del = 0 and (p.title like '%${key1}%' or m.truename LIKE '%${key2}%') limit #{startLimt},#{endLimt};")
    List<Map<String, Object>> getPageList(Long meetingId, int startLimt, int endLimt, String key1, String key2);
    @Select("select p.id,p.title,a.id a_id,m.truename,m.phone,m.email,p.paperurl,p.create_time from attenders a join paper p on a.id=p.attenders_id join member m on m.id=a.member_id where a.meeting_id=#{meetingId} and a.is_del =0 and p.is_del = 0 and (p.title like '%${key1}%' or m.truename LIKE '%${key2}%') limit #{offset},#{limit};")
    List<Map<String, Object>> getPageList(Long meetingId, int offset, int limit, String key1, String key2);
    @Select("select count(p.id) from attenders a join paper p on a.id=p.attenders_id join member m on m.id=a.member_id where a.meeting_id=#{meetingId} and a.is_del =0 and p.is_del = 0 and (p.title like '%${key1}%' or m.truename LIKE '%${key2}%');")
    int getCounts(Long meetingId, String key1, String key2);

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

@@ -19,8 +19,8 @@ import java.util.Map;
 */
@Mapper
public interface PaymentDao extends BaseMapper<PaymentEntity> {
    @Select("select p.id, p.order_id orderId, mem.truename, mem.organization, p.pay_type payType, mem.phone, mem.email, p.pay_time payTime,p.is_pay isPay from attenders join payment p on attenders.id=p.attenders_id join member mem on mem.id=attenders.member_id where p.meeting_id=#{meetingId} and attenders.is_del=0 and p.is_del=0 and (mem.truename like '%${name}%' or p.order_id like '%${order}%') limit #{startLimt},#{endLimt};")
    List<Map<String, Object>> getPageList(Long meetingId, String name, String order, int startLimt, int endLimt);
    @Select("select p.id, p.order_id orderId, mem.truename, mem.organization, p.pay_type payType, mem.phone, mem.email, p.pay_time payTime,p.is_pay isPay from attenders join payment p on attenders.id=p.attenders_id join member mem on mem.id=attenders.member_id where p.meeting_id=#{meetingId} and attenders.is_del=0 and p.is_del=0 and (mem.truename like '%${name}%' or p.order_id like '%${order}%') limit #{offset},#{limit};")
    List<Map<String, Object>> getPageList(Long meetingId, String name, String order, int offset, int limit);
    @Select("select count(*) from attenders join payment p on attenders.id=p.attenders_id join member mem on mem.id=attenders.member_id where p.meeting_id=#{meetingId} and attenders.is_del=0 and p.is_del=0 and (mem.truename like '%${name}%' or p.order_id like '%${order}%');")
    int getCounts(Long meetingId, String name, String order);

src/main/java/io/renren/modules/admin/form/TitlePictureForm.java

@@ -9,5 +9,6 @@ import lombok.Data;
public class TitlePictureForm {
    String status;
    Long uid;
    String url;
    String url;  // 返回时用变量名
    String picname; // 接受表单数据时用变量名(因为上传文件哪里返回的就是picname)
}

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

@@ -43,9 +43,8 @@ public class AttendersServiceImpl extends ServiceImpl<AttendersDao, AttendersEnt
            page = 0;
        }
        int limit = params.containsKey("limit") ? Integer.valueOf((String) params.get("limit")) : 10;
        int startLimt = page * limit;
        int endLimt = startLimt + limit;
        List<Map<String, Object>> list = baseMapper.getPageList(meetingId, key, key, startLimt, endLimt);
        int offseet = page * limit;
        List<Map<String, Object>> list = baseMapper.getPageList(meetingId, key, key, offseet, limit);
        int total = baseMapper.getCounts(meetingId, key, key);
        return new PageUtils(list, total, limit, page+1);

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

@@ -38,9 +38,8 @@ public class LectureServiceImpl extends ServiceImpl<LectureDao, LectureEntity> i
        if (page < 0) {
            page = 0;
        }
        int startLimt = page * limit;
        int endLimt = startLimt + limit;
        List<Map<String, Object>> lectureList=baseMapper.getPageList(meetingId, key, key, startLimt, endLimt);
        int offset = page * limit;
        List<Map<String, Object>> lectureList=baseMapper.getPageList(meetingId, key, key, offset, limit);
        int mc = baseMapper.getCounts(meetingId, key, key);
    

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

@@ -36,9 +36,8 @@ public class MeetingServiceImpl extends ServiceImpl<MeetingDao, MeetingEntity> i
        if (page < 0) {
            page = 0;
        }
        int startLimt = page * limit;
        int endLimt = startLimt + limit;        
        List<Map<String, Object>> mList=baseMapper.getPageList(startLimt, endLimt, key, key);
        int offset = page * limit;   
        List<Map<String, Object>> mList=baseMapper.getPageList(offset, limit, key, key);
        Integer mc = baseMapper.getCounts(key, key);
        return new PageUtils(mList, mc, limit, page+1);

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

@@ -40,9 +40,8 @@ public class PaperServiceImpl extends ServiceImpl<PaperDao, PaperEntity> impleme
        if (page < 0) {
            page = 0;
        }
        int startLimt = page * limit;
        int endLimt = startLimt + limit;
        List<Map<String, Object>> pList=baseMapper.getPageList(meetingId, startLimt, endLimt, key, key);
        int offset = page * limit;
        List<Map<String, Object>> pList=baseMapper.getPageList(meetingId, offset, limit, key, key);
        int mc = baseMapper.getCounts(meetingId, key, key);
    

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

@@ -24,6 +24,7 @@ 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.entity.UserEntity;
import io.renren.modules.app.form.PaymentForm;
import io.renren.modules.admin.entity.TypesOfFeeEntity;
import io.renren.modules.admin.service.TypesOfFeeService;
import io.renren.modules.admin.entity.MoneyAccountEntity;
@@ -163,6 +164,41 @@ public class AppOrderController {
        return R.ok().put("orderInfo", orderInfo);
    }
    /**
     * 根据订单id获取缴费信息
     * @param id
     * @return
     */
    @Login
    @GetMapping("/payinfo/{id}")
    public R payInfo(@PathVariable("id") Long id){
        PaymentEntity payInfo = paymentService.getById(id);
        return R.ok().put("payInfo", payInfo);
    }
     /**
     * 修改开票信息
     * @param payment
     * @return
     */
    @Login
    @PostMapping("/updatetax")
    public R updateTaxInfo(@RequestBody PaymentForm payment){
        PaymentEntity  paymentEntity = new PaymentEntity();
        paymentEntity.setId(payment.getId());
        paymentEntity.setTaxType(payment.getTaxType());
        paymentEntity.setTaxTitle(payment.getTaxTitle());
        paymentEntity.setTaxNumber(payment.getTaxNumber());
        paymentEntity.setAddrPhone(payment.getAddrPhone());
        paymentEntity.setBankAddrAccount(payment.getBankAddrAccount());
        paymentEntity.setTaxAddress(payment.getTaxAddress());
        paymentService.updateById(paymentEntity);
        return R.ok();
    }
    // /**
    //  * 删除
    //  */

src/main/java/io/renren/modules/app/form/PaymentForm.java

@@ -0,0 +1,41 @@
package io.renren.modules.app.form;
import lombok.Data;
/**
 * @author chenshun
 * @email sunlightcs@gmail.com
 * @date 2020-02-14 14:51:30
 */
@Data
public class PaymentForm {
	/**
	 * 缴费信息id
	 */
	private Long id;
	/**
	 * 发票类型
	 */
	private Integer taxType;
	/**
	 * 发票抬头
	 */
	private String taxTitle;
	/**
	 * 纳税人税号
	 */
	private String taxNumber;
	/**
	 * 地址 电话
	 */
	private String addrPhone;
	/**
	 * 开户行及账号
	 */
	private String bankAddrAccount;
	/**
	 * 邮寄地址
	 */
	private String taxAddress;
}

src/main/resources/application.yml

@@ -19,8 +19,8 @@ spring:
    date-format: yyyy-MM-dd HH:mm:ss
  servlet:
    multipart:
      max-file-size: 100MB
      max-request-size: 100MB
      max-file-size: 10MB
      max-request-size: 10MB
      enabled: true
  redis:
    open: false  # 是否开启redis缓存  true开启   false关闭