Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

common/common-entity/src/main/java/com/yihu/jw/entity/care/course/CourseDO.java

@@ -7,6 +7,7 @@ import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
@@ -73,7 +74,7 @@ public class CourseDO extends UuidIdentityEntityWithOperator {
    /**
     * '费用'
     */
    private String fee;
    private BigDecimal fee;
    /**
     * '课程简介'
     */
@@ -172,11 +173,11 @@ public class CourseDO extends UuidIdentityEntityWithOperator {
    }
    @Column(name = "fee")
    public String getFee() {
    public BigDecimal getFee() {
        return fee;
    }
    public void setFee(String fee) {
    public void setFee(BigDecimal fee) {
        this.fee = fee;
    }

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/course/PatientCourseEndpoint.java

@@ -13,7 +13,6 @@ import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.math.BigDecimal;
import java.util.List;
import java.util.Map;
@@ -244,14 +243,10 @@ public class PatientCourseEndpoint extends EnvelopRestEndpoint {
            @ApiParam(name = "patient", value = "居民id", defaultValue = "3ae2673512154d5280d1dcf5ffa5626d") @RequestParam(value = "patient", required = true) String patient,
            @ApiParam(name = "patientName", value = "居民name", defaultValue = "白海灵") @RequestParam(value = "patientName", required = true) String patientName,
            @ApiParam(name = "courseId", value = "课程id", defaultValue = "808080eb7983eb630179882b9a540034") @RequestParam(value = "courseId", required = true) String courseId,
            @ApiParam(name = "courseName", value = "课程name", defaultValue = "3") @RequestParam(value = "courseName", required = true) String courseName,
            @ApiParam(name = "orgCode", value = "机构code", defaultValue = "808080eb7861c327017861d18d070011") @RequestParam(value = "orgCode", required = true) String orgCode,
            @ApiParam(name = "orgName", value = "机构name", defaultValue = "厦门托育机构") @RequestParam(value = "orgName", required = true) String orgName,
            @ApiParam(name = "price", value = "价格", defaultValue = "110") @RequestParam(value = "price", required = true) BigDecimal price,
            @ApiParam(name = "payType", value = "1-微信支付，2-线下支付", defaultValue = "1") @RequestParam(value = "payType", required = true) String payType
    ) {
        try {
            return success(courseService.buyCourseOrder(patient,patientName,courseId,courseName,orgCode,orgName,price,payType));
            return success(courseService.buyCourseOrder(patient,patientName,courseId,payType));
        } catch (Exception e) {
            return failedException(e);
        }

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/course/CourseService.java

@@ -1,7 +1,7 @@
package com.yihu.jw.care.service.course;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.care.dao.course.*;
@@ -9,20 +9,12 @@ import com.yihu.jw.doctor.dao.BaseDoctorDao;
import com.yihu.jw.doctor.dao.BaseDoctorHospitalDao;
import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
import com.yihu.jw.entity.base.doctor.BaseDoctorHospitalDO;
import com.yihu.jw.entity.care.course.CourseSalesOrderRecordDO;
import com.yihu.jw.entity.care.course.PatientOrderRefundDO;
import com.yihu.jw.entity.care.course.RecruitStudentsRecordDO;
import com.yihu.jw.doctor.dao.BaseDoctorHospitalDao;
import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
import com.yihu.jw.entity.base.doctor.BaseDoctorHospitalDO;
import com.yihu.jw.entity.care.course.*;
import com.yihu.jw.entity.order.BusinessOrderDO;
import com.yihu.jw.order.dao.BusinessOrderDao;
import com.yihu.jw.org.dao.BaseOrgDao;
import com.yihu.jw.patient.dao.BasePatientDao;
import com.yihu.jw.restmodel.ResponseContant;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.jw.rm.base.BaseRequestMapping;
import com.yihu.jw.utils.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
@@ -30,12 +22,7 @@ import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.util.*;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
 * Created with IntelliJ IDEA.
@@ -687,21 +674,22 @@ public class CourseService {
        return object;
    }
    public int buyCourseOrder(String patient, String patientName, String courseId, String courseName, String orgCode, String orgName, BigDecimal price,String payType){
    public CourseSalesOrderRecordDO buyCourseOrder(String patient, String patientName, String courseId,String payType){
        CourseDO courseDO = courseDao.findOne(courseId);
        CourseSalesOrderRecordDO recordDO = new CourseSalesOrderRecordDO();
        recordDO.setBuyTime(new Date());
        recordDO.setPatient(patient);
        recordDO.setPatientName(patientName);
        recordDO.setCourseId(courseId);
        recordDO.setCourseName(courseName);
        recordDO.setOrgCode(orgCode);
        recordDO.setOrgName(orgName);
        recordDO.setPrice(price);
        recordDO.setCourseName(courseDO.getName());
        recordDO.setOrgCode(courseDO.getOrgCode());
        recordDO.setOrgName(courseDO.getOrgName());
        recordDO.setPrice(courseDO.getFee());
        recordDO.setPayType(payType);
        long  timeNew =  System.currentTimeMillis(); // 13位数的时间戳
        recordDO.setOrderNo(timeNew+"");
        recordDO.setOrderNo(getOrderNo("2"));
        courseSalesOrderRecordDao.save(recordDO);
        return 1;
        return recordDO;
    }
}