bug修改

@@ -154,7 +154,7 @@
 	        and amount + #{amount,jdbcType=DECIMAL} >= 0
 	        and amount + #{amount,jdbcType=DECIMAL} >= 0
 	      </if>
 	      </if>
 	      <if test="lockAmount != null" >
 	      <if test="lockAmount != null" >
-	        and lock_amount = lock_amount + #{lockAmount,jdbcType=DECIMAL}  &gt;= 0 
+	        and lock_amount + #{lockAmount,jdbcType=DECIMAL}  &gt;= 0 
 	      </if>
 	      </if>
     	  and status=1
     	  and status=1
   </update>
   </update>

@@ -95,10 +95,13 @@ public class MerchantOrderPaymentService extends AbstractOrderPaymentService {
 		if (orderInfo.getType() == TYPE_FIRST_RECHARGE) {
 		if (orderInfo.getType() == TYPE_FIRST_RECHARGE) {
 			try {
 			try {
 				logger.info("首次充值后回调，调用商家入驻接口，uid={}", orderInfo.getUid());
 				logger.info("首次充值后回调，调用商家入驻接口，uid={}", orderInfo.getUid());
-				ufoServiceCaller.call("ufo.user.addUserAsStoredSeller", ApiResponse.class, orderInfo.getUid());
+				com.yoho.tools.common.beans.ApiResponse<?> resp = ufoServiceCaller.call("ufo.user.addUserAsStoredSeller", ApiResponse.class, orderInfo.getUid());
+				if (resp == null || resp.getCode() != 200) {
+					throw new Exception("调用商家入驻接口返回结果code不是200");
+				}
 			} catch (Exception e) {
 			} catch (Exception e) {
-				logger.error("首次充值后回调，商家入驻接口失败，uid={}", orderInfo.getUid());
-				CommonAlarmEventPublisher.publish("商家入驻失败", "ufo.user.addUserAsStoredSeller", "首次充值后回调，商家入驻接口失败:uid=" + orderInfo.getUid() + ",充值订单号为：" + orderInfo.getOrderCode());
+				logger.error("首次充值后回调，商家入驻接口失败，uid={}, msg={}", orderInfo.getUid(), e.getMessage());
+				CommonAlarmEventPublisher.publish("商家入驻失败", "ufo.user.addUserAsStoredSeller", "首次充值后回调，商家入驻接口失败:uid=" + orderInfo.getUid() + ",充值订单号为：" + orderInfo.getOrderCode() + ",err="+ e.getMessage());
 				return;
 				return;
 			}
 			}
 		}
 		}