Compare commits
No commits in common. "ca01d17e9addc27e98bbeeae7f37577e1731267d" and "727b892eab1c49f2e183af01c824086c87a3d46f" have entirely different histories.
ca01d17e9a
...
727b892eab
|
@ -69,9 +69,8 @@ public class WxLoginController {
|
|||
@RequestParam String tel) {
|
||||
try {
|
||||
return ResponseDTO.ok(Ab98ApiUtil.sendLoginSms(token, tel).getOutputData());
|
||||
} catch (Exception e) {
|
||||
log.error("短信发送失败: ", e);
|
||||
return ResponseDTO.fail();
|
||||
} catch (ApiException e) {
|
||||
return ResponseDTO.fail(e);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -21,10 +21,6 @@ public class MqttService implements MqttCallback {
|
|||
private static final String PASSWORD = "sell@ys#6785$";
|
||||
private static final String TOPIC_FILTER = "lock/up/S5200184S";
|
||||
private static final String TOPIC = "lock/down/S5200184S";
|
||||
// private static final String USERNAME = "iot";
|
||||
// private static final String PASSWORD = "iot@ys#9963$";
|
||||
// private static final String TOPIC_FILTER = "hongfa/2401310026C50D24FE/upload/";
|
||||
// private static final String TOPIC = "hongfa/2401310026C50D24FE/download/";
|
||||
|
||||
private MqttClient client;
|
||||
// 设置自定义消息处理器
|
||||
|
|
|
@ -141,7 +141,7 @@ public class OrderApplicationService {
|
|||
}
|
||||
}
|
||||
|
||||
// @Transactional
|
||||
@Transactional
|
||||
public CreateOrderResult createOrder(SubmitOrderCommand command) {
|
||||
List<ShopOrderGoodsEntity> goodsList = command.getGoodsList();
|
||||
|
||||
|
|
|
@ -82,7 +82,7 @@ public class PaymentApplicationService {
|
|||
} catch (Exception e) {
|
||||
AddPaymentOperationLogCommand paymentOperationLogCommand = new AddPaymentOperationLogCommand();
|
||||
paymentOperationLogCommand.setParams("body:" + jsonBody + " result:" + result);
|
||||
paymentOperationLogCommand.setOperationType("callJsApiPreCreate");
|
||||
paymentOperationLogCommand.setOperationType("submitOrder");
|
||||
paymentOperationLogCommand.setStatus(2);
|
||||
paymentOperationLogCommand.setRemark(ExceptionUtils.getStackTrace(e));
|
||||
paymentOperationLogCommand.initBaseEntity();
|
||||
|
|
Loading…
Reference in New Issue