前台添加订单

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

@@ -126,7 +126,7 @@ public class EmployeeController {
////        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
////        String format = dateFormat.format(date);
        //创建时间
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-mm-dd hh:mm:ss");
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
        java.util.Date time = null;
        try {
            time= sdf.parse(sdf.format(new Date()));
@@ -149,7 +149,7 @@ public class EmployeeController {
        //修改时间
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-mm-dd hh:mm:ss");
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
        java.util.Date time = null;
        try {
            time= sdf.parse(sdf.format(new Date()));

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

@@ -86,7 +86,6 @@ public class MeetingController {
    @RequestMapping("/save")
    @RequiresPermissions("admin:meeting:save")
    public R save(@RequestBody MeetingEntity meeting){
        Long meetingid = meeting.getId();
        String subjects = meeting.getSubjects();
        String industries = meeting.getIndustries();
        String attendersType = meeting.getAttendersType();
@@ -114,6 +113,10 @@ public class MeetingController {
            }
        }
        meeting.setCreateTime(new Date());
		meetingService.save(meeting);
        Long meetingid = meeting.getId();
        String[] attenderType = attendersType.split(",");
        for (String s : attenderType) {
@@ -127,9 +130,6 @@ public class MeetingController {
            }
        }
        meeting.setCreateTime(new Date());
		meetingService.save(meeting);
        return R.ok();
    }

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

@@ -40,7 +40,6 @@ public class PaymentController {
        return R.ok().put("page", page);
    }
    /**
     * 信息
     */

src/main/java/io/renren/modules/admin/entity/PaymentEntity.java

@@ -28,10 +28,6 @@ public class PaymentEntity implements Serializable {
	 * 订单编号
	 */
	private String orderId;
	/**
	 * 公司id
	 */
	private Long companyId;
	/**
	 * 公司id
	 */
@@ -39,7 +35,7 @@ public class PaymentEntity implements Serializable {
	/**
	 * 参会人员id
	 */
	private Long attenders;
	private Long attendersId;
	/**
	 * 缴费时间
	 */
@@ -76,6 +72,10 @@ public class PaymentEntity implements Serializable {
	 * 邮寄地址
	 */
	private String taxAddress;
	/**
	 * 确认是否付款
	 */
	private Integer isCheck;
	/**
	 * 创建时间
	 */

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

@@ -8,13 +8,16 @@
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;
import java.text.SimpleDateFormat;
import java.util.Date;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestAttribute;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -47,7 +50,12 @@ public class AppTestController {
    @GetMapping("notToken")
    @ApiOperation("忽略Token验证测试")
    public R notToken(){
        return R.ok().put("msg", "无需token也能访问。。。");
        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddhhmmss");
        String time = sdf.format(new Date());
        System.out.println(time);
        Integer fourRandom = Integer.valueOf((int)((Math.random()*9+1)*1000));
        
        return R.ok().put("msg", "无需token也能访问。。。").put("test", "FY" + time + fourRandom);
    }
}

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

@@ -0,0 +1,129 @@
package io.renren.modules.app.controller;
import java.text.SimpleDateFormat;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestAttribute;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import io.renren.common.utils.R;
import io.renren.modules.admin.entity.AttendersEntity;
import io.renren.modules.admin.entity.PaymentEntity;
import io.renren.modules.admin.service.AttendersService;
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.service.UserService;
/**
 * 
 *
 * @author chenshun
 * @email sunlightcs@gmail.com
 * @date 2020-02-21 15:10:27
 */
@RestController
@RequestMapping("app/order")
public class OrderController {
    @Autowired
    private AttendersService attendersService;
    @Autowired
    private UserService userService;
    @Autowired
    private PaymentService paymentService;
    
    
    /**
     * 订单列表
     */
    @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);        
        return R.ok().put("orderList", orderList);
    }
    /**
     * 保存
     */
    @Login
    @PostMapping("/save")
    public R save(@RequestBody Map<String, Object> params, @LoginUser UserEntity user){
        Long meetingId = Long.valueOf(params.get("meetingId").toString());
        AttendersEntity attendersEntity = new AttendersEntity();
        attendersEntity.setMeetingId(meetingId);
        attendersEntity.setMemberId(user.getUserId());
        attendersEntity.setName(user.getUsername());
        attendersEntity.setPhone(user.getPhone());
        attendersEntity.setEmail(user.getEmail());
        attendersEntity.setTypeId(Long.valueOf(params.get("typeId").toString()));
        attendersEntity.setRoom(Integer.valueOf(params.get("room").toString()));
        attendersEntity.setTransfer(Integer.valueOf(params.get("transfer").toString()));
        attendersEntity.setCreateTime(new Date());
        
        attendersService.save(attendersEntity);
        // System.out.println(attendersEntity.getId());
        // 付款信息
        PaymentEntity paymentEntity = new PaymentEntity();
        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddhhmmss");
        String nowtime = sdf.format(new Date());
        // System.out.println(time);
        Integer fourRandom = Integer.valueOf((int)((Math.random()*9+1)*1000));
        paymentEntity.setOrderId("FY" + nowtime + fourRandom);
        paymentEntity.setMeetingId(meetingId);
        paymentEntity.setAttendersId(attendersEntity.getId());
        paymentEntity.setPayType(1);
        paymentEntity.setTaxTitle(params.get("taxTitle").toString());
        paymentEntity.setTaxNumber(params.get("taxNumber").toString());
        paymentEntity.setAddrPhone(params.get("addPhone").toString());
        paymentEntity.setBankAddrAccount(params.get("bankAddrAccount").toString());
        paymentEntity.setTaxAddress(params.get("taxAddress").toString());
        paymentEntity.setCreateTime(new Date());
        paymentService.save(paymentEntity);
        return R.ok();
    }
    /**
     * 修改
     */
    @Login
    @PostMapping("/update")
    public R update(@RequestBody AttendersEntity attenders){
		attendersService.updateById(attenders);
        return R.ok();
    }
    /**
     * 删除
     */
    @Login
    @PostMapping("/delete")
    public R delete(@RequestBody Long[] ids){
		attendersService.removeByIds(Arrays.asList(ids));
        return R.ok();
    }
}