wanghui преди 8 години
родител
ревизия
4828158d78

+ 3 - 3
src/main/java/com/goafanti/common/mapper/TOrderMapper.xml

@@ -683,7 +683,7 @@
     		and intention_status = 0 and (buyer_id = #{uid,jdbcType=VARCHAR} or seller_id =  #{uid,jdbcType=VARCHAR})
     	</when>
     	<otherwise>
-    		and intention_status != 0  and buyer_id = #{uid,jdbcType=VARCHAR}
+    		and intention_status != 0 and (buyer_id = #{uid,jdbcType=VARCHAR} or seller_id =  #{uid,jdbcType=VARCHAR})
     	</otherwise>
     </choose>
     <if test="page_sql!=null">
@@ -715,7 +715,7 @@
 	from
 		t_funding_records a left join t_order b on a.order_no = b.order_no
 	where
-		(a.payee_id = #{uid,jdbcType=VARCHAR} or a.payer_id = #{uid,jdbcType=VARCHAR}) and delete_sign = 0
+		(a.payee_id = #{uid,jdbcType=VARCHAR} or a.payer_id = #{uid,jdbcType=VARCHAR}) and b.delete_sign = 0
 		<if test="orderNo != null and orderNo != ''">
 			a.order_no = #{orderNo,jdbcType=BIGINT}
 		</if>
@@ -730,7 +730,7 @@
 	from
 		t_funding_records a left join t_order b on a.order_no = b.order_no
 	where
-		(a.payee_id = #{uid,jdbcType=VARCHAR} or a.payer_id = #{uid,jdbcType=VARCHAR}) and delete_sign = 0
+		(a.payee_id = #{uid,jdbcType=VARCHAR} or a.payer_id = #{uid,jdbcType=VARCHAR}) and b.delete_sign = 0
 		<if test="orderNo != null and orderNo != ''">
 			a.order_no = #{orderNo,jdbcType=BIGINT}
 		</if>

+ 9 - 9
src/main/java/com/goafanti/order/controller/OrderController.java

@@ -33,7 +33,7 @@ public class OrderController extends CertifyApiController{
 	public Result toAddIntention(String commodityId,Integer commodityType){
 		Result res = new Result();
 		if(StringUtils.isBlank(commodityId) || null == commodityType){
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"",""));
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","商品编号和商品类型"));
 			return res;
 		}
 		if(!CommodityType.containsType(commodityType)){
@@ -132,7 +132,7 @@ public class OrderController extends CertifyApiController{
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","支付金额"));
 			return res;
 		}
-		orderServiceImpl.payForFirst(Long.valueOf(orderNo),new BigDecimal(fundAmount),remarks);
+		orderServiceImpl.updatePayForFirst(Long.valueOf(orderNo),new BigDecimal(fundAmount),remarks);
 		return res;
 	}
 	
@@ -154,7 +154,7 @@ public class OrderController extends CertifyApiController{
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","支付金额"));
 			return res;
 		}
-		orderServiceImpl.payForLast(Long.valueOf(orderNo),new BigDecimal(fundAmount),remarks);
+		orderServiceImpl.updatePayForLast(Long.valueOf(orderNo),new BigDecimal(fundAmount),remarks);
 		return res;
 	}
 	
@@ -167,9 +167,9 @@ public class OrderController extends CertifyApiController{
 	public Result fundingHistory(String orderNo,Integer pageNo,Integer pageSize) {
 		Result res = new Result();
 		if(StringUtils.isNotBlank(orderNo))
-			orderServiceImpl.selectFundingHistory(Long.valueOf(orderNo),pageNo,pageSize);
+			res.setData(orderServiceImpl.selectFundingHistory(Long.valueOf(orderNo),pageNo,pageSize));
 		else
-			orderServiceImpl.selectFundingHistory(null,pageNo,pageSize);
+			res.setData(orderServiceImpl.selectFundingHistory(null,pageNo,pageSize));
 		return res;
 	}
 	
@@ -185,7 +185,7 @@ public class OrderController extends CertifyApiController{
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单编号"));
 			return res;
 		}
-		orderServiceImpl.applyForWithdraw(Long.valueOf(orderNo),remarks);
+		orderServiceImpl.updateApplyForWithdraw(Long.valueOf(orderNo),remarks);
 		return res;
 	}
 	
@@ -194,14 +194,14 @@ public class OrderController extends CertifyApiController{
 	 * @param orderNo
 	 * @return
 	 */
-	@RequestMapping(value = "/applyForCancel", method = RequestMethod.GET)
+	@RequestMapping(value = "/applyForCancel", method = RequestMethod.POST)
 	public Result applyForCancel(String orderNo){
 		Result res = new Result();
 		if(StringUtils.isBlank(orderNo)){
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单编号"));
 			return res;
 		}
-		orderServiceImpl.applyForCancel(Long.valueOf(orderNo));
+		orderServiceImpl.updateApplyForCancel(Long.valueOf(orderNo));
 		return res;
 	}
 	
@@ -218,7 +218,7 @@ public class OrderController extends CertifyApiController{
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单编号"));
 			return res;
 		}
-		orderServiceImpl.confirmIntention(Long.valueOf(orderNo),confirm);
+		orderServiceImpl.updateConfirmIntention(Long.valueOf(orderNo),confirm);
 		return res;
 	}
 }

+ 5 - 5
src/main/java/com/goafanti/order/service/OrderService.java

@@ -37,7 +37,7 @@ public interface OrderService {
 	 * @param fundAmount 金额
 	 * @return remarks 备注
 	 */
-	int payForFirst(Long orderNo, BigDecimal fundAmount,String remarks);
+	int updatePayForFirst(Long orderNo, BigDecimal fundAmount,String remarks);
 
 	/**
 	 * 支付尾款
@@ -46,7 +46,7 @@ public interface OrderService {
 	 * @param remarks 备注
 	 * @return
 	 */
-	int payForLast(Long orderNo, BigDecimal fundAmount, String remarks);
+	int updatePayForLast(Long orderNo, BigDecimal fundAmount, String remarks);
 
 	/**
 	 * 
@@ -74,14 +74,14 @@ public interface OrderService {
 	 * @param orderNo
 	 * @return
 	 */
-	int applyForWithdraw(Long orderNo,String remarks);
+	int updateApplyForWithdraw(Long orderNo,String remarks);
 
 	/**
 	 * 取消订单
 	 * @param orderNo
 	 * @return
 	 */
-	int applyForCancel(Long orderNo);
+	int updateApplyForCancel(Long orderNo);
 
 	/**
 	 * 确认意向订单
@@ -89,5 +89,5 @@ public interface OrderService {
 	 * @param confirm 是否确认
 	 * @return
 	 */
-	int confirmIntention(Long orderNo, boolean confirm);
+	int updateConfirmIntention(Long orderNo, boolean confirm);
 }

+ 15 - 5
src/main/java/com/goafanti/order/service/impl/OrderServiceImpl.java

@@ -279,6 +279,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		records.setTransactionAmount(transactionAmount);
 		records.setTransactionMode(transactionMode.getCode());
 		records.setTransactionSubject(transactionSubject.getCode());
+		records.setTransactionChannel(payChannel.getCode());
 		tFundingRecordsMapper.insert(records);
 		return 1;
 	}
@@ -440,7 +441,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 	}
 
 	@Override
-	public int payForFirst(Long orderNo, BigDecimal fundAmount,String remarks) {
+	public int updatePayForFirst(Long orderNo, BigDecimal fundAmount,String remarks) {
 		TOrder tOrder = tOrderMapper.selectByPrimaryKey(orderNo);
 		addFundRecord(orderNo, TokenManager.getUserToken().getNickname(), DEFAULT_PLATFORM_ID, TokenManager.getUserId(), remarks, 
 				TransactionSubject.SUPPLY_PAY,PayChannel.UNIONPAY, fundAmount, TransactionMode.OFFLINE, AuditState.WAIT_AUDIT);
@@ -449,7 +450,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 	}
 
 	@Override
-	public int payForLast(Long orderNo, BigDecimal fundAmount, String remarks) {
+	public int updatePayForLast(Long orderNo, BigDecimal fundAmount, String remarks) {
 		TOrder tOrder = tOrderMapper.selectByPrimaryKey(orderNo);
 		addFundRecord(orderNo, TokenManager.getUserToken().getNickname(), DEFAULT_PLATFORM_ID, TokenManager.getUserId(), remarks, 
 				TransactionSubject.SUPPLY_PAY,PayChannel.UNIONPAY, fundAmount, TransactionMode.OFFLINE, AuditState.WAIT_AUDIT);
@@ -529,12 +530,13 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 				bo.setBusinessDesc(setBusinessDesc(bo.getTransactionSubject(),bo.getTransactionAmount()));
 			}
 		}
+		data.setList(list);
 		return data;
 	}
 
 	@Override
 	@Transactional
-	public int applyForWithdraw(Long orderNo,String remarks) {
+	public int updateApplyForWithdraw(Long orderNo,String remarks) {
 		TOrder tOrder = tOrderMapper.selectByPrimaryKey(orderNo);
 		BigDecimal transactionAmount = new BigDecimal(DecimalCalculate.sub(tOrder.getActuallyTotalPayment().doubleValue(), 
 				tOrder.getActuallyBrokerageAmount().doubleValue())); 
@@ -547,7 +549,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 
 	@Override
 	@Transactional
-	public int applyForCancel(Long orderNo) {
+	public int updateApplyForCancel(Long orderNo) {
 		TOrder tOrder = tOrderMapper.selectByPrimaryKey(orderNo);
 		setOrderState(OrderAction.APPLY_FOR_CANCEL, new BigDecimal(0), tOrder, false);
 		if(tOrder.getPaymentStatus() == PaymentState.WAIT_FOR_REFUND.getCode() 
@@ -561,6 +563,14 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		return 1;
 	}
 
+	/**
+	 * 
+	 * @param transactionSubject 交易科目
+	 * @param transactionAmount 交易金额
+	 * @param payeeId 收款人
+	 * @param payerId 付款人
+	 * @return
+	 */
 	private String setBusinessDesc(Integer transactionSubject,BigDecimal transactionAmount){
 		String result = "";
 		if(transactionSubject == TransactionSubject.SUPPLY_PAY.getCode() || transactionSubject == TransactionSubject.REFUND.getCode()){
@@ -572,7 +582,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 	}
 
 	@Override
-	public int confirmIntention(Long orderNo, boolean confirm) {
+	public int updateConfirmIntention(Long orderNo, boolean confirm) {
 		TOrder tOrder = tOrderMapper.selectByPrimaryKey(orderNo);
 		setOrderState(OrderAction.CONFIRM_INTENTION, new BigDecimal(0), tOrder, confirm);
 		tOrderMapper.updateByPrimaryKeySelective(tOrder);

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

@@ -131,7 +131,7 @@ public class UserRegisterController extends BaseController {
 			resultObj.put("password", easemobPass);
 			resultObj.put("username", easemobName);
 			resultObj.put("nickname", StringUtils.isBlank(u.getNickname()) ? "技淘用户" + u.getNumber() : u.getNickname());
-			easemobUtils.sendLater(
+			easemobUtils.send(
 					new EasemobInfo().uri("/users/").data(resultObj.toJSONString()).method(HttpMethod.POST));
 			//绑定账号
 			messageService.addJpushEasemobAccount(uuid,u.getId(),easemobName,easemobPass);