Browse Source

Merge remote-tracking branch 'origin/dev' into test

wanghui 8 years ago
parent
commit
18d5bef935

+ 1 - 1
src/main/java/com/goafanti/common/mapper/BusinessProjectMapper.xml

@@ -790,7 +790,7 @@
  </select>
  
  <select id="selectBusinessProjectByName" parameterType="java.lang.String" resultMap="BaseResultMap">
- 	select  id,bname,ifnull(price,0) as price,ifnull(first_payment,0) as firstPayment from business_project 
+ 	select  id,bname,ifnull(price,0)*10000 as price,ifnull(first_payment,0)*10000 as firstPayment from business_project 
  	where 1=1
  	<if test="cid != null">
  		and cid = #{cid,jdbcType=VARCHAR}

+ 1 - 0
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -702,6 +702,7 @@ public class CustomerServiceImpl  extends BaseMybatisDao<UserMapper> implements
 		user.setId(uid);
 		if(operatorType.equals(AFTConstants.USER_TRANSFER_TO_PUBLIC)){
 			user.setShareType(AFTConstants.USER_SHARE_PUBLIC);
+			user.setAid("");
 		}else if(operatorType.equals(AFTConstants.USER_RECEIVE)){
 			user.setAid(TokenManager.getAdminId());
 			user.setShareType(AFTConstants.USER_SHARE_PRIVATE);

+ 5 - 0
src/main/java/com/goafanti/order/controller/AdminOrderApiController.java

@@ -15,6 +15,7 @@ import com.goafanti.common.controller.CertifyApiController;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.order.bo.OrderListBo;
 import com.goafanti.order.enums.AuditState;
+import com.goafanti.order.enums.CommodityType;
 import com.goafanti.order.service.OrderService;
 
 @RestController
@@ -342,6 +343,10 @@ public class AdminOrderApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单类型"));
 			return res;
 		}
+		if(orderType != CommodityType.SERVICE.getTypeCode()){
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"","暂不支持创建该类型订单"));
+			return res;
+		}
 		orderServiceImpl.createServiceOrder(uid,orderType);
 		return res;
 	}

+ 10 - 8
src/main/java/com/goafanti/order/service/impl/OrderServiceImpl.java

@@ -82,14 +82,15 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 	@Autowired
 	private ContractMapper contractMapper;
 	
-	private final BigDecimal DEFAULT_FIRST_PAYMENT = new BigDecimal(0);// 默认首付价格
-	private final BigDecimal DEFAULT_COMMODITY_PRICE = new BigDecimal(0);// 默认单价
-	private final String DEFAULT_PLATFORM_ID = "0"; // 平台默认id
+	private final BigDecimal DEFAULT_FIRST_PAYMENT = new BigDecimal(0);//默认首付价格
+	private final BigDecimal DEFAULT_COMMODITY_PRICE = new BigDecimal(0);//默认单价
+	private final String DEFAULT_PLATFORM_ID = "0"; //平台默认id
 	private final String DEFAULT_ADMIN_ID = "1"; //默认管理员
 	private final double DEFAULT_BROKERAGE_PROPORTION = 0; //佣金比例
 	private final double DEFAULT_COMMODITY_DISCOUNT = 1; //折扣比例
 	private final String DEFAULT_COMMODITY_MODE = "NO_MODE"; //暂无规格
 	private final String DEFAULT_CREATER = "PLATFORM";//平台方
+	private final BigDecimal DEFAULT_AMOUNT_UNIT = new BigDecimal(10000); //单位
 	/*
 	 * -------------------------------------------------- APP管理端 --------------------------------------------------------
 	 */
@@ -142,6 +143,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 			tOrder.setBuyerId(TokenManager.getUserId());
 			tOrder.setSellerId(StringUtils.isBlank(bo.getSellerId()) ? DEFAULT_PLATFORM_ID : bo.getSellerId());
 		}
+		tOrder.setOrderType(commodityType);
 		tOrder.setBrokerageAmount(discountPrice.multiply(new BigDecimal(DEFAULT_BROKERAGE_PROPORTION)));
 		tOrder.setFirstPayment(DEFAULT_FIRST_PAYMENT);
 		tOrder.setOrderAmount(orderAmount);
@@ -160,10 +162,10 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		tOrderDetail.setCommodityMode(StringUtils.isBlank(commodityMode)?DEFAULT_COMMODITY_MODE: commodityMode);
 		tOrderDetail.setCommodityType(commodityType);
 		tOrderDetail.setCommodityQuantity(commodityQuantity);
-		tOrderDetail.setCommodityPrice(commodityPrice);
-		tOrderDetail.setCommodityFirstPayment(commodityFirstPayment);
-		tOrderDetail.setDiscountPrice(discountPrice);
-		tOrderDetail.setDiscountFirstPayment(discountFirstPayment);
+		tOrderDetail.setCommodityPrice(commodityPrice.multiply(DEFAULT_AMOUNT_UNIT));
+		tOrderDetail.setCommodityFirstPayment(commodityFirstPayment.multiply(DEFAULT_AMOUNT_UNIT));
+		tOrderDetail.setDiscountPrice(discountPrice.multiply(DEFAULT_AMOUNT_UNIT));
+		tOrderDetail.setDiscountFirstPayment(discountFirstPayment.multiply(DEFAULT_AMOUNT_UNIT));
 		tOrderDetailMapper.insert(tOrderDetail);
 		tOrderMapper.insert(tOrder);
 		return 1;
@@ -1015,7 +1017,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 					.multiply(new BigDecimal(detail.getCommodityQuantity()));
 			BigDecimal signTotalAmountChange = detail.getDiscountPrice()
 					.multiply(new BigDecimal(detail.getCommodityQuantity()));
-			BigDecimal signFirstPaymentChange = detail.getCommodityFirstPayment()
+			BigDecimal signFirstPaymentChange = detail.getDiscountFirstPayment()
 					.multiply(new BigDecimal(detail.getCommodityQuantity()));
 			tOrder.setOrderAmount(tOrder.getOrderAmount().subtract(totalAmountChange));
 			tOrder.setFirstPayment(tOrder.getFirstPayment().subtract(firstPaymentChange));

+ 2 - 2
src/main/java/com/goafanti/user/controller/UserRegisterController.java

@@ -111,7 +111,7 @@ public class UserRegisterController extends BaseController {
 			us.setShareType(AFTConstants.USER_SHARE_PUBLIC);
 			us.setIdentifyName(StringUtils.isBlank(user.getUnitName())?"":user.getUnitName());
 			us.setLvl(UserLevel.GENERAL.getCode());
-			us.setAid("0");
+			//us.setAid("0");
 			userService.insertRegister(us,user.getUnitName(),user.getUsername());
 		}
 		return res;
@@ -180,7 +180,7 @@ public class UserRegisterController extends BaseController {
 			us.setShareType(AFTConstants.USER_SHARE_PUBLIC);
 			us.setIdentifyName(StringUtils.isBlank(user.getUnitName())?"":user.getUnitName());
 			us.setLvl(UserLevel.GENERAL.getCode());
-			us.setAid("0");
+			//us.setAid("0");
 			userService.insertRegister(us,user.getUnitName(),user.getUsername());
 			User currentUser = userService.selectByPrimaryKey(us.getId()); 			
 			registerEasemobAfterRegister(uuid,currentUser);//开通环信账号