--no commit message

com.zrqx.core/src/main/java/com/zrqx/core/commons/redis/FgRedisManage.java

@@ -42,6 +42,7 @@ public class FgRedisManage extends RedisAdapter{
 		try {
 			return super.get(FgMemberVo.class);
 		} catch (Exception e) {
+			logger.error(e.getMessage(), e);
 			return (FgMemberVo) environmentInterface.getMemberException(e);
 		}
 	}

com.zrqx.core/src/main/java/com/zrqx/core/enums/env/impl/ProductEnvironmentImpl.java

@@ -43,6 +43,7 @@ public class ProductEnvironmentImpl extends AbstractEnvironment{
 
 	@Override
 	public Member getMemberException(Exception e) {
+		e.printStackTrace();
 		throw new BaseException(ResponseCodeEnum.NO_LOGIN);
 	}
 

com.zrqx.core/src/main/java/com/zrqx/core/enums/school/sysuser/OrderInfiStatusEnum.java

@@ -8,7 +8,8 @@ public enum OrderInfiStatusEnum {
 	UNSUBMITTED("0", "待操作"),
 	SUBMITTED("1", "已提交"),
     RETURNED("2", "已退回"),
-    ORDER("3", "已订购");
+    ORDER("3", "已订购"),
+    READY_ORDER("4", "已补订");
 	
 	
 	private String code;

com.zrqx.core/src/main/java/com/zrqx/core/enums/school/sysuser/OrderStatusEnum.java

@@ -11,7 +11,8 @@ public enum OrderStatusEnum {
 	CONFIRMED("3","待确认"),
 	CONFIRM("4","已确认"),
 	REFUSE("5","已拒绝"),
-	ON_ORDER("6","已订购");
+	ON_ORDER("6","已订购"),
+	ALREADY_ORDER("7","已补订");
 	
 	
 	private String code;

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/controller/order/FgOrderController.java

@@ -31,6 +31,7 @@ import com.zrqx.core.util.page.PageInfo;
 import com.zrqx.core.util.page.PageParam;
 import com.zrqx.core.util.response.CallBack;
 import com.zrqx.core.vo.schoolsysuser.fg.order.ExportOrderExcel;
+import com.zrqx.core.vo.schoolsysuser.fg.order.OrderInfoVo;
 import com.zrqx.core.vo.schoolsysuser.fg.order.OrderVo;
 import com.zrqx.school.sysuser.client.FgMemberClient;
 import com.zrqx.school.sysuser.service.order.FgOrderService;
@@ -54,6 +55,13 @@ public class FgOrderController {
 	}
 	
 	
+	@ApiOperation( value = "保存补订订单", notes = "保存补订订单")
+	@PostMapping(value = SchoolRequestPath.SAVE + SchoolRequestPath.MAKE_UP)
+	public CallBack<Boolean> saveMakeup(SaveOrderForm form){
+		return CallBack.success(fgOrderService.saveMakeup(form));
+	}
+	
+	
 	@ApiOperation(value = "学校订单列表",notes = "分页查询")
 	@GetMapping(value = SchoolRequestPath.PAGE)
 	public CallBack<PageInfo<OrderVo>> page(PageParam pageParam,QueryOrderForm form){

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/controller/order/FgOrderInfoController.java

@@ -48,8 +48,8 @@ public class FgOrderInfoController {
 	
 	@ApiOperation( value = "补丁订单列表", notes = "补丁订单列表")
 	@GetMapping(value = SchoolRequestPath.MAKE_UP + SchoolRequestPath.LIST)
-	public CallBack<List<ShopCartVo>> makeupList(){
-		return null;
+	public CallBack<List<OrderInfoVo>> makeupList(){
+		return CallBack.success(fgOrderInfoService.makeupList());
 	}
 	
 	

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/manage/order/OrderInfoManage.java

@@ -16,6 +16,15 @@ public interface OrderInfoManage {
 	boolean save(List<OrderInfo> list, Integer orderId, Integer academicLevel);
 	
 	/**
+	 * 保存订单详情(补订)
+	 * @param list
+	 * @return
+	 * @auther zzg
+	 * @data 2019年8月7日 下午2:07:36
+	 */
+	boolean saveOrder(List<OrderInfo> list, Integer orderId, Integer academicLevel);
+	
+	/**
 	 * 保存订单详情
 	 * @param list
 	 * @return

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/manage/order/OrderInfoManageimpl.java

@@ -48,6 +48,24 @@ public class OrderInfoManageimpl extends BaseManageImpl<OrderInfo,Integer> imple
 	}
 	
 	
+	
+	
+	@Override
+	public boolean saveOrder(List<OrderInfo> list, Integer orderId, Integer academicLevel) {
+		list.forEach(vo ->{
+			OrderInfo info = new OrderInfo();
+			vo.setOrderId(orderId);
+			if(academicLevel != null){
+				vo.setAcademicLevel(academicLevel);
+			}
+			vo.setDiscount(new BigDecimal(10));
+			BeanUtils.copyProperties(vo, info);
+			super.insert(info);
+			//保存订单详情状态
+			orderInfoStatusManage.saveOrderInfo(info.getId());
+		});
+		return true;
+	}
 	@Override
 	public boolean saveInfo(List<Integer> ids, Integer orderId ,Integer oldOrderId) {
 		//通过订单id查询订单详情，判断订单详情里面是否有数据

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/manage/order/OrderInfoStatusManage.java

@@ -17,6 +17,15 @@ public interface OrderInfoStatusManage {
 	 */
 	boolean save(Integer orderInfoId);
 	
+	/**
+	 * 保存订单详情状态(补订)
+	 * @param orderInfoId
+	 * @return
+	 * @auther zzg
+	 * @data 2019年8月8日 上午10:47:16
+	 */
+	boolean saveOrderInfo(Integer orderInfoId);
+	
 	
 	/**
 	 * 保存订单详情状态(提交)

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/manage/order/OrderInfoStatusManageImpl.java

@@ -30,6 +30,23 @@ public class OrderInfoStatusManageImpl implements OrderInfoStatusManage{
 		fgOrderInfoStatusMapper.insert(ois);
 		return true;
 	}
+	
+	
+	
+
+	@Override
+	public boolean saveOrderInfo(Integer orderInfoId) {
+		OrderInfoStatus ois = new OrderInfoStatus();
+		ois.setOrderInfoId(orderInfoId);
+		ois.setOrderType(MemberTypeEnum.BUSNESS.getCode());
+		ois.setStatus(OrderInfiStatusEnum.READY_ORDER.getCode());
+		ois.setType(OrderTypeEnum.WAIT_GOODS.getCode());
+		fgOrderInfoStatusMapper.insert(ois);
+		return true;
+	}
+
+
+
 
 	@Override
 	public boolean update(List<Integer> ids, String status) {

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/manage/order/OrderStatusManage.java

@@ -16,6 +16,15 @@ public interface OrderStatusManage {
 	boolean save(Integer orderId);
 	
 	/**
+	 * 保存订单状态（补订）
+	 * @param orderId
+	 * @return
+	 * @auther zzg
+	 * @data 2019年8月7日 下午2:26:36
+	 */
+	boolean saveMakeup(Integer orderId);
+	
+	/**
 	 * 保存订单状态（提交）
 	 * @param orderId
 	 * @return

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/manage/order/OrderStatusManageImpl.java

@@ -28,6 +28,23 @@ public class OrderStatusManageImpl implements OrderStatusManage{
 		fgOrderStatusMapper.insert(status);
 		return true;
 	}
+	
+	
+	@Override
+	public boolean saveMakeup(Integer orderId) {
+		OrderStatus status = new OrderStatus();
+		status.setOrderId(orderId);
+		status.setOrderType(MemberTypeEnum.SCHOOL.getCode());
+		status.setStatus(OrderStatusEnum.ALREADY_ORDER.getCode());
+		status.setType(OrderTypeEnum.WAIT_GOODS.getCode());
+		fgOrderStatusMapper.insert(status);
+		status.setOrderType(MemberTypeEnum.BUSNESS.getCode());
+		status.setId(0);
+		fgOrderStatusMapper.insert(status);
+		return true;
+	}
+
+
 	@Override
 	public boolean saveOrderStatus(Integer orderId) {
 		OrderStatus status = new OrderStatus();

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/service/order/FgOrderInfoServiceImpl.java

@@ -6,10 +6,13 @@ import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.zrqx.core.commons.redis.FgRedisManage;
+import com.zrqx.core.exception.BusinessValidateException;
 import com.zrqx.core.form.member.bg.department.QueryTypeAndRelationIdForm;
 import com.zrqx.core.form.school.sysuser.fg.order.BatchSubmitForm;
 import com.zrqx.core.form.school.sysuser.fg.order.QueryOrderInfoForm;
@@ -42,12 +45,14 @@ import com.zrqx.school.sysuser.manage.supplier.SupplierManage;
 import com.zrqx.school.sysuser.mapper.order.FgOrderInfoMapper;
 import com.zrqx.school.sysuser.mapper.order.FgOrderMapper;
 import com.zrqx.school.sysuser.mapper.publiclesson.FgPublicLessonMapper;
+import com.zrqx.school.sysuser.mapper.supplier.FgSupplierMapper;
+import com.zrqx.school.sysuser.service.major.FgMajorServiceImpl;
 
 @Service
 public class FgOrderInfoServiceImpl extends BaseModelServiceImpl<OrderInfo,Integer> implements 	FgOrderInfoService{
 	
 	
-	
+	private Logger log = LoggerFactory.getLogger(FgOrderInfoServiceImpl.class);
 	@Autowired
 	private FgOrderInfoMapper fgOrderInfoMapper;
 	@Autowired
@@ -72,6 +77,8 @@ public class FgOrderInfoServiceImpl extends BaseModelServiceImpl<OrderInfo,Integ
 	private FgMemberClient fgMemberClient;
 	@Autowired
 	private FgRedisManage redis;
+	@Autowired
+	private FgSupplierMapper fgSupplierMapper;
 
 	@Override
 	public BaseMapper<OrderInfo> getMapper() {
@@ -308,9 +315,18 @@ public class FgOrderInfoServiceImpl extends BaseModelServiceImpl<OrderInfo,Integ
 		List<OrderInfoVo> list = fgOrderInfoMapper.makeupList(form);
 		list.stream().forEach(vo ->{
 			//经销商名称
-			/*Order order = fgOrderMapper.selectByPrimaryKey(vo.getOrderId());
+			Order order = fgOrderMapper.selectByPrimaryKey(vo.getOrderId());
 			FgSupplier supplier = new FgSupplier();
-			supplier.setDistributorId(order);*/
+			supplier.setDistributorId(order.getSupplierId());
+			supplier.setRelationId(order.getRelationId());
+			supplier.setType(order.getType());
+			try{
+				FgSupplier entity = fgSupplierMapper.selectOne(supplier);
+				vo.setSupplierName(entity.getDistributorName());
+			}catch(Exception e){
+				log.error("获取经销商名称失败");
+			}
+			
 			//课程
 			if(vo.getLessonId() != null){
 				PublicLesson lesson = fgPublicLessonMapper.selectByPrimaryKey(vo.getLessonId());

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/service/order/FgOrderService.java

@@ -28,6 +28,15 @@ public interface FgOrderService extends BaseService<Order,Integer>{
 	 */
 	boolean saveOrder(SaveOrderForm form);
 	
+	/**
+	 * 保存补订订单
+	 * @param form
+	 * @return
+	 * @auther zzg
+	 * @data 2019年8月7日 下午1:57:38
+	 */
+	boolean saveMakeup(SaveOrderForm form);
+	
 	
 	/**
 	 * 分担列表（分页）

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/service/order/FgOrderServiceImpl.java

@@ -72,6 +72,30 @@ public class FgOrderServiceImpl extends BaseModelServiceImpl<Order,Integer> impl
 	@Override
 	public boolean saveOrder(SaveOrderForm form) {
 		//保存订单
+		Order order = this.savePublicOrder(form);
+		//保存订单详情
+		orderInfoManage.save(form.getList(), order.getId(),form.getAcademicLevel());
+		//保存订单状态
+		orderStatusManage.save(order.getId());
+		return true;
+	}
+	
+	
+	
+
+	@Override
+	public boolean saveMakeup(SaveOrderForm form) {
+		//保存订单
+		Order order = this.savePublicOrder(form);
+		//保存订单详情
+		orderInfoManage.saveOrder(form.getList(), order.getId(),form.getAcademicLevel());
+		//保存订单状态
+		orderStatusManage.saveMakeup(order.getId());
+		return true;
+	}
+	
+	public Order savePublicOrder(SaveOrderForm form){
+		//保存订单
 		Order order = new Order();
 		form.setOrderNumber(environmentInterface.createOrderCode());
 		form.setRelationId(redis.getMember().getRelationId());
@@ -80,11 +104,7 @@ public class FgOrderServiceImpl extends BaseModelServiceImpl<Order,Integer> impl
 		form.setSchoolId(redis.getMember().getRelationId());
 		BeanUtils.copyProperties(form, order);
 		super.insert(order);
-		//保存订单详情
-		orderInfoManage.save(form.getList(), order.getId(),form.getAcademicLevel());
-		//保存订单状态
-		orderStatusManage.save(order.getId());
-		return true;
+		return order;
 	}
 
 	@Override

config-server/src/main/resources/properties/application-prod.yml

@@ -26,7 +26,7 @@ publisher-port: 8211
 #默认
 default: 
   server: 
-    environment: 0 # 测试环境 see EnvironmentEnum
+    environment: 1 # 测试环境 see EnvironmentEnum
   #Sleuth微服务跟踪监控中心
   spring-zipkin-base-url: http://localhost:9411/
   #sleuth 采样率, 1.0代表所有的span都会被采集到zipkin中. 0.0则代表所有的span都不会被采集到zipkin中.