..

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

@@ -2,10 +2,8 @@ package io.renren.modules.app.controller;
import io.renren.common.utils.R;
import io.renren.modules.admin.entity.MeetingEntity;
import io.renren.modules.admin.entity.MoneyAccountEntity;
import io.renren.modules.admin.service.EmployeeService;
import io.renren.modules.admin.service.MeetingService;
import io.renren.modules.admin.service.MoneyAccountService;
import io.renren.modules.admin.entity.PaperRequireEntity;
import io.renren.modules.admin.service.PaperRequireService;
@@ -29,9 +27,6 @@ import org.springframework.web.bind.annotation.RestController;
public class AppMeetingController {
    @Autowired
    private MeetingService meetingService;
    @Autowired
    private MoneyAccountService moneyAccountService;
    @Autowired
    private PaperRequireService paperRequireService;
    @Autowired
@@ -83,18 +78,6 @@ public class AppMeetingController {
            .put("onsiteRegDeadline", onsiteRegDeadline).put("paperDealine", paperDealine);
    }
    /**
     * 根据meetingId信息获取对公账号
     * @param mid
     * @return
     */
    @GetMapping("/accountinfo/{mid}")
    public R infoByMid(@PathVariable("mid") Long mid){
		MoneyAccountEntity moneyAccount = moneyAccountService.getOneByMeetingId(mid);
        
        return R.ok().put("moneyAccount", moneyAccount);
    }
     /**
     * 根据meetingId信息获取投稿要求
     */

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

@@ -6,6 +6,7 @@ import java.util.Date;
import java.util.List;
import java.util.Map;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.beans.factory.annotation.Autowired;
@@ -25,6 +26,10 @@ 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.admin.entity.TypesOfFeeEntity;
import io.renren.modules.admin.service.TypesOfFeeService;
import io.renren.modules.admin.entity.MoneyAccountEntity;
import io.renren.modules.admin.service.MoneyAccountService;
/**
 * @author chenshun
@@ -38,13 +43,17 @@ public class AppOrderController {
    private AttendersService attendersService;
    @Autowired
    private PaymentService paymentService;
    
    @Autowired
    private TypesOfFeeService typesOfFeeService;
    @Autowired
    private MoneyAccountService moneyAccountService;
    /**
     * 订单列表
     */
    @Login
    @GetMapping("/list")
    public R orderList(@RequestAttribute("userId") Integer userId){
    public R list(@RequestAttribute("userId") Integer userId){
        Long memberId = Long.valueOf(userId);
        List<Map<String, Object>> orderList = paymentService.queryOrderListByMemberId(memberId);        
@@ -52,6 +61,29 @@ public class AppOrderController {
        return R.ok().put("orderList", orderList);
    }
    /**
     * 获取注册类型列表
     */
    @GetMapping("/feelist/{mid}")
    public R feeList(@PathVariable("mid") Long mid){
        List<TypesOfFeeEntity> feeList = typesOfFeeService.list(
            new QueryWrapper<TypesOfFeeEntity>().eq("meeting_id", mid));
            
        return R.ok().put("feeList", feeList);
    }
    /**
     * 根据meetingId信息获取对公账号
     * @param mid
     * @return
     */
    @GetMapping("/accountinfo/{mid}")
    public R accountInfoByMid(@PathVariable("mid") Long mid){
		MoneyAccountEntity moneyAccount = moneyAccountService.getOneByMeetingId(mid);
        
        return R.ok().put("moneyAccount", moneyAccount);
    }
    /**
     * 保存
     */
@@ -121,8 +153,13 @@ public class AppOrderController {
        return R.ok();
    }
    /**
     * 根据订单编号获取订单信息
     * @param orderId
     * @return
     */
    @GetMapping("/infobyorderid/{orderId}")
    public R infoByAttendersId(@PathVariable("orderId") String orderId){
    public R infoByOrderId(@PathVariable("orderId") String orderId){
        Map<String, Object> orderInfo = paymentService.queryOrderInfoByOrderId(orderId);
        return R.ok().put("orderInfo", orderInfo);

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

@@ -1,40 +0,0 @@
package io.renren.modules.app.controller;
import io.renren.common.utils.HttpRequestUtil;
import io.renren.modules.app.service.SmsCodeService;
import io.renren.common.utils.ConfigConstant;
import java.net.URLEncoder;
import java.util.UUID;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping("app/smscode")
public class SmsTestController {
	@Autowired
    private SmsCodeService smsCodeService;
    
    /**
	 * 短信发送(验证码通知，会员营销)
	 * 接口文档地址：http://www.miaodiyun.com/doc/https_sms.html
	 */
	@PostMapping("/test")
	public String execute() throws Exception{
		String uuid = UUID.randomUUID().toString();
		String phone = "17611467373";
		String code = smsCodeService.getCode(uuid, phone);
		StringBuilder sb = new StringBuilder();
		sb.append("accountSid").append("=").append(ConfigConstant.ACCOUNT_SID);
		sb.append("&to").append("=").append(phone);
		sb.append("&param").append("=").append(URLEncoder.encode(code + "," + ConfigConstant.EXPIRE_TIME,"UTF-8"));
		sb.append("&templateid").append("=").append("206770");
		String body = sb.toString() + HttpRequestUtil.createCommonParam(ConfigConstant.ACCOUNT_SID, ConfigConstant.AUTH_TOKEN);
		String result = HttpRequestUtil.post(ConfigConstant.BASE_URL, body);
		System.out.println(result);
		return result;
	}
}

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

@@ -1,47 +0,0 @@
package io.renren.modules.app.controller;
import java.math.BigDecimal;
import java.util.Arrays;
import java.util.Map;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import java.util.Date;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
import io.renren.modules.admin.entity.TypesOfFeeEntity;
import io.renren.modules.admin.service.TypesOfFeeService;
import io.renren.common.utils.R;
/**
 * 费用类型表
 *
 * @author chenshun
 * @email sunlightcs@gmail.com
 * @date 2020-02-24 10:38:03
 */
@RestController
@RequestMapping("app/typesoffee")
public class TypesOfFee {
    @Autowired
    private TypesOfFeeService typesOfFeeService;
    /**
     * 列表
     */
    @GetMapping("/list/{mid}")
    public R list(@PathVariable("mid") Long mid){
        List<TypesOfFeeEntity> feeList = typesOfFeeService.list(
            new QueryWrapper<TypesOfFeeEntity>().eq("meeting_id", mid));
            
        return R.ok().put("feeList", feeList);
    }
}